show xEV specific parameters in auxiliary view

VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs

@@ -73,10 +73,13 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 				nameof(AuxHeaterPower),
 				nameof(DoubleGlazing),
-				nameof(AirElectricHeater),
+			
 				nameof(AdjustableAuxiliaryHeater),
 				nameof(SeparateAirDistributionDucts),
-				nameof(OtherHeatingTechnology),
+
+				//xEV
+				nameof(AirElectricHeater),
+                nameof(OtherHeatingTechnology),
 				nameof(WaterElectricHeater)
 			};
 
@@ -322,6 +325,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			set => SetProperty(ref _separateAirDistributionDucts, value);
 		}
 
+		public abstract bool ShowxEVProperties { get; }
+
 		public bool? WaterElectricHeater
 		{
 			get => _waterElectricHeater;
@@ -711,9 +716,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		#region Overrides of MultistageAuxiliariesViewModel
 
 		protected override string XSDType =>  XMLTypes.AUX_Conventional_CompletedBusType;
+		public override bool ShowxEVProperties => false;
 
-        #endregion
-    }
+		#endregion
+	}
 
 	public class MultistageAuxiliariesViewModel_xEV : MultistageAuxiliariesViewModel
 	{
@@ -728,6 +734,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		#region Overrides of MultistageAuxiliariesViewModel
 
 		protected override string XSDType => XMLTypes.AUX_xEV_CompletedBusType;
+		public override bool ShowxEVProperties => true;
 
 		#endregion
 	}

VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml

@@ -58,6 +58,12 @@
                     <ContentControl Content="{Binding ParameterViewModels[DoubleGlazing]}"/>
                     <ContentControl Content="{Binding ParameterViewModels[AdjustableAuxiliaryHeater]}"/>
                     <ContentControl Content="{Binding ParameterViewModels[SeparateAirDistributionDucts]}"/>
+
+                    <StackPanel Orientation="Vertical" Visibility="{Binding ShowxEVProperties, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <ContentControl Content="{Binding ParameterViewModels[WaterElectricHeater]}"/>
+                    <ContentControl Content="{Binding ParameterViewModels[AirElectricHeater]}"/>
+                    <ContentControl Content="{Binding ParameterViewModels[OtherHeatingTechnology]}"/>
+                    </StackPanel>
                 </StackPanel>
             </DockPanel>
         </ScrollViewer>

Vecto3GUI2020Test/ViewModelTests/JobListViewModelTests.cs

@@ -216,15 +216,15 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			var simulationTask = _jobListViewModel.RunSimulationExecute();
 			//Wait until simulation reached 2%
 			Assert.IsTrue(_jobListViewModel.SimulationRunning);
-			while (outputVm.Progress < 2 && (!outputVm.StatusMessage?.Contains("finished") ?? false)) {
+			while (outputVm.Progress < 4 && (!outputVm.StatusMessage?.Contains("finished") ?? false)) {
 				//DO nothing
 			}
-			
-			
-			// Assert.That(() => outputVm.Progress, Is.GreaterThanOrEqualTo(25).After(1 * 60 * 1000, 1),
-			// 	() => $"Simulation reached {outputVm.Progress}%");
 
-			TestContext.Write("Canceling Simulation ... ");
+
+            // Assert.That(() => outputVm.Progress, Is.GreaterThanOrEqualTo(25).After(1 * 60 * 1000, 1),
+            // 	() => $"Simulation reached {outputVm.Progress}%");
+			//_dialogHelper.AssertNoErrorDialogs();
+            TestContext.Write("Canceling Simulation ... ");
 			Assert.IsTrue(_jobListViewModel.SimulationRunning);
 			_jobListViewModel.CancelSimulation.Execute(null);
 			Assert.That(() => _jobListViewModel.SimulationRunning, Is.False.After(20*1000, 50) );