Updated Additional Job Info View Models and Views

VECTO3GUI2020/Helper/NameResolver.cs

@@ -18,7 +18,7 @@ namespace VECTO3GUI2020.Helper
 			}
 
 
-			return propertyName + "*";
+			return propertyName;
 		}
 	}
 }
\ No newline at end of file

VECTO3GUI2020/ViewModel/Implementation/Common/AdditionalJobInfoViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media.TextFormatting;
@@ -27,6 +28,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Common
 
 		public AdditionalJobInfoViewModelBase()
 		{
+			Title = "Job Info";
 			SizeToContent = SizeToContent.WidthAndHeight;
 			MinHeight = 200;
 			MinWidth = 300;
@@ -40,9 +42,21 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Common
 		private IMultiStageJobViewModel _parent;
 		private string _errorInfo;
 
+		public ObservableCollection<string> InvalidEntries { get; set; } = new ObservableCollection<string>();
+
+		public bool InvalidEntriesPresent => InvalidEntries.Count > 0;
+
+		public string ErrorInfo
+		{
+			get => _errorInfo;
+			set => SetProperty(ref _errorInfo, value);
+		}
+
+
 		public AdditionalJobInfoViewModelMultiStage()
 		{
 			Title = "Multistage Job Info";
+			InvalidEntries.CollectionChanged += (sender, args) => OnPropertyChanged(nameof(InvalidEntriesPresent));
 		}
 
 		#region Overrides of AdditionalJobInfoViewModelBase
@@ -68,7 +82,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Common
 
 			
 			if (_parent.InvalidEntries != null && _parent.InvalidEntries.Count != 0) {
-				ErrorInfo = "This Job cannot be Simulated! The following inputs are missing or invalid";
+				ErrorInfo = null;
 				foreach (var parentInvalidEntry in _parent.InvalidEntries)
 				{
 					InvalidEntries.Add(parentInvalidEntry);
@@ -76,13 +90,6 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Common
 			}
 		}
 
-		public ObservableCollection<string> InvalidEntries { get; set; } = new ObservableCollection<string>();
-
-		public string ErrorInfo
-		{
-			get => _errorInfo;
-			set => SetProperty(ref _errorInfo, value);
-		}
 
 		#endregion
 	}
@@ -99,19 +106,33 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Common
 			_parent = parent as CreateVifViewModel;
             (_parent as INotifyPropertyChanged).PropertyChanged += AdditionalJobInfoViewModelNewVif_PropertyChanged;
 			Debug.Assert(_parent != null);
+			UpdateInvalidEntries();
 		}
 
         private void AdditionalJobInfoViewModelNewVif_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
 			if (e.PropertyName == nameof(_parent.CanBeSimulated)) {
+				UpdateInvalidEntries();
+			}
+		}
 
-
-
+		private void UpdateInvalidEntries()
+		{
+			InvalidEntries.Clear();
+			if (_parent.UnsavedChanges) {
+				InvalidEntries.Add("This job has unsaved changes");
 			}
+
+			if (_parent.PrimaryInputPath == null) {
+				InvalidEntries.Add("No Primary input path specified");
 			}
 
+			if (_parent.StageInputPath == null) {
+				InvalidEntries.Add($"No {(_parent.Completed ? "Completed" : "Interim")} input path specified");
+			}
 
 
+		}
 		#endregion
     }
 

VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs

@@ -100,11 +100,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			_dialogHelper = dialogHelper;
 			_inputDataReader = inputDataReader;
 			_additionalJobInfo = additionalJobInfo;
-			additionalJobInfo.SetParent(this);
-			
-
 			SetupBackingStorage();
-
+			additionalJobInfo.SetParent(this);
 
 
 			UpdateTitleAndDocumentName();

VECTO3GUI2020/Views/Multistage/AdditionalJobInfoViews/AdditionalJobInfoViewMultiStage.xaml

@@ -11,7 +11,16 @@
              d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance common:AdditionalJobInfoViewModelMultiStage }">
     <Grid>
         <StackPanel Margin="10">
-            <Label>This Job cannot be Simulated because the following Parameters are invalid:</Label>
+            <Label>This Job cannot be simulated</Label>
+            <Label Content="{Binding ErrorInfo}" 
+                   Visibility="{Binding ErrorInfo, 
+                    Converter={StaticResource NullToVisibilityConverter}}"/>
+            <Border Margin="2" BorderBrush="{DynamicResource ButtonHighlightColor}" BorderThickness="2" Visibility="{Binding InvalidEntriesPresent, 
+                        Converter={StaticResource BooleanToVisibilityConverter}}">
+                <StackPanel>
+                    <Label Style="{StaticResource LabelStyle1}">
+                        Invalid Parameters:
+                    </Label>
                     <ItemsControl ItemsSource="{Binding InvalidEntries }">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
@@ -35,7 +44,14 @@
                                 </BulletDecorator>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel Margin="2"  Orientation="Vertical" IsItemsHost="True"/>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
                     </ItemsControl>
                 </StackPanel>
+            </Border>
+        </StackPanel> 
     </Grid>
 </UserControl>

VECTO3GUI2020/Views/Multistage/AdditionalJobInfoViews/AdditionalJobInfoViewNewVIF.xaml

@@ -7,7 +7,7 @@
              xmlns:properties="clr-namespace:VECTO3GUI2020.Properties"
              xmlns:resources="clr-namespace:System.Resources;assembly=mscorlib"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance local:AdditionalJobInfoViewNewVIF}">
     <Grid>
         <StackPanel Margin="10">
             <Label>This Job cannot be Simulated</Label>