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

1 files changed, 5 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 8b235a13a..a641c87b6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1726,6 +1726,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
             using (_notification.PushTaskItem("Saving Parameters Group..."))
             {
+                var processGroupBefore = ProcessParametersTablesGroupDTO.FromObservable(SelectedRML.GetActiveProcessGroup());
+
                 using (var db = ObservablesContext.CreateDefault())
                 {
                     var active_groups = db.ProcessParametersTablesGroups.Where(x => x.RmlGuid == SelectedRML.Guid && x.Active).ToList();
@@ -1753,8 +1755,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     tables.Add(newTable);
                 }
 
-                var rmlBeforeDTO = RmlDTO.FromObservable(SelectedRML);
-
                 group.Active = true;
                 group.ProcessParametersTables = tables.ToSynchronizedObservableCollection();
                 group.Rml = SelectedRML;
@@ -1769,7 +1769,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 SelectedRML.ProcessParametersTablesGroups.Add(group);
                 await SelectedRML.SaveAsync(_activeJobDbContext);
 
-                _actionLogManager.InsertLog(ActionLogType.RmlSaved, AuthenticationProvider.CurrentUser, SelectedRML.Name, rmlBeforeDTO, RmlDTO.FromObservable(SelectedRML), "Active process parameters changed from Machine Studio Research module.");
+                _actionLogManager.InsertLog(ActionLogType.RmlActiveProcessParametersChanged, AuthenticationProvider.CurrentUser, SelectedRML.Name, processGroupBefore, ProcessParametersTablesGroupDTO.FromObservable(SelectedRML.GetActiveProcessGroup()), "RML Active process parameters changed from Machine Studio Research module.");
 
                 InvalidateLiquidFactorsAndProcessTables();
             }
@@ -2421,7 +2421,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                     foreach (var job in SelectedJobs)
                     {
-                        _actionLogManager.InsertLog(ActionLogType.JobCreated, AuthenticationProvider.CurrentUser, job.Name, job, "Job created using Machine Studio.");
+                        _actionLogManager.InsertLog(ActionLogType.JobCreated, AuthenticationProvider.CurrentUser, job.Name, job, "Job cloned using Machine Studio.");
                     }
 
                     CanWork = true;
@@ -2664,7 +2664,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                         foreach (var job in jobsToReport)
                         {
-                            _actionLogManager.InsertLog(ActionLogType.JobImported, AuthenticationProvider.CurrentUser, job.Name, job, "New job imported using Machine Studio.");
+                            _actionLogManager.InsertLog(ActionLogType.JobImported, AuthenticationProvider.CurrentUser, job.Name, job, "Job imported using Machine Studio.");
                         }
 
                         IsFree = true;