HAM/Berufsschule_HAM
1
0
Fork 1
mirror of https://github.com/LD-Reborn/Berufsschule_HAM.git synced 2025-12-20 06:51:55 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

Merge pull request #177 from LD-Reborn/176-feature-add-user-selection-drop-down-for-assets-owner-field

Browse Source 
176 feature add user selection drop down for assets owner field
This commit is contained in:
LD50
2025-10-26 11:45:14 +01:00
committed by GitHub
parent 17cc9243b5 dc5e117c93
commit d600c2642c
5 changed files with 164 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Resources/Views.Home.Assets.de.resx
View File

@@ -157,4 +157,13 @@
<data name="Add Barcode to print batch" xml:space="preserve">
<value>Barcode zum Druckauftragsstapel hinzufügen</value>
</data>
<data name="Select location" xml:space="preserve">
<value>Ort auswählen</value>
</data>
<data name="Select owner" xml:space="preserve">
<value>Besitzer auswählen</value>
</data>
<data name="Select user" xml:space="preserve">
<value>Benutzer auswählen</value>
</data>
</root>

79
src/Views/Home/Assets.cshtml
View File

@@ -5,6 +5,8 @@
@{
ViewData["Title"] = T["Assets"];
}
<link href="https://cdn.jsdelivr.net/npm/tom-select/dist/css/tom-select.bootstrap5.min.css" rel="preload" as="style" onload="this.onload=null;this.rel='stylesheet'"/>
<script src="https://cdn.jsdelivr.net/npm/tom-select/dist/js/tom-select.complete.min.js" defer></script>
<partial name="_BatchButton"/>
@@ -177,9 +179,10 @@
</div>
<div class="col-md-6">
<label class="form-label">@T["Owner"]</label>
<input type="text" class="form-control" name="Owner" />
<select class="form-select" name="Owner" id="createUsersSelect">
<option value="">@T["Select owner"]</option>
</select>
</div>
<div class="col-md-6">
<label class="form-label">@T["Serial Number"]</label>
<input type="text" class="form-control" name="SerialNumber" />
@@ -388,9 +391,10 @@
</div>
<div class="col-md-6">
<label class="form-label">@T["Owner"]</label>
<input type="text" class="form-control" name="Owner" />
<select class="form-select" name="Owner" id="updateUsersSelect">
<option value="">@T["Select owner"]</option>
</select>
</div>
<div class="col-md-6">
<label class="form-label">@T["Serial Number"]</label>
<input type="text" class="form-control" name="SerialNumber" />
@@ -485,13 +489,16 @@ document.addEventListener('DOMContentLoaded', () => {
updateAttributesContainer.innerHTML = '';
updateForm.reset();
const locationSelect = updateForm.querySelector('#updateLocationSelect');
await loadLocationsIntoSelect(locationSelect);
try {
const response = await fetch(`/Assets/Get?cn=${assetId}`);
const responseJson = await response.json();
const asset = responseJson.assetsModel;
const locationSelect = updateForm.querySelector('#updateLocationSelect');
await loadLocationsIntoSelect(locationSelect, asset.Location);
const usersSelect = updateForm.querySelector('#updateUsersSelect');
await loadUsersIntoSelect(usersSelect, asset.Owner);
for (const [key, value] of Object.entries(asset)) {
const input = updateForm.querySelector(`[name="${key}"]`);
if (input) input.value = value;
@@ -762,11 +769,67 @@ document.addEventListener('DOMContentLoaded', () => {
document.addEventListener('DOMContentLoaded', () => {
const createModal = document.getElementById('createAssetModal');
createModal.addEventListener('show.bs.modal', async () => {
const select = createModal.querySelector('#createLocationSelect');
await loadLocationsIntoSelect(select);
const selectLocations = createModal.querySelector('#createLocationSelect');
await loadLocationsIntoSelect(selectLocations);
const selectUsers = createModal.querySelector('#createUsersSelect');
await loadUsersIntoSelect(selectUsers);
});
});
</script>
<!-- TomSelect dropdowns -->
<script>
// Locations dropdowns
document.addEventListener('DOMContentLoaded', () => {
const createLocationSelect = document.getElementById('createLocationSelect');
const updateLocationSelect = document.getElementById('updateLocationSelect');
async function initLocationSelect(selectElement) {
if (!selectElement) return;
await loadLocationsIntoSelect(selectElement);
new TomSelect(selectElement, {
plugins: ['clear_button'],
create: false,
sortField: { field: 'text', direction: 'asc' },
placeholder: '@T["Select location"]',
maxOptions: 500, // avoid performance hit if there are many
render: {
no_results: function(data, escape) {
return `<div class="no-results">@T["No locations found"]</div>`;
}
}
});
}
initLocationSelect(createLocationSelect);
initLocationSelect(updateLocationSelect);
// Users dropdowns
const createUsersSelect = document.getElementById('createUsersSelect');
const updateUsersSelect = document.getElementById('updateUsersSelect');
async function initUsersSelect(selectElement) {
if (!selectElement) return;
await loadUsersIntoSelect(selectElement);
new TomSelect(selectElement, {
plugins: ['clear_button'],
create: false,
sortField: { field: 'text', direction: 'asc' },
placeholder: '@T["Select user"]',
maxOptions: 500, // avoid performance hit if there are many
render: {
no_results: function(data, escape) {
return `<div class="no-results">@T["No users found"]</div>`;
}
}
});
}
initUsersSelect(createUsersSelect);
initUsersSelect(updateUsersSelect);
});
</script>
<partial name="_Batch"/>

4
src/Views/Shared/_Layout.cshtml
View File

@@ -20,7 +20,9 @@
<script>
window.appTranslations = {
selectLocation: '@T["Select location"]',
errorLoading: '@T["Error loading locations"]'
errorLoadingLocations: '@T["Error loading locations"]',
selectUser: '@T["Select user"]',
errorLoadingUsers: '@T["Error loading users"]'
};
</script>
</head>

23
src/wwwroot/css/site.css
View File

@@ -41,3 +41,26 @@ body {
height: 2rem;
float: right;
}
/* Tomselect dark mode theme */
[data-bs-theme="dark"] .ts-control,
[data-bs-theme="dark"] .ts-dropdown {
color: #f8f9fa !important;
border-color: #444 !important;
}
[data-bs-theme="dark"] .ts-control input,
[data-bs-theme="dark"] .ts-dropdown .option,
[data-bs-theme="dark"] .ts-dropdown .item {
color: #f8f9fa !important;
}
[data-bs-theme="dark"] .ts-dropdown .option:hover,
[data-bs-theme="dark"] .ts-dropdown .active {
color: #ffffff !important;
}
[data-bs-theme="dark"] .ts-control .item {
color: #f8f9fa !important;
border-color: #666 !important;
}

69
src/wwwroot/js/site.js
View File

@@ -123,20 +123,65 @@ async function loadLocationsIntoSelect(selectElement, selectedValue = null) {
const response = await fetch('/Locations/Index');
const locations = await response.json();
selectElement.innerHTML = `<option value="">${appTranslations.selectLocation}</option>`;
const ts = selectElement.tomselect;
if (!ts) {
selectElement.innerHTML = `<option value="">${appTranslations.selectLocation}</option>`;
locations.forEach(loc => {
const option = document.createElement('option');
option.value = loc.location;
option.textContent = loc.location;
if (selectedValue && selectedValue === loc.location) {
option.selected = true;
}
selectElement.appendChild(option);
});
return;
}
ts.clearOptions();
ts.addOption(locations.map(loc => ({
value: loc.location,
text: loc.location
})));
ts.refreshOptions(false);
if (selectedValue) {
ts.setValue(selectedValue);
} else {
ts.clear(true);
}
locations.forEach(loc => {
const text = `${loc.description.Location}, Room ${loc.description.RoomNumber}, Seat ${loc.description.Seat}`;
const option = document.createElement('option');
option.value = loc.location;
option.textContent = text;
if (selectedValue && selectedValue === loc.location) {
option.selected = true;
}
selectElement.appendChild(option);
});
} catch (err) {
console.error('Error loading locations:', err);
showToast(appTranslations.errorLoading, 'danger');
showToast(appTranslations.errorLoadingLocations, 'danger');
}
}
async function loadUsersIntoSelect(selectElement, selectedValue = null) {
try {
const response = await fetch('/Users/Index?Cn=false&Sn=false&Title=false&Description=false&JpegPhoto=false&UserPassword=false');
const users = await response.json();
const ts = selectElement.tomselect;
if (!ts) {
selectElement.innerHTML = `<option value="">${appTranslations.selectUser}</option>`;
users.forEach(u => {
const opt = document.createElement('option');
opt.value = u.uid;
opt.textContent = u.uid;
selectElement.appendChild(opt);
});
return;
}
ts.clearOptions();
ts.addOption(users.map(u => ({ value: u.uid, text: u.uid })));
ts.refreshOptions(false);
if (selectedValue) ts.setValue(selectedValue);
} catch (err) {
console.error('Error loading users:', err);
showToast(appTranslations.errorLoadingUsers, 'danger');
}
}