Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

4 files changed, 10 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
index 869fadb3a..364984375 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
@@ -22,6 +22,7 @@ namespace Tango.MachineStudio.Statistics.Models
         public String GR { get; set; }
         public String Status { get; set; }
         public String EndTime { get; set; }
+        public String TotalDyeingTime { get; set; }
         public String EndPosition { get; set; }
         public String Cyan { get; set; }
         public String Magenta { get; set; }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
index c8556960d..9dcce7d05 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
@@ -300,7 +300,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             JobRuns = new ObservableCollection<JobRunModel>();
             LoadJobRunsCommand = new RelayCommand(async () => await LoadJobRuns(), () => IsFree && SelectedMachines!= null && SelectedMachines.Source.Count >0);
             ExportToExcelCommand = new RelayCommand(ExportToExcel, () => IsFree);
-            LengthUpperValue = 10000.0;
+            LengthUpperValue = 100000.0;
             LengthLowerValue = 0.0;
             DateTime now = DateTime.Now;
             StartSelectedDate = now.AddMonths(-1);
@@ -646,6 +646,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                              "Gradient Resolution",
                              "Status",
                              "End Date",
+                             "Total dyeing time",
                              "End Position",
                              "Cyan",
                              "Magenta",
@@ -677,6 +678,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                         excel_model.GR = jobRunModel.JobRun.GradientResolutionCm.ToString();
                         excel_model.Status = jobRunModel.JobRun.JobRunStatus.ToString();
                         excel_model.EndTime = jobRunModel.JobRun.EndDate != null ? ((DateTime)jobRunModel.JobRun.EndDate).ToLocalTime().ToString("MM/dd/yy HH:mm"): "";
+                        excel_model.TotalDyeingTime = jobRunModel.JobRun.TotalDyeingTime != default(TimeSpan) ? ((TimeSpan)jobRunModel.JobRun.TotalDyeingTime).ToString(@"hh\:mm\:ss") : TimeSpan.FromSeconds(0).ToString(@"hh\:mm\:ss");
                         excel_model.EndPosition = String.Format("{0:0.##}", jobRunModel.JobRun.EndPosition);
                         excel_model.Cyan = jobRunModel.JobRun.CyanQuantity < 0 ? "" :jobRunModel.JobRun.CyanQuantity.ToString();
                         excel_model.Magenta = jobRunModel.JobRun.MagentaQuantity < 0 ? "" : jobRunModel.JobRun.MagentaQuantity.ToString();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
index 1184622f6..9d6d41778 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
@@ -35,6 +35,7 @@
         <localConverters:NanoLiterToLiterFormatConverter x:Key="NanoLiterToLiterFormatConverter"/>
         <localConverters:LiquidQuantityToFormatStringConverter x:Key="LiquidQuantityToFormatStringConverter"/>
         <localConverters:TooltipLiquidQuantityFormatConverter x:Key="TooltipLiquidQuantityFormatConverter"/>
+        <sharedConverters:TimeSpanToMinutesConverter x:Key="TimeSpanToMinutesConverter" />
 
         <ResourceDictionary x:Key="SelectAllTextBoxResource">
             <Style TargetType="TextBox">
@@ -89,8 +90,8 @@
     
     <Grid IsEnabled="{Binding IsFree}" >
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
             <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="390"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -358,7 +359,7 @@
                                 <Border BorderThickness="1" CornerRadius="3" BorderBrush="{StaticResource borderBrush}" Margin="0 10 0 0" Height="24" Padding="10 0">
                                     <StackPanel Orientation="Horizontal">
                                     <TextBlock  Text="{Binding LengthLowerValue, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" FontSize="11" Width="40"></TextBlock>
-                                    <mahapps:RangeSlider Focusable="True" Height="40" Margin="5 5 5 5" Minimum="0" Maximum="10000" Width="140" ExtendedMode="True"
+                                    <mahapps:RangeSlider Focusable="True" Height="40" Margin="5 5 5 5" Minimum="0" Maximum="100000" Width="140" ExtendedMode="True"
                                              LowerValue="{Binding LengthLowerValue,  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                              UpperValue="{Binding LengthUpperValue,  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
                                              VerticalAlignment="Center" IsSnapToTickEnabled="True" FontSize="8"/>
@@ -599,6 +600,7 @@
                 <DataGridTextColumn Header="GR" Binding="{Binding JobRun.GradientResolutionCm}" Width="30" />
                 <DataGridTextColumn Header="Status" Binding="{Binding JobRun.JobRunStatus, Converter={StaticResource EnumToDescriptionConverter}}" Width="70"/>
                 <DataGridTextColumn Header="End Time" Binding="{Binding JobRun.EndDate, Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="95" />
+                <DataGridTextColumn Header="Total&#10;dyeing time" Binding="{Binding JobRun.TotalDyeingTime, Converter={StaticResource DateTimeToStringFormatConverter}}" Width="95" />
                 <DataGridTextColumn Header="End &#10;Position" Binding="{Binding JobRun.EndPosition, StringFormat={}{0:0.00}}" Width="70" />
                 <DataGridTemplateColumn Header="Liquid Quantities" Width="1*">
                     <DataGridTemplateColumn.CellStyle>
@@ -632,7 +634,7 @@
                                     <RowDefinition Height="20"/>
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" MaxWidth="200"/>
+                                    <ColumnDefinition Width="1*" MaxWidth="250"/>
                                 </Grid.ColumnDefinitions>
                                 <ItemsControl ItemsSource="{Binding JobRun.LiquidQuantitiesFast,Mode=OneWay}" Margin="0 0 0 0" Height="70">
                                 <ItemsControl.ItemContainerStyle>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index aa6021ab0..56cf7a413 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.8.9.0")]
+[assembly: AssemblyVersion("4.8.10.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file