Revert "Add pagination"

This reverts commit edac9f28d8.
This commit is contained in:
2025-11-06 09:00:32 +01:00
parent b235e7c411
commit ffa7f25372
4 changed files with 6 additions and 112 deletions

View File

@@ -75,56 +75,22 @@ public class HomeController : Controller
[Authorize(Roles = "CanManageUsers")] [Authorize(Roles = "CanManageUsers")]
[HttpGet("Users")] [HttpGet("Users")]
public async Task<ActionResult> UsersAsync([FromQuery] int page = 1, [FromQuery] int pageSize = 50) public async Task<ActionResult> UsersAsync()
{ {
page = Math.Max(1, page); IEnumerable<UserModel> users = await _ldap.ListUsersAsync([.. _ldap.UsersAttributes.Where(attr => attr != "jpegPhoto" && attr != "userPassword")]);
pageSize = Math.Clamp(pageSize, 10, 100);
// Fetch all users with jpegPhoto (but not userPassword)
IEnumerable<UserModel> allUsers = await _ldap.ListUsersAsync([.. _ldap.UsersAttributes.Where(attr => attr != "userPassword")]);
List<UserModel> usersList = allUsers.ToList();
int totalUsers = usersList.Count;
List<UserModel> paginatedUsers = usersList
.Skip((page - 1) * pageSize)
.Take(pageSize)
.ToList();
List<UserTableViewModel> UserTableViewModels = []; List<UserTableViewModel> 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() UserTableViewModels.Add(new()
{ {
Name = user.Cn ?? "", Name = user.Cn ?? "",
Surname = user.Sn ?? "", Surname = user.Sn ?? "",
Title = user.Title ?? "", Title = user.Title ?? "",
Uid = user.Uid, Uid = user.Uid,
Description = user.Description ?? new() {Address = new(), BirthDate = "", Workplace = "", Groups = []}, Description = user.Description ?? new() {Address = new(), BirthDate = "", Workplace = "", Groups = []}
JpegPhotoBase64 = jpegPhotoBase64
}); });
} }
return View(new UsersIndexViewModel() { UserTableViewModels = UserTableViewModels });
return View(new UsersIndexViewModel()
{
UserTableViewModels = UserTableViewModels,
CurrentPage = page,
PageSize = pageSize,
TotalUsers = totalUsers
});
} }
[Authorize(Roles = "CanManageUsers")] [Authorize(Roles = "CanManageUsers")]

View File

@@ -69,5 +69,4 @@ public class UserTableViewModel
public required string Name { get; set; } public required string Name { get; set; }
public required string Surname { get; set; } public required string Surname { get; set; }
public required UserDescription Description { get; set; } public required UserDescription Description { get; set; }
public string? JpegPhotoBase64 { get; set; }
} }

View File

@@ -3,8 +3,4 @@ namespace Berufsschule_HAM.Models;
public class UsersIndexViewModel public class UsersIndexViewModel
{ {
public required IEnumerable<UserTableViewModel> UserTableViewModels { get; set; } public required IEnumerable<UserTableViewModel> 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);
} }

View File

@@ -41,16 +41,7 @@
{ {
<tr class="user-row"> <tr class="user-row">
<td> <td>
@if (!string.IsNullOrEmpty(userTableViewModel.JpegPhotoBase64)) <img class="rounded-circle user-icon" src="~/Home/UserPhoto?uid=@userTableViewModel.Uid&size=48" alt="Photo" style="width:32px;height:32px;" width="32" height="32" loading="lazy" />
{
<img class="rounded-circle user-icon" src="data:image/webp;base64,@userTableViewModel.JpegPhotoBase64" alt="Photo" style="width:32px;height:32px;" width="32" height="32" />
}
else
{
<div class="rounded-circle user-icon bg-secondary d-flex align-items-center justify-content-center" style="width:32px;height:32px;">
<span class="text-white fw-bold">@userTableViewModel.Name.FirstOrDefault()@userTableViewModel.Surname.FirstOrDefault()</span>
</div>
}
</td> </td>
<td>@userTableViewModel.Uid</td> <td>@userTableViewModel.Uid</td>
<td>@userTableViewModel.Title</td> <td>@userTableViewModel.Title</td>
@@ -88,64 +79,6 @@
</tbody> </tbody>
</table> </table>
</div> </div>
@* Pagination Controls *@
@if (Model.TotalPages > 1)
{
<nav aria-label="User pagination" class="mt-4">
<div class="d-flex justify-content-between align-items-center">
<div class="text-muted">
@T["Showing"] @((Model.CurrentPage - 1) * Model.PageSize + 1) - @Math.Min(Model.CurrentPage * Model.PageSize, Model.TotalUsers) @T["of"] @Model.TotalUsers @T["users"]
</div>
<ul class="pagination mb-0">
@* Previous Button *@
<li class="page-item @(Model.CurrentPage == 1 ? "disabled" : "")">
<a class="page-link" href="?page=@(Model.CurrentPage - 1)&pageSize=@Model.PageSize" aria-label="Previous">
<span aria-hidden="true">&laquo;</span>
</a>
</li>
@* Page Numbers *@
@{
int startPage = Math.Max(1, Model.CurrentPage - 2);
int endPage = Math.Min(Model.TotalPages, Model.CurrentPage + 2);
if (startPage > 1)
{
<li class="page-item"><a class="page-link" href="?page=1&pageSize=@Model.PageSize">1</a></li>
if (startPage > 2)
{
<li class="page-item disabled"><span class="page-link">...</span></li>
}
}
for (int i = startPage; i <= endPage; i++)
{
<li class="page-item @(i == Model.CurrentPage ? "active" : "")">
<a class="page-link" href="?page=@i&pageSize=@Model.PageSize">@i</a>
</li>
}
if (endPage < Model.TotalPages)
{
if (endPage < Model.TotalPages - 1)
{
<li class="page-item disabled"><span class="page-link">...</span></li>
}
<li class="page-item"><a class="page-link" href="?page=@Model.TotalPages&pageSize=@Model.PageSize">@Model.TotalPages</a></li>
}
}
@* Next Button *@
<li class="page-item @(Model.CurrentPage >= Model.TotalPages ? "disabled" : "")">
<a class="page-link" href="?page=@(Model.CurrentPage + 1)&pageSize=@Model.PageSize" aria-label="Next">
<span aria-hidden="true">&raquo;</span>
</a>
</li>
</ul>
</div>
</nav>
}
</div> </div>
<!-- User Delete Confirmation Modal --> <!-- User Delete Confirmation Modal -->