From 41cc78d3211d874dc36dd90a112564b220531da3 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Thu, 9 Oct 2025 10:36:12 +0200
Subject: [PATCH 1/2] Added Users table

---
 src/Controllers/HomeController.cs  | 19 +++++++++--
 src/Controllers/UsersController.cs | 21 +++++-------
 src/Models/UserModels.cs           | 31 +++++++++++++++--
 src/Models/UsersRequestModels.cs   |  7 ++++
 src/Models/UsersViewModel.cs       |  6 ++++
 src/Views/Home/Users.cshtml        | 54 ++++++++++++++++--------------
 6 files changed, 96 insertions(+), 42 deletions(-)
 create mode 100644 src/Models/UsersViewModel.cs

diff --git a/src/Controllers/HomeController.cs b/src/Controllers/HomeController.cs
index 3f42871..1f2d816 100644
--- a/src/Controllers/HomeController.cs
+++ b/src/Controllers/HomeController.cs
@@ -60,10 +60,23 @@ public class HomeController : Controller
     }
 
     [HttpGet("Users")]
-    public ActionResult Users()
+    public async Task<ActionResult> UsersAsync()
     {
-        return View();
-    }
+        IEnumerable<UserModel> users = await _ldap.ListUsersAsync();
+        List<UserTableViewModel> UserTableViewModels = [];
+        foreach (UserModel user in users)
+        {
+            UserTableViewModels.Add(new()
+            {
+                JpegPhoto = user.JpegPhoto ?? "",
+                Name = user.Cn ?? "",
+                Surname = user.Sn ?? "",
+                Title = user.Title ?? "",
+                Uid = user.Uid,
+                Workplace = user.Description?.Workplace ?? ""
+            });
+        }
+        return View(new UsersIndexViewModel() { UserTableViewModels = UserTableViewModels });    }
 
     [HttpPost("Login")]
     public async Task<ActionResult> Login(string username, string password)
diff --git a/src/Controllers/UsersController.cs b/src/Controllers/UsersController.cs
index 8630b08..512f966 100644
--- a/src/Controllers/UsersController.cs
+++ b/src/Controllers/UsersController.cs
@@ -45,20 +45,17 @@ public class UsersController : Controller
     }
 
     [HttpGet("Delete")]
-    public async Task<bool> Delete(string uid)
+    public async Task<UsersDeleteRequestModel> Delete(string uid)
     {
-        return await Task.Run(async () =>
+        try
         {
-            try
-            {
-                await _ldap.DeleteUserAsync(uid);
-                return true;
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        });
+            await _ldap.DeleteUserAsync(uid);
+            return new UsersDeleteRequestModel(true);
+        }
+        catch (Exception ex)
+        {
+            return new UsersDeleteRequestModel(false, ex.Message);
+        }
     }
 
     [HttpGet("Create")]
diff --git a/src/Models/UserModels.cs b/src/Models/UserModels.cs
index c16b520..4895d4b 100644
--- a/src/Models/UserModels.cs
+++ b/src/Models/UserModels.cs
@@ -1,3 +1,5 @@
+using System.Text.Json;
+
 namespace Berufsschule_HAM.Models;
 
 public class UserModel
@@ -5,7 +7,7 @@ public class UserModel
     public required string Uid { get; set; }
     public string? Cn { get; set; }
     public string? Sn { get; set; }
-    public string? Description { get; set; }
+    public UserDescription? Description { get; set; }
     public string? JpegPhoto { get; set; }
     public string? Title { get; set; }
     public string? UserPassword { get; set; }
@@ -14,13 +16,28 @@ public class UserModel
         Uid = ldapData.GetValueOrDefault("uid") ?? throw new ArgumentException("UID is required");
         Cn = ldapData.GetValueOrDefault("cn");
         Sn = ldapData.GetValueOrDefault("sn");
-        Description = ldapData.GetValueOrDefault("description");
+        string? description = ldapData.GetValueOrDefault("description");
+        Description = description != null ? JsonSerializer.Deserialize<UserDescription>(description) : null;
         JpegPhoto = ldapData.GetValueOrDefault("jpegPhoto");
         Title = ldapData.GetValueOrDefault("title");
         UserPassword = ldapData.GetValueOrDefault("userPassword");
     }
 }
 
+public class UserDescription
+{
+    public required string BirthDate { get; set; }
+    public required UserAddress Address { get; set; }
+    public required string Workplace { get; set; }
+}
+
+public class UserAddress
+{
+    public string? City { get; set; }
+    public string? Street { get; set; }
+    public string? StreetNr { get; set; }
+}
+
 public class UserAuthenticationResult
 {
     public required bool Success;
@@ -33,4 +50,14 @@ public enum UserNotAuthenticatedReason
     InvalidCredentials,
     UserNotAuthorized,
     UserLockedOut
+}
+
+public class UserTableViewModel
+{
+    public required string JpegPhoto { get; set; }
+    public required string Uid { get; set; }
+    public required string Title { get; set; }
+    public required string Name { get; set; }
+    public required string Surname { get; set; }
+    public required string Workplace { get; set; }
 }
\ No newline at end of file
diff --git a/src/Models/UsersRequestModels.cs b/src/Models/UsersRequestModels.cs
index 22f26cc..7c2436d 100644
--- a/src/Models/UsersRequestModels.cs
+++ b/src/Models/UsersRequestModels.cs
@@ -21,4 +21,11 @@ public class UsersModifyRequestModel
     public string? Description { get; set; } = null;
     public string? JpegPhoto { get; set; } = null;
     public string? UserPassword { get; set; } = null;
+}
+
+public class UsersDeleteRequestModel(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/Models/UsersViewModel.cs b/src/Models/UsersViewModel.cs
new file mode 100644
index 0000000..1729968
--- /dev/null
+++ b/src/Models/UsersViewModel.cs
@@ -0,0 +1,6 @@
+namespace Berufsschule_HAM.Models;
+
+public class UsersIndexViewModel
+{
+    public required IEnumerable<UserTableViewModel> UserTableViewModels { get; set; }
+}
\ No newline at end of file
diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml
index 9a3eb8d..88aac0e 100644
--- a/src/Views/Home/Users.cshtml
+++ b/src/Views/Home/Users.cshtml
@@ -1,6 +1,6 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Berufsschule_HAM.Models
-@model HomeIndexViewModel
+@model UsersIndexViewModel
 @inject IViewLocalizer T
 @{
     ViewData["Title"] = T["Users"];
@@ -20,27 +20,31 @@
         <table class="table table-striped align-middle">
             <thead>
                 <tr>
-                    <th>User</th>
-                    <th>Asset ID</th>
-                    <th>Asset Name</th>
-                    <th>Location</th>
+                    <th>User Photo</th>
+                    <th>User ID</th>
+                    <th>title</th>
+                    <th>Name</th>
+                    <th>Surname</th>
+                    <th>Workplace</th>
                     <th>Action</th>
                 </tr>
             </thead>
             <tbody>
-            @* @{
-                foreach (AssetsTableViewModel assetsTableViewModel in Model.AssetsTableViewModels)
+            @{
+                foreach (UserTableViewModel userTableViewModel in Model.UserTableViewModels)
                 {
                 <tr>
-                    <td>@assetsTableViewModel.UserUID</td>
-                    <td>@assetsTableViewModel.AssetCn</td>
-                    <td>@assetsTableViewModel.AssetName</td>
-                    <td>@assetsTableViewModel.LocationName</td>
+                    <td>@@userTableViewModel.JpegPhoto</td>
+                    <td>@userTableViewModel.Uid</td>
+                    <td>@userTableViewModel.Title</td>
+                    <td>@userTableViewModel.Name</td>
+                    <td>@userTableViewModel.Surname</td>
+                    <td>@userTableViewModel.Workplace</td>
                     <td>
                         <div class="d-flex gap-2">
                             <button class="btn btn-sm btn-primary">Update</button>
                             <button class="btn btn-sm btn-danger btn-delete" 
-                                data-asset-id="@assetsTableViewModel.AssetCn"
+                                data-user-id="@userTableViewModel.Uid"
                                 data-bs-toggle="modal"
                                 data-bs-target="#deleteModal">
                                 🗑️ Delete
@@ -49,13 +53,13 @@
                     </td>
                 </tr>
                 }
-            } *@
+            }
             </tbody>
         </table>
     </div>
 </div>
 
-<!-- Asset Delete Confirmation Modal -->
+<!-- User Delete Confirmation Modal -->
 <div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
@@ -64,7 +68,7 @@
                 <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
-                <p>Are you sure you want to delete the asset <strong id="assetName"></strong> (ID: <span id="assetId"></span>)?</p>
+                <p>Are you sure you want to delete the user <strong id="userName"></strong> (ID: <span id="userId"></span>)?</p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
@@ -77,21 +81,21 @@
 </div>
 
 
-@* <script>
+<script>
     document.addEventListener('DOMContentLoaded', () => {
         const deleteModal = document.getElementById('deleteModal');
         let currentButton = null; // The delete button that opened the modal
 
         deleteModal.addEventListener('show.bs.modal', event => {
             currentButton = event.relatedTarget; // Button that triggered the modal
-            const assetId = currentButton.getAttribute('data-asset-id');
-            const assetName = currentButton.getAttribute('data-asset-name');
+            const userId = currentButton.getAttribute('data-user-id');
+            const userName = currentButton.getAttribute('data-user-name');
 
-            deleteModal.querySelector('#assetId').textContent = assetId;
-            deleteModal.querySelector('#assetName').textContent = assetName;
+            deleteModal.querySelector('#userId').textContent = userId;
+            deleteModal.querySelector('#userName').textContent = userName;
 
             // Store the delete URL for later use
-            deleteModal.querySelector('#deleteForm').dataset.url = `/Assets/Delete?cn=${assetId}`;
+            deleteModal.querySelector('#deleteForm').dataset.url = `/Users/Delete?uid=${userId}`;
         });
 
         // Handle submit of deleteForm via fetch()
@@ -100,7 +104,7 @@
             e.preventDefault();
 
             const url = deleteForm.dataset.url;
-            const assetId = deleteModal.querySelector('#assetId').textContent;
+            const userId = deleteModal.querySelector('#userId').textContent;
 
             try {
                 const response = await fetch(url, {
@@ -109,7 +113,7 @@
                         'Content-Type': 'application/json',
                         'Accept': 'application/json'
                     }//,
-                    //body: JSON.stringify({ id: assetId }) // Use this for Post requests with [FromBody] parameters like in /Groups/Update
+                    //body: JSON.stringify({ id: userId }) // Use this for Post requests with [FromBody] parameters like in /Groups/Update
                 });
 
                 const result = await response.json();
@@ -124,7 +128,7 @@
                     row.classList.add('table-danger');
                     setTimeout(() => row.remove(), 300);
 
-                    showToast('Asset deleted successfully', 'success');
+                    showToast('User deleted successfully', 'success');
                 } else {
                     showToast(`❌ ${result.reason}: ${result.exception || 'Unknown error'}`, 'danger');
                 }
@@ -160,4 +164,4 @@
             return container;
         }
     });
-</script> *@
+</script>

From 49af3e79c31029ba764005e2c2a943a044ffe729 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Thu, 9 Oct 2025 11:50:43 +0200
Subject: [PATCH 2/2] Fixed images in Users view

---
 src/Controllers/UsersController.cs | 3 ++-
 src/Helpers/StringHelper.cs        | 6 ++++++
 src/Views/Home/Users.cshtml        | 7 +++++--
 src/wwwroot/css/site.css           | 6 ++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Controllers/UsersController.cs b/src/Controllers/UsersController.cs
index 512f966..6de8a0e 100644
--- a/src/Controllers/UsersController.cs
+++ b/src/Controllers/UsersController.cs
@@ -3,6 +3,7 @@ using Berufsschule_HAM.Services;
 using Microsoft.AspNetCore.Mvc;
 using Novell.Directory.Ldap;
 using Berufsschule_HAM.Models;
+using Berufsschule_HAM.Helpers;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.AspNetCore.Authorization;
@@ -63,7 +64,7 @@ public class UsersController : Controller
     {
         try
         {
-            jpegPhoto ??= System.IO.File.ReadAllText("wwwroot/user_default.jpeg"); // TODO: cleanup - make this a config setting
+            jpegPhoto ??= Convert.ToBase64String(System.IO.File.ReadAllBytes("wwwroot/user_default.jpeg")); // TODO: cleanup - make this a config setting
             uid ??= sn.ToLower() + cn.ToLower();
             title ??= "";
             description ??= "{}";
diff --git a/src/Helpers/StringHelper.cs b/src/Helpers/StringHelper.cs
index f65ce3b..8bd12d1 100644
--- a/src/Helpers/StringHelper.cs
+++ b/src/Helpers/StringHelper.cs
@@ -1,4 +1,5 @@
 using System.Text.RegularExpressions;
+using System.Text;
 
 namespace Berufsschule_HAM.Helpers;
 
@@ -16,4 +17,9 @@ public static class StringHelpers
         input = input.Trim('-');
         return input;
     }
+
+    public static string ToBase64String(string input)
+    {
+        return Convert.ToBase64String(Encoding.UTF8.GetBytes(input));
+    }
 }
\ No newline at end of file
diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml
index 88aac0e..f57572e 100644
--- a/src/Views/Home/Users.cshtml
+++ b/src/Views/Home/Users.cshtml
@@ -1,5 +1,6 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Berufsschule_HAM.Models
+@using System.Buffers.Text
 @model UsersIndexViewModel
 @inject IViewLocalizer T
 @{
@@ -20,7 +21,7 @@
         <table class="table table-striped align-middle">
             <thead>
                 <tr>
-                    <th>User Photo</th>
+                    <th style="width: 2rem;"></th>
                     <th>User ID</th>
                     <th>title</th>
                     <th>Name</th>
@@ -34,7 +35,9 @@
                 foreach (UserTableViewModel userTableViewModel in Model.UserTableViewModels)
                 {
                 <tr>
-                    <td>@@userTableViewModel.JpegPhoto</td>
+                    <td>
+                    <img class="rounded-circle user-icon" src="data:image/jpeg;base64,@userTableViewModel.JpegPhoto" alt="Photo" style="max-width:300px;" />
+                    </td>
                     <td>@userTableViewModel.Uid</td>
                     <td>@userTableViewModel.Title</td>
                     <td>@userTableViewModel.Name</td>
diff --git a/src/wwwroot/css/site.css b/src/wwwroot/css/site.css
index 5398705..b50430f 100644
--- a/src/wwwroot/css/site.css
+++ b/src/wwwroot/css/site.css
@@ -34,4 +34,10 @@ body {
   display: inline-block;
   margin: 1rem 0 1rem 0;
   padding: 2rem 4rem 2rem 4rem;
+}
+
+.user-icon {
+  width: 2rem;
+  height: 2rem;
+  float: right;
 }
\ No newline at end of file