From 918db73338e16c80cc1f0c0863a4cabc3a82e0f2 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 15:04:51 +0100 Subject: [PATCH 01/40] Fixed touch targets have insufficient spacing --- src/Views/Home/Groups.cshtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index aa765f6..abd8a29 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -180,7 +180,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
@@ -200,7 +200,7 @@
-
+
@@ -337,7 +337,7 @@
-
+
@@ -347,7 +347,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
From d3a7bae53521a81561cfeaee27567e1440f6e960 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 15:05:08 +0100 Subject: [PATCH 02/40] Fixed wrong address in user settings view --- src/Views/Settings/User.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Views/Settings/User.cshtml b/src/Views/Settings/User.cshtml index e64adff..6029438 100644 --- a/src/Views/Settings/User.cshtml +++ b/src/Views/Settings/User.cshtml @@ -53,7 +53,7 @@
- +
From 377e8f6776dc7e2bfd32fd804eaf0d35ff137094 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 15:35:23 +0100 Subject: [PATCH 03/40] Fixed toast warning type not accessible --- src/wwwroot/js/site.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/wwwroot/js/site.js b/src/wwwroot/js/site.js index c1bd0c8..a30dea4 100644 --- a/src/wwwroot/js/site.js +++ b/src/wwwroot/js/site.js @@ -12,14 +12,19 @@ function showToast(message, type) { const toast = document.createElement('div'); toast.className = `toast align-items-center text-white bg-${type} border-0`; toast.role = 'alert'; + var useDarkElements = type === "warning" toast.innerHTML = `
${message}
- +
`; + if (useDarkElements) { + toast.classList.remove("text-white"); + toast.classList.add("text-dark"); + } toastContainer.appendChild(toast); - const bsToast = new bootstrap.Toast(toast, { delay: 3000 }); + const bsToast = new bootstrap.Toast(toast, { delay: 5000 }); bsToast.show(); toast.addEventListener('hidden.bs.toast', () => toast.remove()); } From a63323cc3b46e719e3bd9442b6de23c70b0878eb Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 15:35:44 +0100 Subject: [PATCH 04/40] Fixed toast warning type not accessible 2 --- src/Resources/Views.Shared._Layout.de.resx | 3 +++ src/Views/Shared/_Layout.cshtml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Resources/Views.Shared._Layout.de.resx b/src/Resources/Views.Shared._Layout.de.resx index c522130..7e27699 100644 --- a/src/Resources/Views.Shared._Layout.de.resx +++ b/src/Resources/Views.Shared._Layout.de.resx @@ -52,6 +52,9 @@ Vorlage auswählen + + Meldung schließen + Einstellungen diff --git a/src/Views/Shared/_Layout.cshtml b/src/Views/Shared/_Layout.cshtml index c8471b6..554d24f 100644 --- a/src/Views/Shared/_Layout.cshtml +++ b/src/Views/Shared/_Layout.cshtml @@ -39,7 +39,8 @@ selectUser: '@T["Select user"]', selectPreset: '@T["Select preset"]', errorLoadingUsers: '@T["Error loading users"]', - errorLoadingPresets: '@T["Error loading presets"]' + errorLoadingPresets: '@T["Error loading presets"]', + closeAlert: '@T["Close alert"]' }; From 48f0eb0e7e016f632362600f7fc39f55d85a332a Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 21:47:03 +0100 Subject: [PATCH 05/40] Improved toast accessibility, improved batch accessibility --- src/Resources/Views.Shared._Batch.de.resx | 3 +++ src/Resources/Views.Shared._BatchButton.resx | 20 +++++++++++++++++++ src/Views/Shared/_Batch.cshtml | 18 +++++++++++++---- src/Views/Shared/_BatchButton.cshtml | 5 ++++- src/wwwroot/js/site.js | 21 ++++++++++++++++++-- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 src/Resources/Views.Shared._BatchButton.resx diff --git a/src/Resources/Views.Shared._Batch.de.resx b/src/Resources/Views.Shared._Batch.de.resx index 23cc857..4898375 100644 --- a/src/Resources/Views.Shared._Batch.de.resx +++ b/src/Resources/Views.Shared._Batch.de.resx @@ -73,4 +73,7 @@ Seriennummer + + Eintrag löschen + diff --git a/src/Resources/Views.Shared._BatchButton.resx b/src/Resources/Views.Shared._BatchButton.resx new file mode 100644 index 0000000..ec9967a --- /dev/null +++ b/src/Resources/Views.Shared._BatchButton.resx @@ -0,0 +1,20 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, ... + + + System.Resources.ResXResourceWriter, System.Windows.Forms, ... + + + + Druckseite öffnen + + + diff --git a/src/Views/Shared/_Batch.cshtml b/src/Views/Shared/_Batch.cshtml index 2c8fc05..c6adfc6 100644 --- a/src/Views/Shared/_Batch.cshtml +++ b/src/Views/Shared/_Batch.cshtml @@ -67,7 +67,10 @@ const asset = json.assetsModel; assetCard.innerHTML = `
-

Asset ${i + 1}: ${asset.Name}

+ +

Asset ${i + 1}: ${asset.Name}

+ +

@T["Asset ID"]: ${asset.Cn}

@@ -87,7 +90,10 @@ } else { assetCard.innerHTML = `
-

Asset ${i + 1}: @T["Empty"]

+ +

Asset ${i + 1}: @T["Empty"]

+ +
@@ -236,10 +242,14 @@ let cardAtIndex = document.querySelector(`[data-card-index="${index}"]`) let cardBodyAtIndex = cardAtIndex.children[0]; - cardBodyAtIndex.children[0].children[1].textContent = `Asset ${newIndex + 1}`; + cardBodyAtIndex.children[1].children[0].children[0].children[0].nextSibling.textContent = ` ${newIndex + 1}`; + cardBodyAtIndex.children[0].children[0].children[0].textContent = `Asset ${newIndex + 1}:`; + cardBodyAtIndex.children[0].children[0].children[0].ariaLabel = cardBodyAtIndex.children[0].children[0].children[0].ariaLabel.replace(/\s\d+\:/, ` ${newIndex + 1}:`); let cardAtTarget = document.querySelector(`[data-card-index="${newIndex}"]`) let cardBodyAtTarget = cardAtTarget.children[0]; - cardBodyAtTarget.children[0].children[1].textContent = `Asset ${index - 0 + 1}`; + cardBodyAtTarget.children[1].children[0].children[0].children[0].nextSibling.textContent = ` ${index - 0 + 1}`; + cardBodyAtTarget.children[0].children[0].children[0].textContent = `Asset ${index - 0 + 1}:`; + cardBodyAtTarget.children[0].children[0].children[0].ariaLabel = cardBodyAtTarget.children[0].children[0].children[0].ariaLabel.replace(/\s\d+\:/, ` ${newIndex + 1}:`); cardAtIndex.insertBefore(cardBodyAtTarget, null); cardAtTarget.insertBefore(cardBodyAtIndex, null); diff --git a/src/Views/Shared/_BatchButton.cshtml b/src/Views/Shared/_BatchButton.cshtml index 5fe2fdc..91504c4 100644 --- a/src/Views/Shared/_BatchButton.cshtml +++ b/src/Views/Shared/_BatchButton.cshtml @@ -1,8 +1,11 @@ +@using Microsoft.AspNetCore.Mvc.Localization +@inject IViewLocalizer T + \ No newline at end of file diff --git a/src/wwwroot/js/site.js b/src/wwwroot/js/site.js index a30dea4..0fd7bda 100644 --- a/src/wwwroot/js/site.js +++ b/src/wwwroot/js/site.js @@ -2,6 +2,16 @@ const container = document.createElement('div'); container.id = 'toastContainer'; container.className = 'toast-container position-fixed bottom-0 end-0 p-3'; + container.setAttribute("aria-live", "polite"); + container.setAttribute("aria-atomic", "true"); + + const liveRegion = document.createElement('div'); + liveRegion.id = 'toastLiveRegion'; + liveRegion.className = 'visually-hidden'; + liveRegion.setAttribute('aria-live', 'assertive'); + liveRegion.setAttribute('aria-atomic', 'true'); + container.appendChild(liveRegion); + document.body.appendChild(container); return container; } @@ -16,7 +26,7 @@ function showToast(message, type) { toast.innerHTML = `
${message}
- +
`; if (useDarkElements) { @@ -24,7 +34,14 @@ function showToast(message, type) { toast.classList.add("text-dark"); } toastContainer.appendChild(toast); - const bsToast = new bootstrap.Toast(toast, { delay: 5000 }); + + const liveRegion = document.getElementById('toastLiveRegion'); + if (liveRegion) { + liveRegion.textContent = ''; + setTimeout(() => liveRegion.textContent = message, 500); + } + + const bsToast = new bootstrap.Toast(toast, { delay: 10000 }); bsToast.show(); toast.addEventListener('hidden.bs.toast', () => toast.remove()); } From 2b62e930e1ef39e1ccbf20b38d7ea7b903065374 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 22:15:36 +0100 Subject: [PATCH 06/40] Improved screenreader based navigation for groups view --- src/Resources/Views.Home.Groups.de.resx | 6 ++++ src/Views/Home/Groups.cshtml | 46 +++++++++++++------------ 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/Resources/Views.Home.Groups.de.resx b/src/Resources/Views.Home.Groups.de.resx index 8314635..8d192f3 100644 --- a/src/Resources/Views.Home.Groups.de.resx +++ b/src/Resources/Views.Home.Groups.de.resx @@ -127,4 +127,10 @@ Fehler beim Anpassen der Gruppe + + Ja + + + Nein + diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index abd8a29..d908430 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -38,13 +38,13 @@ foreach (GroupsTableViewModel groupTableViewModel in Model.GroupsTableViewModels) { - @groupTableViewModel.Group - @(groupTableViewModel.CanInventorize ? "✓" : "✗") - @(groupTableViewModel.CanManageUsers ? "✓" : "✗") - @(groupTableViewModel.CanManageLocations ? "✓" : "✗") - @(groupTableViewModel.CanManageAssets ? "✓" : "✗") - @(groupTableViewModel.CanManageGroups ? "✓" : "✗") - @(groupTableViewModel.CanManageSettings ? "✓" : "✗") + @groupTableViewModel.Group + @(groupTableViewModel.CanInventorize ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) + @(groupTableViewModel.CanManageUsers ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) + @(groupTableViewModel.CanManageLocations ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) + @(groupTableViewModel.CanManageAssets ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) + @(groupTableViewModel.CanManageGroups ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) + @(groupTableViewModel.CanManageSettings ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}"))
${asset.Description?.Attributes ? ` @@ -182,8 +182,8 @@ ${Object.entries(asset.Description.Attributes) .map(([k,v]) => `
- : - + : +
`) .join('')}
` : ''} @@ -194,19 +194,19 @@

@T["Purchase Information"]

- +
- +
- +
- +
` : ''}
`; From c337287b230d82100d48ac84766ee88d9d306352 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 22:39:43 +0100 Subject: [PATCH 08/40] Improved screenreader table discoverability --- src/Views/Home/Assets.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml index dd4ff62..b11c162 100644 --- a/src/Views/Home/Assets.cshtml +++ b/src/Views/Home/Assets.cshtml @@ -49,7 +49,7 @@ foreach (AssetsTableViewModel assetsTableViewModel in Model.AssetsTableViewModels) { - @assetsTableViewModel.UserUID + @assetsTableViewModel.UserUID @assetsTableViewModel.AssetCn @assetsTableViewModel.AssetName @assetsTableViewModel.LocationName From 4f1c55d456aa59f94be60de7916a66523ccb96aa Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 22:45:27 +0100 Subject: [PATCH 09/40] Fixed assets view new items not screenreader navigable --- src/Views/Home/Assets.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml index b11c162..ce30fe3 100644 --- a/src/Views/Home/Assets.cshtml +++ b/src/Views/Home/Assets.cshtml @@ -364,7 +364,7 @@ document.addEventListener('DOMContentLoaded', () => { if (tableBody) { const newRow = document.createElement('tr'); newRow.innerHTML = ` - ${jsonData.Owner || ''} + ${jsonData.Owner || ''} ${result.assetId || ''} ${jsonData.Name || ''} ${jsonData.Location || ''} From 647ca335ea02e3f29b03eca3a0c45de394c8e1b5 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 22:54:24 +0100 Subject: [PATCH 10/40] Improved locations screenreader navigation, fixed unable to delete location after editing --- src/Views/Home/Locations.cshtml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Views/Home/Locations.cshtml b/src/Views/Home/Locations.cshtml index d95bf4a..44f00f0 100644 --- a/src/Views/Home/Locations.cshtml +++ b/src/Views/Home/Locations.cshtml @@ -40,7 +40,7 @@ foreach (LocationTableViewModel locationTableViewModel in Model.LocationTableViewModels) { - @locationTableViewModel.LocationID + @locationTableViewModel.LocationID @locationTableViewModel.LocationName @locationTableViewModel.RoomNumber @locationTableViewModel.Seat @@ -234,6 +234,7 @@ const result = await response.json(); if (result) { const btn = document.querySelector(`button[data-location-id="${data.Location}"]`); + const btn_del = document.querySelector(`button.btn-danger[data-location-id="${data.Location}"]`); const row = btn.closest('tr'); let slugifiedLocationID = `${data.Description.Location}-${data.Description.RoomNumber}-${data.Description.Seat}` .toLowerCase() @@ -244,6 +245,10 @@ btn.setAttribute("data-location-name", data.Description.Location); btn.setAttribute("data-room-number", data.Description.RoomNumber); btn.setAttribute("data-seat", data.Description.Seat); + btn_del.setAttribute("data-location-id", slugifiedLocationID); + btn_del.setAttribute("data-location-name", data.Description.Location); + btn_del.setAttribute("data-room-number", data.Description.RoomNumber); + btn_del.setAttribute("data-seat", data.Description.Seat); row.children[0].textContent = slugifiedLocationID; row.children[1].textContent = data.Description.Location; row.children[2].textContent = data.Description.RoomNumber; @@ -339,7 +344,7 @@ const tbody = document.querySelector('table tbody'); const newRow = document.createElement('tr'); newRow.innerHTML = ` - ${slugifiedLocationID} + ${slugifiedLocationID} ${newLoc.Location} ${newLoc.RoomNumber} ${newLoc.Seat} From 17c9e46a5b3c569b1902122079bdde89d0ec2508 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 23:02:17 +0100 Subject: [PATCH 11/40] Improved users view screenreader table navigation --- src/Views/Home/Users.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index 64e38f8..720e5a7 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -43,7 +43,7 @@ Photo - @userTableViewModel.Uid + @userTableViewModel.Uid @userTableViewModel.Title @userTableViewModel.Name @userTableViewModel.Surname @@ -557,7 +557,7 @@ const newRow = document.createElement('tr'); newRow.innerHTML = ` Photo - ${result.Uid || ''} + ${result.Uid || ''} ${data.Title || ''} ${data.Cn || ''} ${data.Sn || ''} From 22d72e124f22cdcac5ee8cb51ab5afb87a518462 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sun, 23 Nov 2025 23:44:54 +0100 Subject: [PATCH 12/40] Improved admin settings view screenreader navigation --- src/Resources/Views.Settings.Admin.de.resx | 3 ++ src/Views/Settings/Admin.cshtml | 32 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/Resources/Views.Settings.Admin.de.resx b/src/Resources/Views.Settings.Admin.de.resx index b8644ee..1e716dc 100644 --- a/src/Resources/Views.Settings.Admin.de.resx +++ b/src/Resources/Views.Settings.Admin.de.resx @@ -110,4 +110,7 @@ Cache leeren + + Vorlagen. Klicken zum Auf- oder zuklappen + diff --git a/src/Views/Settings/Admin.cshtml b/src/Views/Settings/Admin.cshtml index 79ea760..3bc1e39 100644 --- a/src/Views/Settings/Admin.cshtml +++ b/src/Views/Settings/Admin.cshtml @@ -68,14 +68,18 @@
-

@T["Current user image cache utilization:"] @userImageCacheSize

+

@T["Current user image cache utilization:"] @userImageCacheSize

+ style="cursor: pointer;" + role="button" + tabindex="0" + aria-controls="presetsCollapse" + aria-label="@T["Presets. Press to toggle visibility"]">

@T["Presets"]

{ + + const toggle = document.querySelector('[data-bs-target="#presetsCollapse"]'); + + toggle.addEventListener("keydown", (e) => { + if (e.key === "Enter" || e.key === " ") { + e.preventDefault(); + toggle.click(); + + const collapse = document.querySelector("#presetsCollapse"); + const isShown = collapse.classList.contains("show"); + toggle.setAttribute("aria-expanded", isShown ? "true" : "false"); + } + }); + + toggle.addEventListener("click", () => { + const collapse = document.querySelector("#presetsCollapse"); + const isShown = collapse.classList.contains("show"); + toggle.setAttribute("aria-expanded", isShown ? "true" : "false"); + }); + const updateForm = document.getElementById('updateSettings'); updateForm.addEventListener('submit', async e => { e.preventDefault(); @@ -375,10 +399,10 @@
- +
- +
From e9a55761c259ca61bd5e098c765136d1e9e757ea Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 11:02:58 +0100 Subject: [PATCH 13/40] Improved LdapService thread safety, fixed user images sometimes not loading --- src/Controllers/HomeController.cs | 3 +- src/Services/LdapService.cs | 92 +++++++++++++++++++++++-------- 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/src/Controllers/HomeController.cs b/src/Controllers/HomeController.cs index fc3e440..a4a467a 100644 --- a/src/Controllers/HomeController.cs +++ b/src/Controllers/HomeController.cs @@ -98,7 +98,6 @@ public class HomeController : Controller [ResponseCache(Duration = 3600, Location = ResponseCacheLocation.Any, VaryByQueryKeys = new[] { "uid", "size" })] public async Task UserPhotoAsync(string uid, int? size) { - Task adminSettingsModelTask = _ldap.GetAdminSettingsModelAsync(); UserModel? user = await _ldap.GetUserByUidAsync(uid, _ldap.UsersAttributes); if (user is null || user.JpegPhoto is null || user.JpegPhoto == "") { @@ -110,7 +109,7 @@ public class HomeController : Controller } if (size is not null) { - AdminSettingsModel adminSettingsModel = await adminSettingsModelTask; + AdminSettingsModel adminSettingsModel = await _ldap.GetAdminSettingsModelAsync(); size = Math.Min((int)size, adminSettingsModel.MaxDownloadableUserImageSize); } byte[] encodedFile = ImageHelper.ResizeAndConvertToWebp(user.JpegPhoto, size ?? 32); diff --git a/src/Services/LdapService.cs b/src/Services/LdapService.cs index bb74a51..17a3f6a 100644 --- a/src/Services/LdapService.cs +++ b/src/Services/LdapService.cs @@ -11,6 +11,7 @@ public partial class LdapService : IDisposable { private readonly LdapConfig _opts; private readonly LdapConnection _conn; + private readonly SemaphoreSlim _connLock = new(1, 1); private AdminSettingsModel? adminSettingsModel; private ILogger _logger; @@ -29,19 +30,27 @@ public partial class LdapService : IDisposable { try { - if (!_conn.Connected) + await _connLock.WaitAsync(); + try { - try + if (!_conn.Connected) { - await _conn.ConnectAsync(_opts.Host, _opts.Port); - } - catch (SystemException ex) - { - _logger.LogWarning("Unable to connect to LDAP: {ex.Message}\n{ex.StackTrace}", [ex.Message, ex.StackTrace]); - throw; + try + { + await _conn.ConnectAsync(_opts.Host, _opts.Port); + } + catch (SystemException ex) + { + _logger.LogWarning("Unable to connect to LDAP: {ex.Message}\n{ex.StackTrace}", [ex.Message, ex.StackTrace]); + throw; + } } + await _conn.BindAsync(_opts.BindDn, _opts.BindPassword); + } + finally + { + _connLock.Release(); } - await _conn.BindAsync(_opts.BindDn, _opts.BindPassword); return; } catch (Exception ex) @@ -109,7 +118,7 @@ public partial class LdapService : IDisposable LdapModification.Replace, new LdapAttribute("description", targetText) ); - await _conn.ModifyAsync(dn, modification); + await ModifyAsync(dn, modification); } catch (Exception) { @@ -151,7 +160,7 @@ public partial class LdapService : IDisposable LdapModification.Replace, new LdapAttribute("description", targetText) ); - await _conn.ModifyAsync(dn, modification); + await ModifyAsync(dn, modification); } catch (Exception) { @@ -201,7 +210,7 @@ public partial class LdapService : IDisposable LdapModification.Replace, new LdapAttribute("description", targetText) ); - await _conn.ModifyAsync(dn, modification); + await ModifyAsync(dn, modification); } catch (Exception) { @@ -388,15 +397,16 @@ public async Task CreateAsset(LdapAttributeSet attributeSet) public async Task>> ListObjectBy(string baseDn, string filter, string[] attributes) { - return await Task.Run(async () => + await ConnectAndBind(); + await _connLock.WaitAsync(); + try { - await ConnectAndBind(); var search = await _conn.SearchAsync( baseDn, LdapConnection.ScopeSub, $"{filter}", attributes, - false); + false).ConfigureAwait(false); var list = new List>(); while (await search.HasMoreAsync()) { @@ -415,7 +425,11 @@ public async Task CreateAsset(LdapAttributeSet attributeSet) catch (LdapException) { } } return list; - }); + } + finally + { + _connLock.Release(); + } } public async Task DeleteUserAsync(string uid) @@ -468,7 +482,15 @@ public async Task CreateAsset(LdapAttributeSet attributeSet) string dn = PrependRDN($"{rdnKey}={rdnValue}", baseDn); if (attributeName == rdnKey) { - await _conn.RenameAsync(dn, $"{rdnKey}={attributeValue}", true); + await _connLock.WaitAsync(); + try + { + await _conn.RenameAsync(dn, $"{rdnKey}={attributeValue}", true); + } + finally + { + _connLock.Release(); + } } else { @@ -476,7 +498,7 @@ public async Task CreateAsset(LdapAttributeSet attributeSet) LdapModification.Replace, new LdapAttribute(attributeName, attributeValue) ); - await _conn.ModifyAsync(dn, modification); + await ModifyAsync(dn, modification); } } @@ -490,24 +512,48 @@ public async Task CreateAsset(LdapAttributeSet attributeSet) new LdapAttribute(attributeName) ); - await _conn.ModifyAsync(dn, modification); + await ModifyAsync(dn, modification); } public async Task DeleteObjectByDnAsync(string dn) { - await _conn.DeleteAsync(dn); + await _connLock.WaitAsync(); + try + { + await _conn.DeleteAsync(dn); + } + finally + { + _connLock.Release(); + } } public async Task CreateObject(string dn, LdapAttributeSet attributeSet) { await ConnectAndBind(); LdapEntry ldapEntry = new(dn, attributeSet); - await _conn.AddAsync(ldapEntry); + await _connLock.WaitAsync(); + try + { + await _conn.AddAsync(ldapEntry); + } + finally + { + _connLock.Release(); + } } - public async Task ModifyAsync(string dn, LdapModification ldapModification) + public async Task ModifyAsync(string dn, LdapModification mod, CancellationToken ct = default) { - await _conn.ModifyAsync(dn, ldapModification); + await _connLock.WaitAsync(ct); + try + { + await _conn.ModifyAsync(dn, mod, ct); + } + finally + { + _connLock.Release(); + } } public void Dispose() From 3f6ecbe6174408e17bbe7c1dbdc01db1cdcdd6ff Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 11:06:45 +0100 Subject: [PATCH 14/40] Fixed newly created user can't be deleted --- src/Views/Home/Users.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index 720e5a7..5feb539 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -580,7 +580,7 @@ @T["Update"]
- +

@T["Workplace & account"]

@@ -213,7 +213,7 @@
- +
@@ -278,6 +278,9 @@ var dataFromEntries = Object.fromEntries(new FormData(updateForm).entries()); var data = unflatten(dataFromEntries); data.Description.Groups = Array.from(updateForm.querySelector('#updateGroups').selectedOptions).map(option => option.value); + if (data.Description.Address.StreetNr == "") { + delete(data.Description.Address.StreetNr); + } try { const response = await fetch('/Users/Update', { method: 'POST', @@ -435,11 +438,11 @@
- +
- +
@@ -455,7 +458,7 @@
- +

@T["Workplace & account"]

@@ -471,7 +474,7 @@
- +
@@ -539,7 +542,9 @@ const dataFromEntries = Object.fromEntries(new FormData(createForm).entries()); const data = unflatten(dataFromEntries); data.Description.Groups = Array.from(createGroupsSelect.selectedOptions).map(o => o.value); - + if (data.Description.Address.StreetNr == "") { + delete(data.Description.Address.StreetNr); + } try { const response = await fetch('/Users/Create', { method: 'POST', @@ -572,7 +577,7 @@ data-user-birthdate="${data.Description.BirthDate}" data-user-address-city="${data.Description.Address.City}" data-user-address-street="${data.Description.Address.Street}" - data-user-address-streetnr="${data.Description.Address.StreetNr}" + data-user-address-streetnr="${data.Description.Address.StreetNr || ""}" data-user-workplace="${data.Description?.Workplace || ''}" data-user-groups='${JSON.stringify(data.Description?.Groups || [])}' data-bs-toggle="modal" From feefa29cdf3775b3667935bcb9aaac8ae40b6b2e Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 13:17:02 +0100 Subject: [PATCH 16/40] Added missing required fields and aria-required to users view --- src/Views/Home/Users.cshtml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index 96f594c..8deb724 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -176,12 +176,12 @@
- - + +
- - + +
@@ -437,12 +437,12 @@
- - + +
- - + +
@@ -473,8 +473,8 @@
- - + +
From 53ad5526c7c85b76c297378335a29bbfbfa52575 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 13:18:15 +0100 Subject: [PATCH 17/40] Removed superfluous spaces --- src/Views/Home/Users.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index 8deb724..87dd233 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -176,11 +176,11 @@
- +
- +
From 7c77d10fea45014f147479858e8b1735cb083cc9 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 13:20:05 +0100 Subject: [PATCH 18/40] Added missing required indication and aria-required to locations view --- src/Views/Home/Locations.cshtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Views/Home/Locations.cshtml b/src/Views/Home/Locations.cshtml index 44f00f0..8aeba0d 100644 --- a/src/Views/Home/Locations.cshtml +++ b/src/Views/Home/Locations.cshtml @@ -165,8 +165,8 @@
- - + +
@@ -281,8 +281,8 @@
- - + +
From 57239473459b16c4fa2e3b95304e4c1f95db3ef1 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 13:23:57 +0100 Subject: [PATCH 19/40] Fixed missing required fields and aria-required in groups view --- src/Views/Home/Groups.cshtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index d908430..2fb7246 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -171,12 +171,12 @@
- - + +
- - + +
@@ -330,12 +330,12 @@
- - + +
- - + +
From ff3baf37db3f7f3bebbee344b8f4ff0ff1849587 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 14:01:13 +0100 Subject: [PATCH 20/40] Fixed user settings error message when no changes made --- src/Resources/Views.Settings.User.de.resx | 3 +++ src/Views/Settings/User.cshtml | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Resources/Views.Settings.User.de.resx b/src/Resources/Views.Settings.User.de.resx index 532804f..810f844 100644 --- a/src/Resources/Views.Settings.User.de.resx +++ b/src/Resources/Views.Settings.User.de.resx @@ -64,4 +64,7 @@ Fehler bei der Kommunikation mit dem Server + + Es wurden keine Änderungen gemacht. + diff --git a/src/Views/Settings/User.cshtml b/src/Views/Settings/User.cshtml index 6029438..c72074b 100644 --- a/src/Views/Settings/User.cshtml +++ b/src/Views/Settings/User.cshtml @@ -5,7 +5,6 @@ @inject IConfiguration Configuration @{ ViewData["Title"] = T["User settings"]; - string barcodeType = Configuration["BarcodeType"] ?? "EAN13"; } @@ -82,6 +81,11 @@ showToast('@T["Password must be at least 8 characters long and include upper, lower, number, and special character"]', 'danger'); return; } + const photo = updateForm.querySelector('#updatePhotoFile').value; + if (password.length == 0 && photo.length == 0) { + showToast('@T["There are no changes to be saved."]', 'danger'); + return; + } const url = `/Settings/User`; const dataFromEntries = Object.fromEntries(new FormData(updateForm).entries()); var data = unflatten(dataFromEntries); From 72f0116cab274ecda19f6b6e6797fc0e957e1ca8 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 15:40:52 +0100 Subject: [PATCH 21/40] Made presets cards full height, improved screen reader navigation, added input focus on add attribute and add preset --- src/Views/Settings/Admin.cshtml | 99 +++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/src/Views/Settings/Admin.cshtml b/src/Views/Settings/Admin.cshtml index 3bc1e39..8408036 100644 --- a/src/Views/Settings/Admin.cshtml +++ b/src/Views/Settings/Admin.cshtml @@ -92,28 +92,39 @@ @foreach (var preset in Model.Presets) {
-
+
- @foreach (var attr in preset.Value.Attribute) - { -
-
- -
-
- -
-
- -
-
- } + + + + + + + + + + @foreach (var attr in preset.Value.Attribute) + { + + + + + + } + +
@T["Name"]@T["Value"]@T["Delete attribute"]
+ + + + + +
@@ -240,25 +251,25 @@ function addAttribute(presetContainer, presetKey) { const attributeId = crypto.randomUUID(); - const row = document.createElement('div'); + const row = document.createElement('tr'); row.classList.add('row', 'mb-2'); row.innerHTML = ` -
+ -
-
+ + -
-
+ + -
+ `; presetContainer.querySelector('.attributes').appendChild(row); @@ -335,29 +346,32 @@ const attributeId = crypto.randomUUID(); - const row = document.createElement('div'); - row.classList.add('row', 'mb-2'); + const row = document.createElement('tr'); + row.classList.add('mb-2'); row.setAttribute('data-type', 'attribute'); row.innerHTML = ` -
+ -
-
+ + -
-
+ + -
+ `; attributesContainer.appendChild(row); + requestAnimationFrame(() => { + row.querySelector(".col-md-3 input").focus(); + }); // Delete-Button Eventlistener aktivieren const deleteButton = row.querySelector('button[data-type="deleteAttribute"]'); @@ -392,11 +406,20 @@ const presetDiv = document.createElement('div'); presetDiv.classList.add('col-md-6'); presetDiv.innerHTML = ` -
+
-
+ + + + + + + + + +
@T["Name"]@T["Value"]@T["Delete attribute"]
@@ -410,7 +433,9 @@ // Einfach ans Ende der Container-Liste hängen presetsButton.parentElement.parentElement.insertBefore(presetDiv, presetsButton.parentElement); - + requestAnimationFrame(() => { + presetDiv.querySelector(".form-control.mb-3").focus(); + }); // Eventlistener für den neuen Preset-Block aktivieren const addAttrBtn = presetDiv.querySelector('button[data-type="addAttribute"]'); const deletePresetBtn = presetDiv.querySelector('button[data-type="deletePreset"]'); From d662157885ec46934dc6eccd8db19a4268553232 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 18:19:07 +0100 Subject: [PATCH 22/40] Fixed assets create and update modal attributes not a table --- src/Views/Home/Assets.cshtml | 91 ++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 24 deletions(-) diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml index ce30fe3..27220b6 100644 --- a/src/Views/Home/Assets.cshtml +++ b/src/Views/Home/Assets.cshtml @@ -228,9 +228,17 @@

@T["Attributes"]

-
- -
+ + + + + + + + + + +
@@ -298,12 +306,19 @@ document.addEventListener('DOMContentLoaded', () => { const addAttributeBtn = document.getElementById('addAttributeBtn'); addAttributeBtn.addEventListener('click', () => { - const row = document.createElement('div'); - row.className = 'd-flex gap-2 align-items-center attribute-row'; + const row = document.createElement('tr'); + row.className = 'attribute-row'; + row.classList.add("mb-3"); row.innerHTML = ` - - - + + + + + + + + + `; attributesContainer.appendChild(row); }); @@ -463,7 +478,17 @@ document.addEventListener('DOMContentLoaded', () => {

@T["Attributes"]

-
+ + + + + + + + + + +
@@ -510,12 +535,18 @@ document.addEventListener('DOMContentLoaded', () => { let assetId = null; addAttrBtn.addEventListener('click', () => { - const row = document.createElement('div'); - row.className = 'd-flex gap-2 align-items-center attribute-row'; + const row = document.createElement('tr'); + row.className = 'attribute-row mb-3'; row.innerHTML = ` - - - + + + + + + + + + `; updateAttributesContainer.appendChild(row); }); @@ -559,12 +590,18 @@ document.addEventListener('DOMContentLoaded', () => { // Attributes if (asset.Description.Attributes) { for (const [attrName, attrValue] of Object.entries(asset.Description.Attributes)) { - const row = document.createElement('div'); - row.className = 'd-flex gap-2 align-items-center attribute-row'; + const row = document.createElement('tr'); + row.className = 'attribute-row mb-3'; row.innerHTML = ` - - - + + + + + + + + + `; updateAttributesContainer.appendChild(row); } @@ -876,12 +913,18 @@ document.addEventListener('DOMContentLoaded', () => { if (anyEquals) { anyEqualsElement.value = attributeValue; } else { - const row = document.createElement('div'); - row.className = 'd-flex gap-2 align-items-center attribute-row'; + const row = document.createElement('tr'); + row.className = 'attribute-row mb-3'; row.innerHTML = ` - - - + + + + + + + + + `; attributesContainer.appendChild(row); } From 8bc76ccf0bf7b1d7ca8e0d6f89e1cf63892d56b9 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Mon, 24 Nov 2025 19:40:44 +0100 Subject: [PATCH 23/40] Improved inventory view screen reader navigation --- src/Views/Home/Inventory.cshtml | 76 ++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml index b644043..b44cc1b 100644 --- a/src/Views/Home/Inventory.cshtml +++ b/src/Views/Home/Inventory.cshtml @@ -179,13 +179,29 @@

@T["Attributes"]

- ${Object.entries(asset.Description.Attributes) - .map(([k,v]) => ` -
- : - -
`) + + + + + + + + + + ${Object.entries(asset.Description.Attributes) + .map(([k,v]) => ` + + + + `) .join('')} + +
+ + : + + +
` : ''} ${asset.Description?.Purchase ? ` @@ -194,7 +210,7 @@

@T["Purchase Information"]

- +
@@ -385,10 +401,20 @@
-
+

@T["Attributes"]

+ + + + + + + + + + +
-
@@ -435,12 +461,18 @@ document.addEventListener('DOMContentLoaded', () => { let assetId = null; addAttrBtn.addEventListener('click', () => { - const row = document.createElement('div'); - row.className = 'd-flex gap-2 align-items-center attribute-row'; + const row = document.createElement('tr'); + row.className = 'attribute-row mb-3'; row.innerHTML = ` - - - + + + + + + + + + `; updateAttributesContainer.appendChild(row); }); @@ -486,12 +518,18 @@ document.addEventListener('DOMContentLoaded', () => { // Attributes if (asset.Description.Attributes) { for (const [attrName, attrValue] of Object.entries(asset.Description.Attributes)) { - const row = document.createElement('div'); - row.className = 'd-flex gap-2 align-items-center attribute-row'; + const row = document.createElement('tr'); + row.className = 'attribute-row mb-3'; row.innerHTML = ` - - - + + + + + + + + + `; updateAttributesContainer.appendChild(row); } From bd7d7d5fbb142f21b3d89c394f0def8b836b272f Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 09:21:54 +0100 Subject: [PATCH 24/40] Fixed html lang is static --- src/Views/Shared/_Layout.cshtml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Views/Shared/_Layout.cshtml b/src/Views/Shared/_Layout.cshtml index 554d24f..5b72f8b 100644 --- a/src/Views/Shared/_Layout.cshtml +++ b/src/Views/Shared/_Layout.cshtml @@ -1,11 +1,13 @@ @using Microsoft.AspNetCore.Mvc.Localization @using System.Security.Claims +@using System.Globalization + @inject IViewLocalizer T @{ bool IsAuthenticated = User.Identity?.IsAuthenticated ?? false; } - + From 917e708a7e39237a0d9199c78fcace98266d0106 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 10:07:23 +0100 Subject: [PATCH 25/40] Fixed long lists not skippable --- src/Resources/Views.Home.Assets.de.resx | 3 +++ src/Resources/Views.Home.Inventory.de.resx | 3 +++ src/Resources/Views.Settings.Admin.de.resx | 3 +++ src/Views/Home/Assets.cshtml | 2 ++ src/Views/Home/Inventory.cshtml | 1 + src/Views/Settings/Admin.cshtml | 6 ++++-- 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Resources/Views.Home.Assets.de.resx b/src/Resources/Views.Home.Assets.de.resx index 1becde1..477173d 100644 --- a/src/Resources/Views.Home.Assets.de.resx +++ b/src/Resources/Views.Home.Assets.de.resx @@ -184,4 +184,7 @@ Vorlage anwenden + + Zu Attribut Hinzufügen Button springen + diff --git a/src/Resources/Views.Home.Inventory.de.resx b/src/Resources/Views.Home.Inventory.de.resx index 859a0cd..2fdd077 100644 --- a/src/Resources/Views.Home.Inventory.de.resx +++ b/src/Resources/Views.Home.Inventory.de.resx @@ -150,4 +150,7 @@ Barcode wurde erfolgreich dem Auftragsstapel hinzugefügt + + Zu Attribut Hinzufügen Button springen + diff --git a/src/Resources/Views.Settings.Admin.de.resx b/src/Resources/Views.Settings.Admin.de.resx index 1e716dc..6113f56 100644 --- a/src/Resources/Views.Settings.Admin.de.resx +++ b/src/Resources/Views.Settings.Admin.de.resx @@ -113,4 +113,7 @@ Vorlagen. Klicken zum Auf- oder zuklappen + + Attribut-Tabelle überspringen + diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml index 27220b6..a2887af 100644 --- a/src/Views/Home/Assets.cshtml +++ b/src/Views/Home/Assets.cshtml @@ -228,6 +228,7 @@

@T["Attributes"]

+ @T["Jump to add attribute button"] @@ -478,6 +479,7 @@ document.addEventListener('DOMContentLoaded', () => {

@T["Attributes"]

+ @T["Jump to add attribute button"]
diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml index b44cc1b..8e4e13d 100644 --- a/src/Views/Home/Inventory.cshtml +++ b/src/Views/Home/Inventory.cshtml @@ -403,6 +403,7 @@

@T["Attributes"]

+ @T["Jump to add attribute button"]
diff --git a/src/Views/Settings/Admin.cshtml b/src/Views/Settings/Admin.cshtml index 8408036..598d875 100644 --- a/src/Views/Settings/Admin.cshtml +++ b/src/Views/Settings/Admin.cshtml @@ -96,6 +96,7 @@ + @T["Skip attributes table"]
@@ -128,7 +129,7 @@
- +
@@ -410,6 +411,7 @@ + @T["Skip attributes table"]
@@ -422,7 +424,7 @@
- +
From b31afb75894d542dfd0023586ef200bf679e3bf7 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 10:20:53 +0100 Subject: [PATCH 26/40] Added links to settings to comply with 2.4.5 of WCAG 2.2 --- src/Resources/Views.Home.Index.de.resx | 7 ++++++- src/Views/Home/Index.cshtml | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Resources/Views.Home.Index.de.resx b/src/Resources/Views.Home.Index.de.resx index 6933252..c975086 100644 --- a/src/Resources/Views.Home.Index.de.resx +++ b/src/Resources/Views.Home.Index.de.resx @@ -40,5 +40,10 @@ Navigiere von hier oder über die Navigationsleiste - + + Einstellungen + + + Administration + diff --git a/src/Views/Home/Index.cshtml b/src/Views/Home/Index.cshtml index 595cd30..2a23335 100644 --- a/src/Views/Home/Index.cshtml +++ b/src/Views/Home/Index.cshtml @@ -52,4 +52,13 @@ }
+
+
+ @T["User settings"] + @if (User.HasClaim(ClaimTypes.Role, "CanManageSettings")) + { + @T["Admin settings"] + } +
+
From 4463010fb9f181ad4d7e7629eaefe10ab5ecbf07 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 11:23:12 +0100 Subject: [PATCH 27/40] Fixed zoomed in state issues for WCAG 2.2 1.4.4 compliance --- src/Views/Home/Users.cshtml | 4 ++-- src/Views/Settings/Admin.cshtml | 8 ++++---- src/Views/Settings/User.cshtml | 24 ++++++++++++++++-------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index 87dd233..adb1458 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -666,11 +666,11 @@
-
+
-
+
diff --git a/src/Views/Settings/Admin.cshtml b/src/Views/Settings/Admin.cshtml index 598d875..965d540 100644 --- a/src/Views/Settings/Admin.cshtml +++ b/src/Views/Settings/Admin.cshtml @@ -128,10 +128,10 @@
-
+
-
+
@@ -423,10 +423,10 @@
-
+
-
+
diff --git a/src/Views/Settings/User.cshtml b/src/Views/Settings/User.cshtml index c72074b..15a5062 100644 --- a/src/Views/Settings/User.cshtml +++ b/src/Views/Settings/User.cshtml @@ -32,29 +32,37 @@

@T["Personal data"]

-
+
-
+
-
+
-
+
+ + +
+
+ + +
+
+ + +
+
- - -
-
From 4a63309d7d6a609eca171064c33acf81d21aa27b Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 11:37:34 +0100 Subject: [PATCH 28/40] Fixed preset deletion not working bug --- src/Views/Settings/Admin.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Views/Settings/Admin.cshtml b/src/Views/Settings/Admin.cshtml index 965d540..c52a9bb 100644 --- a/src/Views/Settings/Admin.cshtml +++ b/src/Views/Settings/Admin.cshtml @@ -389,7 +389,7 @@ function addDeletePresetEventListener(button) { button.addEventListener('click', e => { - const presetContainer = e.target.closest('.col-md-6'); + const presetContainer = e.target.parentElement.parentElement.closest('.col-md-6'); if (!presetContainer) return; presetContainer.remove(); }); From f262545332afecd3f3945f780040319d64c4bf2d Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 11:52:24 +0100 Subject: [PATCH 29/40] Fixed login WCAG 2.2 3.3.8 and 3.3.9 compliance --- src/Views/Home/Login.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Views/Home/Login.cshtml b/src/Views/Home/Login.cshtml index fc7d34f..760c2e6 100644 --- a/src/Views/Home/Login.cshtml +++ b/src/Views/Home/Login.cshtml @@ -18,12 +18,12 @@
- +
- +
From f8a4350fa0e1b6504efc61422c501400f50c4d1b Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 16:57:15 +0100 Subject: [PATCH 30/40] Fixed groups view checkmarks contrast issue --- src/wwwroot/css/site.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/wwwroot/css/site.css b/src/wwwroot/css/site.css index 3f3a52d..d6700f5 100644 --- a/src/wwwroot/css/site.css +++ b/src/wwwroot/css/site.css @@ -89,3 +89,8 @@ input[readonly] { opacity: 1; border-color: var(--bs-border-color) !important; } + +/* Groups view checkmarks */ +td.text-success span, td.text-danger span { + font-size: 2rem; +} From 9d3e78b713e9bb3e03df017ff132df60b3755765 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 17:06:40 +0100 Subject: [PATCH 31/40] Fixed html element id collisions --- src/Views/Home/Groups.cshtml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index 2fb7246..727ac8e 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -78,7 +78,7 @@
-

@T["GroupDeleteConfirmation1"] (ID: )@T["GroupDeleteConfirmation2"]

+

@T["GroupDeleteConfirmation1"] (ID: )@T["GroupDeleteConfirmation2"]

@@ -101,8 +101,8 @@ const groupId = currentButton.getAttribute('data-group-id'); const groupName = currentButton.getAttribute('data-group-name'); - deleteModal.querySelector('#groupId').textContent = groupId; - deleteModal.querySelector('#groupName').textContent = groupName; + deleteModal.querySelector('#deleteGroupId').textContent = groupId; + deleteModal.querySelector('#deleteGroupName').textContent = groupName; // Store the delete URL for later use deleteModal.querySelector('#deleteForm').dataset.url = `/Groups/Delete?uid=${groupId}`; @@ -114,7 +114,7 @@ e.preventDefault(); const url = deleteForm.dataset.url; - const groupId = deleteModal.querySelector('#groupId').textContent; + const groupId = deleteModal.querySelector('#deleteGroupId').textContent; try { const response = await fetch(url, { @@ -340,32 +340,32 @@
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
From 10314d209c3552673e73411925f7db060d1a0209 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 17:14:31 +0100 Subject: [PATCH 32/40] Fixed Asset ID input without label --- src/Views/Home/Inventory.cshtml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml index 8e4e13d..42c6ffa 100644 --- a/src/Views/Home/Inventory.cshtml +++ b/src/Views/Home/Inventory.cshtml @@ -17,6 +17,7 @@
+ From b319e50a1840a9de647732f45eb265da14115c4d Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Fri, 28 Nov 2025 17:34:14 +0100 Subject: [PATCH 33/40] Fixed asset id entering issue --- src/Views/Home/Inventory.cshtml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml index 42c6ffa..9df805d 100644 --- a/src/Views/Home/Inventory.cshtml +++ b/src/Views/Home/Inventory.cshtml @@ -73,9 +73,11 @@ + @* *@ diff --git a/src/Views/Shared/_Login.cshtml b/src/Views/Shared/_Login.cshtml new file mode 100644 index 0000000..30e55cb --- /dev/null +++ b/src/Views/Shared/_Login.cshtml @@ -0,0 +1,16 @@ +@using Microsoft.AspNetCore.Mvc.Localization +@inject IViewLocalizer T + + +
+ + +
+ +
+ + +
+ + + \ No newline at end of file From 61e370600f7b55e22d38f284cba464adea0bb876 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 29 Nov 2025 12:31:16 +0100 Subject: [PATCH 39/40] Added accessibility claim --- src/Controllers/HomeController.cs | 6 +++ .../Views.Home.Accessibility.de.resx | 41 ++++++++++++++++ .../Views.Home.Accessibility.en.resx | 47 +++++++++++++++++++ src/Resources/Views.Shared._Layout.de.resx | 3 ++ src/Views/Home/Accessibility.cshtml | 22 +++++++++ src/Views/Shared/_Layout.cshtml | 3 +- 6 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 src/Resources/Views.Home.Accessibility.de.resx create mode 100644 src/Resources/Views.Home.Accessibility.en.resx create mode 100644 src/Views/Home/Accessibility.cshtml diff --git a/src/Controllers/HomeController.cs b/src/Controllers/HomeController.cs index 1ee3513..32d565c 100644 --- a/src/Controllers/HomeController.cs +++ b/src/Controllers/HomeController.cs @@ -194,6 +194,12 @@ public class HomeController : Controller return RedirectToAction("Index", "Home"); } + [HttpGet("Accessibility")] + public ActionResult Accessibility() + { + return View(); + } + [HttpGet("AccessDenied")] public ActionResult AccessDenied() { diff --git a/src/Resources/Views.Home.Accessibility.de.resx b/src/Resources/Views.Home.Accessibility.de.resx new file mode 100644 index 0000000..28c97e6 --- /dev/null +++ b/src/Resources/Views.Home.Accessibility.de.resx @@ -0,0 +1,41 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, ... + + + System.Resources.ResXResourceWriter, System.Windows.Forms, ... + + + + Barrierefreiheit + + + + Am {0} entspricht sämtlicher Inhalt im Projekt LD-Reborn/HAM den Web Content Accessibility Guidelines 2.2 unter {1}. Konformitätsstufe Triple-A. + + + Die Technologie, auf die sich dieser Inhalt "stützt", ist: + + + Die Technologien, die dieser Inhalt verwendet, jedoch nicht voraussetzt, sind: + + + Dieser Inhalt wurde mit den folgenden User Agents und Assistenztechnologien getestet: + + + Diese Seite enthält sowohl Text + als auch Bilder. + Alternativtexte sind für alle Bilder enthalten, und ausführliche Beschreibungen werden für Bilder bereitgestellt, die mehr als einfachen Alternativtext erfordern. Sämtliche Inhalte sind in Textform verfügbar und können von Assistenztechnologien ausgelesen werden. + + + {0} mit {1} und {2} + + diff --git a/src/Resources/Views.Home.Accessibility.en.resx b/src/Resources/Views.Home.Accessibility.en.resx new file mode 100644 index 0000000..1372b67 --- /dev/null +++ b/src/Resources/Views.Home.Accessibility.en.resx @@ -0,0 +1,47 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, ... + + + System.Resources.ResXResourceWriter, System.Windows.Forms, ... + + + + Accessibility + + + + On {0}, all content available in the project LD-Reborn/HAM conforms to Web Content Accessibility Guidelines 2.2 at {1}. Triple-A conformance. + + + The technology that this content "relies upon" is: + + + The technologies that this content "uses but does not rely + upon" are: + + + This content was tested using the following user agents and assistive + technologies: + + + This page includes both text + and images. + Alternative + text is included for all image content and long + descriptions are also provided for images that require more + than simple alternate text. All content is available in text, which + can be accessed by assistive technology. + + + {0} on {1} with {2} + + diff --git a/src/Resources/Views.Shared._Layout.de.resx b/src/Resources/Views.Shared._Layout.de.resx index b34100c..2d81a04 100644 --- a/src/Resources/Views.Shared._Layout.de.resx +++ b/src/Resources/Views.Shared._Layout.de.resx @@ -37,6 +37,9 @@ Anmelden + + Barrierefreiheit + Ort auswählen diff --git a/src/Views/Home/Accessibility.cshtml b/src/Views/Home/Accessibility.cshtml new file mode 100644 index 0000000..450b45e --- /dev/null +++ b/src/Views/Home/Accessibility.cshtml @@ -0,0 +1,22 @@ +@using Microsoft.AspNetCore.Html +@using Microsoft.AspNetCore.Mvc.Localization +@inject IViewLocalizer T +@{ + ViewData["Title"] = T["Accessibility"]; +} + +
+

@T["PageIntro", + "28 November 2025", + new HtmlString("https://www.w3.org/TR/2024/REC-WCAG22-20241212/") + ]) +

+
    +
  • @T["ReliesUpon"] + HTML 5.
    • +
  • @T["UsesButNotReliesUpon"] CSS2.1, gif.
    • +
  • @T["TestedWith"] @T["OnWith", "Firefox 145.0.2", "Kubuntu", "Orca"] +
    • +
+

@T["Features"]

+
\ No newline at end of file diff --git a/src/Views/Shared/_Layout.cshtml b/src/Views/Shared/_Layout.cshtml index 713d818..7369604 100644 --- a/src/Views/Shared/_Layout.cshtml +++ b/src/Views/Shared/_Layout.cshtml @@ -136,7 +136,8 @@ From 8a8964a08c339a4b54bde2c26bd571309fcc72e4 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Sat, 29 Nov 2025 13:13:26 +0100 Subject: [PATCH 40/40] Removed tabindices for non-interactive elements --- src/Views/Home/Groups.cshtml | 4 ++-- src/Views/Home/Locations.cshtml | 4 ++-- src/Views/Home/Users.cshtml | 4 ++-- src/Views/Settings/Admin.cshtml | 2 +- src/Views/Shared/_Batch.cshtml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Views/Home/Groups.cshtml b/src/Views/Home/Groups.cshtml index 2ac3fbc..34cda84 100644 --- a/src/Views/Home/Groups.cshtml +++ b/src/Views/Home/Groups.cshtml @@ -38,7 +38,7 @@ foreach (GroupsTableViewModel groupTableViewModel in Model.GroupsTableViewModels) { - @groupTableViewModel.Group + @groupTableViewModel.Group @(groupTableViewModel.CanInventorize ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) @(groupTableViewModel.CanManageUsers ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) @(groupTableViewModel.CanManageLocations ? Html.Raw($"✓{@T["Yes"].Value}") : Html.Raw($"✗{@T["No"].Value}")) @@ -268,7 +268,7 @@ const tableBody = document.querySelector('tbody'); const newRow = document.createElement('tr'); newRow.innerHTML = ` - ${jsonData.DisplayName} + ${jsonData.DisplayName} ${jsonData.Permissions.includes("CanInventorize") ? contentYes : contentNo} ${jsonData.Permissions.includes("CanManageUsers") ? contentYes : contentNo} ${jsonData.Permissions.includes("CanManageLocations") ? contentYes : contentNo} diff --git a/src/Views/Home/Locations.cshtml b/src/Views/Home/Locations.cshtml index 8aeba0d..258a571 100644 --- a/src/Views/Home/Locations.cshtml +++ b/src/Views/Home/Locations.cshtml @@ -40,7 +40,7 @@ foreach (LocationTableViewModel locationTableViewModel in Model.LocationTableViewModels) { - @locationTableViewModel.LocationID + @locationTableViewModel.LocationID @locationTableViewModel.LocationName @locationTableViewModel.RoomNumber @locationTableViewModel.Seat @@ -344,7 +344,7 @@ const tbody = document.querySelector('table tbody'); const newRow = document.createElement('tr'); newRow.innerHTML = ` - ${slugifiedLocationID} + ${slugifiedLocationID} ${newLoc.Location} ${newLoc.RoomNumber} ${newLoc.Seat} diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index adb1458..238842f 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -43,7 +43,7 @@ Photo - @userTableViewModel.Uid + @userTableViewModel.Uid @userTableViewModel.Title @userTableViewModel.Name @userTableViewModel.Surname @@ -562,7 +562,7 @@ const newRow = document.createElement('tr'); newRow.innerHTML = ` Photo - ${result.Uid || ''} + ${result.Uid || ''} ${data.Title || ''} ${data.Cn || ''} ${data.Sn || ''} diff --git a/src/Views/Settings/Admin.cshtml b/src/Views/Settings/Admin.cshtml index c52a9bb..3847318 100644 --- a/src/Views/Settings/Admin.cshtml +++ b/src/Views/Settings/Admin.cshtml @@ -68,7 +68,7 @@
-

@T["Current user image cache utilization:"] @userImageCacheSize

+

@T["Current user image cache utilization:"] @userImageCacheSize

diff --git a/src/Views/Shared/_Batch.cshtml b/src/Views/Shared/_Batch.cshtml index c6adfc6..c7e14af 100644 --- a/src/Views/Shared/_Batch.cshtml +++ b/src/Views/Shared/_Batch.cshtml @@ -68,7 +68,7 @@ assetCard.innerHTML = `
-

Asset ${i + 1}: ${asset.Name}

+

Asset ${i + 1}: ${asset.Name}
@@ -91,7 +91,7 @@ assetCard.innerHTML = `
-

Asset ${i + 1}: @T["Empty"]

+

Asset ${i + 1}: @T["Empty"]