From bf8bffbd56328b55b98db79e700bd3dc4dc8e882 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 27 Aug 2023 13:52:59 +0300
Subject: Added detailed "getting ready" to TS1800

Related Work Items: #8716
---
 .../PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs       | 10 ++++++++--
 .../PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml    |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
index c874e5fc2..9d8ae1555 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
@@ -101,7 +101,13 @@ namespace Tango.PPC.Jobs.ViewModels
 
         public bool CanEdit
         {
-            get { return (!MachineProvider.MachineOperator.IsPrinting || MachineProvider.MachineOperator.RunningJob == null || MachineProvider.MachineOperator.RunningJob.Guid != Job.Guid) && !HasResumeModel; }
+            get {
+                return Job != null && 
+                    (!MachineProvider.MachineOperator.IsPrinting 
+                        || MachineProvider.MachineOperator.RunningJob == null 
+                        || MachineProvider.MachineOperator.RunningJob.Guid != Job.Guid) 
+                    && !HasResumeModel;
+            }
         }
 
         private ICollectionView _segmentsCollectionView;
@@ -768,7 +774,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     printConfig.FirstUnitStartPosition = ResumeModel.FirstUnitStartPosition;
                     printConfig.GlobalStartPosition = ResumeModel.GlobalStartPosition;
                     printConfig.RemainingUnits = ResumeModel.RemainingUnits;
-                   // LogManager.Log($"Start Job resume :    FirstUnitStartPosition = {ResumeModel.FirstUnitStartPosition}   GlobalStartPosition = {ResumeModel.GlobalStartPosition}    RemainingUnits = {ResumeModel.RemainingUnits}", LogCategory.Debug);
+                    //LogManager.Log($"!!!!!  Start Job resume :    FirstUnitStartPosition = {ResumeModel.FirstUnitStartPosition}   GlobalStartPosition = {ResumeModel.GlobalStartPosition}    RemainingUnits = {ResumeModel.RemainingUnits}", LogCategory.Debug);
 
                 }
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml
index ec8801dc1..a91d5676b 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml
@@ -102,6 +102,7 @@
                             <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
                         </StackPanel>
+                        <TextBlock Margin="40 20 40 0" FontSize="{StaticResource TangoSmallFontSize}" FontWeight="Light" Text="{Binding RunningJobStatus.Message, FallbackValue='', TargetNullValue='', Converter={StaticResource StringEllipsisConverter},ConverterParameter='76'}" TextWrapping="Wrap" MaxWidth="310" HorizontalAlignment="Center" TextAlignment="Center" Height="42"></TextBlock>
                     </StackPanel>
 
                     <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
-- 
cgit v1.3.1