From 87e6aa14ac8c5be4cac5b080c0f542d2ac3dd296 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 27 May 2020 15:12:05 +0300 Subject: When a organization is selected the sites is refreshed and added "None" value. Related Work Items: #2872 --- .../ViewModels/MainViewVM.cs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner') 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 ed93b4308..d52daaea2 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 @@ -39,6 +39,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels private ActionTimer _machines_action_timer; private ActionTimer _dispensers_action_timer; private MachineDTO _machineBeforeSave; + private List _all_sites; #region Properties @@ -609,11 +610,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels } } } + ActiveMachine.OrganizationChanged -= ActiveMachine_OrganizationChanged; + ActiveMachine.OrganizationChanged += ActiveMachine_OrganizationChanged; - var sites = await ActiveMachineAdapter.Context.Sites.ToListAsync(); - sites.Insert(0, new Site() { Name = "NONE", ID = -1 }); + _all_sites = await ActiveMachineAdapter.Context.Sites.ToListAsync(); + + Sites = ActiveMachine.Organization != null ? _all_sites.Where(x => ActiveMachine.Organization.Sites.All(y => y.OrganizationGuid == x.OrganizationGuid)).ToList() : new List() ; + Sites.Insert(0, new Site() { Name = "NONE", ID = -1 }); - Sites = sites; SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid); ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context) @@ -651,7 +655,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels } } } - + private async void Configuration_HardwareVersionChanged(object sender, HardwareVersion e) { var version = ActiveMachine.Configuration.HardwareVersion; @@ -997,5 +1001,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels }); } } + + private void ActiveMachine_OrganizationChanged(object sender, Organization e) + { + var sites = ActiveMachine.Organization != null ? _all_sites.Where(x => ActiveMachine.Organization.Sites.All(y => y.OrganizationGuid == x.OrganizationGuid)).ToList() : new List(); + sites.Insert(0, new Site() { Name = "NONE", ID = -1 }); + Sites = sites; + SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid); + } } } -- cgit v1.3.1 From fd73c4f58e643ee43d2f487e7be0caa32a7cb073 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 28 May 2020 17:12:14 +0300 Subject: Improved machine site selection. Added support for job resume on MS --- .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 4 ++-- .../ViewModels/MainViewVM.cs | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 5477f97d6..eed594718 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -1376,7 +1376,7 @@ namespace Tango.MachineStudio.Developer.ViewModels /// /// Starts the job. /// - private async void StartJob(Func resumeFunc = null) + private async void StartJob(Func resumeFunc = null) { SettingsManager.Default.Save(); @@ -1441,7 +1441,7 @@ namespace Tango.MachineStudio.Developer.ViewModels } else { - JobHandler = resumeFunc(ActiveJob); + JobHandler = resumeFunc(); } _navigation.NavigateTo(DeveloperNavigationView.RunningJobView); 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 d52daaea2..9c4c2281d 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 @@ -615,8 +615,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels _all_sites = await ActiveMachineAdapter.Context.Sites.ToListAsync(); - Sites = ActiveMachine.Organization != null ? _all_sites.Where(x => ActiveMachine.Organization.Sites.All(y => y.OrganizationGuid == x.OrganizationGuid)).ToList() : new List() ; - Sites.Insert(0, new Site() { Name = "NONE", ID = -1 }); + var sites = ActiveMachine.Organization != null ? _all_sites.Where(x => x.OrganizationGuid == ActiveMachine.OrganizationGuid).ToList() : new List(); + sites.Insert(0, new Site() { Name = "NONE", ID = -1 }); + Sites = sites; SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid); @@ -655,7 +656,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels } } } - + private async void Configuration_HardwareVersionChanged(object sender, HardwareVersion e) { var version = ActiveMachine.Configuration.HardwareVersion; @@ -1004,9 +1005,10 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels private void ActiveMachine_OrganizationChanged(object sender, Organization e) { - var sites = ActiveMachine.Organization != null ? _all_sites.Where(x => ActiveMachine.Organization.Sites.All(y => y.OrganizationGuid == x.OrganizationGuid)).ToList() : new List(); + var sites = ActiveMachine.Organization != null ? _all_sites.Where(x => x.OrganizationGuid == ActiveMachine.OrganizationGuid).ToList() : new List(); sites.Insert(0, new Site() { Name = "NONE", ID = -1 }); Sites = sites; + SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid); } } -- cgit v1.3.1 From 7c429939d3857ac22e5dccb6757bae679a017ed9 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 23 Jul 2020 16:36:59 +0300 Subject: Added combobox style to some items Related Work Items: #3099 --- .../Modules/MachineStudio.Dispensers/Views/DispenserView.xaml | 4 ++-- .../Views/MachineSettingsView.xaml | 4 ++-- .../Tango.MachineStudio.Common/Resources/MaterialDesign.xaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner') diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml index 0a63e6423..e0f93df5a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml @@ -51,9 +51,9 @@ Dispenser Type: - + - Nanoliter / Pulse: + Nanoliter / Pulse: Part Number: diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml index 954ac5f0e..76517ec37 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml @@ -51,10 +51,10 @@ Head Type - + Machine Version - + Organization diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml index 11dc2bad3..222eecb71 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml @@ -556,7 +556,7 @@ + Height="{StaticResource PopupTopBottomMargin}"/> @@ -575,7 +575,7 @@ - + @@ -675,7 +675,7 @@ - + -- cgit v1.3.1