Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 78174212 authored by Harald MARTINI's avatar Harald MARTINI
Browse files

Enabled storing the edited value if checkbox is set to false in MultistageParameter

parent eafcb5f5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 82 additions and 36 deletions
VECTO3GUI2020/Test.xaml
+ 1
− 0
View file @ 78174212
......@@ -16,6 +16,7 @@
<customControls:MultiStageParameter Content="{Binding ConvertedSI}" DummyContent="{Binding Source={StaticResource milimeterDummy}}"/>
<customControls:MultiStageParameter Content="{Binding ConvertedSI1}" DummyContent="{Binding Source={StaticResource milimeterDummy}}"/>
<customControls:MultiStageParameter Mode="COMBOBOX" Content="{Binding HeatPumpMode}"></customControls:MultiStageParameter>
<customControls:MultiStageParameter Mode="TEXTBOX" Content="{Binding TestString}"></customControls:MultiStageParameter>
</StackPanel>
</Grid>
</UserControl>
VECTO3GUI2020/TestViewModel.cs
+ 8
− 1
View file @ 78174212
......@@ -35,6 +35,7 @@ namespace VECTO3GUI2020
private Meter _meter;
private HeatPumpMode? _heatpumpMode;
private string _testString;
public Meter Meter
{
......@@ -48,9 +49,15 @@ namespace VECTO3GUI2020
set => SetProperty(ref _heatpumpMode, value);
}
public String TestString
{
get => _testString;
set => SetProperty(ref _testString, value);
}
public TestViewModel()
{
TestString = "Value loaded";
}
}
}
VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
+ 2
− 2
View file @ 78174212
......@@ -71,8 +71,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public void SetInputData(IVehicleDeclarationInputData vehicleInputData)
{
_vehicleViewModel.SetVehicleInputData(vehicleInputData);
_airDragEditViewModel.SetAirdragInputData(vehicleInputData.Components.AirdragInputData);
_auxiliariesViewModel.SetAuxiliariesInputData(vehicleInputData.Components.BusAuxiliaries);
_airDragEditViewModel.SetAirdragInputData(vehicleInputData?.Components?.AirdragInputData);
_auxiliariesViewModel.SetAuxiliariesInputData(vehicleInputData?.Components?.BusAuxiliaries);
}
......
VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAirdragViewModel.cs
+ 8
− 1
View file @ 78174212
......@@ -46,8 +46,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public void SetAirdragInputData(IAirdragDeclarationInputData airdragInputData)
{
if (airdragInputData == null) {
AirDragViewModel = null;
return;
}
AirDragViewModel = _dependencies.ComponentViewModelFactory.CreateComponentViewModel(airdragInputData) as IAirDragViewModel;
if (AirDragViewModel != null) {
AirDragViewModel.LabelVisible = false;
}
}
public IAirdragDeclarationInputData ConsolidatedAirdragData
......
VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+ 48
− 20
View file @ 78174212
......@@ -335,26 +335,54 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
#endregion
public void SetAuxiliariesInputData(IBusAuxiliariesDeclarationData componentsAuxiliaryInputData)
{
_heatPumpGroupEditingEnabled = componentsAuxiliaryInputData.HVACAux != null;
_systemConfiguration = componentsAuxiliaryInputData.HVACAux?.SystemConfiguration;
_heatPumpTypeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypeDriverCompartment;
_heatPumpModeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModeDriverCompartment;
_heatPumpTypePassengerCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypePassengerCompartment;
_heatPumpModePassengerCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModePassengerCompartment;
_auxHeaterPower = componentsAuxiliaryInputData.HVACAux?.AuxHeaterPower;
_doubleGlazing = componentsAuxiliaryInputData.HVACAux?.DoubleGlazing;
_adjustableAuxiliaryHeater = componentsAuxiliaryInputData.HVACAux?.AdjustableAuxiliaryHeater;
_separateAirDistributionDucts = componentsAuxiliaryInputData.HVACAux?.SeparateAirDistributionDucts;
_waterElectricHeater = componentsAuxiliaryInputData.HVACAux?.WaterElectricHeater;
_airElectricHeater = componentsAuxiliaryInputData.HVACAux?.AirElectricHeater;
_otherHeatingTechnology = componentsAuxiliaryInputData.HVACAux?.OtherHeatingTechnology;
_interiorLightsLed = componentsAuxiliaryInputData.ElectricConsumers?.InteriorLightsLED;
_dayrunninglightsLed = componentsAuxiliaryInputData.ElectricConsumers?.DayrunninglightsLED;
_positionlightsLed = componentsAuxiliaryInputData.ElectricConsumers?.PositionlightsLED;
_headlightsLed = componentsAuxiliaryInputData.ElectricConsumers?.HeadlightsLED;
_brakelightsLed = componentsAuxiliaryInputData.ElectricConsumers?.BrakelightsLED;
if (componentsAuxiliaryInputData == null) {
return;
}
HeatPumpGroupEditingEnabled = componentsAuxiliaryInputData.HVACAux != null;
SystemConfiguration = componentsAuxiliaryInputData.HVACAux?.SystemConfiguration;
HeatPumpTypeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypeDriverCompartment;
HeatPumpModeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModeDriverCompartment;
HeatPumpTypePassengerCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypePassengerCompartment;
HeatPumpModePassengerCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModePassengerCompartment;
AuxHeaterPower = componentsAuxiliaryInputData.HVACAux?.AuxHeaterPower;
DoubleGlazing = componentsAuxiliaryInputData.HVACAux?.DoubleGlazing;
AdjustableAuxiliaryHeater = componentsAuxiliaryInputData.HVACAux?.AdjustableAuxiliaryHeater;
SeparateAirDistributionDucts = componentsAuxiliaryInputData.HVACAux?.SeparateAirDistributionDucts;
WaterElectricHeater = componentsAuxiliaryInputData.HVACAux?.WaterElectricHeater;
AirElectricHeater = componentsAuxiliaryInputData.HVACAux?.AirElectricHeater;
OtherHeatingTechnology = componentsAuxiliaryInputData.HVACAux?.OtherHeatingTechnology;
InteriorLightsLED = componentsAuxiliaryInputData.ElectricConsumers?.InteriorLightsLED;
DayrunninglightsLED = componentsAuxiliaryInputData.ElectricConsumers?.DayrunninglightsLED;
PositionlightsLED = componentsAuxiliaryInputData.ElectricConsumers?.PositionlightsLED;
HeadlightsLED = componentsAuxiliaryInputData.ElectricConsumers?.HeadlightsLED;
BrakelightsLED = componentsAuxiliaryInputData.ElectricConsumers?.BrakelightsLED;
}
private void ResetData()
{
HeatPumpGroupEditingEnabled = false;
SystemConfiguration = null;
HeatPumpTypeDriverCompartment = null;
HeatPumpModeDriverCompartment = null;
HeatPumpTypePassengerCompartment = null;
HeatPumpModePassengerCompartment = null;
AuxHeaterPower = null;
DoubleGlazing = null;
AdjustableAuxiliaryHeater = null;
SeparateAirDistributionDucts = null;
WaterElectricHeater = null;
AirElectricHeater = null;
OtherHeatingTechnology = null;
InteriorLightsLED = null;
DayrunninglightsLED = null;
PositionlightsLED = null;
HeadlightsLED = null;
BrakelightsLED = null;
}
public MultistageAuxiliariesViewModel(IBusAuxiliariesDeclarationData consolidatedAuxiliariesInputData)
......
VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml.cs
+ 15
− 12
View file @ 78174212
......@@ -168,18 +168,21 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
if (multiStageParameter.DummyContent == null) {
multiStageParameter.DummyContent = multiStageParameter.CreateDummyContent(e, multiStageParameter);
}
if (multiStageParameter.Content != null) {
multiStageParameter.EditingEnabled = true;
}
multiStageParameter.SetListItems();
if (multiStageParameter.Mode == MultistageParameterViewMode.COMBOBOX) {
multiStageParameter.SetListItems();
}
if (multiStageParameter.LabelText != null) {
return;
if (multiStageParameter.LabelText == null) {
multiStageParameter.LabelText = multiStageParameter.GetLabelByPropertyName(
MultiStageParameter.ContentProperty,
Strings.ResourceManager);
}
multiStageParameter.LabelText = multiStageParameter.GetLabelByPropertyName(
MultiStageParameter.ContentProperty,
Strings.ResourceManager);
}
private void SetListItems()
......@@ -248,11 +251,13 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
private static void EditingEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
MultiStageParameter multiStageParameter = (MultiStageParameter)d;
if((bool)e.NewValue == false)
{
if((bool)e.NewValue == false) {
multiStageParameter.DummyContent = multiStageParameter.Content;
multiStageParameter.Content = null;
} else {
if (multiStageParameter.DummyContent != null) {
if (multiStageParameter.Content != null) {
multiStageParameter.DummyContent = multiStageParameter.Content;
}else if (multiStageParameter.DummyContent != null) {
multiStageParameter.Content = multiStageParameter.DummyContent;
}
}
......@@ -267,8 +272,6 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
public MultiStageParameter()
{
InitializeComponent();
//LabelText = this.GetLabelByPropertyName(ContentProperty, Strings.ResourceManager);
}
private void Control_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about