Compare commits

Author SHA1 Message Date
Technoir 302419802b imports 2026-10-15 12:15:39 +02:00
Technoir 3f5856c86b errmsg hinzugefügt 2026-10-15 12:15:29 +02:00
Technoir 8c347d124a async und await fetch unnötig 2026-10-15 12:15:15 +02:00
Technoir 0b69384fb7 dead code entfernt 2026-10-15 11:38:49 +02:00
Technoir 2d19d9a06f editElement nach shared/editing.js ausgelagert 2026-10-15 11:38:46 +02:00
Technoir 70338266f2 dead code entfert 2026-10-15 11:38:27 +02:00
Technoir 00ac28aebf wsp 2026-10-15 11:38:19 +02:00
Technoir c9c38f07ad sharedAPI gelöscht 2026-10-15 11:38:07 +02:00
Technoir 7af099f022 falsche Klammern korrigiert 2026-10-14 20:34:23 +02:00
Technoir b4eb339657 refactor 2026-10-14 20:19:41 +02:00
Technoir 79443930e2 editElement neue Paraemter eingefügt
das coole an dem neuen model ist, dass wir heade rund das element auch
so bearbeiten können mit einer funktion
2026-10-14 20:19:35 +02:00
Technoir 08315359c7 editElement neue Parameter eingefügt 2026-10-14 20:19:00 +02:00
Technoir b3ec0257d5 editElement mit einem {} objekt ersetzt
Erlaubt es uns besser und übersichtlicher zu parametisieren, da
ansonsten zu übersichtlich
2026-10-14 20:18:41 +02:00
Technoir 1dd335e166 generishce editElement funktion implementiert 2026-10-14 19:54:35 +02:00
Technoir f33b979bcb impots 2026-10-14 19:54:23 +02:00
Technoir 69389afdb7 artefakt 2026-10-14 19:54:20 +02:00
Technoir 593c540d81 spezifische editfunktionen durch generische ersettzt 2026-10-14 19:54:06 +02:00
Technoir dfff051b55 editCateogry entfern 2026-10-14 19:53:27 +02:00
Technoir 97de073621 generische editElement funktioni impleenneit 2026-10-14 19:53:20 +02:00
Technoir 6c227dcaad imports 2026-10-14 18:56:06 +02:00
Technoir df90bf21d1 editCateogry nimmt jtz das element shopping-category 2026-10-14 18:56:02 +02:00
Technoir 5f9ce78476 element wird jtz miteditElement bearbeitet 2026-10-14 18:55:51 +02:00
Technoir e008e2583e editForm wird jtz mit editForm() erstellt 2026-10-14 18:55:40 +02:00
Technoir f2a5419064 editElement implementiert
man gibt ihr das Element und eine Liste an Attribute welche geändert
werden sollen. Der attributeChangedCallback des Elementes macht dann den
Rest
2026-10-14 18:32:29 +02:00
Technoir a89225fce6 javascript ist scheiße 2026-10-14 18:31:48 +02:00
Technoir 9e58b18e43 createEditForm erstellt ein editForm unabhängig von dem zu beabretieten Gegenstand 2026-10-14 17:37:23 +02:00
Technoir b2badea855 refactor 2026-10-14 17:36:45 +02:00
Technoir d222604fcf error handler mit handleResponse ersetzt und abort mit abortEditing 2026-10-14 16:08:46 +02:00
Technoir c99d5f4347 wsp 2026-10-14 16:08:20 +02:00
Technoir 9b552b88f8 import entfertn 2026-10-14 16:08:14 +02:00
Technoir 5886777854 refactor 2026-10-14 16:08:09 +02:00
Technoir 730248f3e8 abort nach shared ausgelagert 2026-10-14 16:07:59 +02:00
Technoir 01dd5c9089 await hinzugefügt und showError import entfern 2026-10-14 16:00:12 +02:00
Technoir 9c0d704748 import 2026-10-14 15:51:40 +02:00
Technoir e736170735 name und amount in variable ausgelagert 2026-10-14 15:51:38 +02:00
Technoir 1290df93f6 editCategory nimmt jtz direkt den header 2026-10-14 15:51:30 +02:00
Technoir ed05aa3a53 save und abort entfernt und gekürtzt 2026-10-14 15:51:19 +02:00
Technoir e715e66929 abort mit ui.abort ersetzt 2026-10-14 15:50:05 +02:00
Technoir 6233d27d7b fehlerhandling mit handleResponse ersetzt 2026-10-14 15:50:05 +02:00
Technoir 76a4b201b8 abort Funktion aus list.js ausgelagert 2026-10-14 15:48:46 +02:00
Technoir 4622e91f26 helper.js hinzugefügt
diese Datei hat eine methode handleResponse() welche die fetchanfrage
übernimmt und dessen response handlet.
2026-10-14 15:48:35 +02:00
Technoir c6bc6cf8f9 Merge branch 'feature/35-custom-element-category', fixes #35
eine Kategorie hat jetzt ein eigenes element <shopping-category> mit dem
Attribut category-name. Name wird geändert über setAttribute. Das
Element erstellt eine eigene <ul> falls es keine hat (zB wenn Kategorie
an sich leer oder im Frtonend erstellt)
2026-10-14 14:49:08 +02:00
Technoir a39eee06e9 editCategory angepasst, dass shopping-category und id übergeben wird 2026-10-14 14:24:36 +02:00
Technoir 4137b511bb abortButton hat Klasse 2026-10-14 14:24:16 +02:00
Technoir 2e11917ea1 addCategory erstellt ein li an was das cateogyr-element angehangen wird 2026-10-14 13:54:36 +02:00
Technoir 148c33cf6e neuer name wird über setAttribute gesetzt 2026-10-14 13:54:01 +02:00
Technoir d9fd91ad8d ul wird erstellt falls keins existiert
passiert wenn man im Frontend eine neue Kategorie erstellt
2026-10-14 13:53:44 +02:00
Technoir b5293e246c shopping-category in list.html eingefügt 2026-10-14 13:37:08 +02:00
Technoir b1aa5bec07 shopping-category implementiert 2026-10-14 13:37:01 +02:00
Technoir fd984529e7 shopping-category wird definiert 2026-10-14 13:36:55 +02:00
14 changed files with 225 additions and 328 deletions

No files matched your search

@@ -1,31 +1,26 @@
export class ShoppingCategory extends HTMLElement {
export class ShoppingCategory {
constructor(categoryName) {
this.categoryName = categoryName;
this.categoryID = null;
static get observedAttributes() { return ["category-name"] }
constructor() {
super();
this._rendered = false;
}
static fromJSON(categoryAsJSON) {
const category = new ShoppingCategory(categoryAsJSON.categoryName);
category.categoryID = categoryAsJSON.categoryID;
return category;
}
render() {
const li = document.createElement("li");
connectedCallback() {
if (this._rendered) return;
const categoryHeaderDiv = document.createElement("div");
const span = document.createElement("span");
const deleteCategoryButton = document.createElement("button");
const labelDeleteAllItems = document.createElement("label");
const deleteAllItemsCheckbox = document.createElement("input");
const innerUl = document.createElement("ul");
li.dataset.id = this.categoryID;
li.classList.add("category");
const ul = document.createElement("ul");
categoryHeaderDiv.classList.add("category__div");
span.textContent = this.categoryName;
categoryHeaderDiv.classList.add("category__header");
span.textContent = this.getAttribute("category-name");
span.classList.add("category__name", "category__name--bold", "category__name--big");
labelDeleteAllItems.classList.add("category__labelDeleteAll");
@@ -40,8 +35,24 @@ export class ShoppingCategory {
categoryHeaderDiv.append(span, deleteCategoryButton, labelDeleteAllItems);
li.append(categoryHeaderDiv, innerUl);
this.prepend(categoryHeaderDiv);
return li;
if (!this.querySelector("ul")) this.append(ul);
this._rendered = true;
}
attributeChangedCallback(name, oldVal, newVal) {
if (!this._rendered) return;
if (newVal == oldVal) return;
switch (name) {
case "category-name":
this.querySelector(".category__name").textContent = newVal;
break;
default:
break;
}
}
}
@@ -1,8 +1,8 @@
export async function addList(listName) {
return await fetch(`/api/lists`,
export function addList(listName) {
return fetch(`/api/lists`,
{
method: "POST",
body: JSON.stringify({ listName: listName }),
@@ -12,14 +12,14 @@ export async function addList(listName) {
}
export async function deleteList(id) {
return await fetch(`/api/lists/${id}`, { method: "DELETE" });
export function deleteList(id) {
return fetch(`/api/lists/${id}`, { method: "DELETE" });
}
export async function editList(listID, toChange) {
return await fetch(`/api/lists/${listID}`,
export function editList(listID, toChange) {
return fetch(`/api/lists/${listID}`,
{
method: "PATCH",
body: JSON.stringify(toChange),
@@ -47,5 +47,6 @@ export function editList(id, formElement, formData, listLi) {
listLi.querySelector(".list__name").textContent = newName;
listLi.setAttribute("href", `/list/${id}`);
formElement.replaceWith(listLi);
}
@@ -1,20 +1,14 @@
import { showError, initErrors } from "../../shared/error.js";
import { initErrors } from "../../shared/error.js";
import { handleResponse } from "../../shared/helper.js";
import { abortEditing } from "../../shared/sharedUI.js";
import * as api from "./api/indexAPI.js";
import * as ui from "./frontend/indexUI.js"
const addListForm = document.querySelector(".addListForm");
async function addList(listName) {
const response = await api.addList(listName);
const json = await response.json();
if (!response.ok) {
console.error(`error creating list ${json.msg}`);
showError(json.msg);
return;
}
ui.addList(json);
const json = await handleResponse(api.addList(listName), `error creating list`);
if (json) ui.addList(json);
}
function editList(listLi) {
@@ -26,51 +20,27 @@ function editList(listLi) {
formElement.querySelector(".editForm__name").focus();
async function save() {
let formData = Object.fromEntries(new FormData(formElement));
console.log(`editing catogory ${id} with ${formData}`)
const response = await api.editList(id, { newListName: formData.newListName });
if (!response.ok) {
const json = await response.json();
console.error(`error editing list ${json}`);
showError(json.msg);
return;
}
ui.editList(id, formElement, formData, listLi);
}
formElement.addEventListener("submit", (event) => {
formElement.addEventListener("submit", async (event) => {
event.preventDefault();
save();
let formData = Object.fromEntries(new FormData(formElement));
const result = await handleResponse(api.editList(id, { newListName: formData.newListName }), `error editing list`);
if (result) ui.editList(id, formElement, formData, listLi);
});
formElement.querySelector(".editForm__abortButton").addEventListener("click", () => {
formElement.replaceWith(listLi);
abortEditing(formElement, listLi);
})
formElement.addEventListener("keydown", (e) => {
if (e.key == "Escape") formElement.replaceWith(listLi);
if (e.key == "Escape") abortEditing(formElement, listLi);
})
}
async function deleteList(listElement) {
const response = await api.deleteList(listElement.dataset.id);
if (!response.ok) {
const json = await response.json();
console.error(`error deleting list ${json}`);
showError(json.msg);
return;
}
ui.deleteList(listElement);
const json = await handleResponse(api.deleteList(listElement.dataset.id), `error deleting list`);
if (json) ui.deleteList(listElement);
}
@@ -1,5 +1,5 @@
export async function addCategory(listID, categoryName) {
return await fetch(`/api/categories`,
export function addCategory(listID, categoryName) {
return fetch(`/api/categories`,
{
method: "POST"
, body: JSON.stringify({ "categoryName": categoryName, "listID": listID })
@@ -7,9 +7,8 @@ export async function addCategory(listID, categoryName) {
});
}
export async function editCategory(categoryID, toChange) {
return await fetch(`/api/categories/${categoryID}`,
export function editCategory(categoryID, toChange) {
return fetch(`/api/categories/${categoryID}`,
{
method: "PATCH",
body: JSON.stringify(toChange),
@@ -17,6 +16,6 @@ export async function editCategory(categoryID, toChange) {
});
}
export async function deleteCategory(deleteAllItems, categoryID) {
return await fetch(`/api/categories/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" });
export function deleteCategory(deleteAllItems, categoryID) {
return fetch(`/api/categories/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" });
}
@@ -1,7 +1,5 @@
export async function addItem(listID, itemName, itemAmount, categoryID) {
return await fetch(`/api/items`,
export function addItem(listID, itemName, itemAmount, categoryID) {
return fetch(`/api/items`,
{
method: "POST",
body: JSON.stringify({
@@ -14,15 +12,14 @@ export async function addItem(listID, itemName, itemAmount, categoryID) {
});
}
export function deleteItem(itemID) {
export async function deleteItem(itemID) {
return await fetch(`/api/items/${itemID}`, { method: "DELETE" });
return fetch(`/api/items/${itemID}`, { method: "DELETE" });
}
export async function editItem(itemID, toChange) {
return await fetch(`/api/items/${itemID}`,
export function editItem(itemID, toChange) {
return fetch(`/api/items/${itemID}`,
{
method: "PATCH",
body: JSON.stringify(toChange),
@@ -31,10 +28,6 @@ export async function editItem(itemID, toChange) {
}
export async function deleteAllDoneItems(listID) {
return await fetch(`/api/lists/${listID}/items?done=true`, { method: "DELETE" });
export function deleteAllDoneItems(listID) {
return fetch(`/api/lists/${listID}/items?done=true`, { method: "DELETE" });
}
@@ -1,16 +1,20 @@
import { ShoppingCategory } from "../../../models/ShoppingCategory.js";
export function addCategory(categoryAsJSON) {
const list = document.querySelector(".displayedList");
const category = ShoppingCategory.fromJSON(categoryAsJSON);
const category = document.createElement("shopping-category");
const li = document.createElement("li");
list.append(category.render()); //fügt Kategorie der Liste hinzu
li.classList.add("category");
li.dataset.id = categoryAsJSON.categoryID;
category.setAttribute("category-name", categoryAsJSON.categoryName);
li.append(category); //fügt Kategorie der Liste hinzu
list.append(li);
const categorySelect = document.querySelector(".addItemForm__categorySelect");
const newCategoryOption = document.createElement("option");
newCategoryOption.setAttribute("value", category.categoryID);
newCategoryOption.textContent = category.categoryName;
newCategoryOption.setAttribute("value", categoryAsJSON.categoryID);
newCategoryOption.textContent = categoryAsJSON.categoryName;
categorySelect.append(newCategoryOption);
}
@@ -23,34 +27,4 @@ export function deleteCategory(deleteAllItems, categoryID) {
}
category.remove()
document.querySelector(`option[value='${categoryID}']`).remove();
}
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.append(inputName, saveButton, 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;
}
@@ -1,5 +1,3 @@
import { ShoppingItem } from "../../../models/ShoppingItem.js";
export function addItem(itemAsJSON) {
let list;
if (!itemAsJSON.categoryID) {
@@ -20,47 +18,6 @@ export function addItem(itemAsJSON) {
list.append(li);
}
export function createEditItemForm(currentName, currentAmount) {
const editForm = document.createElement("form");
const inputName = document.createElement("input");
const inputAmount = document.createElement("input");
const abortButton = document.createElement("button");
const saveButton = document.createElement("button");
inputName.setAttribute("name", "newItemName");
inputName.setAttribute("value", currentName);
inputName.classList.add("editForm__name");
inputAmount.setAttribute("name", "newItemAmount");
inputAmount.setAttribute("value", currentAmount);
inputAmount.classList.add("editForm__amount");
abortButton.setAttribute("type", "button");
abortButton.classList.add("editForm__buttonAbort");
abortButton.textContent = "Abbrechen";
saveButton.textContent = "Speichern";
saveButton.setAttribute("type", "submit");
editForm.append(inputName, inputAmount, saveButton, abortButton);
return editForm;
}
export function editItem(shoppingItemElement, formElement, formData) {
let newName = formData.newItemName;
let newAmount = formData.newItemAmount;
shoppingItemElement.setAttribute("item-name", newName);
shoppingItemElement.setAttribute("item-amount", newAmount);
formElement.replaceWith(shoppingItemElement);
}
export function deleteItem(li) {
li.remove();
}
@@ -1,3 +1,4 @@
export * from "./itemUI.js";
export * from "./categoryUI.js";
@@ -7,3 +8,4 @@ export function deleteAllDoneItems() {
li.remove();
})
}
+53 -142
View File
@@ -1,8 +1,11 @@
import { ShoppingCategory } from "../../models/ShoppingCategory.js";
import { ShoppingItem } from "../../models/ShoppingItem.js";
import { showError, initErrors } from "../../shared/error.js";
import { initErrors } from "../../shared/error.js";
import * as api from "./api/listAPI.js"
import * as ui from "./frontend/listUI.js"
import { handleResponse } from "../../shared/helper.js";
import { editElement } from "../../shared/editing.js";
import * as sharedUI from "../../shared/sharedUI.js";
const addCategoryForm = document.querySelector(".addCategoryForm");
const addItemForm = document.querySelector(".addItemForm");
@@ -12,162 +15,36 @@ const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButt
async function addItem(itemName, itemAmount, categoryID) {
console.log(` adding item with id:${currentList.dataset.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`)
const response = await api.addItem(currentList.dataset.id, itemName, itemAmount, categoryID);
const json = await response.json();
if (!response.ok) {
console.error(`Error, item couldnt be created ${json}`);
showError(json.msg);
return;
}
console.log(`rendering frontend item: ${json}`);
ui.addItem(json);
const json = await handleResponse(api.addItem(currentList.dataset.id, itemName, itemAmount, categoryID), `item couldnt be created!`);
if (json) ui.addItem(json);
}
async function addCategory(categoryName) {
console.log(`adding category ${categoryName}`)
const response = await api.addCategory(currentList.dataset.id, categoryName);
const json = await response.json();
const json = await handleResponse(api.addCategory(currentList.dataset.id, categoryName), `category couldnt be added!`);
if (json) ui.addCategory(json);
if (!response.ok) {
console.error(`Error, category couldnt be created ${json}`);
showError(json.msg);
return;
}
ui.addCategory(json);
return 0;
}
//shoppingItem ist immer das li mit der id
async function editItem(shoppingItem, id) {
//erstellen das Forms
const formElement = ui.createEditItemForm(shoppingItem.querySelector(".item__itemName").textContent, shoppingItem.querySelector(".item__itemAmount").textContent);
shoppingItem.replaceWith(formElement);
formElement.querySelector(".editForm__name").focus();
async function save() {
let formData = Object.fromEntries(new FormData(formElement));
console.log(`editing item ${id} with ${formData}`)
const response = await api.editItem(id, { itemName: formData.newItemName, itemAmount: formData.newItemAmount });
if (!response.ok) {
const json = await response.json();
console.error(`Error editingItem ${json}`);
showError(json.msg)
return;
}
ui.editItem(shoppingItem, formElement, formData);
}
function abort() {
formElement.replaceWith(shoppingItem);
}
formElement.addEventListener("submit", (event) => {
event.preventDefault();
save();
});
formElement.addEventListener("click", (e) => {
if (e.target.matches(".editForm__buttonAbort")) abort();
})
formElement.addEventListener("keydown", (e) => {
if (e.key == "Escape") abort();
})
}
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.dataset.id;
categoryDiv.replaceWith(formElement);
formElement.querySelector(".editForm__name").focus();
async function save() {
let formData = Object.fromEntries(new FormData(formElement));
console.log(`editing catogory ${id} with ${formData}`)
const response = await api.editCategory(id, { categoryName: formData.newCategoryName });
if (!response.ok) {
const json = await response.json();
console.error(`Error editing category ${json}`);
showError(json.msg);
return;
}
ui.editCategory(id, formElement, formData, categoryDiv);
}
formElement.addEventListener("submit", (event) => {
event.preventDefault();
save();
});
formElement.addEventListener("keydown", (e) => {
if (e.key == "Escape") formElement.replaceWith(categoryDiv);
})
}
async function deleteItem(li) {
const response = await api.deleteItem(li.dataset.id);
console.log(`deleting item ${li.dataset.id}`)
if (!response.ok) {
const json = await response.json();
console.error(`Error deleting item ${json}`);
showError(json.msg);
return;
}
ui.deleteItem(li);
const json = await handleResponse(api.deleteItem(li.dataset.id), `error deleting item`);
if (json) ui.deleteItem(li);
}
async function deleteCategory(deleteAllItems, categoryID) {
console.log(`deleting category with allItems: ${deleteAllItems} id: ${categoryID}`);
const response = await api.deleteCategory(deleteAllItems, categoryID);
const json = await handleResponse(api.deleteCategory(deleteAllItems, categoryID), `error deleting category`);
if (!response.ok) {
const json = await response.json();
console.error(`Error deleting category ${json}`);
showError(json.msg);
return;
}
ui.deleteCategory(deleteAllItems, categoryID);
if (json) ui.deleteCategory(deleteAllItems, categoryID);
}
async function deleteAllDoneItems() {
console.log(`deleting all done items...`)
const response = await api.deleteAllDoneItems(currentList.dataset.id);
if (!response.ok) {
const json = await response.json();
console.error(`Error deleting all done items ${json}`);
showError(json.msg);
return;
}
ui.deleteAllDoneItems();
const json = await handleResponse(api.deleteAllDoneItems(currentList.dataset.id), `error deleting all done items`);
if (json) ui.deleteAllDoneItems();
}
function init() {
@@ -175,6 +52,8 @@ function init() {
initErrors(document.querySelector(".nav"));
customElements.define("shopping-item", ShoppingItem);
customElements.define("shopping-category", ShoppingCategory);
addCategoryForm.addEventListener("submit", (event) => {
event.preventDefault();
let formData = Object.fromEntries(new FormData(addCategoryForm));
@@ -205,11 +84,43 @@ function init() {
} else if (event.target.closest(".item__text")) {
const shoppingItemElement = event.target.closest("shopping-item");
editItem(shoppingItemElement, shoppingItemElement.closest("li").dataset.id);
const id = event.target.closest("li").dataset.id;
let itemName = shoppingItemElement.querySelector(".item__itemName").textContent;
let itemAmount = shoppingItemElement.querySelector(".item__itemAmount").textContent;
/*
* { name: "", value: "", class: "", attr: ""}
*/
editElement({
element: shoppingItemElement, apiCall: api.editItem, id: id,
fields: [
{ name: "itemName", value: itemName, class: "editForm__name", attr: "item-name" },
{ name: "itemAmount", value: itemAmount, class: "editForm__amount", attr: "item-amount" }
]
, onSuccess: (f) => { sharedUI.setElementAttributes(shoppingItemElement, { "item-name": f.itemName, "item-amount": f.itemAmount }) }
, errmsg: `konnte Item nicht bearbeiten`
});
} else if (event.target.closest(".category__name")) {
editCategory(event.target.closest("li"));
const categoryElement = event.target.closest("shopping-category");
const categoryHeader = event.target.closest(".category__header");
const id = event.target.closest("li").dataset.id;
let categoryName = categoryElement.querySelector(".category__name").textContent;
editElement({
element: categoryHeader, apiCall: api.editCategory, id: id,
fields: [
{ name: "categoryName", value: categoryName, class: "editForm__name", attr: "category-name" },
]
, onSuccess: (f) => {
sharedUI.setElementAttributes(categoryElement, { "category-name": f.categoryName })
document.querySelector(`option[value='${id}']`).textContent = f.categoryName;
}
, errmsg: `konnte Kategorie nicht bearbeiten`
});
}
});
@@ -223,8 +134,8 @@ function init() {
});
console.log("javascript initialized!");
return 0;
}
document.addEventListener('DOMContentLoaded', init);
@@ -0,0 +1,29 @@
import { abortEditing, createEditForm } from "./sharedUI.js";
import { handleResponse } from "./helper.js";
export async function editElement({ element, fields, apiCall, id, onSuccess, errmsg }) {
const formElement = createEditForm(fields);
element.replaceWith(formElement);
formElement.querySelector("input").focus();
formElement.addEventListener("submit", async (event) => {
event.preventDefault();
let formData = Object.fromEntries(new FormData(formElement));
let result = await handleResponse(apiCall(id, formData), errmsg);
abortEditing(formElement, element);
if (result) onSuccess(formData);
});
formElement.addEventListener("click", (e) => {
if (e.target.matches(".editForm__buttonAbort")) abortEditing(formElement, element);
})
formElement.addEventListener("keydown", (e) => {
if (e.key == "Escape") abortEditing(formElement, element);
});
}
@@ -0,0 +1,21 @@
import { showError } from "./error.js";
export async function handleResponse(promise, errorMsg) {
const response = await promise;
//weil 204 kein body ist un damit unparsbar, geben wir vorab true zurück
if (response.status == 204) {
return true;
}
const json = await response.json();
if (!response.ok) {
showError(json.msg);
console.error(errorMsg);
return false;
}
return json;
}
@@ -0,0 +1,36 @@
export function abortEditing(formElement, old) {
formElement.replaceWith(old);
}
export function createEditForm(fields) {
const editForm = document.createElement("form");
const abortButton = document.createElement("button");
const saveButton = document.createElement("button");
const inputs = fields.map(f => {
const input = document.createElement("input");
input.setAttribute("name", f.name);
input.setAttribute("value", f.value);
input.classList.add(f.class);
return input;
});
abortButton.setAttribute("type", "button");
abortButton.classList.add("editForm__buttonAbort");
abortButton.textContent = "Abbrechen";
saveButton.textContent = "Speichern";
saveButton.classList.add("editForm__buttonSave");
saveButton.setAttribute("type", "submit");
editForm.append(...inputs, saveButton, abortButton);
return editForm;
}
export function setElementAttributes(element, attributes) {
for (const [attr, val] of Object.entries(attributes)) element.setAttribute(attr, val);
}
+7 -14
View File
@@ -53,20 +53,13 @@
<ul class="displayedList">
<!-- Es werden erste alle Kategorien erstellt, jede Kategorie muss ein ul in einem li sein um Verschachtelung zu ermöglichen -->
<li th:each="category: ${categories}" th:data-id="${category.id}" class="category">
<div class="category__div">
<span class="category__name category__name--big category__name--bold" th:text="${category.categoryName}"></span>
<button class="category__deleteButton">Kategorie löschen</button>
<label class="category__labelCheckbox">
Gegenstände mit Kategorie löschen?
<input name="deleteAllInCategory" type="checkbox">
</label>
</div>
<!-- Items der Kategorie -->
<ul>
<li th:each="item: ${category.itemsInCategory}" th:data-id="${item.id}" class="item">
<shopping-item th:attr="item-name=${item.itemName}, item-amount=${item.itemAmount}, is-checked=${item.isDone}"></shopping-item>
</li>
</ul>
<shopping-category th:attr="category-name=${category.categoryName}">
<ul>
<li th:each="item: ${category.itemsInCategory}" th:data-id="${item.id}" class="item">
<shopping-item th:attr="item-name=${item.itemName}, item-amount=${item.itemAmount}, is-checked=${item.isDone}"></shopping-item>
</li>
</ul>
</shopping-category>
</li>
<li th:each="item: ${items}" th:data-id="${item.id}" class="item"> <!-- erstellung items ohne Kategorie -->