merge

3 files changed, 32 insertions, 22 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
index 45b3ef1ce..b5f0f2d5b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")]
-[assembly: AssemblyVersion("2.0.7.1633")]
+[assembly: AssemblyVersion("2.0.9.1159")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
index 48fe2b34c..539f10574 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
@@ -8,7 +8,7 @@
     <OutputType>library</OutputType>
     <RootNamespace>Tango.MachineStudio.UsersAndRoles</RootNamespace>
     <AssemblyName>Tango.MachineStudio.UsersAndRoles</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
index 7d82cbbbc..db312b78f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
@@ -8,14 +8,16 @@ using System.Threading.Tasks;
 using Tango.BL;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
+using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.UsersAndRoles.Navigation;
 using Tango.MachineStudio.UsersAndRoles.Providers;
 using Tango.SharedUI;
+using System.Data.Entity;
 
 namespace Tango.MachineStudio.UsersAndRoles.ViewModels
 {
-    public class MainViewVM : ViewModel
+    public class MainViewVM : StudioViewModel
     {
         private ObservablesContext _organizationsContext;
         private ObservablesContext _manageContext;
@@ -129,8 +131,6 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             _navigation = navigation;
             _notification = notification;
 
-            LoadOrganizations();
-
             ManageOrganizationCommand = new RelayCommand(LoadSelectedOrganization, () => SelectedOrganization != null);
             BackToOrganizationsCommand = new RelayCommand(BackToOrganizations);
             ManageUserCommand = new RelayCommand(LoadSelectedUser, () => SelectedUser != null);
@@ -144,6 +144,11 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             RemoveUserCommand = new RelayCommand(RemoveSelectedUser, () => SelectedUser != null);
         }
 
+        public override void OnApplicationReady()
+        {
+            LoadOrganizations();
+        }
+
         private async void AddOrganization()
         {
             String name = _notification.ShowTextInput("Enter organization name", "Name");
@@ -187,19 +192,20 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             }
         }
 
-        private void LoadSelectedUser()
+        private async void LoadSelectedUser()
         {
             using (_notification.PushTaskItem("Loading user details..."))
             {
-                Task.Factory.StartNew(() =>
+                await Task.Factory.StartNew(() =>
                 {
                     _userContext = ObservablesContext.CreateDefault();
+
                     Roles = _userContext.Roles.ToObservableCollection();
-                    ManagedUser = _userContext.Users.SingleOrDefault(x => x.Guid == SelectedUser.Guid);
+                    ManagedUser = _userContext.Adapter.GetUser(SelectedUser.Guid);
                     ManagedUserRoles = ManagedUser.Roles.ToObservableCollection();
-
-                    InvokeUI(() => _navigation.NavigateTo(UsersAndRolesNavigationView.UserManagementView));
                 });
+
+                _navigation.NavigateTo(UsersAndRolesNavigationView.UserManagementView);
             }
         }
 
@@ -242,31 +248,35 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             }
         }
 
-        private void LoadSelectedOrganization()
+        private async void LoadSelectedOrganization()
         {
             using (_notification.PushTaskItem("Loading organization..."))
             {
-                Task.Factory.StartNew(() =>
+                await Task.Factory.StartNew(() =>
                 {
                     _manageContext = ObservablesContext.CreateDefault();
-                    ManagedOrganization = _manageContext.Organizations.SingleOrDefault(x => x.Guid == SelectedOrganization.Guid);
 
-                    InvokeUI(() => _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView));
+                    ManagedOrganization = _manageContext.Adapter.GetOrganizationAndUsers(SelectedOrganization.Guid);
                 });
+
+                _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView);
             }
         }
 
         private void LoadOrganizations()
         {
-            _organizationsContext = ObservablesContext.CreateDefault();
-            _organizationsContext.Configuration.LazyLoadingEnabled = false;
-
-            _organizationsContext.Users.ToList();
-            _organizationsContext.Contacts.ToList();
-            _organizationsContext.Addresses.ToList();
-            _organizationsContext.Machines.ToList();
+            Task.Factory.StartNew(() =>
+            {
+                _organizationsContext = ObservablesContext.CreateDefault();
 
-            Organizations = _organizationsContext.Organizations.ToObservableCollection();
+                Organizations = _organizationsContext.Organizations
+                    .Include(x => x.Machines)
+                    .Include(x => x.Users)
+                    .Include(x => x.Users.Select(y => y.Contact))
+                    .Include(x => x.Users.Select(y => y.Address))
+                    .Include(x => x.Address)
+                    .ToObservableCollection();
+            });
         }
 
         public void OnDropRole(Role role)