merge

1 files changed, 24 insertions, 61 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index 47fe19a05..40dc82d29 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -16,9 +16,6 @@ using Tango.Core.ExtensionMethods;
 using Tango.MachineStudio.HardwareDesigner.Views;
 using Microsoft.Win32;
 using System.IO;
-using Tango.BL.ActionLogs;
-using Tango.MachineStudio.Common.Authentication;
-using Tango.BL.DTO;
 
 namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 {
@@ -27,9 +24,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
         private INotificationProvider _notification;
         private bool _isNew;
         private ObservablesContext _db;
-        private IActionLogManager _actionLogManager;
-        private IAuthenticationProvider _authentication;
-        private HardwareVersionDTO _hwBeforeSave;
 
         private HardwareVersion _selectedVersion;
         public HardwareVersion SelectedVersion
@@ -51,8 +45,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             get { return _selectedHardwareObject; }
             set
             {
-                _selectedHardwareObject = null;
-                RaisePropertyChangedAuto();
                 _selectedHardwareObject = value;
                 RaisePropertyChangedAuto();
                 RaisePropertyChanged(nameof(SelectedHardwareObjectTypeName));
@@ -121,11 +113,9 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
         public RelayCommand ImportHardwareVersionCommand { get; set; }
 
-        public MainViewVM(INotificationProvider notification, IActionLogManager actionLogManager, IAuthenticationProvider authentication)
+        public MainViewVM(INotificationProvider notification)
         {
             _notification = notification;
-            _actionLogManager = actionLogManager;
-            _authentication = authentication;
 
             CurrentVersion = new HardwareVersion();
 
@@ -193,8 +183,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                                 _db.HardwareVersions.Add(hv);
                                 await _db.SaveChangesAsync();
 
-                                _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.HardwareVersionImported, _authentication.CurrentUser, CurrentVersion.Name, CurrentVersion, "New hardware version imported using Machine Studio.");
-
                                 RefreshVersions();
 
                                 InvokeUI(() =>
@@ -233,7 +221,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
         private void CopyParameters(object obj)
         {
-            obj.MapPropertiesTo(SelectedHardwareObject, MappingFlags.ValueTypesOnly,
+            obj.MapPrimitivesTo(SelectedHardwareObject,
                 (prop) =>
                 !prop.PropertyType.IsEnum
                 &&
@@ -248,20 +236,20 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
             _db = ObservablesContext.CreateDefault();
 
-            CurrentVersion.HardwareMotors = _db.HardwareMotorTypes.ToList().Select(x => new HardwareMotor() { HardwareMotorType = x }).OrderByAlphaNumeric(x => x.HardwareMotorType.Description).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareDancers = _db.HardwareDancerTypes.ToList().Select(x => new HardwareDancer() { HardwareDancerType = x }).OrderByAlphaNumeric(x => x.HardwareDancerType.Description).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwarePidControls = _db.HardwarePidControlTypes.ToList().Select(x => new HardwarePidControl() { HardwarePidControlType = x }).OrderByAlphaNumeric(x => x.HardwarePidControlType.Description).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareWinders = _db.HardwareWinderTypes.ToList().Select(x => new HardwareWinder() { HardwareWinderType = x }).OrderByAlphaNumeric(x => x.HardwareWinderType.Description).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareSpeedSensors = _db.HardwareSpeedSensorTypes.ToList().Select(x => new HardwareSpeedSensor() { HardwareSpeedSensorType = x }).OrderByAlphaNumeric(x => x.HardwareSpeedSensorType.Description).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareBlowers = _db.HardwareBlowerTypes.ToList().Select(x => new HardwareBlower() { HardwareBlowerType = x }).OrderByAlphaNumeric(x => x.HardwareBlowerType.Description).ToSynchronizedObservableCollection();
-            CurrentVersion.HardwareBreakSensors = _db.HardwareBreakSensorTypes.ToList().Select(x => new HardwareBreakSensor() { HardwareBreakSensorType = x }).OrderByAlphaNumeric(x => x.HardwareBreakSensorType.Description).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareMotors = _db.HardwareMotorTypes.ToList().Select(x => new HardwareMotor() { HardwareMotorType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareDancers = _db.HardwareDancerTypes.ToList().Select(x => new HardwareDancer() { HardwareDancerType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwarePidControls = _db.HardwarePidControlTypes.ToList().Select(x => new HardwarePidControl() { HardwarePidControlType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareWinders = _db.HardwareWinderTypes.ToList().Select(x => new HardwareWinder() { HardwareWinderType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareSpeedSensors = _db.HardwareSpeedSensorTypes.ToList().Select(x => new HardwareSpeedSensor() { HardwareSpeedSensorType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareBlowers = _db.HardwareBlowerTypes.ToList().Select(x => new HardwareBlower() { HardwareBlowerType = x }).ToSynchronizedObservableCollection();
+            CurrentVersion.HardwareBreakSensors = _db.HardwareBreakSensorTypes.ToList().Select(x => new HardwareBreakSensor() { HardwareBreakSensorType = x }).ToSynchronizedObservableCollection();
         }
 
         private void RefreshVersions()
         {
             using (var db = ObservablesContext.CreateDefault())
             {
-                _hardwareVersions = db.HardwareVersions.OrderByDescending(x => x.Version).ToObservableCollection();
+                _hardwareVersions = db.HardwareVersions.ToObservableCollection();
                 InvokeUI(() =>
                 {
                     RaisePropertyChanged(nameof(HardwareVersions));
@@ -349,8 +337,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                 });
 
                 CurrentVersion.HardwareBreakSensors = CurrentVersion.HardwareBreakSensors.OrderBy(x => x.HardwareBreakSensorType.Code).ToSynchronizedObservableCollection();
-
-                _hwBeforeSave = HardwareVersionDTO.FromObservable(CurrentVersion);
             });
         }
 
@@ -360,34 +346,24 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             {
                 using (_notification.PushTaskItem("Loading hardware version..."))
                 {
-                    try
+                    IsFree = false;
+
+                    await Task.Factory.StartNew(() =>
                     {
-                        IsFree = false;
+                        _isNew = false;
+                        var selectedVersion = SelectedVersion;
+                        RefreshVersions();
+                        var version = _hardwareVersions.SingleOrDefault(X => X.Guid == selectedVersion.Guid);
+                        CreateVersionView(SelectedVersion);
 
-                        await Task.Factory.StartNew(() =>
+                        InvokeUI(() =>
                         {
-                            _isNew = false;
-                            var selectedVersion = SelectedVersion;
-                            RefreshVersions();
-                            var version = _hardwareVersions.SingleOrDefault(X => X.Guid == selectedVersion.Guid);
-                            CreateVersionView(SelectedVersion);
-
-                            InvokeUI(() =>
-                            {
-                                _selectedVersion = version;
-                                RaisePropertyChanged(nameof(SelectedVersion));
-                            });
+                            _selectedVersion = version;
+                            RaisePropertyChanged(nameof(SelectedVersion));
                         });
-                    }
-                    catch (Exception ex)
-                    {
-                        LogManager.Log(ex, "Error loading hardware version.");
-                        _notification.ShowError($"Error loading the selected hardware version.\n{ex.FlattenMessage()}");
-                    }
-                    finally
-                    {
-                        IsFree = true;
-                    }
+                    });
+
+                    IsFree = true;
                 }
             }
 
@@ -415,8 +391,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                         _db.HardwareVersions.Add(CurrentVersion);
                         _db.SaveChanges();
 
-                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.HardwareVersionCreated, _authentication.CurrentUser, CurrentVersion.Name, CurrentVersion, "New hardware version created using Machine Studio.");
-
                         RefreshVersions();
 
                         InvokeUI(() =>
@@ -444,13 +418,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
                     await Task.Factory.StartNew(() =>
                     {
-                        CurrentVersion.LastUpdated = DateTime.UtcNow;
                         _db.SaveChanges();
-
-                        var dtoAfter = HardwareVersionDTO.FromObservable(CurrentVersion);
-                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.HardwareVersionSaved, _authentication.CurrentUser, _hwBeforeSave.Name, _hwBeforeSave, dtoAfter, "Hardware Version saved using Machine Studio.");
-                        _hwBeforeSave = dtoAfter;
-
                         RefreshVersions();
 
                         InvokeUI(() =>
@@ -492,9 +460,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                                 cloned.Version = HardwareVersions.Max(x => x.Version) + 1;
                                 _db.HardwareVersions.Add(cloned);
                                 _db.SaveChanges();
-
-                                _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.HardwareVersionCreated, _authentication.CurrentUser, cloned.Name, cloned, "New hardware version cloned using Machine Studio.");
-
                                 RefreshVersions();
 
                                 InvokeUI(() =>
@@ -530,8 +495,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
                         await CurrentVersion.DeleteCascadeAsync(_db);
 
-                        _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.HardwareVersionDeleted, _authentication.CurrentUser, CurrentVersion.Name, _hwBeforeSave, "Hardware version deleted using Machine Studio.", true);
-
                         await Task.Factory.StartNew(() =>
                         {
                             SelectedVersion = null;