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

8 files changed, 16 insertions, 24 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs
index 374fe78a3..e607b13d5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs
@@ -24,7 +24,7 @@ namespace Tango.MachineStudio.DB.Converters
             if (value is IEnumerable<UsersRole>)
             {
                 IEnumerable<UsersRole> userRoles = value as IEnumerable<UsersRole>;
-                return String.Join(", ", userRoles.Where(x => !x.Deleted).Select(x => x.Role.Name));
+                return String.Join(", ", userRoles.Select(x => x.Role.Name));
             }
             else
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
index 6c98227e3..5606d9da8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
@@ -30,7 +30,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var role in SelectedRoles)
             {
-                if (SelectedEntity.UsersRoles.ToList().Exists(x => x.Role == role.Entity && !x.Deleted))
+                if (SelectedEntity.UsersRoles.ToList().Exists(x => x.Role == role.Entity))
                 {
                     role.IsSelected = true;
                 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 57c1aa724..ebcfe72fd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -177,7 +177,7 @@ namespace Tango.MachineStudio.RML.ViewModels
             if (_rmls_context != null) _rmls_context.Dispose();
 
             _rmls_context = ObservablesContext.CreateDefault();
-            Rmls = await new RmlsCollectionBuilder(_rmls_context).Set().WithLiquidFactors().WithMediaProperties().BuildAsync();
+            Rmls = await new RmlsCollectionBuilder(_rmls_context).SetAll().WithLiquidFactors().WithMediaProperties().BuildAsync();
         }
 
         private async void LoadActiveRML(String guid)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index e1fddac83..666a56704 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -2218,7 +2218,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         {
                             using (ObservablesContext db = ObservablesContext.CreateDefault())
                             {
-                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.Machine.ConfigurationGuid).Clone();
+                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.Machine.ConfigurationGuid);
                                 hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid).Clone();
                             }
                         });
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();
             });
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index e07952f29..d6fb50a8c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -16,6 +16,7 @@ using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.Core.Helpers;
 using Tango.MachineStudio.Common.Web;
+using Tango.BL.Builders;
 
 namespace Tango.MachineStudio.UI.Authentication
 {
@@ -87,15 +88,7 @@ namespace Tango.MachineStudio.UI.Authentication
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                db.Roles.Load();
-                db.Permissions.Load();
-                db.RolesPermissions.Load();
-
-                User user = db.Users
-                    .Include(x => x.UsersRoles)
-                    .Include(x => x.Contact)
-                    .Include(x => x.Address)
-                    .Include(x => x.Organization).SingleOrDefault(x => x.Email.ToLower() == email.ToLower());
+                User user = new UserBuilder(db).Set(x => x.Email.ToLower() == email.ToLower()).WithRolesAndPermissions().WithOrganization().Build();
 
                 if (user == null)
                 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index bceaaf956..f6386cfc9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.0.7.0")]
+[assembly: AssemblyVersion("4.0.8.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
index 17edf1dfd..c40f91005 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -25,6 +25,7 @@ using Tango.MachineStudio.UI.Messages;
 using Tango.Settings;
 using Tango.MachineStudio.Common;
 using Tango.Transport.Web;
+using Tango.BL;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
@@ -384,6 +385,9 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             try
             {
+                LogManager.Log("Clearing EF model store...");
+                ObservablesContext.ClearModelStore();
+
                 Process p = new Process();
 
                 if (Status == UpdateStatus.UpdateCompleted)