From ed0df61e1631a18abf37681b6fc9597da2752df3 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:15:54 +0200 Subject: [PATCH] =?UTF-8?q?alle=20abgeschlossenene=20Items=20werden=20gel?= =?UTF-8?q?=C3=B6scht,=20fixes=20#6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wir schicken eine delete request an /api/list/{listID}, im backend wird dann geschaut, welche items in der liste mit der listID schon abgeschlossen sind. Im frontend entfernen wir alle li dessen child input checked=true und item__markAsDone klasse hat --- .../Controller/ShoppingListController.java | 8 ++++++++ .../Repository/ShoppingItemRepository.java | 1 + src/main/resources/static/js/list/list.js | 13 ++++++++++++- src/main/resources/static/js/list/listAPI.js | 11 +++++++++++ src/main/resources/static/js/list/listFrontend.js | 5 +++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index 1f30f38..98b9774 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -26,5 +26,13 @@ public class ShoppingListController { @Autowired private ShoppingItemRepository shoppingItemRepository; + @DeleteMapping("/api/list/{listID}") + public ResponseEntity deleteAllDoneItems(@PathVariable UUID listID, @RequestParam(required = false) boolean deleteAllDoneItems){ + if(deleteAllDoneItems){ + List items = shoppingItemRepository.findByList_IdAndIsDoneIsTrue(listID); + shoppingItemRepository.deleteAll(items); + } + return ResponseEntity.noContent().build(); + } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java index 76e69f9..fa5e64f 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -11,4 +11,5 @@ public interface ShoppingItemRepository extends JpaRepository findByList_IdAndCategoryIsNull(UUID list); List findAllByCategory_Id(UUID categoryID); + List findByList_IdAndIsDoneIsTrue(UUID listID); } diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 4e3d1e7..43e5307 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -5,6 +5,7 @@ import * as ui from "./listFrontend.js" const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); const currentList = document.querySelector(".list"); +const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); async function addItem(itemName, itemAmount, categoryID) { console.log(` adding item with id:${currentList.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`) @@ -32,6 +33,12 @@ function deleteCategory(deleteAllItems, categoryID) { ui.deleteCategory(deleteAllItems, categoryID); } +function deleteAllDoneItems() { + console.log(`deleting all done items...`) + api.deleteAllDoneItems(currentList.id); + ui.deleteAllDoneItems(); +} + function init() { addCategoryForm.addEventListener("submit", (event) => { event.preventDefault(); @@ -43,7 +50,11 @@ function init() { event.preventDefault(); let formData = Object.fromEntries(new FormData(addItemForm)); addItem(formData.itemName, formData.itemAmount, formData.itemCategoryID); - }) + }); + + deleteAllDoneItemsButton.addEventListener("click", event => { + deleteAllDoneItems(); + }); //event delegation ist schon geil document.querySelector(".displayedList").addEventListener("click", (event) => { diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index c2e6964..bf238ac 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -59,3 +59,14 @@ export async function deleteCategory(deleteAllItems, categoryID) { } return response; } + +export async function deleteAllDoneItems(listID) { + + const response = await fetch(`/api/list/${listID}?deleteAllDoneItems=true`, { method: "DELETE" }); + + if (response.status == 204) { + console.log(`items have been deleted`); + } + return response; + +} diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index 34db4e2..74cad93 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -34,4 +34,9 @@ export function deleteCategory(deleteAllItems, categoryID) { category.remove() } +export function deleteAllDoneItems() { + const doneItems = document.querySelectorAll("li.item:has(input[type=checkbox]:checked)"); + doneItems.forEach((li) => { + li.remove(); + }) }