From d9127736d974be66957e8e360117847ae0095870 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 11 Oct 2025 12:57:51 +0200 Subject: [PATCH 1/9] Added basic Groups view and controller --- src/Controllers/HomeController.cs | 9 +- src/Views/Home/Groups.cshtml | 169 ++++++++++++++++++++++++++++++ src/Views/Shared/_Layout.cshtml | 3 + 3 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 src/Views/Home/Groups.cshtml diff --git a/src/Controllers/HomeController.cs b/src/Controllers/HomeController.cs index dd5be8f..d513b5a 100644 --- a/src/Controllers/HomeController.cs +++ b/src/Controllers/HomeController.cs @@ -88,7 +88,14 @@ public class HomeController : Controller Workplace = user.Description?.Workplace ?? "" }); } - return View(new UsersIndexViewModel() { UserTableViewModels = UserTableViewModels }); } + return View(new UsersIndexViewModel() { UserTableViewModels = UserTableViewModels }); + } + + [HttpGet("Groups")] + public async Task GroupsAsync() + { + return View(); // TODO: Add viewmodel + } [HttpPost("Login")] public async Task Login(string username, string password) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml new file mode 100644 index 0000000..e9ef79b --- /dev/null +++ b/src/Views/Home/Groups.cshtml @@ -0,0 +1,169 @@ +@using Microsoft.AspNetCore.Mvc.Localization +@using Berufsschule_HAM.Models +@using System.Buffers.Text +@* @model UsersIndexViewModel *@ +@inject IViewLocalizer T +@{ + ViewData["Title"] = T["Groups"]; +} + + +
+

@T["Groups"]

+ + +
+ +
+ + +
+ + + + + + + + + + + + + @* @{ + foreach (UserTableViewModel userTableViewModel in Model.UserTableViewModels) + { + + + + + + + + + + } + } *@ + +
Group@T["Can"]:
@T["inventorize"]		@T["Can"]:
@T["Manage users"]		@T["Can"]:
@T["Manage locations"]		@T["Can"]:
@T["Manage assets"]		@T["Can"]:
@T["manage groups"]
+ Photo + @userTableViewModel.Uid@userTableViewModel.Title@userTableViewModel.Name@userTableViewModel.Surname@userTableViewModel.Workplace +
+ + +
+
+
+
+@* + + + + + *@ diff --git a/src/Views/Shared/_Layout.cshtml b/src/Views/Shared/_Layout.cshtml index 6ca4965..11901ea 100644 --- a/src/Views/Shared/_Layout.cshtml +++ b/src/Views/Shared/_Layout.cshtml @@ -46,6 +46,9 @@
  • @T["Users"]
    • +
  • + @T["Groups"] +
    • }
  • @if (User.Identity.IsAuthenticated) From fd5dcb56188c17b38b9d74103a03434a56a68001 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 11 Oct 2025 13:29:59 +0200 Subject: [PATCH 2/9] Added groups view model, implemented basic groups table view --- src/Controllers/HomeController.cs | 3 ++- src/Models/GroupModel.cs | 2 ++ src/Models/GroupsViewModels.cs | 38 +++++++++++++++++++++++++++++++ src/Services/LdapService.cs | 5 ++++ src/Views/Home/Groups.cshtml | 37 +++++++++++++++--------------- 5 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 src/Models/GroupsViewModels.cs diff --git a/src/Controllers/HomeController.cs b/src/Controllers/HomeController.cs index d513b5a..6b0647f 100644 --- a/src/Controllers/HomeController.cs +++ b/src/Controllers/HomeController.cs @@ -94,7 +94,8 @@ public class HomeController : Controller [HttpGet("Groups")] public async Task GroupsAsync() { - return View(); // TODO: Add viewmodel + IEnumerable groups = await _ldap.ListGroupsAsync(); + return View(new GroupsIndexViewModel(groups)); } [HttpPost("Login")] diff --git a/src/Models/GroupModel.cs b/src/Models/GroupModel.cs index c625c15..e094979 100644 --- a/src/Models/GroupModel.cs +++ b/src/Models/GroupModel.cs @@ -7,12 +7,14 @@ namespace Berufsschule_HAM.Models; public class GroupModel { public required string Cn { get; set; } + public string DisplayName { get; set; } public string? GidNumber { get; set; } public List Permissions { get; set; } public GroupModel(Dictionary ldapData) { Cn = ldapData.GetValueOrDefault("cn") ?? throw new GroupModelConfigurationException(); GidNumber = ldapData.GetValueOrDefault("gidNumber"); + DisplayName = ldapData.GetValueOrDefault("displayName") ?? Cn; string? descriptionValue = ldapData.GetValueOrDefault("description"); if (descriptionValue is null) { diff --git a/src/Models/GroupsViewModels.cs b/src/Models/GroupsViewModels.cs new file mode 100644 index 0000000..362145d --- /dev/null +++ b/src/Models/GroupsViewModels.cs @@ -0,0 +1,38 @@ +namespace Berufsschule_HAM.Models; + +public class GroupsIndexViewModel +{ + public List GroupsTableViewModels { get; set; } = []; + + public GroupsIndexViewModel(IEnumerable groupModels) + { + foreach (GroupModel model in groupModels) + { + GroupsTableViewModels.Add(new() + { + Cn = model.Cn, + Group = model.DisplayName, + CanInventorize = model.Permissions.Any(x => x == GroupPermission.CanInventorize), + CanManageAssets = model.Permissions.Any(x => x == GroupPermission.CanManageAssets), + CanManageGroups = model.Permissions.Any(x => x == GroupPermission.CanManageGroups), + CanManageLocations = model.Permissions.Any(x => x == GroupPermission.CanManageLocations), + CanManageUsers = model.Permissions.Any(x => x == GroupPermission.CanManageUsers) + }); + } + } + + + + +} + +public class GroupsTableViewModel +{ + public required string Cn { get; set; } + public required string Group { get; set; } + public required bool CanInventorize { get; set; } + public required bool CanManageUsers { get; set; } + public required bool CanManageLocations { get; set; } + public required bool CanManageAssets { get; set; } + public required bool CanManageGroups { get; set; } +} \ No newline at end of file diff --git a/src/Services/LdapService.cs b/src/Services/LdapService.cs index 65e37e3..2ff006d 100644 --- a/src/Services/LdapService.cs +++ b/src/Services/LdapService.cs @@ -134,6 +134,11 @@ public partial class LdapService : IDisposable return returnValue; } + public async Task> ListGroupsAsync() + { + return await ListGroupsAsync(GroupsAttributes); + } + public async Task> ListGroupsAsync(string[] attributes) { List returnValue = []; diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index e9ef79b..8aff08b 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -1,7 +1,7 @@ @using Microsoft.AspNetCore.Mvc.Localization @using Berufsschule_HAM.Models @using System.Buffers.Text -@* @model UsersIndexViewModel *@ +@model GroupsIndexViewModel @inject IViewLocalizer T @{ ViewData["Title"] = T["Groups"]; @@ -23,39 +23,38 @@ Group @T["Can"]:
    @T["inventorize"] - @T["Can"]:
    @T["Manage users"] - @T["Can"]:
    @T["Manage locations"] - @T["Can"]:
    @T["Manage assets"] + @T["Can"]:
    @T["manage users"] + @T["Can"]:
    @T["manage locations"] + @T["Can"]:
    @T["manage assets"] @T["Can"]:
    @T["manage groups"] + @T["Action"] - @* @{ - foreach (UserTableViewModel userTableViewModel in Model.UserTableViewModels) + @{ + foreach (GroupsTableViewModel userTableViewModel in Model.GroupsTableViewModels) { - - Photo - - @userTableViewModel.Uid - @userTableViewModel.Title - @userTableViewModel.Name - @userTableViewModel.Surname - @userTableViewModel.Workplace - -
    + @userTableViewModel.Group + @userTableViewModel.CanInventorize + @userTableViewModel.CanManageUsers + @userTableViewModel.CanManageLocations + @userTableViewModel.CanManageAssets + @userTableViewModel.CanManageGroups + +
    } - } *@ + }
    From 92776af1fff908b8817bd07ebe959421c561c764 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 11 Oct 2025 13:36:39 +0200 Subject: [PATCH 3/9] Fixed layout localization --- src/Resources/Views.Shared._Layout.de.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Resources/Views.Shared._Layout.de.resx b/src/Resources/Views.Shared._Layout.de.resx index d7c5ebc..31369ef 100644 --- a/src/Resources/Views.Shared._Layout.de.resx +++ b/src/Resources/Views.Shared._Layout.de.resx @@ -16,8 +16,8 @@ Zum Inhalt springen - - Startseite + + Schnellaktionen Inventur From 0ab76d895ed5db6038a079dabb91716e07600314 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 11 Oct 2025 13:37:10 +0200 Subject: [PATCH 4/9] Replaced text with icons for Groups permissions in view --- src/Views/Home/Groups.cshtml | 10 +++++----- src/Views/Shared/_Layout.cshtml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index 8aff08b..18c6d17 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -36,11 +36,11 @@ { @userTableViewModel.Group - @userTableViewModel.CanInventorize - @userTableViewModel.CanManageUsers - @userTableViewModel.CanManageLocations - @userTableViewModel.CanManageAssets - @userTableViewModel.CanManageGroups + @(userTableViewModel.CanInventorize ? "☑️" : "❌") + @(userTableViewModel.CanManageUsers ? "☑️" : "❌") + @(userTableViewModel.CanManageLocations ? "☑️" : "❌") + @(userTableViewModel.CanManageAssets ? "☑️" : "❌") + @(userTableViewModel.CanManageGroups ? "☑️" : "❌")
    diff --git a/src/Views/Shared/_Layout.cshtml b/src/Views/Shared/_Layout.cshtml index 11901ea..20fc558 100644 --- a/src/Views/Shared/_Layout.cshtml +++ b/src/Views/Shared/_Layout.cshtml @@ -30,7 +30,7 @@
    • - @T["Home"] + @T["Quick-Actions"]
      • @if (User.Identity.IsAuthenticated) { From dfe1a2b2b1e6d481a924170ebecfa1033d09955b Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 11 Oct 2025 13:48:23 +0200 Subject: [PATCH 5/9] Implemented Groups delete buttons --- src/Controllers/GroupsController.cs | 8 +++--- src/Models/GroupsResponseModels.cs | 6 +++++ src/Views/Home/Groups.cshtml | 42 ++++++++++++++--------------- 3 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 src/Models/GroupsResponseModels.cs diff --git a/src/Controllers/GroupsController.cs b/src/Controllers/GroupsController.cs index 08b37e0..3adb40e 100644 --- a/src/Controllers/GroupsController.cs +++ b/src/Controllers/GroupsController.cs @@ -44,19 +44,19 @@ public class GroupsController : Controller return groups; } - [HttpGet("Delete")] - public async Task Delete(string uid) + [HttpDelete("Delete")] + public async Task Delete(string uid) { return await Task.Run(async () => { try { await _ldap.DeleteGroupAsync(uid); - return true; + return new GroupsDeleteResponseModel(true); } catch (Exception) { - return false; + return new GroupsDeleteResponseModel(false); } }); } diff --git a/src/Models/GroupsResponseModels.cs b/src/Models/GroupsResponseModels.cs new file mode 100644 index 0000000..252f7f2 --- /dev/null +++ b/src/Models/GroupsResponseModels.cs @@ -0,0 +1,6 @@ +namespace Berufsschule_HAM.Models; +public class GroupsDeleteResponseModel(bool successful, string exception = "None") +{ + public bool Success { get; set; } = successful; + public string? Exception { get; set; } = exception; +} \ No newline at end of file diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index 18c6d17..416b179 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -32,20 +32,20 @@ @{ - foreach (GroupsTableViewModel userTableViewModel in Model.GroupsTableViewModels) + foreach (GroupsTableViewModel groupTableViewModel in Model.GroupsTableViewModels) { - @userTableViewModel.Group - @(userTableViewModel.CanInventorize ? "☑️" : "❌") - @(userTableViewModel.CanManageUsers ? "☑️" : "❌") - @(userTableViewModel.CanManageLocations ? "☑️" : "❌") - @(userTableViewModel.CanManageAssets ? "☑️" : "❌") - @(userTableViewModel.CanManageGroups ? "☑️" : "❌") + @groupTableViewModel.Group + @(groupTableViewModel.CanInventorize ? "☑️" : "❌") + @(groupTableViewModel.CanManageUsers ? "☑️" : "❌") + @(groupTableViewModel.CanManageLocations ? "☑️" : "❌") + @(groupTableViewModel.CanManageAssets ? "☑️" : "❌") + @(groupTableViewModel.CanManageGroups ? "☑️" : "❌")
    -@* - + + + + \ No newline at end of file From 358e35bb6a9640b066cdbfd2920bc672552ab52a Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 12 Oct 2025 16:23:58 +0200 Subject: [PATCH 9/9] Fixed Group creation not updating table --- src/Views/Home/Groups.cshtml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index ba533d9..aa80e9c 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -281,6 +281,36 @@ if (result.success) { bootstrap.Modal.getInstance(createModalEl).hide(); createForm.reset(); + // Add the new group to the table + const tableBody = document.querySelector('tbody'); + const newRow = document.createElement('tr'); + + newRow.innerHTML = ` + ${jsonData.Cn} + ${jsonData.Permissions.includes("CanInventorize") ? "☑️" : "❌"} + ${jsonData.Permissions.includes("CanManageUsers") ? "☑️" : "❌"} + ${jsonData.Permissions.includes("CanManageLocations") ? "☑️" : "❌"} + ${jsonData.Permissions.includes("CanManageAssets") ? "☑️" : "❌"} + ${jsonData.Permissions.includes("CanManageGroups") ? "☑️" : "❌"} + +
    + + +
    + + `; + + tableBody.appendChild(newRow); showToast('@T["Group created successfully"]', 'success'); } else { let exception = result.exception;