1 files changed, 19 insertions, 10 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 cef55a4ad..01b819284 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
@@ -428,8 +428,8 @@ namespace Tango.PPC.Jobs.ViewModels
                     //await SetSpoolTension(Job.Rml);
 
                     LogManager.Log("Loading RMLS...");
-                    Rmls = (await new RmlsCollectionBuilder(_db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToList();
-                   //Rmls = (await new RmlsCollectionBuilder(_db).SetAll().BuildAsync()).OrderBy(x => x.FinalName).ToList();
+                    //Rmls = (await new RmlsCollectionBuilder(_db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToList();
+                   Rmls = (await new RmlsCollectionBuilder(_db).SetAll().BuildAsync()).OrderBy(x => x.FinalName).ToList();
                     LogManager.Log("Loading Color Spaces...");
                     ColorSpaces = await _db.ColorSpaces.Where(x => x.Code != (int)BL.Enumerations.ColorSpaces.CMYK).ToListAsync();
                     LogManager.Log("Loading Spool Types...");
@@ -507,12 +507,11 @@ namespace Tango.PPC.Jobs.ViewModels
             Dictionary<string, SegmentsGroupModel> guidToGroup = new Dictionary<string, SegmentsGroupModel>();
             if (Job.Version < 2)
             {
+                int segmentindex = 1;
                 foreach (var segm in Job.OrderedSegments)
                 {
                     if(segm.BrushStops.Count > 1)
                     {
-                        int segmentindex = 1;
-
                         var brushes = segm.BrushStops;
                         Segment currentSegment = segm;
                         double lengthOfOldSegment = segm.Length;
@@ -542,9 +541,11 @@ namespace Tango.PPC.Jobs.ViewModels
                     else
                     {
                         SegmentModel segmentModel = LoadSegmentModel(segm, jobModel);
+                        segmentModel.SegmentIndex  = segmentindex++;
                         jobModel.Segments.Add(segmentModel);
                     }
                 }
+                
             }
             else
             {
@@ -613,12 +614,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             DyeCommand.RaiseCanExecuteChanged();
         }
-        public override void OnBeforeNavigatedFrom()
-        {
-            base.OnBeforeNavigatedFrom();
-            //Save...
-        }
-
+       
         /// <summary>
         /// Starts the job.
         /// </summary>
@@ -1142,6 +1138,18 @@ namespace Tango.PPC.Jobs.ViewModels
             LoadJob();
         }
 
+       
+        
+        public override void OnBeforeNavigatedTo()
+        {
+            base.OnBeforeNavigatedTo();
+        }
+
+        public override void OnBeforeNavigatedFrom()
+        {
+            base.OnBeforeNavigatedFrom();
+        }
+
         /// <summary>
         /// Called when the navigation system has navigated from this VM view.
         /// </summary>
@@ -1360,6 +1368,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     foreach (var stop in innerSegment.BrushStops.OrderBy(x => x.StopIndex).ToList())
                     {
                         var dbStop = new BrushStop();
+                        dbStop.Guid = stop.Guid;
                         dbStop.Segment = dbSegment;
                         _db.BrushStops.Add(dbStop);