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

1 files changed, 11 insertions, 0 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 5c55892ba..3b3a307ad 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
@@ -24,6 +24,7 @@ using Tango.Core.ExtensionMethods;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.BL.ActionLogs;
 using Tango.BL.DTO;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.RML.ViewModels
 {
@@ -410,6 +411,8 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                     Rml rml = new Rml();
                     rml.Name = name;
+                    rml.DisplayName = name;
+                    rml.QualificationDate = DateTime.UtcNow;
                     rml.Manufacturer = "Twine";
                     rml.Code = Rmls.Max(x => x.Code) + 1;
                     rml.MediaMaterial = Materials.FirstOrDefault();
@@ -501,6 +504,9 @@ namespace Tango.MachineStudio.RML.ViewModels
                             cloned.Guid = Guid.NewGuid().ToString();
                             cloned.ID = 0;
                             cloned.Name = name;
+                            cloned.DisplayName = name;
+                            cloned.RmlQualificationLevel = RmlQualifications.Provisional;
+                            cloned.QualificationDate = DateTime.UtcNow;
 
                             ProcessParametersTablesGroup group = new ProcessParametersTablesGroup();
                             group.Name = rml.GetActiveProcessGroup().Name;
@@ -674,6 +680,11 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                     ActiveRML.LastUpdated = DateTime.UtcNow;
 
+                    if (_rmlBeforeSave.QualificationLevel != ActiveRML.QualificationLevel)
+                    {
+                        ActiveRML.QualificationDate = DateTime.UtcNow;
+                    }
+
                     if (SelectedCCT != null)
                     {
                         if (SelectedCCT.IsNew)