Merge branch 'featureDeleteAllDone'
This commit is contained in:
commit
be92e93c3c
3 files changed
+27
-8
No files matched your search
@@ -30,6 +30,7 @@
|
||||
<button class="addItemForm__submitButton" type="submit">Hinzufügen</button>
|
||||
</form>
|
||||
|
||||
<button type="" class="deleteAllDoneItemsButton">Alle fertigen Items löschen</button>
|
||||
<ul class="displayedList">
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ export class ShoppingListItem {
|
||||
this.itemName = itemName;
|
||||
this.itemAmount = itemAmount;
|
||||
this.isEditing = false;
|
||||
this.isDone = false;
|
||||
this.remove = false;
|
||||
this.onChange = onChange;
|
||||
}
|
||||
@@ -12,7 +13,7 @@ export class ShoppingListItem {
|
||||
render() {
|
||||
let li;
|
||||
if (this.isEditing) {
|
||||
li = this.#rendereditIng();
|
||||
li = this.#renderEditing();
|
||||
} else {
|
||||
li = this.#renderNormal()
|
||||
}
|
||||
@@ -20,7 +21,7 @@ export class ShoppingListItem {
|
||||
|
||||
}
|
||||
|
||||
#rendereditIng() {
|
||||
#renderEditing() {
|
||||
const li = document.createElement("li");
|
||||
const editForm = document.createElement("form");
|
||||
const editItemNameField = document.createElement("input");
|
||||
@@ -30,10 +31,10 @@ export class ShoppingListItem {
|
||||
|
||||
|
||||
editItemNameField.setAttribute("name", "newItemName");
|
||||
editItemNameField.setAttribute("value", this.name);
|
||||
editItemNameField.setAttribute("value", this.itemName);
|
||||
|
||||
editItemAmountField.setAttribute("itemName", "newItemAmount");
|
||||
editItemAmountField.setAttribute("value", this.amount);
|
||||
editItemAmountField.setAttribute("value", this.itemAmount);
|
||||
|
||||
abortButton.textContent = "Abbrechen";
|
||||
abortButton.addEventListener("click", (event) => {
|
||||
@@ -48,13 +49,13 @@ export class ShoppingListItem {
|
||||
|
||||
const editFormData = Object.fromEntries(new FormData(editForm));
|
||||
|
||||
if (!editFormData.newItemitemName && !editFormData.newItemitemAmount) {
|
||||
if (!editFormData.newItemName && !editFormData.newItemAmount) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.itemName = editFormData.newItemName;
|
||||
this.itemAmount = editFormData.newItemAmount;
|
||||
this.isediting = false;
|
||||
this.isEditing = false;
|
||||
this.onChange();
|
||||
});
|
||||
|
||||
@@ -76,6 +77,7 @@ export class ShoppingListItem {
|
||||
|
||||
doneButton.setAttribute("type", "checkbox");
|
||||
doneButton.addEventListener("change", () => {
|
||||
this.isDone = true;
|
||||
li.classList.toggle("displayedList__item--checked");
|
||||
});
|
||||
|
||||
|
||||
+18
-2
@@ -4,10 +4,12 @@ import { ShoppingCategory } from "./ShoppingCategory";
|
||||
const addItemForm = document.querySelector(".addItemForm");
|
||||
const addCategoryForm = document.querySelector(".addCategoryForm")
|
||||
const itemListElement = document.querySelector(".displayedList");
|
||||
const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton");
|
||||
|
||||
let listElements = []; // Liste der erstellten Items und Kategorien
|
||||
|
||||
function addNewCategory(categoryName) {
|
||||
|
||||
listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList));
|
||||
renderItemList();
|
||||
return 0;
|
||||
@@ -36,6 +38,16 @@ function renderItemList() {
|
||||
|
||||
}
|
||||
|
||||
function deleteAllDoneItems() {
|
||||
listElements.forEach((category, index) => {
|
||||
if (category instanceof ShoppingCategory) {
|
||||
category.itemsInCategory = category.itemsInCategory.filter((item) => !item.isDone);
|
||||
}
|
||||
});
|
||||
listElements = listElements.filter((element) => !element.isDone);
|
||||
renderItemList();
|
||||
}
|
||||
|
||||
function renderAddItemPrompt() {
|
||||
const selectMenu = document.querySelector(".addItemForm__categorySelect");
|
||||
let categories = listElements.filter(element => element instanceof ShoppingCategory);
|
||||
@@ -63,7 +75,7 @@ function init() {
|
||||
|
||||
renderAddItemPrompt();
|
||||
|
||||
document.querySelector(".addItemForm").addEventListener("submit", (event) => {
|
||||
addItemForm.addEventListener("submit", (event) => {
|
||||
if (!addItemForm.checkValidity()) return;
|
||||
event.preventDefault();
|
||||
const addItemFormData = Object.fromEntries(new FormData(addItemForm));
|
||||
@@ -71,13 +83,17 @@ function init() {
|
||||
});
|
||||
|
||||
|
||||
document.querySelector(".addCategoryForm").addEventListener("submit", (event) => {
|
||||
addCategoryForm.addEventListener("submit", (event) => {
|
||||
if (!addCategoryForm.checkValidity()) return;
|
||||
event.preventDefault();
|
||||
const addCategoryFormData = Object.fromEntries(new FormData(addCategoryForm));
|
||||
addNewCategory(addCategoryFormData.categoryName);
|
||||
renderAddItemPrompt();
|
||||
});
|
||||
|
||||
deleteAllDoneItemsButton.addEventListener("click", (event) => {
|
||||
deleteAllDoneItems();
|
||||
})
|
||||
}
|
||||
|
||||
init();
|
||||
Reference in new issue
Block a user