From ffa7f253727cce3a23f168082c8d5a447025435d Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Thu, 6 Nov 2025 09:00:32 +0100 Subject: [PATCH] Revert "Add pagination" This reverts commit edac9f28d8d5cbf6c36aaaa74e99d654a8488100. --- src/Controllers/HomeController.cs | 44 +++----------------- src/Models/UserModels.cs | 1 - src/Models/UsersViewModel.cs | 4 -- src/Views/Home/Users.cshtml | 69 +------------------------------ 4 files changed, 6 insertions(+), 112 deletions(-) diff --git a/src/Controllers/HomeController.cs b/src/Controllers/HomeController.cs index 4578bfa..4b30b38 100644 --- a/src/Controllers/HomeController.cs +++ b/src/Controllers/HomeController.cs @@ -75,56 +75,22 @@ public class HomeController : Controller [Authorize(Roles = "CanManageUsers")] [HttpGet("Users")] - public async Task UsersAsync([FromQuery] int page = 1, [FromQuery] int pageSize = 50) + public async Task UsersAsync() { - page = Math.Max(1, page); - pageSize = Math.Clamp(pageSize, 10, 100); - - // Fetch all users with jpegPhoto (but not userPassword) - IEnumerable allUsers = await _ldap.ListUsersAsync([.. _ldap.UsersAttributes.Where(attr => attr != "userPassword")]); - List usersList = allUsers.ToList(); - int totalUsers = usersList.Count; - - List paginatedUsers = usersList - .Skip((page - 1) * pageSize) - .Take(pageSize) - .ToList(); - + IEnumerable users = await _ldap.ListUsersAsync([.. _ldap.UsersAttributes.Where(attr => attr != "jpegPhoto" && attr != "userPassword")]); List UserTableViewModels = []; - foreach (UserModel user in paginatedUsers) + foreach (UserModel user in users) { - string? jpegPhotoBase64 = null; - if (user.JpegPhoto != null) - { - try - { - byte[] photoBytes = Convert.FromBase64String(user.JpegPhoto); - jpegPhotoBase64 = ImageHelper.ResizeAndConvertToBase64(photoBytes, 48); - } - catch - { - // If image processing fails, leave as null - } - } - UserTableViewModels.Add(new() { Name = user.Cn ?? "", Surname = user.Sn ?? "", Title = user.Title ?? "", Uid = user.Uid, - Description = user.Description ?? new() {Address = new(), BirthDate = "", Workplace = "", Groups = []}, - JpegPhotoBase64 = jpegPhotoBase64 + Description = user.Description ?? new() {Address = new(), BirthDate = "", Workplace = "", Groups = []} }); } - - return View(new UsersIndexViewModel() - { - UserTableViewModels = UserTableViewModels, - CurrentPage = page, - PageSize = pageSize, - TotalUsers = totalUsers - }); + return View(new UsersIndexViewModel() { UserTableViewModels = UserTableViewModels }); } [Authorize(Roles = "CanManageUsers")] diff --git a/src/Models/UserModels.cs b/src/Models/UserModels.cs index 5821e62..9fa36d0 100644 --- a/src/Models/UserModels.cs +++ b/src/Models/UserModels.cs @@ -69,5 +69,4 @@ public class UserTableViewModel public required string Name { get; set; } public required string Surname { get; set; } public required UserDescription Description { get; set; } - public string? JpegPhotoBase64 { get; set; } } \ No newline at end of file diff --git a/src/Models/UsersViewModel.cs b/src/Models/UsersViewModel.cs index 3e18d30..1729968 100644 --- a/src/Models/UsersViewModel.cs +++ b/src/Models/UsersViewModel.cs @@ -3,8 +3,4 @@ namespace Berufsschule_HAM.Models; public class UsersIndexViewModel { public required IEnumerable UserTableViewModels { get; set; } - public int CurrentPage { get; set; } = 1; - public int PageSize { get; set; } = 50; - public int TotalUsers { get; set; } - public int TotalPages => (int)Math.Ceiling((double)TotalUsers / PageSize); } \ No newline at end of file diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index 3e3ec25..3e5a255 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -41,16 +41,7 @@ { - @if (!string.IsNullOrEmpty(userTableViewModel.JpegPhotoBase64)) - { - Photo - } - else - { -
- @userTableViewModel.Name.FirstOrDefault()@userTableViewModel.Surname.FirstOrDefault() -
- } + Photo @userTableViewModel.Uid @userTableViewModel.Title @@ -88,64 +79,6 @@ - - @* Pagination Controls *@ - @if (Model.TotalPages > 1) - { - - }