From 9b717b80556c3ec743c605f599353bc92f967328 Mon Sep 17 00:00:00 2001 From: peterbarancek <62284244+peterbarancek@users.noreply.github.com> Date: Thu, 15 Aug 2024 10:56:02 +0200 Subject: [PATCH] ****TcOpen.Inxton.Local.Security**** *Users are limited to 100 *Fixed layout in grouped users view **** TcoElements ******** *Carousel base view -> Spot view * visibility in Carousel in position fixed... --- .../UserManagement/BaseUserViewModel.cs | 10 +++++++--- .../UserManagementGroupManagementView.xaml | 13 ++++++------- src/TcOpen.Inxton/src/Security/RoleGroupManager.cs | 2 +- ...coCarouselView.xaml => TcoCarouselSpotView.xaml} | 8 ++++---- ...uselView.xaml.cs => TcoCarouselSpotView.xaml.cs} | 4 ++-- .../TcOpen.Inxton.TcoElements.Wpf.csproj | 2 +- 6 files changed, 21 insertions(+), 18 deletions(-) rename src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/{TcoCarouselView.xaml => TcoCarouselSpotView.xaml} (96%) rename src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/{TcoCarouselView.xaml.cs => TcoCarouselSpotView.xaml.cs} (96%) diff --git a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs index 892478694..a4ca5b6f2 100644 --- a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs +++ b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs @@ -15,7 +15,7 @@ public class BaseUserViewModel : BindableBase private static ObservableCollection _allUsers; public IRepository UserRepository { get => _userRepositary; set => _userRepositary = value; } - public ObservableCollection AllUsers { get => _allUsers; private set => _allUsers = value; } + public ObservableCollection AllUsers { get => _allUsers;private set => _allUsers = value; } public List AllRoles { get; private set; } = new List(); public List AllGroups { get; private set; } public static event EventHandler OnNewUserAdded; @@ -27,13 +27,17 @@ public BaseUserViewModel() UserRepository = SecurityManager.Manager.UserRepository; AllRoles = SecurityManager.Manager.AvailableRoles.ToList(); AllGroups = SecurityManager.Manager.AvailableGroups().ToList(); - AllUsers = new ObservableCollection(UserRepository.GetRecords()); + AllUsers = new ObservableCollection(UserRepository.Queryable.Where(p=> true)); } + + + + protected void UsersChanged() { AllUsers.Clear(); - UserRepository.GetRecords().ToList().ForEach(AllUsers.Add); + UserRepository.Queryable.Where(p => true).ToList().ForEach(AllUsers.Add); OnNewUserAdded?.Invoke(this, EventArgs.Empty); } } diff --git a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml index ee9ef63ed..26d3b816e 100644 --- a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml +++ b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml @@ -32,11 +32,10 @@ - - - - - + + + + @@ -46,11 +45,11 @@ - + - + diff --git a/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs b/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs index ef4df8c12..3ba693afc 100644 --- a/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs +++ b/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs @@ -230,7 +230,7 @@ public string GetRolesFromGroupString(string group) public List GetAllGroup() { List data = null; - data = groupRepo.GetRecords().ToList(); + data = groupRepo.Queryable.Where(p => true).ToList(); return data; } } diff --git a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml similarity index 96% rename from src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml rename to src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml index 532bee9a7..2279ed03a 100644 --- a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml +++ b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml @@ -1,5 +1,5 @@ diff --git a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml.cs b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml.cs similarity index 96% rename from src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml.cs rename to src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml.cs index 8dc287a89..7ec6d025a 100644 --- a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml.cs +++ b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml.cs @@ -14,10 +14,10 @@ namespace TcoElements /// /// Interaction logic for TcoCarouselServiceView.xaml /// - public partial class TcoCarouselView + public partial class TcoCarouselSpotView : UserControl { - public TcoCarouselView() + public TcoCarouselSpotView() { if (DesignerProperties.GetIsInDesignMode(this)) { diff --git a/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj b/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj index 1d4bdfa2c..8a75ffc2b 100644 --- a/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj +++ b/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj @@ -51,7 +51,7 @@ $(DefaultXamlRuntime) - + $(DefaultXamlRuntime) Designer