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

1 files changed, 128 insertions, 27 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 1ceaf07df..cadd1fb95 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -45,6 +45,20 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _rmls = value; RaisePropertyChangedAuto(); }
         }
 
+        private ICollectionView _rmlssCollectionView;
+        /// <summary>
+        /// Gets or sets the RML collection view.
+        /// </summary>
+        public ICollectionView RmlsCollectionView
+        {
+            get { return _rmlssCollectionView; }
+            set
+            {
+                _rmlssCollectionView = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
         private ObservableCollection<MediaMaterial> _materials;
         public ObservableCollection<MediaMaterial> Materials
         {
@@ -164,6 +178,22 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _selectedSpool = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
+        private ColorCalibrationViewVM _colorCalibrationVM;
+        public ColorCalibrationViewVM ColorCalibrationVM
+        {
+            get { return _colorCalibrationVM; }
+            set { _colorCalibrationVM = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _RMLFilter;
+        /// <summary>
+        /// Gets or sets the job filter.
+        /// </summary>
+        public String RMLFilter
+        {
+            get { return _RMLFilter; }
+            set { _RMLFilter = value; RaisePropertyChangedAuto(); OnRMLFilterChanged(); }
+        }
 
         /// <summary>
         /// Gets or sets the manage RML command.
@@ -252,31 +282,57 @@ namespace Tango.MachineStudio.RML.ViewModels
 
         private async void LoadRmls()
         {
-            if (_rmls_context != null) _rmls_context.Dispose();
+            try
+            {
+                IsFree = false;
 
-            _rmls_context = ObservablesContext.CreateDefault();
-            Rmls = await new RmlsCollectionBuilder(_rmls_context).SetAll().WithLiquidFactors().WithMediaProperties().BuildAsync();
+                using (_notification.PushTaskItem("Loading Rmls..."))
+                {
+                    if (_rmls_context != null) _rmls_context.Dispose();
 
-            //Load CCT file names...
-            var ccts = await _rmls_context.Ccts.Select(x => new
-            {
-                x.Guid,
-                x.FileName
-            }).ToListAsync();
+                    _rmls_context = ObservablesContext.CreateDefault();
+                    Rmls = await new RmlsCollectionBuilder(_rmls_context).SetAll().WithLiquidFactors().WithMediaProperties().BuildAsync();
+                    //Load CCT file names...
+                    var ccts = await _rmls_context.Ccts.Select(x => new
+                    {
+                        x.Guid,
+                        x.FileName
+                    }).ToListAsync();
 
-            foreach (var rml in Rmls)
-            {
-                var cct = ccts.SingleOrDefault(x => x.Guid == rml.CctGuid);
+                    foreach (var rml in Rmls)
+                    {
+                        var cct = ccts.SingleOrDefault(x => x.Guid == rml.CctGuid);
 
-                if (cct != null)
-                {
-                    rml.Cct = new Cct()
+                        if (cct != null)
+                        {
+                            rml.Cct = new Cct()
+                            {
+                                Guid = cct.Guid,
+                                FileName = cct.FileName,
+                            };
+                        }
+                    }
+                    RmlsCollectionView = CollectionViewSource.GetDefaultView(Rmls);
+                    RmlsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Rml.LastUpdated), ListSortDirection.Descending));
+                    //RmlsCollectionView.Filter = new Predicate<object>(FilterCollection);
+
+                    RmlsCollectionView.Filter = (rml) =>
                     {
-                        Guid = cct.Guid,
-                        FileName = cct.FileName,
+                        Rml r = rml as Rml;
+                        return String.IsNullOrWhiteSpace(RMLFilter)
+                        || r.Name.ToLower().Contains(RMLFilter.ToLower());
                     };
+
                 }
             }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, $"Error loading RMLS.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
         }
 
         private async void LoadActiveRML(String guid)
@@ -374,6 +430,12 @@ namespace Tango.MachineStudio.RML.ViewModels
                         LiquidTypesRmls = LiquidTypesRmls,
                     };
 
+                    ColorCalibrationVM = new ColorCalibrationViewVM(_notification)
+                    {
+                        RML = ActiveRML,
+                        LiquidTypes = LiquidTypesRmls.Where(x => x.LiquidType.HasPigment).ToList().Select(y => y.LiquidType).ToList(),
+                    };
+
                     _rmlBeforeSave = RmlDTO.FromObservable(ActiveRML);
 
                     View.NavigateTo(RmlNavigationView.RmlView);
@@ -456,7 +518,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                     rml.DisplayName = name;
                     rml.QualificationDate = DateTime.UtcNow;
                     rml.Manufacturer = "Twine";
-                    rml.Code = Rmls.Max(x => x.Code) + 1;
+                    rml.Code = Rmls.Count > 0 ? Rmls.Max(x => x.Code) + 1 : 1;
                     rml.MediaMaterial = Materials.FirstOrDefault();
                     rml.MediaPurpose = Purposes.FirstOrDefault();
                     rml.MediaCondition = Conditions.FirstOrDefault();
@@ -492,34 +554,62 @@ namespace Tango.MachineStudio.RML.ViewModels
         {
             if (_notification.ShowQuestion("Removing the selected thread will result in the loss of all related process parameters and default calibration data. Are you sure you want to delete the selected RML?"))
             {
-                IsFree = false;
-
                 using (_notification.PushTaskItem("Removing RML..."))
                 {
                     try
                     {
+                        IsFree = false;
+
                         var rml_jobs = await _rmls_context.Jobs.Where(x => x.RmlGuid == SelectedRML.Guid).Include(x => x.Machine).OrderBy(x => x.Machine.SerialNumber).ToListAsync();
 
                         if (rml_jobs.Count > 0)
                         {
-                            _notification.ShowError($"The following jobs must be removed or change thread type before the selected thread can be deleted:\n{String.Join("\n", rml_jobs.Select(x => $"{x.Machine.SerialNumber} => {x.Name}"))}");
-                            return;
+                            var vm = new RmlDeleteDialogViewVM(SelectedRML, Rmls.ToList(), rml_jobs.ToList());
+                            _notification.ShowModalDialog<RmlDeleteDialogViewVM, RmlDeleteDialogView>(vm, (x) => { }, () => { });
+
+                            if (!vm.DialogResult)
+                            {
+                                return;
+                            }
+
+                            //Perform actions...
+                            using (var db = ObservablesContext.CreateDefault())
+                            {
+                                foreach (var jobAction in vm.JobsActions)
+                                {
+                                    if (jobAction.Action == RmlDeleteDialogViewVM.RmlDeleteJobAction.Delete)
+                                    {
+                                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.JobDeleted, _authentication.CurrentUser.Guid, jobAction.Job.Name, jobAction.Job.Guid, $"Job deleted due to RML '{SelectedRML.Name}' being removed.");
+                                        await jobAction.Job.DeleteCascadeAsync(db);
+                                    }
+                                    else if (jobAction.Action == RmlDeleteDialogViewVM.RmlDeleteJobAction.Change)
+                                    {
+                                        var job = await db.Jobs.SingleOrDefaultAsync(x => x.Guid == jobAction.Job.Guid);
+                                        job.RmlGuid = jobAction.TargetRml.Guid;
+                                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.JobSaved, _authentication.CurrentUser.Guid, jobAction.Job.Name, jobAction.Job.Guid, $"Job RML changed to '{jobAction.TargetRml.Name}' due to RML '{SelectedRML.Name}' being removed.");
+                                    }
+                                }
+
+                                await db.SaveChangesAsync();
+                            }
                         }
 
                         await SelectedRML.DeleteCascadeAsync(_rmls_context);
-
                         _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.RmlDeleted, _authentication.CurrentUser, SelectedRML.Name, SelectedRML, "RML deleted from Machine Studio.");
 
                         LoadRmls();
                     }
                     catch (Exception ex)
                     {
-                        LogManager.Log(ex, $"Error removing selected RML {SelectedRML.Name}.");
-                        _notification.ShowError($"An error occurred while trying to remove the selected RML.\n{ex.Message}");
+                        LogManager.Log(ex, $"Error removing selected RML {SelectedRML?.Name}.");
+                        _notification.ShowError($"An error occurred while trying to remove the selected RML.\n{ex.FlattenMessage()}");
+                        LoadRmls();
+                    }
+                    finally
+                    {
+                        IsFree = true;
                     }
                 }
-
-                IsFree = true;
             }
         }
 
@@ -641,6 +731,11 @@ namespace Tango.MachineStudio.RML.ViewModels
             ActiveProcessParametersTableView.Refresh();
         }
 
+        private void OnRMLFilterChanged()
+        {
+            RmlsCollectionView.Refresh();
+        }
+
         private void RemoveLiquidFactor(LiquidTypesRml liquidFactor)
         {
             if (_notification.ShowQuestion("Removing this liquid factor will remove the liquid type association with the RML and will drop the calibration data. Are you sure?"))
@@ -788,6 +883,12 @@ namespace Tango.MachineStudio.RML.ViewModels
             String file = GetCCTFileOpen();
             if (file != null)
             {
+                if (CCTS.ToList().Exists(x => x.FileName == Path.GetFileName(file)))
+                {
+                    _notification.ShowError("The selected CCT file already exists on the database. Please select the CCT file from the dropdown box.");
+                    return;
+                }
+
                 CctModel cctModel = new CctModel();
                 cctModel.Guid = Guid.NewGuid().ToString();
                 cctModel.IsNew = true;