Improved machine site selection.

Added support for job resume on MS

1 files changed, 6 insertions, 4 deletions

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<Site>() ;
-                    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<Site>();
+                    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<Site>();
+            var sites = ActiveMachine.Organization != null ? _all_sites.Where(x => x.OrganizationGuid == ActiveMachine.OrganizationGuid).ToList() : new List<Site>();
             sites.Insert(0, new Site() { Name = "NONE", ID = -1 });
             Sites = sites;
+
             SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid);
         }
     }