Implemented job upload using JobDescriptionFile.

5 files changed, 15 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index c9c7a4efc..16d312da4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -190,8 +190,8 @@
                                     </DataGridTemplateColumn.CellTemplate>
                                 </DataGridTemplateColumn>
                                 <DataGridTextColumn SortDirection="Descending" Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" />
-                                <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.EventTypesGroup.Name}" />
-                                <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" />
+                                <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" />
+                                <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Title}" />
                                 <DataGridTemplateColumn Header="MESSAGE" Width="1*">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
index 2dda7d342..389b18776 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
@@ -54,7 +54,7 @@
                         </Style>
                     </materialDesign:PackIcon.Style>
                 </materialDesign:PackIcon>
-                <TextBlock VerticalAlignment="Center" Text="{Binding Event.EventType.Name}" Margin="10 0 0 0" FontSize="16"></TextBlock>
+                <TextBlock VerticalAlignment="Center" Text="{Binding Event.EventType.Title}" Margin="10 0 0 0" FontSize="16"></TextBlock>
             </StackPanel>
 
             <Grid Grid.Row="1">
@@ -68,7 +68,7 @@
                             <TextBlock Text="Machine:" FontWeight="SemiBold" />
                             <TextBlock Text="{Binding Event.Machine.SerialNumber}"></TextBlock>
                             <TextBlock Text="User:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Event.User.Contact.FullName}"></TextBlock>
+                            <TextBlock Text="{Binding Event.EventUser.Contact.FullName}"></TextBlock>
                         </controls:TableGrid>
 
                         <controls:TableGrid RowHeight="30">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
index 846ea1fe2..632495103 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
@@ -201,9 +201,9 @@
                                         </DataGridTemplateColumn>
                                         <DataGridTextColumn Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" />
                                         <DataGridTextColumn Header="HOST" Binding="{Binding HostName}" />
-                                        <DataGridTextColumn Header="USER" Binding="{Binding User.Contact.FullName,Mode=OneTime}" />
+                                        <DataGridTextColumn Header="USER" Binding="{Binding EventUser.Contact.FullName,Mode=OneTime}" />
                                         <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" />
-                                        <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" />
+                                        <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Title}" />
                                         <DataGridTemplateColumn Header="MESSAGE" Width="1*">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 90fe33958..461a36b46 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using Tango.Logging;
+using Tango.PMR.Printing;
 using Tango.Settings;
 using Tango.Web;
 
@@ -102,6 +103,11 @@ namespace Tango.MachineStudio.Common
         public DeploymentSlot DeploymentSlot { get; set; }
 
         /// <summary>
+        /// Gets or sets the job upload strategy.
+        /// </summary>
+        public JobUploadStrategy JobUploadStrategy { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         /// <returns></returns>
@@ -121,6 +127,7 @@ namespace Tango.MachineStudio.Common
             StudioModulesBounds = new List<StudioModuleBounds>();
             Environment = WorkingEnvironment.Remote;
             DeploymentSlot = DeploymentSlot.DEV;
+            JobUploadStrategy = JobUploadStrategy.Default;
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 1612eb36c..90a2e34e7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -366,6 +366,8 @@ namespace Tango.MachineStudio.UI.StudioApplication
 
                 ConnectedMachine = connectedMachine;
                 ConnectedMachine.SetMachine(Machine);
+                var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+                ConnectedMachine.JobUploadStrategy = settings.JobUploadStrategy;
             }
             else
             {