From f249a4552c27c194b5bc96bcde0b9e7cc24755ea Mon Sep 17 00:00:00 2001 From: Spacelord Date: Tue, 6 Jun 2023 23:49:16 +0200 Subject: [PATCH] Frontend update --- src/frontend/dashboard.eta.html | 4 +- src/frontend/items.eta.html | 24 ++++--- src/frontend/partials/controls.eta.html | 11 ++- src/frontend/partials/controlsFoot.eta.html | 6 +- src/frontend/partials/deleteModal.eta.html | 2 +- static/css/dashboard.css | 3 +- static/js/editItems.js | 77 +++++++++++++++++++++ static/js/formHandler.js | 3 +- static/js/searchBox.js | 4 +- 9 files changed, 119 insertions(+), 15 deletions(-) create mode 100644 static/js/editItems.js diff --git a/src/frontend/dashboard.eta.html b/src/frontend/dashboard.eta.html index 71074cb..ee5aa54 100644 --- a/src/frontend/dashboard.eta.html +++ b/src/frontend/dashboard.eta.html @@ -38,7 +38,9 @@ <% it.recents.forEach(function(user){ %> - <%= user.SKU %> + <% if (user.SKU == null) { %> + No SKU assigned + <% } else { %> <%= user.SKU %> <% } %> <%= user.name %> <% if(user.status == "normal") { %> diff --git a/src/frontend/items.eta.html b/src/frontend/items.eta.html index 7990d54..b7562d0 100644 --- a/src/frontend/items.eta.html +++ b/src/frontend/items.eta.html @@ -1,4 +1,4 @@ -<%~ E.includeFile("partials/head.eta.html", {"title": "Items"}) %> <%~ E.includeFile("partials/controls.eta.html", {"active": "Items"}) %> +<%~ E.includeFile("partials/head.eta.html", {"title": "Items"}) %> <%~ E.includeFile("partials/controls.eta.html", {"active": "Items"}) %> <%~ E.includeFile("./partials/deleteModal.eta.html") %> - + <%~ E.includeFile("partials/controlsFoot.eta.html") %> <%~ E.includeFile("partials/foot.eta.html") %> diff --git a/src/frontend/partials/controls.eta.html b/src/frontend/partials/controls.eta.html index 4e78b04..49004b7 100644 --- a/src/frontend/partials/controls.eta.html +++ b/src/frontend/partials/controls.eta.html @@ -14,7 +14,7 @@ @@ -28,6 +28,15 @@ +
+ +
+
- \ No newline at end of file + + \ No newline at end of file diff --git a/src/frontend/partials/deleteModal.eta.html b/src/frontend/partials/deleteModal.eta.html index d4ad5a5..22ed8bb 100644 --- a/src/frontend/partials/deleteModal.eta.html +++ b/src/frontend/partials/deleteModal.eta.html @@ -3,7 +3,7 @@
-

Do you really want to delete Placeholder?

+

Do you really want to delete ?

This will permanently delete the category and all its associated data.
Items will be kept but will be unassigned from this category.
diff --git a/static/css/dashboard.css b/static/css/dashboard.css index de0a3ab..5e4efa4 100644 --- a/static/css/dashboard.css +++ b/static/css/dashboard.css @@ -91,6 +91,7 @@ body { box-shadow: 0 0 0 3px rgba(255, 255, 255, 0.25); } +/* .autocomplete-items { position: absolute; z-index: 99; @@ -98,7 +99,7 @@ body { left: 0; right: 0; } - +*/ .rotate { transform: rotate(-90deg) !important; transition: 0.5s; diff --git a/static/js/editItems.js b/static/js/editItems.js new file mode 100644 index 0000000..046484e --- /dev/null +++ b/static/js/editItems.js @@ -0,0 +1,77 @@ + +function primeCreateNew() { + // Clear the form + $('.form-control').val(''); + const form = document.getElementById('ItemModalForm'); + document.getElementById('itemModifyModalLabel').innerText= "Create a new item"; + form.setAttribute('method', 'POST'); + return true; +} + +function primeEdit() { + const form = document.getElementById('ItemModalForm'); + document.getElementById('itemModifyModalLabel').innerText = 'Edit an item'; + form.setAttribute('method', 'PATCH'); + return true; +} + +function getDataForEdit(id) { + $.ajax({ + type: 'get', + url: `/api/v1/items?id=${id}`, + success: function (data) { + const result = JSON.parse(data); + + // Get elements inside the editCategoryModal + const modal_itemName = document.getElementById('itemModifyModalName'); + const modal_itemComment = document.getElementById('itemModifyModalComment'); + const modal_itemAmount = document.getElementById('itemModifyModalAmount'); + const modal_itemSKU = document.getElementById('itemModifyModalSKU'); + const modal_itemStorageLocation = document.getElementById('itemModifyModalStorageLocation'); + const modal_itemManufacturer = document.getElementById('itemModifyModalManuf'); + const modal_itemCategory = document.getElementById('itemModifyModalCategory'); + const modal_itemStatus = document.getElementById('itemModifyModalStatus'); + const modal_itemid = document.getElementById('itemModifyModalId'); + + modal_itemName.value = result.name; + modal_itemComment.value = result.comment; + modal_itemAmount.value = result.amount; + modal_itemSKU.value = result.SKU; + modal_itemManufacturer.value = result.manufacturer; + + // Select the correct option in the dropdown + const modal_itemCategoryOptions = modal_itemCategory.options; + for (let i = 0; i < modal_itemCategoryOptions.length; i++) { + if (modal_itemCategoryOptions[i].value == result.category.id) { + modal_itemCategoryOptions[i].selected = true; + } + } + + // Select the correct option in the dropdown + const modal_itemStatusOptions = modal_itemStatus.options; + for (let i = 0; i < modal_itemStatusOptions.length; i++) { + if (modal_itemStatusOptions[i].value == result.status.id) { + modal_itemStatusOptions[i].selected = true; + } + } + + // Select the correct option in the dropdown + const modal_itemStorageLocationOptions = modal_itemStorageLocation.options; + for (let i = 0; i < modal_itemStorageLocationOptions.length; i++) { + if (modal_itemStorageLocationOptions[i].value == result.storageLocation.id) { + modal_itemStorageLocationOptions[i].selected = true; + } + } + + modal_itemid.value = result.id; + }, + error: function (data) { + console.log('!!!! ERROR !!!!', data); + // Hide overlay with spinner + $('.loader-overlay').removeClass('active'); + // Close the modal + $('.modal').modal('hide'); + createNewToast(' Something went wrong. The category does no longer exist.', "text-bg-danger") + } + }); +} \ No newline at end of file diff --git a/static/js/formHandler.js b/static/js/formHandler.js index b2a4583..6b616dc 100644 --- a/static/js/formHandler.js +++ b/static/js/formHandler.js @@ -1,5 +1,6 @@ var amountOfForms = $('.frontendForm').length; $('.frontendForm').each(function () { + // TODO Handle empty strings as null or undefined, not as '' $(this).on('submit', function (e) { e.preventDefault(); // Prevent the form from submitting via the browser @@ -108,7 +109,7 @@ function preFillDeleteModalNxt(id, route, name, requestIdent='id') { document.getElementById('deleteNamePlaceholder').innerText = 'Deleted'; $('#staticBackdrop').modal('hide'); - createNewToast(` Something went wrong. The ${name} does no longer exist.', "text-bg-danger`) + createNewToast(` Something went wrong. The ${name} does no longer exist.`, `text-bg-danger`) } }); } diff --git a/static/js/searchBox.js b/static/js/searchBox.js index 16bf68e..f1705c9 100644 --- a/static/js/searchBox.js +++ b/static/js/searchBox.js @@ -3,7 +3,9 @@ const autocompleteBox = document.getElementById("autocomplete-items"); autocompleteBox.style.display = "none"; function handleSearchChange(e) { console.log(e.target.value); - + // document.getElementById("SearchBox").setAttribute("data-bs-content", "Search results will show up here soon") + + return; // No you won't. I'm not done yet. // Check if known prefix is used (either > or #) if(e.target.value != "" ) {