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

5 files changed, 251 insertions, 59 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
index 103a10b28..03cd5bfff 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.Integration.Operation;
+using Tango.PMR.Printing;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Jobs.AppBarItems;
@@ -47,6 +48,26 @@ namespace Tango.PPC.Jobs.ViewModels
             set { _runningJobStatus = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isDisplayJobOutline;
+        /// <summary>
+        /// Gets or sets a value indicating whether to display the job outline.
+        /// </summary>
+        public bool IsDisplayJobOutline
+        {
+            get { return _isDisplayJobOutline; }
+            set { _isDisplayJobOutline = value; RaisePropertyChangedAuto(); }
+        }
+
+        private JobTicket _jobOutlineTicket;
+        /// <summary>
+        /// Gets or sets the job outline ticket.
+        /// </summary>
+        public JobTicket JobOutlineTicket
+        {
+            get { return _jobOutlineTicket; }
+            set { _jobOutlineTicket = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -59,6 +80,16 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </value>
         public RelayCommand GoToJobCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the display job outline command.
+        /// </summary>
+        public RelayCommand DisplayJobOutlineCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the hide job outline command.
+        /// </summary>
+        public RelayCommand HideJobOutlineCommand { get; set; }
+
         #endregion
 
         public JobProgressViewVM()
@@ -67,14 +98,21 @@ namespace Tango.PPC.Jobs.ViewModels
             _stop_job_btn.Pressed += _stop_job_btn_Pressed;
 
             GoToJobCommand = new RelayCommand(GoToJob);
+            DisplayJobOutlineCommand = new RelayCommand(DisplayJobOutline);
+            HideJobOutlineCommand = new RelayCommand(HideJobOutline);
         }
 
-        private void _stop_job_btn_Pressed()
+        #region Private Methods
+
+        private void HideJobOutline()
         {
-            if (_handler != null)
-            {
-                _handler.Cancel();
-            }
+            IsDisplayJobOutline = false;
+        }
+
+        private void DisplayJobOutline()
+        {
+            JobOutlineTicket = _handler.JobTicket;
+            IsDisplayJobOutline = true;
         }
 
         private void GoToJob()
@@ -83,6 +121,8 @@ namespace Tango.PPC.Jobs.ViewModels
             NavigationManager.ClearHistoryExcept<JobsView>();
         }
 
+        #endregion
+
         #region Override Methods
 
         /// <summary>
@@ -117,18 +157,31 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             base.OnNavigatedTo();
 
+            IsDisplayJobOutline = false;
+
             if (NotificationProvider.HasAppBarItem && NotificationProvider.CurrentAppBarItem is JobProgressAppBarItem)
             {
                 NotificationProvider.CurrentAppBarItem.Close();
             }
 
-            _stop_job_btn.Push();
+            if (_handler != null && !_handler.Status.IsFailed)
+            {
+                _stop_job_btn.Push();
+            }
         }
 
         #endregion
 
         #region Event Handlers
 
+        private void _stop_job_btn_Pressed()
+        {
+            if (_handler != null)
+            {
+                _handler.Cancel();
+            }
+        }
+
         /// <summary>
         /// Handles the PrintingStarted event of the MachineOperator.
         /// </summary>
@@ -141,8 +194,10 @@ namespace Tango.PPC.Jobs.ViewModels
             e.JobHandler.StatusChanged += JobHandler_StatusChanged;
             e.JobHandler.SpoolChangeRequired += JobHandler_SpoolChangeRequired;
             e.JobHandler.Stopped += JobHandler_Stopped;
+            e.JobHandler.CanCancelChanged += JobHandler_CanCancelChanged;
 
             _stop_job_btn.Push();
+            _stop_job_btn.IsEnabled = true;
         }
 
         /// <summary>
@@ -172,12 +227,23 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         private void JobHandler_Stopped(object sender, EventArgs e)
         {
+            if (_stop_job_btn != null)
+            {
+                _stop_job_btn.Pop();
+            }
+
             if (NotificationProvider.HasAppBarItem && NotificationProvider.CurrentAppBarItem is JobProgressAppBarItem)
             {
                 NotificationProvider.CurrentAppBarItem.Close();
             }
 
-            _stop_job_btn.Pop();
+            if (_handler != null)
+            {
+                _handler.StatusChanged -= JobHandler_StatusChanged;
+                _handler.SpoolChangeRequired -= JobHandler_SpoolChangeRequired;
+                _handler.Stopped -= JobHandler_Stopped;
+                _handler.CanCancelChanged -= JobHandler_CanCancelChanged;
+            }
         }
 
         /// <summary>
@@ -193,6 +259,16 @@ namespace Tango.PPC.Jobs.ViewModels
             });
         }
 
+        /// <summary>
+        /// Handles the CanCancelChanged event of the JobHandler control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        private void JobHandler_CanCancelChanged(object sender, EventArgs e)
+        {
+            _stop_job_btn.IsEnabled = _handler.CanCancel;
+        }
+
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
index bff6beff5..365075d4a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
@@ -130,16 +130,6 @@ namespace Tango.PPC.Jobs.ViewModels
             _context = obj.Context;
             Job = obj.Job;
 
-            if (Job.ColorSpace.Space == BL.Enumerations.ColorSpaces.Catalog)
-            {
-                if (_context.ColorCatalogs.SingleOrDefault(x => x.Guid == Job.ColorCatalogGuid) == null)
-                {
-                    await NotificationProvider.ShowError("The selected color catalog for this job could not be found.\nCannot load job.");
-                    await NavigationManager.NavigateBack();
-                    return;
-                }
-            }
-
             IsPreparingJob = true;
 
             Job = await new JobBuilder(_context).Set(Job.Guid)
@@ -150,7 +140,15 @@ namespace Tango.PPC.Jobs.ViewModels
                     .WithBrushStops()
                     .BuildAsync();
 
-            await Task.Delay(2000);
+            if (Job.ColorSpace.Space == BL.Enumerations.ColorSpaces.Catalog)
+            {
+                if (_context.ColorCatalogs.SingleOrDefault(x => x.Guid == Job.ColorCatalogGuid) == null)
+                {
+                    await NotificationProvider.ShowError("The selected color catalog for this job could not be found.\nCannot load job.");
+                    await NavigationManager.NavigateBack();
+                    return;
+                }
+            }
 
             await Task.Factory.StartNew(() =>
             {
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 b5fbbe2ea..1b80eed35 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
@@ -55,6 +55,7 @@ namespace Tango.PPC.Jobs.ViewModels
         private StartPrintingButton _start_printing_btn;
         private ActionTimer _volumeConversionTimer;
         private IColorConverter _converter;
+        private string _current_job_string;
 
         #region Properties
 
@@ -411,7 +412,7 @@ namespace Tango.PPC.Jobs.ViewModels
             RepeatSampleDyeCommand = new RelayCommand(RepeatSampleDye);
             AnotherSampleCommand = new RelayCommand(DyeAnotherSample);
             InvokeFineTuningPaletteCommand = new RelayCommand<FineTuneItem>(InvokeFineTuningPalette);
-            ResetFineTuningCommand = new RelayCommand(ResetFineTuning);
+            ResetFineTuningCommand = new RelayCommand(() => ResetFineTuning(true));
             StartFineTuningCommand = new RelayCommand(StartFineTuning, () => FineTuneItems.Any(x => x.IsSelected) && CanStartJob());
             RepeatFineTuningCommand = new RelayCommand(RepeatFineTuning);
             ApproveFineTuningCommand = new RelayCommand(ApproveFineTuning);
@@ -467,7 +468,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     Job.ValidateOnPropertyChanged = true;
 
                     LogManager.Log("Loading RMLS...");
-                    Rmls = (await new RmlsCollectionBuilder(_db).SetAll().WithActiveParametersGroup().WithCAT(Job.MachineGuid).WithCCT().WithLiquidFactors().BuildAsync()).ToList();
+                    Rmls = (await new RmlsCollectionBuilder(_db).SetAll().WithActiveParametersGroup().WithCAT(Job.MachineGuid).WithCCT().WithLiquidFactors().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).ToList();
                     LogManager.Log("Loading Color Spaces...");
                     ColorSpaces = await _db.ColorSpaces.ToListAsync();
                     LogManager.Log("Loading Spool Types...");
@@ -477,7 +478,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
                     if (Job.ColorSpace.Space == BL.Enumerations.ColorSpaces.Catalog)
                     {
-                        SelectedCatalog = await new ColorCatalogBuilder(_db).Set(Job.ColorCatalogGuid).WithGroups().WithItems().BuildAsync();
+                        SelectedCatalog = await new CatalogBuilder(_db).Set(Job.ColorCatalogGuid).WithGroups().WithItems().BuildAsync();
 
                         if (SelectedCatalog != null)
                         {
@@ -509,6 +510,8 @@ namespace Tango.PPC.Jobs.ViewModels
                     ResetFineTuning();
 
                     _job_to_load = null;
+
+                    _current_job_string = Job.ToJobFileWhenLoaded().ToString();
                 }
 
                 if (!_jobs_fine_tune_items.ContainsKey(Job.Guid) && Job.JobFineTuningStatus == BL.Enumerations.FineTuningStatuses.PendingApproval)
@@ -544,6 +547,8 @@ namespace Tango.PPC.Jobs.ViewModels
             {
                 LogManager.Log(ex, $"Error loading job '{_job_to_load.Name}'");
                 await NotificationProvider.ShowError("An error occurred while trying to load the selected job.");
+                _can_navigate_back = true;
+                await NavigationManager.NavigateBack();
             }
             finally
             {
@@ -588,8 +593,11 @@ namespace Tango.PPC.Jobs.ViewModels
                     }
 
                     Job.LastUpdated = DateTime.UtcNow;
+                    Job.IsSynchronized = false;
                     Job.JobStatus = BL.Enumerations.JobStatuses.Draft;
+                    Job.MarkModified(_db);
                     await _db.SaveChangesAsync();
+                    _current_job_string = Job.ToJobFileWhenLoaded().ToString();
 
                     if (displayNotification)
                     {
@@ -642,7 +650,7 @@ namespace Tango.PPC.Jobs.ViewModels
             try
             {
                 LogManager.Log("Start job command pressed. Starting job and navigating to job progress view...");
-                await PrintingManager.Print(Job, _db);
+                var handler = await PrintingManager.Print(Job, _db);
                 await NavigationManager.NavigateTo<JobsModule>(nameof(JobProgressView));
             }
             catch (InsufficientLiquidQuantityException)
@@ -663,7 +671,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             return
                 Job != null && Job.Validate(_db) &&
-                !Job.Segments.SelectMany(x => x.BrushStops).ToList().Exists(x => x.IsOutOfGamut);
+                !Job.Segments.SelectMany(x => x.BrushStops).Where(x => !x.IsTransparent).ToList().Exists(x => x.IsOutOfGamut);
         }
 
         #endregion
@@ -703,7 +711,7 @@ namespace Tango.PPC.Jobs.ViewModels
             try
             {
                 LogManager.Log("Adding new solid segment...");
-                var s = Job.AddSolidSegment(MachineProvider.Machine.DefaultSegmentLength > 0 ? MachineProvider.Machine.DefaultSegmentLength : 10);
+                var s = Job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 10);
                 SetSegmentLiquidVolumesIfVolume(s);
                 return s;
             }
@@ -723,7 +731,7 @@ namespace Tango.PPC.Jobs.ViewModels
             try
             {
                 LogManager.Log("Adding new gradient segment...");
-                var s = Job.AddGradientSegment(MachineProvider.Machine.DefaultSegmentLength > 0 ? MachineProvider.Machine.DefaultSegmentLength : 10);
+                var s = Job.AddGradientSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 10);
                 SetSegmentLiquidVolumesIfVolume(s);
                 return s;
             }
@@ -874,23 +882,55 @@ namespace Tango.PPC.Jobs.ViewModels
                 LogManager.Log($"Invoking triplet color adjustment dialog for brush stop {brushStop.StopIndex} at segment {brushStop.Segment.SegmentIndex}.");
 
                 LogManager.Log("Retrieving color conversion suggestions for brush stop...");
-                var conversionOutput = _converter.Convert(brushStop, true);
+                PMR.ColorLab.ConversionOutput conversionOutput = null;
+
+                if (brushStop.IsOutOfGamut)
+                {
+                    conversionOutput = _converter.Convert(brushStop, false);
+                }
 
                 BasicColorCorrectionViewVM vm = null;
+                List<ColorConversionSuggestion> suggestions = null;
 
-                vm = await NotificationProvider.ShowDialog<BasicColorCorrectionViewVM>(new BasicColorCorrectionViewVM()
+                if (brushStop.IsOutOfGamut)
                 {
-                    InvalidBrushStop = brushStop,
-                    Suggestions = conversionOutput.CreateTrippletSuggestions(),
-                });
+                    vm = await NotificationProvider.ShowDialog<BasicColorCorrectionViewVM>(new BasicColorCorrectionViewVM()
+                    {
+                        InvalidBrushStop = brushStop,
+                        Suggestions = new List<ColorConversionSuggestion>() { new ColorConversionSuggestion(conversionOutput.SingleCoordinates, 0, 0) },
+                    });
+                }
 
-                if (vm.Result == BasicColorCorrectionViewVM.ColorCorrectionDialogResult.MoreOptions)
+                if (vm == null || vm.Result == BasicColorCorrectionViewVM.ColorCorrectionDialogResult.MoreOptions)
                 {
+                    NotificationProvider.SetGlobalBusyMessage("Generating color hive...");
+
+                    await Task.Factory.StartNew(() =>
+                    {
+                        conversionOutput = _converter.Convert(brushStop, true);
+
+                        suggestions = conversionOutput.CreateHiveSuggestions();
+
+                        if (vm == null)
+                        {
+                            var center = suggestions.GetCenterSuggestion();
+                            center.Coordinates.Red = brushStop.Red;
+                            center.Coordinates.Green = brushStop.Green;
+                            center.Coordinates.Blue = brushStop.Blue;
+
+                            center.Coordinates.L = brushStop.L;
+                            center.Coordinates.A = brushStop.A;
+                            center.Coordinates.B = brushStop.B;
+                        }
+                    });
+
+                    NotificationProvider.ReleaseGlobalBusyMessage();
                     LogManager.Log("Invoking hive color conversion dialog...");
                     vm = await NotificationProvider.ShowDialog<AdvancedColorCorrectionViewVM>(new AdvancedColorCorrectionViewVM()
                     {
                         InvalidBrushStop = brushStop,
-                        Suggestions = conversionOutput.CreateHiveSuggestions(),
+                        Suggestions = suggestions,
+                        IsOutOfGamut = brushStop.IsOutOfGamut,
                     });
                 }
 
@@ -910,6 +950,13 @@ namespace Tango.PPC.Jobs.ViewModels
                         brushStop.A = vm.SelectedSuggestion.Coordinates.A;
                         brushStop.B = vm.SelectedSuggestion.Coordinates.B;
                     }
+                    else if (brushStop.BrushColorSpace == BL.Enumerations.ColorSpaces.Volume)
+                    {
+                        if (vm.SelectedSuggestion != suggestions.GetCenterSuggestion())
+                        {
+                            vm.SelectedSuggestion.ApplyOnBrushStop(brushStop);
+                        }
+                    }
 
                     brushStop.Corrected = true;
                     brushStop.IsOutOfGamut = false;
@@ -921,6 +968,11 @@ namespace Tango.PPC.Jobs.ViewModels
                 LogManager.Log(ex, "Error while invoking color adjustment dialog.");
                 await NotificationProvider.ShowError("An error occurred while trying to convert the selected color.");
             }
+            finally
+            {
+                NotificationProvider.ReleaseGlobalBusyMessage();
+                DyeCommand.RaiseCanExecuteChanged();
+            }
         }
 
         /// <summary>
@@ -1068,7 +1120,7 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <summary>
         /// Synchronizes the fine tune items to brush stops.
         /// </summary>
-        private void SyncFineTuneItemsToBrushStops()
+        private async void SyncFineTuneItemsToBrushStops(bool displayBusy = false)
         {
             try
             {
@@ -1080,18 +1132,27 @@ namespace Tango.PPC.Jobs.ViewModels
                     }
                     else
                     {
+                        if (displayBusy)
+                        {
+                            NotificationProvider.SetGlobalBusyMessage("Generating suggestions...");
+                        }
+
                         FineTuneItems.Clear();
 
-                        foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorSpace.Space == BL.Enumerations.ColorSpaces.RGB || x.ColorSpace.Space == BL.Enumerations.ColorSpaces.LAB).DistinctBy(x => x.Color))
+                        foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => !x.IsTransparent).Where(x => x.ColorSpace.Space == BL.Enumerations.ColorSpaces.RGB || x.ColorSpace.Space == BL.Enumerations.ColorSpaces.LAB).DistinctBy(x => x.Color))
                         {
-                            FineTuneItem item = new FineTuneItem(_converter.Convert(stop, true));
+                            var conversionoutput = await _converter.ConvertAsync(stop, true);
+                            FineTuneItem item = new FineTuneItem(conversionoutput);
+                            item.BrushStop = stop;
                             item.BrushStops = Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.Color == stop.Color).ToList();
-                            item.SelectedSuggestion = item.Suggestions[item.Suggestions.Count / 2];
+                            item.SelectedSuggestion = item.Suggestions.GetCenterSuggestion();
                             item.SelectedChanged += () => StartFineTuningCommand.RaiseCanExecuteChanged();
                             FineTuneItems.Add(item);
                         }
 
                         _jobs_fine_tune_items[Job.Guid] = FineTuneItems.ToList();
+
+                        NotificationProvider.ReleaseGlobalBusyMessage();
                     }
 
                     ApprovalFineTuneItems = FineTuneItems.Where(x => x.IsSelected).ToObservableCollection();
@@ -1103,6 +1164,10 @@ namespace Tango.PPC.Jobs.ViewModels
             {
                 LogManager.Log(ex, "Error while trying to synchronize fine tuning items with brush stops.");
             }
+            finally
+            {
+                NotificationProvider.ReleaseGlobalBusyMessage();
+            }
         }
 
         /// <summary>
@@ -1129,19 +1194,23 @@ namespace Tango.PPC.Jobs.ViewModels
                 LogManager.Log(ex, "Error invoking the fine tunning palette");
                 await NotificationProvider.ShowError("An error occurred while trying to display the fine tunning palette.");
             }
+            finally
+            {
+                NotificationProvider.ReleaseGlobalBusyMessage();
+            }
         }
 
         /// <summary>
         /// Resets the fine tuning.
         /// </summary>
-        private void ResetFineTuning()
+        private void ResetFineTuning(bool displayBusy = false)
         {
             if (Job != null && _jobs_fine_tune_items.ContainsKey(Job.Guid))
             {
                 _jobs_fine_tune_items.Remove(Job.Guid);
             }
 
-            SyncFineTuneItemsToBrushStops();
+            SyncFineTuneItemsToBrushStops(displayBusy);
         }
 
         /// <summary>
@@ -1353,14 +1422,30 @@ namespace Tango.PPC.Jobs.ViewModels
 
             if (!_can_navigate_back)
             {
-                if (await NotificationProvider.ShowQuestion("Are you sure you want to exit this job?"))
+                bool jobChainged = false;
+
+                if (Job != null)
                 {
-                    Job = null;
-                    SegmentsCollectionView = null;
+                    string job_string = Job.ToJobFileWhenLoaded().ToString();
+                    jobChainged = job_string != _current_job_string;
+                }
+
+                if (jobChainged)
+                {
+                    if (await NotificationProvider.ShowQuestion("Are you sure you want to exit this job without saving changes?"))
+                    {
+                        Job = null;
+                        SegmentsCollectionView = null;
+                    }
+                    else
+                    {
+                        result = false;
+                    }
                 }
                 else
                 {
-                    result = false;
+                    Job = null;
+                    SegmentsCollectionView = null;
                 }
             }
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index a7b06f6eb..08f3adba6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -36,6 +36,8 @@ using System.Windows.Media.Imaging;
 using Tango.Touch.Components;
 using Tango.PPC.Jobs.ViewContracts;
 using Tango.Core.ExtensionMethods;
+using Tango.PPC.Common.Synchronization;
+using Tango.PPC.Jobs.NotificationItems;
 
 namespace Tango.PPC.Jobs.ViewModels
 {
@@ -46,7 +48,8 @@ namespace Tango.PPC.Jobs.ViewModels
     public class JobsViewVM : PPCViewModel<IJobsView>
     {
         private ObservablesContext _db; //Holds the db context for the job list.
-        private ObservableCollection<ColorCatalog> _catalogs; //Holds the available color catalogs.
+        private ObservableCollection<ColorCatalog> _catalogs; //Holds the available color catalogs for the site.
+        private ObservableCollection<Rml> _rmls; //Holds the available RML for the site.
 
         public enum JobsCategory
         {
@@ -318,7 +321,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
             RaiseMessage(new JobSelectedMessage() { Job = job, Context = _db });
 
-            if (!directlyToEdit && MachineProvider.MachineOperator.Status == Integration.Operation.MachineStatuses.ReadyToDye)
+            if (!directlyToEdit && MachineProvider.MachineOperator.CanPrint)
             {
                 await NavigationManager.NavigateWithObject<JobsModule, JobSummeryView, JobSummeryNavigationObject>(new JobSummeryNavigationObject()
                 {
@@ -407,10 +410,15 @@ namespace Tango.PPC.Jobs.ViewModels
                 var machine = MachineProvider.Machine;
 
                 JobCreationViewVM vm = new JobCreationViewVM(
-                    machine.SupportedJobTypes.Count > 0 ? machine.SupportedJobTypes : Enum.GetValues(typeof(JobTypes)).Cast<JobTypes>().ToList(),
-                    machine.SupportedColorSpaces.Count > 0 ? machine.SupportedColorSpaces : Enum.GetValues(typeof(ColorSpaces)).Cast<ColorSpaces>().Where(x => x.IsUserSpace() || (ApplicationManager.IsInTechnicianMode && x == ColorSpaces.Volume)).ToList()
+                    Settings.SupportedJobTypes.Count > 0 ? Settings.SupportedJobTypes : Enum.GetValues(typeof(JobTypes)).Cast<JobTypes>().ToList(),
+                    Settings.SupportedColorSpaces.Count > 0 ? Settings.SupportedColorSpaces : Enum.GetValues(typeof(ColorSpaces)).Cast<ColorSpaces>().Where(x => x.IsUserSpace() || (ApplicationManager.IsInTechnicianMode && x == ColorSpaces.Volume)).ToList()
                     );
 
+                if (_catalogs.Count == 0)
+                {
+                    vm.SupportedColorSpaces.Remove(ColorSpaces.Catalog);
+                }
+
                 CatalogSelectionViewVM catalogVM = new CatalogSelectionViewVM(_catalogs.ToList(), _catalogs.ToList().SingleOrDefault(x => x.Guid == settings.LastSelectedCatalogGuid));
 
                 if (settings.LastJobType != null)
@@ -419,7 +427,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
                 else
                 {
-                    vm.SelectedJobType = machine.SupportedJobTypes.FirstOrDefault();
+                    vm.SelectedJobType = Settings.SupportedJobTypes.FirstOrDefault();
                 }
 
                 if (settings.LastJobColorSpace != null)
@@ -428,7 +436,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
                 else
                 {
-                    var space = machine.SupportedColorSpaces.FirstOrDefault();
+                    var space = Settings.SupportedColorSpaces.FirstOrDefault();
                     vm.SelectedColorSpace = space.IsUserSpace() ? space : ColorSpaces.Catalog;
                 }
 
@@ -446,7 +454,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
                 if (twnFile == null)
                 {
-                    if (machine.SupportedJobTypes.Count != 1 || machine.SupportedColorSpaces.Count != 1)
+                    if (Settings.SupportedJobTypes.Count != 1 || Settings.SupportedColorSpaces.Count != 1)
                     {
                         vm = await NotificationProvider.ShowDialog<JobCreationViewVM>(vm);
                         if (!vm.DialogResult) return;
@@ -476,14 +484,14 @@ namespace Tango.PPC.Jobs.ViewModels
                     }
                     else
                     {
-                        vm.SelectedJobType = machine.SupportedJobTypes.First();
-                        vm.SelectedColorSpace = machine.SupportedColorSpaces.First();
+                        vm.SelectedJobType = Settings.SupportedJobTypes.First();
+                        vm.SelectedColorSpace = Settings.SupportedColorSpaces.First();
                     }
                 }
 
                 settings.LastJobType = vm.SelectedJobType;
                 settings.LastJobColorSpace = vm.SelectedColorSpace;
-                
+
                 if (vm.SelectedColorSpace == ColorSpaces.Catalog)
                 {
                     settings.LastSelectedCatalogGuid = catalogVM.SelectedCatalog.Guid;
@@ -492,6 +500,8 @@ namespace Tango.PPC.Jobs.ViewModels
                 settings.Save();
 
                 Job job = new Job();
+                job.LastUpdated = DateTime.UtcNow;
+                job.JobSource = JobSource.Local;
                 job.Name = "untitled";
                 job.NumberOfHeads = 1;
                 job.NumberOfUnits = 1;
@@ -503,9 +513,9 @@ namespace Tango.PPC.Jobs.ViewModels
                 job.ColorSpaceGuid = Adapter.ColorSpaces.FirstOrDefault(x => x.Code == vm.SelectedColorSpace.ToInt32()).Guid;
                 job.MachineGuid = MachineProvider.Machine.Guid;
                 job.UserGuid = AuthenticationProvider.CurrentUser.Guid;
-                job.RmlGuid = machine.DefaultRml != null ? machine.DefaultRmlGuid : Adapter.Rmls.FirstOrDefault().Guid;
+                job.RmlGuid = Settings.DefaultRmlGuid != null ? Settings.DefaultRmlGuid : _rmls.FirstOrDefault().Guid;
                 job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid;
-                job.SpoolTypeGuid = machine.DefaultSpoolType != null ? machine.DefaultSpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
+                job.SpoolTypeGuid = Settings.DefaultSpoolTypeGuid != null ? Settings.DefaultSpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
 
                 if (vm.SelectedColorSpace == ColorSpaces.Catalog)
                 {
@@ -519,11 +529,11 @@ namespace Tango.PPC.Jobs.ViewModels
 
                 if (colorProfile == null)
                 {
-                    job.AddSolidSegment(machine.DefaultSegmentLength > 0 ? machine.DefaultSegmentLength : 100);
+                    job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100);
                 }
                 else
                 {
-                    job.AddSolidSegment(colorProfile.Value, machine.DefaultSegmentLength > 0 ? machine.DefaultSegmentLength : 100);
+                    job.AddSolidSegment(colorProfile.Value, Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100);
                     job.Name = $"SnapMatch {colorProfile.Value.R}, {colorProfile.Value.G}, {colorProfile.Value.B}";
                 }
 
@@ -724,10 +734,13 @@ namespace Tango.PPC.Jobs.ViewModels
             StorageProvider.RegisterFileHandler(ExplorerFileDefinition.Pulse.Extension, HandlePulseFileLoaded);
 
             //Load catalogs.
-            using (ObservablesContext c = ObservablesContext.CreateDefault())
+            using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                _catalogs = (await c.ColorCatalogs.ToListAsync()).ToObservableCollection();
+                _catalogs = await new CatalogsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
+                _rmls = await new RmlsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
             }
+
+            MachineDataSynchronizer.SynchronizationEnded += MachineDataSynchronizer_SynchronizationEnded;
         }
 
         public override void OnNavigatedTo()
@@ -796,6 +809,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     {
                         JobFile jFile = JobFile.Parser.ParseFrom(File.ReadAllBytes(jobFile.Path));
                         var job = await Job.FromJobFile(jFile, MachineProvider.Machine.Guid, AuthenticationProvider.CurrentUser.Guid);
+                        job.JobSource = JobSource.Local;
                         jobContext.Jobs.Add(job);
                         await jobContext.SaveChangesAsync();
                         LoadJobs(() =>
@@ -871,6 +885,25 @@ namespace Tango.PPC.Jobs.ViewModels
 
         #endregion
 
+        #region Handle New Synchronized Jobs
+
+        private void MachineDataSynchronizer_SynchronizationEnded(object sender, SynchronizationEndedEventArgs e)
+        {
+            if (e.NewChangedJobs > 0)
+            {
+                var item = NotificationProvider.PushNotification<NewSynchronizardJobsNotificationItem>();
+                item.Pressed += (_, __) =>
+                {
+                    LoadJobs(() =>
+                    {
+                        NotificationProvider.ShowSuccess("Your job list is now synchronized.");
+                    });
+                };
+            }
+        }
+
+        #endregion
+
         #region Color Profile Request
 
         private void ExternalBridgeService_ColorProfileRequest(object sender, ColorProfileRequestEventArgs e)
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
index ed1e28f55..624b192a5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
@@ -85,7 +85,7 @@ namespace Tango.PPC.Jobs.ViewModels
                  {
                      NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
                      NavigationManager.ClearHistoryExcept<JobsView>();
-                 }));
+                 }, NotificationItem.NotificationPriority.Critical));
         }
 
         /// <summary>