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

10 files changed, 269 insertions, 87 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthWithSpoolsConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthWithSpoolsConverter.cs
new file mode 100644
index 000000000..60f94b8aa
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthWithSpoolsConverter.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Tango.PPC.Jobs.Converters
+{
+    public class LengthWithSpoolsConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                double length = System.Convert.ToDouble(values[0]);
+                bool isEureka = System.Convert.ToBoolean(values[1]);
+                double spools = System.Convert.ToDouble(values[2]);
+
+                if (isEureka)
+                    return length * spools;
+                else return length;
+            }
+            catch
+            {
+                return 0d;
+            }
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml
index 0e72c6aa0..99b78d7ec 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml
@@ -548,7 +548,18 @@
                                                 <TextBlock FontSize="{StaticResource TangoSmallFontSize}" FontWeight="SemiBold" Margin="10 0 0 -5" HorizontalAlignment="Left" >Correction</TextBlock>
 
                                                 <Border Grid.Row="1" Height="220"   Margin="0 10 0 0"  CornerRadius="0 0 0 0"  BorderThickness="0" BorderBrush="{StaticResource TangoGrayBrush}"  Background="{Binding VisualCorrectionModel.ManualColorBrush}" >
-                                                    <UniformGrid Rows="3" Columns="1" VerticalAlignment="Bottom" Background="Transparent">
+                                                        <Grid>
+                                                            <Grid.RowDefinitions>
+                                                                <RowDefinition Height="1*"/>
+                                                                <RowDefinition Height="Auto"/>
+                                                            </Grid.RowDefinitions>
+                                                            <StackPanel Grid.Row="0" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding VisualCorrectionModel.IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                <Image Margin="30 0 24 0" Stretch="Fill" Width="47" Height="43" RenderOptions.BitmapScalingMode="Fant" Source="../Images/ColorSelection/Exclamation.png" HorizontalAlignment="Center"></Image>
+                                                                <!--<Border Margin=" 0 10 0 0" MinWidth="115" Height="31" Background="{StaticResource TangoDarkForegroundBrush}" CornerRadius="2">
+                                                                    <TextBlock Margin="10 0" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource TangoLightForegroundBrush}" FontSize="{StaticResource TangoSmallFontSize}" FontWeight="SemiBold" Text="This color is not supported." ></TextBlock>
+                                                                </Border>-->
+                                                            </StackPanel>
+                                                            <UniformGrid Grid.Row="1"  Rows="3" Columns="1" VerticalAlignment="Bottom" Background="Transparent">
                                                             <TextBlock FontWeight="Medium" Margin="10 10 0 0" VerticalAlignment="Center" Foreground="{Binding VisualCorrectionModel.ManualColorBrush, Converter={StaticResource ColorContrastConverter}}" FontSize="{StaticResource TangoSmallFontSize}">
                                                             <Run Text="L:" ></Run>
                                                             <Run Text="{Binding VisualCorrectionModel.L, StringFormat={}{0:F2}}"></Run>
@@ -562,7 +573,8 @@
                                                             <Run Text="{Binding VisualCorrectionModel.B,  StringFormat={}{0:F2}}"></Run>
                                                         </TextBlock>
                                                     </UniformGrid>
-                                                </Border>
+                                                        </Grid>
+                                                    </Border>
                                             </StackPanel>
                                                 <StackPanel Orientation="Vertical" Grid.Column="2" Grid.Row="1" Margin="0 10 0 0" Visibility="{Binding IsTargetVisible, Converter={StaticResource BooleanToVisibilityConverter}, Mode=TwoWay}">
                                                     <TextBlock FontSize="{StaticResource TangoSmallFontSize}" FontWeight="SemiBold" Margin="10 0 0 -5" HorizontalAlignment="Left" >Target</TextBlock>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
index e473fa420..b9149b81f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
@@ -1319,6 +1319,7 @@ namespace Tango.PPC.Jobs.Dialogs
             ActiveLogModel.VectorCorrectionL = VisualCorrectionModel.L;
             ActiveLogModel.VectorCorrectionA = VisualCorrectionModel.A;
             ActiveLogModel.VectorCorrectionB = VisualCorrectionModel.B;
+            VisualCorrectionModel.IsOutOfGamut = IsOutOfGammot();
             TestCommand.RaiseCanExecuteChanged();
             ByPassTestCommand.RaiseCanExecuteChanged();
 
@@ -1333,6 +1334,7 @@ namespace Tango.PPC.Jobs.Dialogs
             ActiveLogModel.VectorCorrectionL = VisualCorrectionModel.L;
             ActiveLogModel.VectorCorrectionA = VisualCorrectionModel.A;
             ActiveLogModel.VectorCorrectionB = VisualCorrectionModel.B;
+            VisualCorrectionModel.IsOutOfGamut = IsOutOfGammot();
             TestCommand.RaiseCanExecuteChanged();
             ByPassTestCommand.RaiseCanExecuteChanged();
         }
@@ -1347,10 +1349,25 @@ namespace Tango.PPC.Jobs.Dialogs
             ActiveLogModel.VectorCorrectionL = VisualCorrectionModel.L;
             ActiveLogModel.VectorCorrectionA = VisualCorrectionModel.A;
             ActiveLogModel.VectorCorrectionB = VisualCorrectionModel.B;
+            VisualCorrectionModel.IsOutOfGamut = IsOutOfGammot();
             TestCommand.RaiseCanExecuteChanged();
             ByPassTestCommand.RaiseCanExecuteChanged();
         }
 
+        private bool IsOutOfGammot()
+        {
+            BrushStopModel.ColorSpace = ColorSpaces.LAB;
+            BrushStopModel.PreventPropertyUpdate = true;
+            BrushStopModel.L = ActiveLogModel.VectorCorrectionL;
+            BrushStopModel.A = ActiveLogModel.VectorCorrectionA;
+            BrushStopModel.B = ActiveLogModel.VectorCorrectionB;
+            BrushStopModel.PreventPropertyUpdate = false;
+            BrushStopModel.IsOutputOfGamut(ColorSpaces.LAB);
+
+            return BrushStopModel.IsOutOfGamut;
+
+        }
+
         #endregion
 
         #region Job
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
index d415dbb79..5464aa5ed 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
@@ -1796,6 +1796,25 @@ namespace Tango.PPC.Jobs.Models
             }
         }
 
+        public void IsOutputOfGamut(ColorSpaces colorSpace)
+        {
+            try
+            {
+                BrushStop stop = CreateBrushStop(colorSpace);
+                Configuration configuration = SegmentModel.Job.Machine.Configuration;
+                Rml rml = SegmentModel.Job.Rml;
+                IsOutOfGamut = _converter.IsOutOfGamut(stop, configuration, rml);
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "An error occurred while trying to test IsOutputOfGammut from conversion engine." + ex);
+                BestMatchColor = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue);
+            }
+            finally
+            {
+                IsBusy = false;
+            }
+        }
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs
index a0b6156a3..74651992e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs
@@ -237,7 +237,24 @@ namespace Tango.PPC.Jobs.Models
                 return new SolidColorBrush() { Color = Color.FromRgb((byte)rgb.R, (byte)rgb.G, (byte)rgb.B) };
             }
         }
-        
+
+        private bool _isOutOfGamut;
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is out of gamut.
+        /// </summary>
+        public bool IsOutOfGamut
+        {
+            get { return _isOutOfGamut; }
+            set
+            {
+                if (_isOutOfGamut != value)
+                {
+                    _isOutOfGamut = value;
+                    RaisePropertyChangedAuto();
+                }
+            }
+        }
+
         #endregion
 
         public VisualOffsetModel()
@@ -248,7 +265,9 @@ namespace Tango.PPC.Jobs.Models
             MaxChroma = new VisualLCHOffset(TypeColorCorrection.Chroma, 1);
             MinHue = new VisualLCHOffset(TypeColorCorrection.Hue, -1);
             MaxHue = new VisualLCHOffset(TypeColorCorrection.Hue, 1);
-            
+            IsOutOfGamut = false;
+
+
         }
         
         public void InitLAB(double l, double a, double b, double c, double h)
@@ -292,6 +311,7 @@ namespace Tango.PPC.Jobs.Models
             B = b;
             C = last_LCH.C;
             H = last_LCH.h;
+            IsOutOfGamut = false;
         }
 
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
index c0e24ac8c..3aefa29a1 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
@@ -240,6 +240,7 @@
     <Compile Include="Converters\JobToPieImageConverter.cs" />
     <Compile Include="Converters\JobTypeToImageConverter.cs" />
     <Compile Include="Converters\LengthToWeightConverter.cs" />
+    <Compile Include="Converters\LengthWithSpoolsConverter.cs" />
     <Compile Include="Converters\MarginOffsetSliderConverter .cs" />
     <Compile Include="Converters\RoundDoubleConverter.cs" />
     <Compile Include="Converters\TimeSpanToHoursConverter.cs" />
@@ -753,7 +754,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
index 0e4ec8fa4..e5e41b382 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
@@ -225,6 +225,11 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public RelayCommand ExportJobCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the move to list ( History or Draft) jobs command.
+        /// </summary>
+        public RelayCommand MoveToListJobsCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -251,6 +256,7 @@ namespace Tango.PPC.Jobs.ViewModels
             DeleteJobsCommand = new RelayCommand(() => DeleteJobs(SelectedJobs));
             CloneJobsCommand = new RelayCommand(() => CloneJobs(SelectedJobs));
             ExportJobCommand = new RelayCommand(ExportJob);
+            MoveToListJobsCommand = new RelayCommand(() => MoveToListJobs(SelectedJobs));
 
             RegisterForMessage<JobRemovedMessage>(HandleJobRemovedMessage);
             RegisterForMessage<JobSavedMessage>(HandleJobSavedMessage);
@@ -371,7 +377,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
                     _colorSpaces = _db.ColorSpaces.ToList();
 
-                    var jobs = new JobsCollectionBuilder(_db).Set(x => x.MachineGuid == MachineProvider.Machine.Guid).WithSegments().WithBrushStops().WithCustomer().WithColorSpace().WithSegmentsGroups().Build();
+                    var jobs = new JobsCollectionBuilder(_db).Set(x => x.MachineGuid == MachineProvider.Machine.Guid).WithSegments().WithBrushStops().WithCustomer().WithColorSpace().WithSegmentsGroups().WithRmls().Build();
 
                     InvokeUI(() =>
                     {
@@ -644,6 +650,52 @@ namespace Tango.PPC.Jobs.ViewModels
         }
 
         /// <summary>
+        /// Moves to list (Draft/History) jobs.
+        /// </summary>
+        /// <param name="jobs">The jobs.</param>
+        private async void MoveToListJobs(ObservableCollection<Job> jobs)
+        {
+            bool isHistory = SelectedCategory == JobsCategory.History;
+            string list = isHistory ? "Draft" : "History";
+            try
+            {
+               
+                LogManager.Log($"Move To {list} selected jobs:\n{jobs.Select(x => x.Name).ToList().ToJsonString()}");
+                
+                foreach (var job in SelectedJobs)
+                {
+                    if(isHistory)
+                    {
+                        if(job.JobStatus != JobStatuses.Draft)
+                        {
+                            job.JobStatus = JobStatuses.Draft;
+                            job.LastUpdated = DateTime.UtcNow;
+                        }
+                    }
+                    if(!isHistory)//draft
+                    {
+                        if(job.JobStatus == JobStatuses.Draft)
+                        {
+                            job.JobStatus = JobStatuses.Completed;
+                            job.LastUpdated = DateTime.UtcNow;
+                        }
+                    }
+                }
+
+                await _db.SaveChangesAsync();
+                
+                HistoryJobsCollectionView.Refresh();
+                DraftJobsCollectionView.Refresh();
+                ClearSelection();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error Move To {list} selected jobs.");
+                await NotificationProvider.ShowError($"An error occurred while trying to Move To {list} the selected jobs.");
+            }
+        }
+
+        /// <summary>
         /// Called when the search filter has been changed
         /// </summary>
         private void OnFilterChanged()
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index efa080561..165f251c3 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -30,9 +30,10 @@
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter"/>
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter"/>
         <converters:TimeSpanToMinutesConverter x:Key="TimeSpanToMinutesConverter"/>
+        <converters:TimeSpanToTwoDigitsTimeConverter x:Key="TimeSpanToTwoDigitsTimeConverter"/>
+        <converters:TimeSpanToLabelConverter x:Key="TimeSpanToLabelConverter"/>
         <localConverters:MarginOffsetSliderConverter x:Key="MarginOffsetSliderConverter"/>
         <localConverters:FirstValueCollectionConverter x:Key="FirstValueCollectionConverter"/>
-        <localConverters:TimeSpanToHoursConverter x:Key="TimeSpanToHoursConverter"/>
         <localConverters:LengthToWeightConverter x:Key="LengthToWeightConverter"/>
 
         <BitmapImage x:Key="Image_Out_Of_Gamut" UriSource="../Images/JobView/error.png" />
@@ -257,8 +258,8 @@
                             <Border Margin="20 0 0 0" BorderThickness="1"  Height="44" CornerRadius="12" BorderBrush="{StaticResource TangoMidAccentBrush}" Visibility="{Binding ElementName=segmentsGrid, Path=DataContext.IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Length, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
-                                                                                   StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="100000" 
+                                                                                   StringFormat="N1" AutoCalculateJogStep="False" 
+                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="1000000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18" ValueChangedEnd="Length_ValueChanged" 
                                                                                    TextGotFocus="Length_BeforeChangeValue" RippleBrush="Transparent"/>
@@ -267,7 +268,7 @@
                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Weight, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
                                                                                    StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="1000" 
+                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="100000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18"  RippleBrush="Transparent"/>
                             </Border>
@@ -886,14 +887,14 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" Text="Copies" FontSize="{StaticResource TangoButtonFontSize}" Width="145"/>
                                 <Border Margin="20 0 0 0" BorderThickness="1"  Height="44" CornerRadius="12" BorderBrush="{StaticResource TangoMidAccentBrush}" Width="120">
-                                    <touch:TouchNumericTextBox BorderBrush="Transparent" HasDecimalPoint="False" Minimum="4" Step="4" Margin="0 0 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Value="{Binding JobModel.Copies}" HideUnderline="True" RippleBrush="Transparent"></touch:TouchNumericTextBox>
+                                    <touch:TouchNumericTextBox BorderBrush="Transparent" HasDecimalPoint="False" Minimum="4" Maximum="1000000"  Step="4" Margin="0 0 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Value="{Binding JobModel.Copies}" HideUnderline="True" RippleBrush="Transparent"></touch:TouchNumericTextBox>
 
                                 </Border>
                             </StackPanel>
                            
                         </DockPanel>
                         <StackPanel Orientation="Horizontal" Margin="60 0 60 20" Visibility="{Binding IsBasicMode, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                            <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" Text="White Gap (m)" FontSize="{StaticResource TangoButtonFontSize}" Width="145"/>
+                            <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" Text="White Gap(m)" FontSize="{StaticResource TangoButtonFontSize}" Width="145"/>
                             <Border Margin="20 0 0 0" BorderThickness="1"  Height="44" CornerRadius="12" BorderBrush="{StaticResource TangoMidAccentBrush}" Width="120">
                                 <touch:TouchNumericTextBox BorderBrush="Transparent" HasDecimalPoint="False" Minimum="0" Margin="0 0 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Value="{Binding JobModel.InterSegmentLength}" HideUnderline="True" RippleBrush="Transparent"></touch:TouchNumericTextBox>
 
@@ -1029,7 +1030,7 @@
                                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Length, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
                                                                                    StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="100000" 
+                                                                                   HasDecimalPoint="True" Minimum="1" Maximum="1000000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18" ValueChangedEnd="Length_ValueChanged" 
                                                                                    TextGotFocus="Length_BeforeChangeValue" RippleBrush="Transparent"/>
@@ -1039,7 +1040,7 @@
                                                 <touch:TouchNumericTextBox Margin="20 0 0 0" Width="192" FocusSelectionMode="SelectAll" HorizontalAlignment="Left" HideUnderline="True" VerticalAlignment="Center" 
                                                                                    Value="{Binding Weight, UpdateSourceTrigger=LostFocus}" VerticalContentAlignment="Center"
                                                                                    StringFormat="0.0" AutoCalculateJogStep="False" 
-                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="1000" 
+                                                                                   HasDecimalPoint="True" Minimum="0" Maximum="100000" 
                                                                                    KeyboardContainer="{Binding ElementName=Container}" 
                                                                                    FontSize="18"  RippleBrush="Transparent"/>
 
@@ -1188,18 +1189,18 @@
                 </Grid>
 
                 <!--<touch:TouchDropShadowBorder Grid.Row="3"  Margin="10 0 10 15" CornerRadius="0" BorderThickness="0"  Padding="0" >-->
-                <Border Grid.Row="2" Margin="10 0 10 15" BorderThickness="0">
-                    <touch:TouchExpander x:Name="summaryExpander" IsExpanded="{Binding IsSummaryOpened, Mode=TwoWay}"  Grid.Row="3" Margin="15 0 15 0 "  FontSize="{StaticResource TangoTitleFontSize}"  BorderThickness="0" Style="{StaticResource TouchRoundedExpander}">
+                <Border Grid.Row="2" Margin="0 0 0 0" BorderThickness="0">
+                    <touch:TouchExpander x:Name="summaryExpander" IsExpanded="{Binding IsSummaryOpened, Mode=TwoWay}"  Grid.Row="3" Margin="15 0 15 0 "  FontSize="{StaticResource TangoTitleFontSize}"  BorderThickness="0" Style="{StaticResource TouchRoundedExpander}" CornerRadius="20 20 0 0" Padding="10" IsTabStop="False" >
                         <touch:TouchExpander.Header>
-                            <DockPanel >
-                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 0 20 0" >
+                            <DockPanel Height="80">
+                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 0 10 0" VerticalAlignment="Center" >
                                     <StackPanel Orientation="Horizontal" Visibility="{Binding IsSummaryOpened, Converter={StaticResource BooleanToVisibilityInverseConverter}, Mode=TwoWay}">
-                                        <TextBlock VerticalAlignment="Center"  FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <TextBlock VerticalAlignment="Center"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Run Text="Copy:" FontWeight="Normal"></Run>
                                             <Run Text="{Binding JobModel.Length,Mode=OneWay,StringFormat=0.##}" FontWeight="DemiBold"/>
                                             <Run Text="m" FontWeight="DemiBold"></Run>
                                         </TextBlock>
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <Run Text="Copy:" FontWeight="Normal"></Run>
                                             <Run  FontWeight="DemiBold">
                                                 <Run.Text>
@@ -1211,14 +1212,14 @@
                                                 </Run>
                                             <Run Text="g" FontWeight="DemiBold"></Run>
                                         </TextBlock>
-                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0"  FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Run Text="Total:" FontWeight="Normal"></Run>
-                                             <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat=0.##}" FontWeight="DemiBold"/>
-                                             <Run Text="m" FontWeight="DemiBold"></Run> 
+                                             <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat=0.##}" FontWeight="Bold"/>
+                                             <Run Text="m" FontWeight="Bold"></Run> 
                                         </TextBlock>
-                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0"  FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0"  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <Run Text="Total:" FontWeight="Normal"></Run>
-                                            <Run  FontWeight="DemiBold">
+                                            <Run  FontWeight="Bold">
                                                     <Run.Text>
                                                         <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                             <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
@@ -1226,23 +1227,23 @@
                                                         </MultiBinding>
                                                     </Run.Text>
                                                     </Run>
-                                             <Run Text="g" FontWeight="DemiBold"></Run> 
+                                             <Run Text="g" FontWeight="Bold"></Run> 
                                         </TextBlock>
                                     </StackPanel>
-                                    <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="SemiBold" Foreground="{StaticResource TangoDarkForegroundBrush}">
-                                        <Run Text="Duration: "></Run>
-                                        <Run Text="{Binding JobModel.GetEstimatedDuration, Converter={StaticResource TimeSpanToHoursConverter}, FallbackValue=0, Mode=OneWay,StringFormat=0.0}"></Run>
-                                        <Run Text="h"></Run>
-                                        </TextBlock>
+                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" FontWeight="Bold" Foreground="{StaticResource TangoDarkForegroundBrush}">
+                                        <Run Text="Duration: " FontWeight="Normal"></Run>
+                                        <Run Text="{Binding JobModel.GetEstimatedDuration, Converter={StaticResource TimeSpanToTwoDigitsTimeConverter}, FallbackValue=0, Mode=OneWay}"></Run>
+                                        <Run Text="{Binding JobModel.GetEstimatedDuration, Converter={StaticResource TimeSpanToLabelConverter}, FallbackValue=min, Mode=OneWay}"></Run>
+                                    </TextBlock>
                                 </StackPanel>
                                 <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" VerticalAlignment="Center"  Style="{StaticResource Level1Container}">
                                     <Image Source="../Images/JobView/job-summary.png" Width="39" />
-                                    <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Summary</TextBlock>
+                                    <TextBlock FontWeight="Medium" Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Summary</TextBlock>
                                 </StackPanel>
                             </DockPanel>
                           
                         </touch:TouchExpander.Header>
-                        <Grid Margin="40 0 40 0">
+                        <Grid Margin="40 0 40 10">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="Auto"/>
@@ -1254,15 +1255,15 @@
                                 
                             </Grid>
                             <UniformGrid Grid.Row="1" Margin="0 40 0 0" Columns="4" Rows="1" HorizontalAlignment="Stretch" >
-                                <TextBlock Text="Total:" FontWeight="DemiBold" FontSize="{StaticResource TangoDefaultFontSize}" ></TextBlock>
-                                <TextBlock  FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <TextBlock Text="Total:" FontWeight="Bold" FontSize="{StaticResource TangoTitleFontSize}" ></TextBlock>
+                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                         <Run Text="Copy:" FontWeight="Normal"></Run>
-                                        <Run Text="{Binding JobModel.Length,Mode=OneWay,StringFormat=0.##}" FontWeight="DemiBold"/>
-                                        <Run Text="m" FontWeight="DemiBold"></Run>
+                                        <Run Text="{Binding JobModel.Length,Mode=OneWay,StringFormat=0.##}" FontWeight="Bold"/>
+                                        <Run Text="m" FontWeight="Bold"></Run>
                                 </TextBlock>
-                                <TextBlock  FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                         <Run Text="Copy:" FontWeight="Normal"></Run>
-                                        <Run  FontWeight="DemiBold">
+                                        <Run  FontWeight="Bold">
                                             <Run.Text>
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                     <Binding Path="JobModel.Length" Mode="OneWay"/>
@@ -1272,18 +1273,18 @@
                                             </Run>
                                         <Run Text="g" FontWeight="DemiBold"></Run>
                                 </TextBlock>
-                                <TextBlock FontSize="{StaticResource TangoDefaultFontSize}">
+                                <TextBlock FontSize="{StaticResource TangoTitleFontSize}">
                                         <Run Text="Copies:" FontWeight="Normal"></Run>
-                                        <Run Text="{Binding JobModel.Copies}" FontWeight="DemiBold"/>
+                                        <Run Text="{Binding JobModel.Copies}" FontWeight="Bold"/>
                                 </TextBlock>
-                                <TextBlock FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                         <Run Text="Total:" FontWeight="Normal"></Run>
-                                        <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat=0.##}" FontWeight="DemiBold"/>
-                                        <Run Text="m" FontWeight="DemiBold"></Run>
+                                        <Run Text="{Binding JobModel.LengthIncludingNumberOfUnitsAndSpools,Mode=OneWay, StringFormat=0.##}" FontWeight="Bold"/>
+                                        <Run Text="m" FontWeight="Bold"></Run>
                                     </TextBlock>
-                                <TextBlock FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                         <Run Text="Total:" FontWeight="Normal"></Run>
-                                        <Run  FontWeight="DemiBold">
+                                        <Run  FontWeight="Bold">
                                             <Run.Text>
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                     <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/>
@@ -1291,27 +1292,27 @@
                                                 </MultiBinding>
                                             </Run.Text>
                                             </Run>
-                                        <Run Text="g" FontWeight="DemiBold"></Run>
+                                        <Run Text="g" FontWeight="Bold"></Run>
                                 </TextBlock>
                             </UniformGrid>
                             <UniformGrid Grid.Row="2" Margin="0 40 0 0" Columns="4" Rows="1" HorizontalAlignment="Stretch">
-                                <TextBlock Text="Per Spool:" FontWeight="DemiBold" FontSize="{StaticResource TangoDefaultFontSize}"></TextBlock>
-                                <TextBlock  FontSize="{StaticResource TangoDefaultFontSize}"> 
+                                <TextBlock Text="Per Spool:" FontWeight="Bold" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
+                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}"> 
                                     <Run Text="Spools:" FontWeight="Normal"></Run>
-                                    <Run Text="{Binding JobModel.NumberSpools}" FontWeight="DemiBold"/>
+                                    <Run Text="{Binding JobModel.NumberSpools}" FontWeight="Bold"/>
                                 </TextBlock>
-                                <TextBlock FontSize="{StaticResource TangoDefaultFontSize}">
+                                <TextBlock FontSize="{StaticResource TangoTitleFontSize}">
                                      <Run Text="Copies:" FontWeight="Normal"></Run>
-                                    <Run Text="{Binding JobModel.NumberOfUnits}" FontWeight="DemiBold"/>
+                                    <Run Text="{Binding JobModel.NumberOfUnits}" FontWeight="Bold"/>
                                 </TextBlock>
-                                <TextBlock FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                     <Run Text="Total:" FontWeight="Normal"></Run>
-                                     <Run Text="{Binding JobModel.LengthIncludingNumberOfUnits,Mode=OneWay, StringFormat=0.##}" FontWeight="DemiBold"/>
-                                     <Run Text="m" FontWeight="DemiBold"></Run>
+                                     <Run Text="{Binding JobModel.LengthIncludingNumberOfUnits,Mode=OneWay, StringFormat=0.##}" FontWeight="Bold"/>
+                                     <Run Text="m" FontWeight="Bold"></Run>
                                 </TextBlock>
-                                <TextBlock FontSize="{StaticResource TangoDefaultFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding IsWeightView, Converter={StaticResource BooleanToVisibilityConverter}}">
                                     <Run Text="Total:" FontWeight="Normal"></Run>
-                                    <Run  FontWeight="DemiBold">
+                                    <Run  FontWeight="Bold">
                                             <Run.Text>
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" >
                                                     <Binding Path="JobModel.LengthIncludingNumberOfUnits" Mode="OneWay"/>
@@ -1319,7 +1320,7 @@
                                                     </MultiBinding>
                                             </Run.Text>
                                             </Run>
-                                     <Run Text="g" FontWeight="DemiBold"></Run>
+                                     <Run Text="g" FontWeight="Bold"></Run>
                                 </TextBlock>
                             </UniformGrid>
                         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
index d143268c7..0e9e6d617 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
@@ -29,6 +29,7 @@
             </ResourceDictionary.MergedDictionaries>
 
             <converters:JobToPieImageConverter x:Key="JobToPieImageConverter" />
+            <converters:LengthWithSpoolsConverter x:Key="LengthWithSpoolsConverter"/>
             <sharedConverters:DateTimeUTCToShortDateConverter x:Key="DateTimeUTCToShortDateConverter" />
             <sharedConverters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
             <sharedConverters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
@@ -90,26 +91,17 @@
                             </Style.Triggers>
                         </Style>
                     </StackPanel.Style>
-                    <touch:TouchIconButton Command="{Binding ClearSelectionCommand}" Visibility="{Binding IsMultiSelecting,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 0 30 0" Padding="20" Icon="Undo">
+                    <touch:TouchIconButton Command="{Binding ClearSelectionCommand}" Visibility="{Binding IsMultiSelecting,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 0 30 0" Padding="20" Icon="Close" Width="50" Height="50" Style="{StaticResource TangoRoundTouchIconButton}">
+                       
+                    </touch:TouchIconButton>
+                    <touch:TouchIconButton Command="{Binding MoveToListJobsCommand}" Margin="0 0 30 0" Padding="20"  >
                         <touch:TouchIconButton.Style>
                             <Style TargetType="touch:TouchIconButton" BasedOn="{StaticResource TangoRoundTouchIconButton}">
                                 <Setter Property="IconAngle" Value="0"></Setter>
+                                <Setter Property="Icon" Value="Redo"/>
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsMultiSelecting}" Value="True">
-                                        <DataTrigger.EnterActions>
-                                            <BeginStoryboard>
-                                                <Storyboard>
-                                                    <DoubleAnimation Storyboard.TargetProperty="IconAngle" To="360" Duration="00:00:0.2"></DoubleAnimation>
-                                                </Storyboard>
-                                            </BeginStoryboard>
-                                        </DataTrigger.EnterActions>
-                                        <DataTrigger.ExitActions>
-                                            <BeginStoryboard>
-                                                <Storyboard>
-                                                    <DoubleAnimation Storyboard.TargetProperty="IconAngle" To="0" Duration="00:00:00"></DoubleAnimation>
-                                                </Storyboard>
-                                            </BeginStoryboard>
-                                        </DataTrigger.ExitActions>
+                                    <DataTrigger Binding="{Binding SelectedCategoryIndex}" Value="1">
+                                        <Setter Property="Icon" Value="Undo"/>
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
@@ -167,7 +159,7 @@
                     <DockPanel>
                         <Rectangle Margin="0 0 20 0" HorizontalAlignment="Center" VerticalAlignment="Bottom" Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" Height="25"></Rectangle>
                         <touch:TouchIcon DockPanel.Dock="Left" Foreground="{StaticResource TangoGrayBrush}" Width="20" Height="20" VerticalAlignment="Bottom" Icon="Magnify" />
-                        <touch:TouchTextBox Margin="5 0 0 0" Width="300" Text="{Binding Filter,Mode=TwoWay}" Watermark="find name, customer..."></touch:TouchTextBox>
+                        <touch:TouchTextBox Margin="5 0 0 0" Width="300" Text="{Binding Filter,Mode=TwoWay}" Watermark="find name"></touch:TouchTextBox>
                     </DockPanel>
                 </Grid>
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Right" Margin="0 20 20 0"  Visibility="{Binding BuildProvider.IsEureka, Converter={StaticResource BooleanToVisibilityConverter}}">
@@ -256,28 +248,44 @@
                                 </touch:LightTouchDataGridColumn.Header>
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Margin="20 0 0 0" IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='40'}"></TextBlock>
+                                        <TextBlock Margin="20 0 0 0" IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='56'}" TextWrapping="Wrap"></TextBlock>
+                                    </DataTemplate>
+                                </touch:LightTouchDataGridColumn.CellTemplate>
+                            </touch:LightTouchDataGridColumn> 
+                            <touch:LightTouchDataGridColumn Width="200" Header="Thread" SortMember="ThreadName" HorizontalContentAlignment="Left">
+                                <touch:LightTouchDataGridColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Margin="5 0 0 0" IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='44'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
-                            <touch:LightTouchDataGridColumn Width="117" Header="Length (m)" SortMember="Length">
+                            <touch:LightTouchDataGridColumn Width="117" Header="Length (m)" SortMember="LengthIncludingNumberOfUnits">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding Length,StringFormat=0.0}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False">
+                                            <TextBlock.Text>
+                                                <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.0" TargetNullValue='0' FallbackValue='0' Mode="OneWay">
+                                                    <Binding Path="LengthIncludingNumberOfUnits" Mode="OneWay"/>
+                                                    <Binding Path="DataContext.BuildProvider.IsEureka" Mode="OneWay" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
+                                                    <Binding Path="Spools" Mode="OneWay"/>
+                                                </MultiBinding>
+                                            </TextBlock.Text>
+                                        </TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
+                           
                             <touch:LightTouchDataGridColumn Header="Colors" SortMember="Segments.Count" Width="85">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <Image Stretch="Fill" IsHitTestVisible="False" Source="{Binding Converter={StaticResource JobToPieImageConverter},ConverterParameter='25,25',IsAsync=True}" Width="25" Height="25" HorizontalAlignment="Left"></Image>
+                                        <Image Stretch="Fill" IsHitTestVisible="False" Source="{Binding Converter={StaticResource JobToPieImageConverter},ConverterParameter='60,60',IsAsync=True}" Width="60" Height="60" HorizontalAlignment="Left"></Image>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -356,35 +364,50 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="1*" Header="Name" SortMember="Name" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock  IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='40'}" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock  IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='46'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                    </DataTemplate>
+                                </touch:LightTouchDataGridColumn.CellTemplate>
+                            </touch:LightTouchDataGridColumn>
+                            <touch:LightTouchDataGridColumn Width="200" Header="Thread" SortMember="ThreadName" HorizontalContentAlignment="Left">
+                                <touch:LightTouchDataGridColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Margin="5 0 0 0"  IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='43'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
-                            <touch:LightTouchDataGridColumn Width="117" Header="Length (m)" SortMember="Length">
+                            <touch:LightTouchDataGridColumn Width="117" Header="Length (m)" SortMember="LengthIncludingNumberOfUnits">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding Length,StringFormat=0.0}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" >
+                                            <TextBlock.Text>
+                                                <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.0" TargetNullValue='0' FallbackValue='0'>
+                                                    <Binding Path="LengthIncludingNumberOfUnits" Mode="OneWay"/>
+                                                    <Binding Path="DataContext.BuildProvider.IsEureka" Mode="OneWay" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
+                                                    <Binding Path="Spools" Mode="OneWay"/>
+                                                </MultiBinding>
+                                            </TextBlock.Text>
+                                        </TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Header="Colors" SortMember="Segments.Count" Width="85">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <Image Stretch="Fill" IsHitTestVisible="False" Source="{Binding Converter={StaticResource JobToPieImageConverter},ConverterParameter='25,25',IsAsync=True}" Width="25" Height="25" HorizontalAlignment="Left"></Image>
+                                        <Image Stretch="Fill" IsHitTestVisible="False" Source="{Binding Converter={StaticResource JobToPieImageConverter},ConverterParameter='60,60',IsAsync=True}" Width="60" Height="60" HorizontalAlignment="Left"></Image>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index 6475869dd..764f044d0 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -461,7 +461,7 @@
                                         </DockPanel>
 
                                         <DockPanel Margin="0 20 0 0" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
-                                            <TextBlock VerticalAlignment="Center">Show advanced options (Multi-segments &amp; Gradients) in the Job Editor</TextBlock>
+                                            <TextBlock VerticalAlignment="Center">Show advanced options (Segments &amp; Gradients) in the Job Editor</TextBlock>
                                             <touch:TouchToggleSlider IsChecked="{Binding Settings.ShowAdvancedOptions}" Margin="0 0 100 0" DockPanel.Dock="Right" Style="{StaticResource TangoToggleButtonGrayAccent}" HorizontalAlignment="Right" Width="90"></touch:TouchToggleSlider>
                                         </DockPanel>