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

1 files changed, 20 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
index 4d88a71d9..ae763167b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
@@ -17,6 +17,10 @@ using Microsoft.Win32;
 using Tango.Core.Helpers;
 using System.IO;
 using Tango.MachineStudio.Catalogs.Excel;
+using Tango.BL.ActionLogs;
+using Tango.MachineStudio.Common.Authentication;
+using Tango.BL.Enumerations;
+using Tango.BL.DTO;
 
 namespace Tango.MachineStudio.Catalogs.ViewModels
 {
@@ -25,6 +29,9 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
         private ObservablesContext _catalogsContext;
         private ObservablesContext _activeCatalogContext;
         private INotificationProvider _notification;
+        private IActionLogManager _actionLogManager;
+        private IAuthenticationProvider _authentication;
+        private ColorCatalogDTO _catalogBeforeSave;
 
         #region Properties
 
@@ -151,9 +158,11 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
         /// Initializes a new instance of the <see cref="MainViewVM"/> class.
         /// </summary>
         /// <param name="notificationProvider">The notification provider.</param>
-        public MainViewVM(INotificationProvider notificationProvider) : this()
+        public MainViewVM(INotificationProvider notificationProvider, IActionLogManager actionLogManager, IAuthenticationProvider authenticationProvider) : this()
         {
+            _actionLogManager = actionLogManager;
             _notification = notificationProvider;
+            _authentication = authenticationProvider;
         }
 
         #endregion
@@ -206,6 +215,8 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
                             SelectedItem = SelectedGroup.ColorCatalogsItems.FirstOrDefault();
                         }
 
+                        _catalogBeforeSave = ColorCatalogDTO.FromObservable(ActiveCatalog);
+
                         View.NavigateTo(CatalogsNavigationView.CatalogView);
                     }
                     catch (Exception ex)
@@ -233,6 +244,7 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
                         {
                             IsFree = false;
                             await SelectedCatalog.DeleteCascadeAsync(_catalogsContext);
+                            _actionLogManager.InsertLog(ActionLogType.CatalogDeleted, _authentication.CurrentUser, SelectedCatalog.Name, SelectedCatalog, "Catalog deleted using Machine Studio.");
                             SelectedCatalog = null;
                         }
                         catch (Exception ex)
@@ -265,6 +277,7 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
                         newCatalog.Company = "Twine";
                         _catalogsContext.ColorCatalogs.Add(newCatalog);
                         await _catalogsContext.SaveChangesAsync();
+                        _actionLogManager.InsertLog(ActionLogType.CatalogCreated, _authentication.CurrentUser, newCatalog.Name, newCatalog, "Catalog created using Machine Studio.");
                         SelectedCatalog = newCatalog;
                         EditSelectedCatalog();
                     }
@@ -307,7 +320,13 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
                         IsFree = false;
                         ActiveCatalog.LastUpdated = DateTime.UtcNow;
                         await _activeCatalogContext.SaveChangesAsync();
+
+                        var activeCatalogDTO = ColorCatalogDTO.FromObservable(ActiveCatalog);
+                        _actionLogManager.InsertLog(ActionLogType.CatalogSaved, _authentication.CurrentUser, ActiveCatalog.Name, _catalogBeforeSave, activeCatalogDTO, "Catalog created using Machine Studio.");
+                        _catalogBeforeSave = activeCatalogDTO;
+
                         await LoadCatalogs();
+
                         _notification.ShowInfo("Catalog updated successfully.");
                     }
                     catch (Exception ex)