diff --git a/src/Controllers/AssetsController.cs b/src/Controllers/AssetsController.cs index 1b803e5..f65f9ea 100644 --- a/src/Controllers/AssetsController.cs +++ b/src/Controllers/AssetsController.cs @@ -66,6 +66,7 @@ public class AssetsController : Controller [HttpPost("Create")] public async Task Create([FromBody]AssetsCreateRequestModel assetModel) { + string? assetId; AssetsCreateResponseModel result; if (assetModel is null) { @@ -82,8 +83,8 @@ public class AssetsController : Controller [ new LdapAttribute("objectClass", ["top", "device", "extensibleObject"]), ]; - - attributeSet.Add(new LdapAttribute("cn", await _ldap.GetAssetCounterAndIncrementAsync())); + assetId = await _ldap.GetAssetCounterAndIncrementAsync(); + attributeSet.Add(new LdapAttribute("cn", assetId)); if (assetModel.SerialNumber != null) { attributeSet.Add(new LdapAttribute("serialNumber", assetModel.SerialNumber)); @@ -107,7 +108,7 @@ public class AssetsController : Controller } await _ldap.CreateAsset(attributeSet); - result = new AssetsCreateResponseModel(successful: true); + result = new AssetsCreateResponseModel(successful: true, assetId); } catch (Exception e) { diff --git a/src/Models/AssetsResponseModel.cs b/src/Models/AssetsResponseModel.cs index d2577f2..8257285 100644 --- a/src/Models/AssetsResponseModel.cs +++ b/src/Models/AssetsResponseModel.cs @@ -1,8 +1,9 @@ using Berufsschule_HAM.Models; -public class AssetsCreateResponseModel(bool successful, string exception = "None") +public class AssetsCreateResponseModel(bool successful, string? assetId = null, string exception = "None") { public bool Success { get; set; } = successful; + public string? AssetId { get; set; } = assetId; public string? Exception { get; set; } = exception; } diff --git a/src/Resources/Views.Home.Assets.de.resx b/src/Resources/Views.Home.Assets.de.resx index 516c898..8cdb457 100644 --- a/src/Resources/Views.Home.Assets.de.resx +++ b/src/Resources/Views.Home.Assets.de.resx @@ -13,8 +13,26 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, ... + + Assets + - Asset anlegen + Asset erstellen + + + Besitzer + + + Asset ID + + + Asset Name + + + Ort + + + Aktion Anpassen @@ -22,4 +40,103 @@ Löschen + + Asset erstellen + + + Name + + + Seriennummer + + + Beschreibung + + + Art + + + Marke + + + Modell + + + Attribute + + + Attribut hinzufügen + + + Kaufinformationen + + + Kaufwert + + + Gekauft bei + + + Gekauft von + + + Abbrechen + + + Erstellen + + + Asset anpassen + + + Kaufdatum + + + Änderungen anwenden + + + Attribut Name + + + Attribut Wert + + + Entfernen + + + Asset löschen + + + Sind Sie sicher, dass Sie das Asset + + + löschen wollen? + + + Ja, löschen + + + Asset wurde erfolgreich gelöscht + + + Server konnte nicht erreicht werden + + + Unbekannter Fehler + + + Asset wurde erfolgreich erstellt + + + Fehler beim Erstellen des Asset + + + Fehler beim Laden der Asset Daten + + + Asset wurde erfolgreich angepasst + + + Fehler beim Anpassen des Assets + diff --git a/src/Resources/Views.Home.Assets.en.resx b/src/Resources/Views.Home.Assets.en.resx new file mode 100644 index 0000000..a9a1e58 --- /dev/null +++ b/src/Resources/Views.Home.Assets.en.resx @@ -0,0 +1,21 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, ... + + + System.Resources.ResXResourceWriter, System.Windows.Forms, ... + + + Are you sure you want to delete the asset + + + ? + + diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml index debcf0e..ec34ca8 100644 --- a/src/Views/Home/Assets.cshtml +++ b/src/Views/Home/Assets.cshtml @@ -67,16 +67,16 @@
- +
-

Are you sure you want to delete the asset (ID: )?

+

@T["AssetDeleteConfirmation1"] (ID: )@T["AssetDeleteConfirmation2"]

- +
- +
@@ -157,13 +157,13 @@ row.classList.add('table-danger'); setTimeout(() => row.remove(), 300); - showToast('Asset deleted successfully', 'success'); + showToast('@T["Asset deleted successfully"]', 'success'); } else { - showToast(`${result.reason}: ${result.exception || 'Unknown error'}`, 'danger'); + showToast(`${result.reason}: ${result.exception || '@T["Unknown error"]'}`, 'danger'); } } catch (error) { console.error(error); - showToast('Error contacting server', 'danger'); + showToast('@T["Error contacting server"]', 'danger'); } }); }); @@ -274,9 +274,9 @@ const row = document.createElement('div'); row.className = 'd-flex gap-2 align-items-center attribute-row'; row.innerHTML = ` - - - + + + `; attributesContainer.appendChild(row); }); @@ -333,14 +333,47 @@ bootstrap.Modal.getInstance(createModalEl).hide(); createForm.reset(); attributesContainer.innerHTML = ''; - showToast('Asset created successfully', 'success'); + const tableBody = document.querySelector('table tbody'); + if (tableBody) { + const newRow = document.createElement('tr'); + newRow.innerHTML = ` + ${jsonData.Owner || ''} + ${result.assetId || ''} + ${jsonData.Name || ''} + ${jsonData.Location || ''} + +
+ + +
+ + `; + + newRow.classList.add('table-success'); + setTimeout(() => { + newRow.classList.toggle('table-success'); + }, 500); + tableBody.append(newRow); + } + showToast('@T["Asset created successfully"]', 'success'); } else { - showToast(`${result.reason || 'Error creating asset'}`, 'danger'); + showToast(`${result.reason || '@T["Error creating asset"]'}`, 'danger'); } }) .catch(err => { console.error(err); - showToast('Error contacting server', 'danger'); + showToast('@T["Error contacting server"]', 'danger'); }); }); }); @@ -448,9 +481,9 @@ document.addEventListener('DOMContentLoaded', () => { const row = document.createElement('div'); row.className = 'd-flex gap-2 align-items-center attribute-row'; row.innerHTML = ` - - - + + + `; updateAttributesContainer.appendChild(row); }); @@ -493,7 +526,7 @@ document.addEventListener('DOMContentLoaded', () => { row.innerHTML = ` - + `; updateAttributesContainer.appendChild(row); } @@ -509,7 +542,7 @@ document.addEventListener('DOMContentLoaded', () => { } } catch (err) { console.error(err); - showToast('Error loading asset data', 'danger'); + showToast('@T["Error loading asset data"]', 'danger'); } }); @@ -551,7 +584,7 @@ document.addEventListener('DOMContentLoaded', () => { if (result.success) { bootstrap.Modal.getInstance(updateModal).hide(); - showToast('Asset updated successfully', 'success'); + showToast('@T["Asset updated successfully"]', 'success'); // Optionally refresh the row const row = [...document.querySelectorAll('tr')] @@ -563,11 +596,11 @@ document.addEventListener('DOMContentLoaded', () => { row.children[3].textContent = jsonData.Location || ''; } } else { - showToast(result.reason || 'Error updating asset', 'danger'); + showToast(result.reason || '@T["Error updating asset"]', 'danger'); } } catch (err) { console.error(err); - showToast('Error contacting server', 'danger'); + showToast('@T["Error contacting server"]', 'danger'); } }); });