diff --git a/src/Controllers/AssetsController.cs b/src/Controllers/AssetsController.cs index b6095e7..d99b577 100644 --- a/src/Controllers/AssetsController.cs +++ b/src/Controllers/AssetsController.cs @@ -102,10 +102,9 @@ public class AssetsController : Controller { attributeSet.Add(new LdapAttribute("name", assetModel.Name)); } - if (assetModel.Description != null) - { - attributeSet.Add(new LdapAttribute("description", JsonSerializer.Serialize(assetModel.Description))); - } + assetModel.Description ??= new(); + assetModel.Description.Inventory = GenerateInventory(); + attributeSet.Add(new LdapAttribute("description", JsonSerializer.Serialize(assetModel.Description))); await _ldap.CreateAsset(attributeSet); result = new AssetsCreateResponseModel(successful: true, assetId); @@ -145,7 +144,7 @@ public class AssetsController : Controller } [HttpPatch("Update")] - public async Task Update([FromBody]AssetsModifyRequestModel requestModel) + public async Task Update([FromBody] AssetsModifyRequestModel requestModel) { AssetsUpdateResponseModel result; if (requestModel is null) @@ -192,8 +191,7 @@ public class AssetsController : Controller } if (requestModel.UpdateInventory) { - string? userName = User.Identity?.Name ?? "Unknown"; - asset.Description.Inventory = new() { Date = DateTime.Now.ToString("yyyy-MM-dd"), PersonUid = userName }; + asset.Description.Inventory = GenerateInventory(); await _ldap.UpdateAsset(cn, "description", JsonSerializer.Serialize(asset.Description)); } @@ -203,7 +201,13 @@ public class AssetsController : Controller { result = new AssetsUpdateResponseModel(successful: false, exception: e.Message); } - + return result; } + + private AssetInventory GenerateInventory() + { + string? userName = User.Identity?.Name ?? "Unknown"; + return new() { Date = DateTime.UtcNow.ToString("o"), PersonUid = userName }; + } } \ No newline at end of file diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml index ca1195d..f96db97 100644 --- a/src/Views/Home/Inventory.cshtml +++ b/src/Views/Home/Inventory.cshtml @@ -6,17 +6,606 @@ ViewData["Title"] = T["Inventory"]; } -

@T["Inventory"]

- -
- - - +
+
+ + +
+
+ + +
- - -
+ + + + + + + +@section Scripts { + + + + +} + + + + + \ No newline at end of file