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

1 files changed, 5 insertions, 10 deletions

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 2234d09c1..735b1e75c 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
@@ -14,6 +14,7 @@ using Tango.MachineStudio.UsersAndRoles.Navigation;
 using Tango.MachineStudio.UsersAndRoles.Providers;
 using Tango.SharedUI;
 using System.Data.Entity;
+using Tango.BL.Builders;
 
 namespace Tango.MachineStudio.UsersAndRoles.ViewModels
 {
@@ -200,8 +201,8 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                 {
                     _userContext = ObservablesContext.CreateDefault();
 
-                    Roles = _userContext.Roles.ToObservableCollection();
-                    ManagedUser = _userContext.Adapter.GetUser(SelectedUser.Guid);
+                    Roles = new RolesCollectionBuilder(_userContext).SetAll().WithPermission().Build();
+                    ManagedUser = new UserBuilder(_userContext).Set(SelectedUser.Guid).WithRolesAndPermissions().Build();
                     ManagedUserRoles = ManagedUser.Roles.ToObservableCollection();
                 });
 
@@ -256,7 +257,7 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                 {
                     _manageContext = ObservablesContext.CreateDefault();
 
-                    ManagedOrganization = _manageContext.Adapter.GetOrganizationAndUsers(SelectedOrganization.Guid);
+                    ManagedOrganization = new OrganizationBuilder(_manageContext).Set(SelectedOrganization.Guid).WithUsers().Build();
                 });
 
                 _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView);
@@ -269,13 +270,7 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
             {
                 _organizationsContext = ObservablesContext.CreateDefault();
 
-                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();
+                Organizations = new OrganizationsCollectionBuilder(_organizationsContext).SetAll().WithUsers().WithMachines().Build();
             });
         }