Updated Auxiliary Writer

VECTO3GUI2020/Properties/Strings.Designer.cs

@@ -276,6 +276,15 @@ namespace VECTO3GUI2020.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Heat Pump Mode.
+        /// </summary>
+        public static string HeatPumpMode {
+            get {
+                return ResourceManager.GetString("HeatPumpMode", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Mode Driver.
         /// </summary>
@@ -294,6 +303,15 @@ namespace VECTO3GUI2020.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Heat Pump Type.
+        /// </summary>
+        public static string HeatPumpType {
+            get {
+                return ResourceManager.GetString("HeatPumpType", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Type Driver.
         /// </summary>

VECTO3GUI2020/Properties/Strings.resx

@@ -319,4 +319,10 @@
   <data name="TransferredAirDragArea" xml:space="preserve">
     <value>Transferred Airdrag Area</value>
   </data>
+  <data name="HeatPumpMode" xml:space="preserve">
+    <value>Heat Pump Mode</value>
+  </data>
+  <data name="HeatPumpType" xml:space="preserve">
+    <value>Heat Pump Type</value>
+  </data>
 </root>
\ No newline at end of file

VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs

@@ -85,7 +85,11 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
 			if (_inputData.HVACAux != null) {
 				var hvacElement = new XElement(_defaultNamespace + "HVAC");
 				hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_SystemConfiguration, _inputData.HVACAux.SystemConfiguration.GetXmlFormat()));
-				hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypeDriver, _inputData.HVACAux.HeatPumpTypeDriverCompartment.GetLabel()));
+				var heatPumpTypeLabel = _inputData.HVACAux.HeatPumpTypeDriverCompartment.GetLabel();
+				if (heatPumpTypeLabel == "~null~") {
+					heatPumpTypeLabel = null;
+				}
+				hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypeDriver, heatPumpTypeLabel));
 				hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModeDriver, _inputData.HVACAux.HeatPumpModeDriverCompartment.GetLabel()));
 				//TODO
 				if (_inputData.HVACAux.HeatPumpPassengerCompartments != null) {

VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs

@@ -47,7 +47,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		{
 			ConsolidatedInputData = consolidatedAuxiliariesInputData;
 			if (ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments != null) {
-				ConsolidatedHeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>();
+				_consolidatedHeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>();
 				foreach (var (heatPumpType, heatPumpMode) in ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments) {
 					ConsolidatedHeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()
 					{
@@ -361,7 +361,13 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		public ICommand AddPassengerHeatpumpCommand
 		{
 			get => _addPassengerHeatpumpCommand ??
-					new RelayCommand(() => HeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()),
+					new RelayCommand(() => {
+							HeatPumpGroupEditingEnabled = true;
+							if (HeatPumpConfigurationsPassenger == null) {
+								HeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>();
+							}
+							HeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration());
+						},
 						() => true);
 		}
 
@@ -370,7 +376,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		public ICommand RemovePassengerHeatpumpCommand
 		{
 			get => _removePasssengerHeatpumpCommand ??
-					new RelayCommand<HeatPumpConfiguration>(hp => HeatPumpConfigurationsPassenger.Remove(hp), (hp) => true);
+					new RelayCommand<HeatPumpConfiguration>(hp => HeatPumpConfigurationsPassenger?.Remove(hp), (hp) => true);
 		}
 
 		public IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments{
@@ -383,11 +389,19 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				return list;
 			}
 		}
-		public ObservableCollection<HeatPumpConfiguration> ConsolidatedHeatPumpConfigurationsPassenger { get; }
 
+		public ObservableCollection<HeatPumpConfiguration> ConsolidatedHeatPumpConfigurationsPassenger
+		{
+			get => _consolidatedHeatPumpConfigurationsPassenger;
+			private set => SetProperty(ref _consolidatedHeatPumpConfigurationsPassenger, value);
+		}
 
-		public ObservableCollection<HeatPumpConfiguration> HeatPumpConfigurationsPassenger { get; } =
-			new ObservableCollection<HeatPumpConfiguration>();
+
+		public ObservableCollection<HeatPumpConfiguration> HeatPumpConfigurationsPassenger
+		{
+			get => _heatPumpConfigurationsPassenger;
+			private set => SetProperty(ref _heatPumpConfigurationsPassenger, value);
+		}
 
 		public class HeatPumpConfiguration : ViewModelBase, ITuple, IDataErrorInfo
 		{
@@ -505,6 +519,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 					_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].EditingEnabled = value;
 					_parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingEnabled = value;
 					_parameterViewModels[nameof(SystemConfiguration)].EditingEnabled = value;
+					if (value == false) {
+						HeatPumpConfigurationsPassenger = null;
+					}
 				}
 			}
 		}
@@ -635,6 +652,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 		private CompressorDrive _compressorDrive;
 		private Dictionary<string, MultistageParameterViewModel> _parameterViewModels;
+		private ObservableCollection<HeatPumpConfiguration> _consolidatedHeatPumpConfigurationsPassenger;
+		private ObservableCollection<HeatPumpConfiguration> _heatPumpConfigurationsPassenger;
 
 
 		public CompressorDrive CompressorDrive

VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml

@@ -8,7 +8,7 @@
              xmlns:impl="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation"
              xmlns:properties="clr-namespace:VECTO3GUI2020.Properties"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" BorderBrush="{DynamicResource ButtonHighlightColor}" BorderThickness="2" Margin="4"
+             d:DesignHeight="450" d:DesignWidth="800" BorderBrush="{DynamicResource ButtonHighlightColor}" BorderThickness="3" Margin="4"
              d:DataContext="{d:DesignInstance impl:MultistageAuxiliariesViewModel}">
     <UserControl.Resources>
         <Style TargetType="customControls:MultiStageParameter">
@@ -38,6 +38,9 @@
                     <ContentControl Content="{Binding ParameterViewModels[SystemConfiguration]}"/>
                     <ContentControl Content="{Binding ParameterViewModels[HeatPumpTypeDriverCompartment]}"/>
                     <ContentControl Content="{Binding ParameterViewModels[HeatPumpModeDriverCompartment]}"/>
+                    <Border Margin="5 0" BorderBrush="{DynamicResource ButtonHighlightColor}" BorderThickness="2" >
+                        <StackPanel Margin="0">
+                            <Label Margin="0" Style="{DynamicResource LabelStyle1}">Heat Pumps Passenger Compartment</Label>
                             <Label Padding="10 4 0 4" Style="{DynamicResource LabelStyle1}">Consolidated Data</Label>
                             <ItemsControl 
                         Visibility="{Binding ConsolidatedHeatPumpConfigurationsPassenger, Converter={StaticResource NullToVisibilityConverter}}" 
@@ -88,6 +91,8 @@
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
+                        </StackPanel>
+                    </Border>
 
 
                     <ContentControl Content="{Binding ParameterViewModels[AuxHeaterPower]}"/>

Vecto3GUI2020Test/ViewModelTests/VehicleViewModelTests.cs

@@ -72,6 +72,9 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			var vehicleVM =
 				vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
 					DeclarationInterimStageBusVehicleViewModel_v2_8;
+
+			
+
 		}
 		/// <summary>
 		/// airdrag component is in VIF set => AirdragModifiedMultistage is mandatory