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

3 files changed, 174 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdateDetailsDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdateDetailsDialogVM.cs
new file mode 100644
index 000000000..49d410cdf
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdateDetailsDialogVM.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.MachineDesigner.ViewModels
+{
+    public class MachineUpdateDetailsDialogVM : DialogViewVM
+    {
+        private TangoUpdate _update;
+        public TangoUpdate Update
+        {
+            get { return _update; }
+            set { _update = value; RaisePropertyChangedAuto(); }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs
new file mode 100644
index 000000000..7ff64c505
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using Tango.BL;
+using Tango.BL.Builders;
+using Tango.BL.Entities;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.MachineDesigner.Views;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.MachineDesigner.ViewModels
+{
+    public class MachineUpdatesViewVM : ViewModel
+    {
+        private INotificationProvider _notification;
+
+        #region Properties
+
+        private Machine _machine;
+        public Machine Machine
+        {
+            get { return _machine; }
+            set { _machine = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<TangoUpdate> _updates;
+        public List<TangoUpdate> Updates
+        {
+            get { return _updates; }
+            set { _updates = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ICollectionView _updatesView;
+        public ICollectionView UpdatesView
+        {
+            get { return _updatesView; }
+            set { _updatesView = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        private TangoUpdate _selectedUpdate;
+        public TangoUpdate SelectedUpdate
+        {
+            get { return _selectedUpdate; }
+            set { _selectedUpdate = value; RaisePropertyChangedAuto(); OnSelectedUpdateChanged(); }
+        }
+
+        private bool _displayMachineSetups;
+        public bool DisplayMachineSetups
+        {
+            get { return _displayMachineSetups; }
+            set { _displayMachineSetups = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
+        }
+
+        private bool _displayApplicationUpdates;
+        public bool DisplayApplicationUpdates
+        {
+            get { return _displayApplicationUpdates; }
+            set { _displayApplicationUpdates = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
+        }
+
+        private bool _displayDatabaseUpdates;
+        public bool DisplayDatabaseUpdates
+        {
+            get { return _displayDatabaseUpdates; }
+            set { _displayDatabaseUpdates = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        public MachineUpdatesViewVM()
+        {
+            DisplayApplicationUpdates = true;
+            DisplayMachineSetups = true;
+            DisplayDatabaseUpdates = true;
+        }
+
+        public MachineUpdatesViewVM(INotificationProvider notificationProvider) : this()
+        {
+            _notification = notificationProvider;
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        public async Task Init(Machine machine, ObservablesContext context)
+        {
+            Machine = machine;
+            Updates = (await new TangoUpdatesCollectionBuilder(context).Set(x => x.MachineGuid == machine.Guid).BuildAsync()).OrderByDescending(x => x.StartDate).ToList();
+            UpdatesView = CollectionViewSource.GetDefaultView(Updates);
+            UpdatesView.Filter = UpdatesFilter;
+            OnFilterChanged();
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private void OnFilterChanged()
+        {
+            if (UpdatesView != null)
+            {
+                UpdatesView.Refresh();
+            }
+        }
+
+        private bool UpdatesFilter(object obj)
+        {
+            TangoUpdate update = obj as TangoUpdate;
+            if (update != null)
+            {
+                if (!DisplayMachineSetups && update.IsSetup) return false;
+                if (!DisplayApplicationUpdates && update.IsUpdate) return false;
+                if (!DisplayDatabaseUpdates && update.IsDataBase) return false;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void OnSelectedUpdateChanged()
+        {
+            if (SelectedUpdate == null) return;
+
+            var selectedUpdate = SelectedUpdate;
+            SelectedUpdate = null;
+
+            _notification.ShowModalDialog<MachineUpdateDetailsDialogVM, MachineUpdateDetailsDialog>(new MachineUpdateDetailsDialogVM() { Update = selectedUpdate }, (vm) => { }, () => { });
+        }
+
+        #endregion
+    }
+}
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 5fd086198..820950290 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
@@ -123,7 +123,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         }
 
         private HardwareConfigurationViewVM _hardwareConfigurationViewVM;
-
         public HardwareConfigurationViewVM HardwareConfigurationViewVM
         {
             get { return _hardwareConfigurationViewVM; }
@@ -134,6 +133,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             }
         }
 
+        private MachineUpdatesViewVM _machineUpdatesViewVM;
+        public MachineUpdatesViewVM MachineUpdatesViewVM
+        {
+            get { return _machineUpdatesViewVM; }
+            set { _machineUpdatesViewVM = value; RaisePropertyChangedAuto(); }
+        }
+
 
         #endregion
 
@@ -225,6 +231,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             RemoveSpoolCommand = new RelayCommand(RemoveSpool, () => SelectedSpool != null);
             CloneMachineCommand = new RelayCommand(CloneMachine, () => SelectedMachine != null);
             ResetDeviceRegistrationCommand = new RelayCommand(ResetDeviceRegistration);
+
+            MachineUpdatesViewVM = new MachineUpdatesViewVM(_notification);
         }
 
         #endregion
@@ -469,6 +477,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     HardwareConfigurationViewVM = new HardwareConfigurationViewVM(_notification);
                     HardwareConfigurationViewVM.Init(ActiveMachine.Configuration);
 
+                    await MachineUpdatesViewVM.Init(ActiveMachine, ActiveMachineAdapter.Context);
+
+
                     ActiveMachine.Configuration.HardwareVersionChanged += Configuration_HardwareVersionChanged;
 
                     View.NavigateTo(MachineDesignerNavigationView.MachineDetailsView);