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

3 files changed, 206 insertions, 12 deletions

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
index 7ff64c505..e1e9ee561 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs
@@ -8,6 +8,7 @@ using System.Windows.Data;
 using Tango.BL;
 using Tango.BL.Builders;
 using Tango.BL.Entities;
+using Tango.Core.Commands;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.MachineDesigner.Views;
 using Tango.SharedUI;
@@ -17,6 +18,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
     public class MachineUpdatesViewVM : ViewModel
     {
         private INotificationProvider _notification;
+        private ObservablesContext _context;
+        private const int MAX_UPDATE_ITEMS = 100;
 
         #region Properties
 
@@ -70,6 +73,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _displayDatabaseUpdates = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
         }
 
+        private bool _displaySynchronizations;
+        public bool DisplaySynchronizations
+        {
+            get { return _displaySynchronizations; }
+            set { _displaySynchronizations = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
+        }
+
+        #endregion
+
+        #region Commands
+
+        public RelayCommand RefreshCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -79,6 +95,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             DisplayApplicationUpdates = true;
             DisplayMachineSetups = true;
             DisplayDatabaseUpdates = true;
+            DisplaySynchronizations = true;
+
+            RefreshCommand = new RelayCommand(Refresh, () => IsFree);
         }
 
         public MachineUpdatesViewVM(INotificationProvider notificationProvider) : this()
@@ -92,17 +111,36 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         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();
+            try
+            {
+                _context = context;
+                Machine = machine;
+                Updates = (await new TangoUpdatesCollectionBuilder(context).Set(x => x.MachineGuid == machine.Guid).Query(x => x.OrderByDescending(y => y.StartDate).Take(MAX_UPDATE_ITEMS)).BuildAsync()).ToList();
+                UpdatesView = CollectionViewSource.GetDefaultView(Updates);
+                UpdatesView.Filter = UpdatesFilter;
+                OnFilterChanged();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error loading machine updates.");
+                _notification.ShowError($"An error occurred while loading the history of machine updates.\n{ex.FlattenMessage()}");
+            }
         }
 
         #endregion
 
         #region Private Methods
 
+        private async void Refresh()
+        {
+            IsFree = false;
+            using (_notification.PushTaskItem("Refreshing machine updates..."))
+            {
+                await Init(Machine, _context);
+            }
+            IsFree = true;
+        }
+
         private void OnFilterChanged()
         {
             if (UpdatesView != null)
@@ -119,6 +157,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 if (!DisplayMachineSetups && update.IsSetup) return false;
                 if (!DisplayApplicationUpdates && update.IsUpdate) return false;
                 if (!DisplayDatabaseUpdates && update.IsDataBase) return false;
+                if (!DisplaySynchronizations && update.IsSynchronization) return false;
                 return true;
             }
             else
@@ -129,12 +168,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         private void OnSelectedUpdateChanged()
         {
-            if (SelectedUpdate == null) return;
-
-            var selectedUpdate = SelectedUpdate;
-            SelectedUpdate = null;
-
-            _notification.ShowModalDialog<MachineUpdateDetailsDialogVM, MachineUpdateDetailsDialog>(new MachineUpdateDetailsDialogVM() { Update = selectedUpdate }, (vm) => { }, () => { });
+            if (SelectedUpdate != null && SelectedUpdate.ApplicationVersion != "Fake")
+            {
+                _notification.ShowModalDialog<MachineUpdateDetailsDialogVM, MachineUpdateDetailsDialog>(new MachineUpdateDetailsDialogVM() { Update = SelectedUpdate }, (vm) => { }, () => { });
+                SelectedUpdate = new TangoUpdate() {  ApplicationVersion = "Fake"};
+            }
         }
 
         #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 820950290..fd31cd950 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
@@ -115,6 +115,21 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _selectedSpool = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
+        private Site _selectedSite;
+        public Site SelectedSite
+        {
+            get { return _selectedSite; }
+            set { _selectedSite = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<Site> _sites;
+        public List<Site> Sites
+        {
+            get { return _sites; }
+            set { _sites = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private ColorCalibrationViewVM _colorCalibrationViewVM;
         public ColorCalibrationViewVM ColorCalibrationViewVM
         {
@@ -140,6 +155,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _machineUpdatesViewVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private TupViewVM _tupViewVM;
+        public TupViewVM TupViewVM
+        {
+            get { return _tupViewVM; }
+            set { _tupViewVM = value; RaisePropertyChangedAuto(); }
+        }
 
         #endregion
 
@@ -233,6 +254,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             ResetDeviceRegistrationCommand = new RelayCommand(ResetDeviceRegistration);
 
             MachineUpdatesViewVM = new MachineUpdatesViewVM(_notification);
+            TupViewVM = new TupViewVM(_notification);
         }
 
         #endregion
@@ -467,6 +489,10 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         }
                     }
 
+                    Sites = await ActiveMachineAdapter.Context.Sites.ToListAsync();
+                    Sites.Insert(0, new Site() { Name = "NONE", ID = -1 });
+                    SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid);
+
                     ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context)
                     {
                         Rmls = ActiveMachineAdapter.Rmls,
@@ -478,7 +504,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     HardwareConfigurationViewVM.Init(ActiveMachine.Configuration);
 
                     await MachineUpdatesViewVM.Init(ActiveMachine, ActiveMachineAdapter.Context);
-
+                    TupViewVM.Init(ActiveMachine);
 
                     ActiveMachine.Configuration.HardwareVersionChanged += Configuration_HardwareVersionChanged;
 
@@ -643,6 +669,7 @@ 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();
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/TupViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/TupViewVM.cs
new file mode 100644
index 000000000..5d1703dc3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/TupViewVM.cs
@@ -0,0 +1,129 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.Common.Tup;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.MachineDesigner.ViewModels
+{
+    public class TupViewVM : ViewModel
+    {
+        private INotificationProvider _notification;
+
+        private String _latestVersion;
+        public String LatestVersion
+        {
+            get { return _latestVersion; }
+            set { _latestVersion = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Machine _machine;
+        public Machine Machine
+        {
+            get { return _machine; }
+            set { _machine = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _filePath;
+        public String FilePath
+        {
+            get { return _filePath; }
+            set { _filePath = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private TupFileBuilderProgressEventArgs _progress;
+        public TupFileBuilderProgressEventArgs Progress
+        {
+            get { return _progress; }
+            set { _progress = value; RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand CreateTupFileCommand { get; set; }
+
+        public RelayCommand SelectFileCommand { get; set; }
+
+        public TupViewVM()
+        {
+
+        }
+
+        public TupViewVM(INotificationProvider notification) : this()
+        {
+            _notification = notification;
+            CreateTupFileCommand = new RelayCommand(CreateTupFile, () => FilePath != null && IsFree);
+            SelectFileCommand = new RelayCommand(SelectFile);
+        }
+
+        public void Init(Machine machine)
+        {
+            Machine = machine;
+            DisplayLatestPPCVersion();
+        }
+
+        private async void DisplayLatestPPCVersion()
+        {
+            TupFileBuilder builder = new TupFileBuilder();
+
+            try
+            {
+                LatestVersion = await builder.GetLatestPPCVersion(Machine.SerialNumber);
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error retrieving latest PPC version.");
+                await Task.Delay(5000);
+                DisplayLatestPPCVersion();
+            }
+        }
+
+        private void SelectFile()
+        {
+            SaveFileDialog dlg = new SaveFileDialog();
+            dlg.Title = "Select package location";
+            dlg.Filter = "Tango Update Package Files|*.tup";
+            dlg.DefaultExt = ".tup";
+            dlg.FileName = LatestVersion == null ? $"{Machine.SerialNumber}_Update_{DateTime.Now.Date.ToFileName()}.tup" : $"{Machine.SerialNumber}_Update_{DateTime.Now.Date.ToFileName()}_v{LatestVersion}.tup";
+
+            if (dlg.ShowDialog().Value)
+            {
+                FilePath = dlg.FileName;
+            }
+        }
+
+        private async void CreateTupFile()
+        {
+            try
+            {
+                LogManager.Log($"Generating TUP file to '{FilePath}'...");
+
+                IsFree = false;
+                TupFileBuilder builder = new TupFileBuilder();
+                builder.Progress += Builder_Progress;
+                await builder.Build(Machine.SerialNumber, FilePath);
+
+                LogManager.Log("TUP file generated successfully.");
+                _notification.ShowInfo("Tango update package created successfuly.");
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error generating tup file.");
+                _notification.ShowError($"An error occurred while generating the .tup file.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+
+        private void Builder_Progress(object sender, TupFileBuilderProgressEventArgs e)
+        {
+            Progress = e;
+        }
+    }
+}