1 files changed, 29 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index fd31cd950..7b6ae7ef0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -25,14 +25,21 @@ using Tango.Core.Threading;
 using Tango.MachineStudio.RML.ViewModels;
 using Tango.Settings;
 using Tango.MachineStudio.RML.Models;
+using Tango.BL.ActionLogs;
+using Tango.MachineStudio.Common.Authentication;
+using Tango.BL.DTO;
 
 namespace Tango.MachineStudio.MachineDesigner.ViewModels
 {
     public class MainViewVM : StudioViewModel<IMainView>
     {
         private INotificationProvider _notification;
+        private IActionLogManager _actionLogManager;
+        private IAuthenticationProvider _authentication;
         private ActionTimer _machines_action_timer;
         private ActionTimer _dispensers_action_timer;
+        private MachineDTO _machineBeforeSave;
+        private bool _isNewMachine;
 
         #region Properties
 
@@ -233,10 +240,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <summary>
         /// Initializes a new instance of the <see cref="MainViewVM"/> class.
         /// </summary>
-        public MainViewVM(INotificationProvider notification)
+        public MainViewVM(INotificationProvider notification, IAuthenticationProvider authentication, IActionLogManager actionLogManager)
         {
             MachinesAdapter = new ObservablesStaticCollections(ObservablesContext.CreateDefault());
             _notification = notification;
+            _authentication = authentication;
+            _actionLogManager = actionLogManager;
 
             _machines_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
             _dispensers_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
@@ -428,6 +437,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         private async void LoadSelectedMachine(bool newMachine = false, bool clone = false, MachineVersion selectedVersion = null)
         {
+            _isNewMachine = false;
+
             using (_notification.PushTaskItem("Loading machine details..."))
             {
                 try
@@ -462,9 +473,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     if (!newMachine)
                     {
                         ActiveMachine = (await new MachineBuilder(ActiveMachineAdapter.Context).Set(SelectedMachine.Guid).WithOrganization().WithConfiguration().WithSpools().BuildAsync());
+                        _machineBeforeSave = MachineDTO.FromObservable(ActiveMachine);
+
 
                         if (clone)
                         {
+                            _isNewMachine = true;
                             ActiveMachine = ActiveMachine.Clone();
                             ActiveMachine.Name = "";
                             ActiveMachine.SerialNumber = "";
@@ -476,6 +490,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     }
                     else
                     {
+                        _isNewMachine = true;
+
                         if (selectedVersion == null)
                         {
                             ActiveMachine = new Machine();
@@ -668,16 +684,25 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                     ActiveMachine.ConfigurationGuid = ActiveMachine.Configuration.Guid;
                     ActiveMachine.LastUpdated = DateTime.UtcNow;
-                    ActiveMachine.ProductionDate = DateTime.UtcNow;
                     ActiveMachine.SiteGuid = SelectedSite == null ? null : (SelectedSite.ID == -1 ? null : SelectedSite.Guid);
 
                     ColorCalibrationViewVM.Save();
 
                     var hwConfig = HardwareConfigurationViewVM.GetResultingHardwareConfiguration();
                     ActiveMachine.Configuration.SetHardwareConfiguration(hwConfig);
-
                     await ActiveMachineAdapter.Context.SaveChangesAsync();
 
+                    if (_isNewMachine)
+                    {
+                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineCreated, _authentication.CurrentUser, ActiveMachine.Name, ActiveMachine, "New machine created using Machine Studio.");
+                    }
+                    else
+                    {
+                        var machineAfterDTO = MachineDTO.FromObservable(ActiveMachine);
+                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineSaved, _authentication.CurrentUser, _machineBeforeSave.Name, _machineBeforeSave, machineAfterDTO, "Machine saved using Machine Studio.");
+                        _machineBeforeSave = machineAfterDTO;
+                    }
+
                     if (SelectedMachine != null)
                     {
                         await SelectedMachine.Reload(MachinesAdapter.Context);
@@ -725,6 +750,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         IsFree = false;
                         await SelectedMachine.DeleteCascadeAsync(MachinesAdapter.Context);
                         MachinesAdapter.Context.Machines.Remove(SelectedMachine);
+                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineDeleted, _authentication.CurrentUser, SelectedMachine.Name, SelectedMachine, "Machine deleted using Machine Studio.");
                     }
                     catch (Exception ex)
                     {