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

5 files changed, 0 insertions, 124 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs
deleted file mode 100644
index 69092a70d..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class ActionTypesViewVM : DbTableViewModel<ActionType>
-    {
-        public ActionTypesViewVM(INotificationProvider notification) : base(notification)
-        {
-
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
index 18c8c3daa..d5022c761 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
@@ -18,7 +18,6 @@ namespace Tango.MachineStudio.DB.ViewModels
         protected override void InitializeEntity(Configuration entity)
         {
             base.InitializeEntity(entity);
-            entity.CreationDate = DateTime.UtcNow;
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs
deleted file mode 100644
index abdb00e32..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class EventTypesGroupsViewVM : DbTableViewModel<EventTypesGroup>
-    {
-        public EventTypesGroupsViewVM(INotificationProvider notification) : base(notification)
-        {
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
deleted file mode 100644
index 6702b720f..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class EventTypesViewVM : DbTableViewModel<EventType>
-    {
-        public EventTypesViewVM(INotificationProvider notification) : base(notification)
-        {
-            SelectedActions = new ObservableCollection<MultiComboVM<ActionType>>();
-        }
-
-        private ObservableCollection<MultiComboVM<ActionType>> _selectedActions;
-        public ObservableCollection<MultiComboVM<ActionType>> SelectedActions
-        {
-            get { return _selectedActions; }
-            set { _selectedActions = value; RaisePropertyChangedAuto(); }
-        }
-
-        protected override void OnEdit()
-        {
-            SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM<ActionType>(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection();
-
-            foreach (var actionType in SelectedActions)
-            {
-                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionType == actionType.Entity))
-                {
-                    actionType.IsSelected = true;
-                }
-            }
-
-            base.OnEdit();
-        }
-
-        protected override void OnAdd()
-        {
-            SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM<ActionType>(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection();
-
-            base.OnAdd();
-        }
-
-        protected override void OnBeforeEntitySave(DialogOpenMode mode, EventType eventType)
-        {
-            base.OnBeforeEntitySave(mode, eventType);
-
-
-
-            Adapter.Context.EventTypesActions.RemoveRange(eventType.EventTypesActions);
-
-            foreach (var actionType in SelectedActions)
-            {
-                if (actionType.IsSelected)
-                {
-                    eventType.EventTypesActions.Add(new EventTypesAction()
-                    {
-                        ActionType = actionType.Entity,
-                        EventType = eventType,
-                        ActionTypeGuid = actionType.Entity.Guid,
-                        EventTypeGuid = eventType.Guid
-                    });
-                }
-            }
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
deleted file mode 100644
index fd815e5df..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class MediaColorsViewVM : DbTableViewModel<MediaColor>
-    {
-        public MediaColorsViewVM(INotificationProvider notification) : base(notification)
-        {
-        }
-    }
-}