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

1 files changed, 27 insertions, 18 deletions

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 345231e57..8a01e07cc 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
@@ -110,6 +110,17 @@ namespace Tango.PPC.Jobs.ViewModels
             }
         }
 
+        public bool CanDropResume
+        {
+            get
+            {
+                return Job != null && HasResumeModel &&
+                    (!MachineProvider.MachineOperator.IsPrinting
+                      ||  (MachineProvider.MachineOperator.RunningJob != null
+                        && MachineProvider.MachineOperator.RunningJob.Guid != Job.Guid));
+            }
+        }
+
         private ICollectionView _segmentsCollectionView;
         /// <summary>
         /// Gets or sets the job segments collection view.
@@ -280,19 +291,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
             }
         }
-
-        private bool _showAdvanced;
-
-        public bool ShowAdvanced
-        {
-            get { return _showAdvanced; }
-            set
-            {
-                _showAdvanced = value;
-                RaisePropertyChangedAuto();
-            }
-        }
-
+        
         private JobResumeModel _resumeModel;
         public JobResumeModel ResumeModel
         {
@@ -435,7 +434,7 @@ namespace Tango.PPC.Jobs.ViewModels
             CopyCommand = new RelayCommand(Copy);
             UndoCommand = new RelayCommand(Undo);//(x) => { return UndoRedoManager.Instance.IsEnableUndoOperation(); }
             RedoCommand = new RelayCommand(Redo);//(x) => { return UndoRedoManager.Instance.IsEnableRedoOperation();}
-            DropResumeCommand = new RelayCommand(DropResume);
+            DropResumeCommand = new RelayCommand(DropResume, (x)=> CanDropResume);
 
 
             NavigateBackToJobs = new RelayCommand(NavigateBack);
@@ -522,6 +521,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     }
 
                     RaisePropertyChanged(nameof(CanEdit));
+                     DropResumeCommand.RaiseCanExecuteChanged();
 
                     Job.NameChanged -= Job_NameChanged;
                     Job.NameChanged += Job_NameChanged;
@@ -547,7 +547,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     RaisePropertyChanged(nameof(SelectedRML));
 
                     await LoadRML(_selectedRML);
-                    if (BuildProvider.IsEureka && Job.Segments.Count == 1 && Job.Segments[0].BrushStops.Count == 1)
+                    if (BuildProvider.IsEureka && Job.Segments.Count == 1 && Job.Segments[0].BrushStops.Count <= 1)
                     {
                         IsBasicMode = true;
                     }
@@ -581,7 +581,6 @@ namespace Tango.PPC.Jobs.ViewModels
 
                 IsFullMode = true;
                 DyeCommand.RaiseCanExecuteChanged();
-                ShowAdvanced = Settings.ShowAdvancedOptions;
             }
             catch (Exception ex)
             {
@@ -633,8 +632,8 @@ namespace Tango.PPC.Jobs.ViewModels
                 JobType = Job.JobType,
                 InterSegmentLength = Job.InterSegmentLength,
                 EnableInterSegment = Job.EnableInterSegment,
-                NumberSpools = (BuildProvider.IsEureka ? Job.Spools : 1),
-                Copies = (BuildProvider.IsEureka ? Job.NumberOfUnits * Job.Spools : Job.NumberOfUnits)
+                NumberSpools = (BuildProvider.IsEureka ? Job.NumberOfSpools : 1),
+                Copies = (BuildProvider.IsEureka ? Job.NumberOfUnits * Job.NumberOfSpools : Job.NumberOfUnits)
             };
             Dictionary<string, SegmentsGroupModel> guidToGroup = new Dictionary<string, SegmentsGroupModel>();
             if (Job.Version < 2)
@@ -781,6 +780,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 var handler = await PrintingManager.Print(Job, _db, printConfig);
 
                 RaisePropertyChanged(nameof(CanEdit));
+                DropResumeCommand.RaiseCanExecuteChanged();
 
                 if (!BuildProvider.IsEureka)
                 {
@@ -1607,6 +1607,7 @@ namespace Tango.PPC.Jobs.ViewModels
             {
                 Job.SpoolType = _spoolTypes.FirstOrDefault(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool);
             }
+            Job.NumberOfSpools = JobModel.NumberSpools;
 
             var oldSegments = Job.Segments.ToList();
 
@@ -1786,6 +1787,10 @@ namespace Tango.PPC.Jobs.ViewModels
         private void MachineOperator_PrintingStarted(object sender, PrintingEventArgs e)
         {
             RaisePropertyChanged(nameof(CanEdit));
+            InvokeUI( () =>
+            {
+                DropResumeCommand.RaiseCanExecuteChanged();
+            });
         }
 
         private void MachineOperator_PrintingEnded(object sender, Integration.Operation.PrintingEventArgs e)
@@ -1796,6 +1801,10 @@ namespace Tango.PPC.Jobs.ViewModels
             }
 
             RaisePropertyChanged(nameof(CanEdit));
+            InvokeUI(() =>
+            {
+                DropResumeCommand.RaiseCanExecuteChanged();
+            });
         }