diff --git a/src/main/resources/static/js/list/ShoppingCategory.js b/src/main/resources/static/js/list/ShoppingCategory.js index 345b5ee..f1b6525 100644 --- a/src/main/resources/static/js/list/ShoppingCategory.js +++ b/src/main/resources/static/js/list/ShoppingCategory.js @@ -12,6 +12,7 @@ export class ShoppingCategory { render() { const li = document.createElement("li"); + const categoryHeaderDiv = document.createElement("div"); const span = document.createElement("span"); const deleteCategoryButton = document.createElement("button"); const deleteAllItemsCheckbox = document.createElement("input"); @@ -19,18 +20,20 @@ export class ShoppingCategory { li.id = this.categoryID; li.classList.add("category"); + + categoryHeaderDiv.classList.add("category__div"); + span.textContent = this.categoryName; - span.classList.add("category__name--bold", "category__name--big"); + span.classList.add("category__name", "category__name--bold", "category__name--big"); deleteCategoryButton.classList.add("category__deleteButton"); deleteCategoryButton.textContent = "Kategorie löschen"; deleteAllItemsCheckbox.setAttribute("type", "checkbox"); - li.appendChild(span); - li.appendChild(deleteCategoryButton); - li.appendChild(deleteAllItemsCheckbox); - li.appendChild(innerUl); + categoryHeaderDiv.append(span, deleteCategoryButton, deleteAllItemsCheckbox); + + li.append(categoryHeaderDiv, innerUl); return li; } diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 1036c96..87f83d2 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -49,6 +49,7 @@ async function editItem(textElement) { } formElement.addEventListener("submit", (event) => { + event.preventDefault(); save(); }); @@ -60,6 +61,34 @@ async function editItem(textElement) { } async function editCategory(categoryElement) { + //erstellen das Forms + //wir nutzen für das Element nur das div, weil sonst alle items mitgelöscht werden würden + const categoryDiv = categoryElement.querySelector(".category__div"); + const formElement = ui.createEditCategoryForm(categoryDiv); + let id = categoryElement.id; + + categoryDiv.replaceWith(formElement); + + formElement.querySelector(".editForm__name").focus(); + + function save() { + let formData = Object.fromEntries(new FormData(formElement)); + ui.editCategory(id, formElement, formData, categoryDiv); + + console.log(`editing catogory ${id} with ${formData}`) + api.editCategory(id, { categoryName: formData.newCategoryName }); + + } + + formElement.addEventListener("submit", (event) => { + event.preventDefault(); + save(); + }); + + formElement.addEventListener("keydown", (e) => { + if (e.key == "Escape") formElement.replaceWith(categoryDiv); + }) + } @@ -102,12 +131,16 @@ function init() { document.querySelector(".displayedList").addEventListener("click", (event) => { if (event.target.matches(".item__deleteButton")) { deleteItem(event.target.closest("li")); + } else if (event.target.matches(".category__deleteButton")) { const li = event.target.closest("li"); const checkbox = li.querySelector("input[type=checkbox]"); deleteCategory(checkbox.checked, li.id); + } else if (event.target.closest(".item__text")) { editItem(event.target.closest("li")); + } else if (event.target.closest(".category__name")) { + editCategory(event.target.closest("li")); } }); diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index bf238ac..843c1aa 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -51,6 +51,17 @@ export async function addCategory(listID, categoryName) { } +export async function editCategory(categoryID, toChange) { + const response = await fetch(`/api/category/${categoryID}`, + { + method: "PATCH", + body: JSON.stringify(toChange), + headers: { "Content-Type": "application/json" } + }); + + return response; +} + export async function deleteCategory(deleteAllItems, categoryID) { const response = await fetch(`/api/category/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index 958ddca..c1ea796 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -41,6 +41,7 @@ export function createEditItemForm(textElement) { return editForm; } + export function deleteItem(li) { li.remove(); } @@ -70,6 +71,37 @@ export function deleteCategory(deleteAllItems, categoryID) { } +export function createEditCategoryForm(textElement) { + const editForm = document.createElement("form"); + const inputName = document.createElement("input"); + const abortButton = document.createElement("button"); + const saveButton = document.createElement("button"); + + inputName.setAttribute("name", "newCategoryName"); + inputName.setAttribute("value", textElement.querySelector(".category__name").textContent); + inputName.classList.add("editForm__name"); + + abortButton.textContent = "Abbrechen"; + saveButton.textContent = "Speichern"; + + editForm.appendChild(inputName); + editForm.appendChild(saveButton); + editForm.appendChild(abortButton); + + return editForm; +} + +export function editCategory(id, formElement, formData, categoryDiv) { + + let newName = formData.newCategoryName; + + categoryDiv.querySelector(".category__name").textContent = newName; + formElement.replaceWith(categoryDiv); + + document.querySelector(`option[value='${id}']`).textContent = newName; + +} + export function deleteAllDoneItems() { const doneItems = document.querySelectorAll("li.item:has(input[type=checkbox]:checked)"); doneItems.forEach((li) => { diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 3f71a8a..8e887d9 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -39,9 +39,11 @@