diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs index ff7190924fb7456f9c7aa8ee593ed667e808d89c..58f60ceea39429e23cdb3e51719851858f8c53ac 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs @@ -318,6 +318,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation _parameterViewModels[nameof(PredictiveCruiseControlNullable)].EditingChangedCallback = ADASGroupEditingCallback; _parameterViewModels[nameof(ATEcoRollReleaseLockupClutch)].EditingChangedCallback = ADASGroupEditingCallback; + _parameterViewModels[nameof(ATEcoRollReleaseLockupClutch)].AllowNullValue = true; + Action<MultistageParameterViewModel> PassengerGroupEditingCallback = (MultistageParameterViewModel param) => { NumberOfPassengersEditingEnabled = param.EditingEnabled; }; diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageParameterViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageParameterViewModel.cs index 17248322fe92fd3e603b09c24df0331e3cecb515..be128352b789d81823ed1145e64e77486dceae78 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageParameterViewModel.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageParameterViewModel.cs @@ -37,6 +37,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation private object _currentContent; private object _dummyContent; private bool _mandatory; + private bool _allowNullValue; private object _storedContent; private string _label; private ObservableCollection<Enum> _allowedItems; @@ -207,6 +208,16 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation } } + public bool AllowNullValue + { + get => _allowNullValue; + set + { + SetProperty(ref _allowNullValue, value); + UpdateValueFieldEditable(); + } + } + public bool EditingEnabled { get => _editingEnabled; @@ -398,7 +409,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation /// <returns></returns> public bool UpdateEditingEnabled() { - if (CurrentContent == null) { + if (!AllowNullValue && CurrentContent == null) { EditingEnabled = false; } else { EditingEnabled = true;