Added empty heatpump configurations to error list in auxiliary viewmodel

VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs

@@ -1063,19 +1063,19 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				switch (propertyName) {
 					case nameof(Manufacturer):
 						if (string.IsNullOrWhiteSpace(Manufacturer)) {
-							result = "Manufacturer cannot be empty";
+							result = "Manufacturer must not be empty";
 						}
 						
 						break;
 					case nameof(ManufacturerAddress):
 						if (string.IsNullOrWhiteSpace(ManufacturerAddress))
 						{
-							result = "Manufacturer address cannot be empty";
+							result = "Manufacturer address must not be empty";
 						}
 						break;
 					case nameof(VIN):
 						if (string.IsNullOrEmpty(VIN)) {
-							result = "VIN cannot be empty";
+							result = "VIN must not be empty";
 						}
 						break;
 					case nameof(AirdragModifiedEnum):

VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs

@@ -515,12 +515,30 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 							break;
 					}
 
+					if (result == null)
+					{
+						if (Errors.ContainsKey(columnName))
+							Errors.Remove(columnName);
+					}
+					else
+					{
+						Errors[columnName] = result;
+					}
+
+
 
 					return result;
 				}
 			}
 
-			string IDataErrorInfo.Error => throw new NotImplementedException();
+			private Dictionary<string, string> Errors { get; } = new Dictionary<string, string>();
+
+			public bool HasErrors
+			{
+				get => !Errors.IsNullOrEmpty();
+
+			}
+			string IDataErrorInfo.Error => String.Join(",", Errors.Values);
 
 			#endregion
 		}
@@ -797,12 +815,41 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			}
 		}
 
-		public string Error { get => String.Join(",", Errors.Values); }
+		public string Error
+		{
+			get
+			{
+				string result = string.Empty;
+				var auxVmError = String.Join(",", Errors.Values);
+				result = auxVmError;
+				if (HeatPumpConfigurationsPassenger != null) {
+					foreach (var heatPumpConfiguration in HeatPumpConfigurationsPassenger) {
+						if (heatPumpConfiguration.HasErrors) {
+							result += "," + ((IDataErrorInfo)heatPumpConfiguration).Error;
+						}
+					}
+				}
+
+				return result;
+			}
+		}
+
 		public bool HasErrors
 		{
 			get
 			{
-				return !Error.IsNullOrEmpty();
+				var auxVmHasErrors = !Error.IsNullOrEmpty();
+				var passengerHeatPumpsHaveError = false;
+				if (HeatPumpConfigurationsPassenger != null) {
+					foreach (var heatPump in HeatPumpConfigurationsPassenger) {
+						if (heatPump.HasErrors) {
+							passengerHeatPumpsHaveError = true;
+							break;
+						}
+					}
+				}
+
+				return auxVmHasErrors || passengerHeatPumpsHaveError;
 			}
 		}
 

VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs

 using System;
 using System.CodeDom;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -10,6 +11,7 @@ using System.Windows.Input;
 using System.Windows.Navigation;
 using System.Xml;
 using System.Xml.Linq;
+using Castle.Core.Internal;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCore.InputData.FileIO.JSON;
@@ -104,11 +106,25 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				return _saveVifCommand ?? new RelayCommand(() => {
 					if (_manufacturingStageViewModel.Vehicle is IMultistageVehicleViewModel vehicleViewModel)
 					{
-						if (vehicleViewModel.HasErrors)
-						{
-							_dialogHelper.Value.ShowMessageBox("Vehicle\n" + string.Join("\n", vehicleViewModel.Errors.Values) 
-																			+ (vehicleViewModel.MultistageAuxiliariesViewModel.HasErrors ? ("\nAuxiliaries\n" + string.Join("\n", vehicleViewModel.MultistageAuxiliariesViewModel.Errors.Values)) : ""),
-								"Error");
+						if (vehicleViewModel.HasErrors) {
+							var errorMessage = "Vehicle\n";
+							var vehicleErrorInfo = vehicleViewModel as IDataErrorInfo;
+							errorMessage += vehicleErrorInfo.Error.Replace(",", "\n");
+
+							var auxiliariesErrorInfo =
+								vehicleViewModel.MultistageAuxiliariesViewModel as IDataErrorInfo;
+							if (!auxiliariesErrorInfo.Error.IsNullOrEmpty()) {
+								errorMessage += "Auxiliaries\n";
+								errorMessage += auxiliariesErrorInfo.Error.Replace(",", "\n");
+							}
+
+
+							//_dialogHelper.Value.ShowMessageBox("Vehicle\n" + string.Join("\n", vehicleViewModel.Errors.Values) 
+							//												+ (vehicleViewModel.MultistageAuxiliariesViewModel.HasErrors ? ("\nAuxiliaries\n" + string.Join("\n", vehicleViewModel.MultistageAuxiliariesViewModel.Errors.Values)) : ""),
+								//"Error");
+
+							_dialogHelper.Value.ShowMessageBox(errorMessage, "Error", MessageBoxButton.OK,
+									MessageBoxImage.Error);
 							return;
 						}
 					} else {
@@ -203,9 +219,25 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			if(_manufacturingStageViewModel.Vehicle is IMultistageVehicleViewModel vehicleViewModel)
 			{
 				if (vehicleViewModel.HasErrors) {
-					_dialogHelper.Value.ShowMessageBox("Vehicle\n" + string.Join("\n", vehicleViewModel.Errors.Values)
-																	+ (vehicleViewModel.MultistageAuxiliariesViewModel.HasErrors ? ("\nAuxiliaries\n" + string.Join("\n", vehicleViewModel.MultistageAuxiliariesViewModel.Errors.Values)) : ""),
-						"Error");
+					var errorMessage = "Vehicle\n";
+					var vehicleErrorInfo = vehicleViewModel as IDataErrorInfo;
+					errorMessage += vehicleErrorInfo.Error.Replace(",", "\n");
+
+					var auxiliariesErrorInfo =
+						vehicleViewModel.MultistageAuxiliariesViewModel as IDataErrorInfo;
+					if (!auxiliariesErrorInfo.Error.IsNullOrEmpty())
+					{
+						errorMessage += "\n Auxiliaries \n";
+						errorMessage += auxiliariesErrorInfo.Error.Replace(",", "\n");
+					}
+
+					_dialogHelper.Value.ShowMessageBox(errorMessage, "Error", MessageBoxButton.OK,
+						MessageBoxImage.Error);
+					return;
+
+					//_dialogHelper.Value.ShowMessageBox("Vehicle\n" + string.Join("\n", vehicleViewModel.Errors.Values)
+					//												+ (vehicleViewModel.MultistageAuxiliariesViewModel.HasErrors ? ("\nAuxiliaries\n" + string.Join("\n", vehicleViewModel.MultistageAuxiliariesViewModel.Errors.Values)) : ""),
+					//	"Error");
 					return;
 				}
 			}