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

Fixed users and locations not filling in in Assets modals

Browse Source
This commit is contained in:
LD-Reborn
2025-10-26 11:45:01 +01:00
parent 2c0ae9f5e9
commit dc5e117c93
2 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -489,13 +489,16 @@ document.addEventListener('DOMContentLoaded', () => {
updateAttributesContainer.innerHTML = ''; updateAttributesContainer.innerHTML = '';
updateForm.reset(); updateForm.reset();
const locationSelect = updateForm.querySelector('#updateLocationSelect');
await loadLocationsIntoSelect(locationSelect);
try { try {
const response = await fetch(`/Assets/Get?cn=${assetId}`); const response = await fetch(`/Assets/Get?cn=${assetId}`);
const responseJson = await response.json(); const responseJson = await response.json();
const asset = responseJson.assetsModel; 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)) { for (const [key, value] of Object.entries(asset)) {
const input = updateForm.querySelector(`[name="${key}"]`); const input = updateForm.querySelector(`[name="${key}"]`);
if (input) input.value = value; if (input) input.value = value;

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

@@ -123,18 +123,35 @@ async function loadLocationsIntoSelect(selectElement, selectedValue = null) {
const response = await fetch('/Locations/Index'); const response = await fetch('/Locations/Index');
const locations = await response.json(); 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.location}`;
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) { } catch (err) {
console.error('Error loading locations:', err); console.error('Error loading locations:', err);
showToast(appTranslations.errorLoadingLocations, 'danger'); showToast(appTranslations.errorLoadingLocations, 'danger');
@@ -146,20 +163,25 @@ async function loadUsersIntoSelect(selectElement, selectedValue = null) {
const response = await fetch('/Users/Index?Cn=false&Sn=false&Title=false&Description=false&JpegPhoto=false&UserPassword=false'); const response = await fetch('/Users/Index?Cn=false&Sn=false&Title=false&Description=false&JpegPhoto=false&UserPassword=false');
const users = await response.json(); const users = await response.json();
selectElement.innerHTML = `<option value="">${appTranslations.selectUser}</option>`; 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;
}
users.forEach(usr => { ts.clearOptions();
const text = usr.uid; ts.addOption(users.map(u => ({ value: u.uid, text: u.uid })));
const option = document.createElement('option'); ts.refreshOptions(false);
option.value = usr.uid;
option.textContent = text; if (selectedValue) ts.setValue(selectedValue);
if (selectedValue && selectedValue === usr.uid) {
option.selected = true;
}
selectElement.appendChild(option);
});
} catch (err) { } catch (err) {
console.error('Error loading users:', err); console.error('Error loading users:', err);
showToast(appTranslations.errorLoadingUsers, 'danger'); showToast(appTranslations.errorLoadingUsers, 'danger');
} }
} }