1 files changed, 13 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index a87340101..cda2ba96f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -29,6 +29,7 @@ using System.Collections.ObjectModel;
 using Tango.PPC.Common.Models;
 using Tango.Logging;
 using Tango.PPC.Common.Messages;
+using Tango.BL.Builders;
 
 namespace Tango.PPC.Jobs.ViewModels
 {
@@ -365,12 +366,21 @@ namespace Tango.PPC.Jobs.ViewModels
                     _can_navigate_back = false;
 
                     _db = ObservablesContext.CreateDefault();
-                    var a = _db.Jobs.ToList();
-                    Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == _job_to_load.Guid);
+
+
+
+                    Job = await new JobBuilder(_db).Set(_job_to_load.Guid)
+                        .WithConfiguration()
+                        .WithRML()
+                        .WithUser()
+                        .WithSegments()
+                        .WithBrushStops()
+                        .BuildAsync();
+
                     Job.ValidateOnPropertyChanged = true;
 
                     LogManager.Log("Loading RMLS...");
-                    Rmls = await _db.Rmls.ToListAsync();
+                    Rmls = (await new RmlsCollectionBuilder(_db).Set().WithActiveParametersGroup().WithCAT(Job.MachineGuid).WithCCT().WithLiquidFactors().BuildAsync()).ToList();
                     LogManager.Log("Loading Color Spaces...");
                     ColorSpaces = await _db.ColorSpaces.ToListAsync();
                     LogManager.Log("Loading Spool Types...");