Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fbd20f9089 | ||
|
|
9e8202d382 | ||
|
|
ccb37a666a | ||
|
|
fd0a3959a5 | ||
|
|
6cfe4d3510 | ||
|
|
18cf37f7c9 | ||
|
|
62953ffa61 | ||
|
|
d731c46c9c | ||
|
|
dd5308b495 | ||
|
|
002d09955a | ||
|
|
f4822ceb4d |
No files matched your search
@@ -1,8 +1,8 @@
|
||||
package de.timaldinger.einkaufsliste.Controller;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
@Controller
|
||||
@@ -21,10 +20,10 @@ public class PageController {
|
||||
private ShoppingListRepository shoppingListRepository;
|
||||
|
||||
@Autowired
|
||||
private ShoppingListCategoryRepository shoppingListCategoryRepository;
|
||||
private ShoppingCategoryRepository shoppingCategoryRepository;
|
||||
|
||||
@Autowired
|
||||
private ShoppingListItemRepository shoppingListItemRepository;
|
||||
private ShoppingItemRepository shoppingItemRepository;
|
||||
|
||||
@PostMapping("api/list")
|
||||
public String addList(@Valid @ModelAttribute ShoppingList newList){
|
||||
@@ -54,8 +53,8 @@ public class PageController {
|
||||
public String list(Model model, @PathVariable UUID id){
|
||||
ShoppingList list = shoppingListRepository.findById(id).orElseThrow();
|
||||
model.addAttribute("list", list);
|
||||
model.addAttribute("categories", shoppingListCategoryRepository.findByShoppingList(list));
|
||||
model.addAttribute("items", shoppingListItemRepository.findByListAndCategoryIsNull(list));
|
||||
model.addAttribute("categories", shoppingCategoryRepository.findByShoppingList(list));
|
||||
model.addAttribute("items", shoppingItemRepository.findByListAndCategoryIsNull(list));
|
||||
return "list";
|
||||
}
|
||||
}
|
||||
@@ -1,20 +1,17 @@
|
||||
package de.timaldinger.einkaufsliste.Controller;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.ShoppingListItemDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO;
|
||||
import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingListCategory;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingListItem;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingCategory;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository;
|
||||
import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.HttpStatusCode;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.thymeleaf.expression.Lists;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
@@ -23,47 +20,48 @@ import java.util.UUID;
|
||||
public class ShoppingListController {
|
||||
|
||||
@Autowired
|
||||
private ShoppingListCategoryRepository shoppingListCategoryRepository;
|
||||
private ShoppingCategoryRepository shoppingCategoryRepository;
|
||||
@Autowired
|
||||
private ShoppingListRepository shoppingListRepository;
|
||||
@Autowired
|
||||
private ShoppingListItemRepository shoppingListItemRepository;
|
||||
private ShoppingItemRepository shoppingItemRepository;
|
||||
|
||||
@PostMapping("/api/list/{listID}/category/")
|
||||
public ShoppingListCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){
|
||||
public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){
|
||||
|
||||
String name = newCategory.categoryName();
|
||||
ShoppingList list = shoppingListRepository.findById(listID).orElseThrow();
|
||||
|
||||
ShoppingListCategory category = new ShoppingListCategory(name, List.of(),list);
|
||||
ShoppingCategory category = new ShoppingCategory(name, List.of(),list);
|
||||
|
||||
shoppingListCategoryRepository.save(category);
|
||||
shoppingCategoryRepository.save(category);
|
||||
|
||||
return category;
|
||||
}
|
||||
|
||||
@PostMapping("/api/list/{listID}/item")
|
||||
public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){
|
||||
@PostMapping("/api/item")
|
||||
public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemDTO newItem){
|
||||
String name = newItem.itemName();
|
||||
String amount = newItem.itemAmount();
|
||||
ShoppingListCategory c;
|
||||
ShoppingCategory c;
|
||||
if(newItem.categoryID() != null){
|
||||
c = shoppingListCategoryRepository.findById(newItem.categoryID()).orElseThrow();
|
||||
c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow();
|
||||
}else{
|
||||
c = null;
|
||||
}
|
||||
ShoppingList list = shoppingListRepository.findById(listID).orElseThrow();
|
||||
ShoppingListItem item = new ShoppingListItem(name, amount, false, c, list);
|
||||
shoppingListItemRepository.save(item);
|
||||
return item;
|
||||
ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow();
|
||||
ShoppingItem item = new ShoppingItem(name, amount, false, c, list);
|
||||
shoppingItemRepository.save(item);
|
||||
|
||||
return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null);
|
||||
}
|
||||
|
||||
@DeleteMapping("/api/item/{itemID}")
|
||||
public ResponseEntity<Void> deleteItem(@PathVariable UUID itemID){
|
||||
if(!shoppingListItemRepository.existsById(itemID)){
|
||||
if(!shoppingItemRepository.existsById(itemID)){
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
shoppingListItemRepository.deleteById(itemID);
|
||||
shoppingItemRepository.deleteById(itemID);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package de.timaldinger.einkaufsliste.Dto;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingItemDTO(String itemName, String itemAmount, UUID categoryID, UUID listID){
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package de.timaldinger.einkaufsliste.Dto;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingItemResponseDTO(String itemName, String itemAmount, UUID itemID, UUID categoryID) {
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
package de.timaldinger.einkaufsliste.Dto;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingListItemDTO (String itemName, String itemAmount, UUID categoryID){
|
||||
}
|
||||
+2
-2
@@ -14,12 +14,12 @@ import java.util.List;
|
||||
@Entity
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ShoppingListCategory extends ShoppingElement{
|
||||
public class ShoppingCategory extends ShoppingElement{
|
||||
|
||||
@NotBlank
|
||||
private String categoryName;
|
||||
@OneToMany(mappedBy = "category")
|
||||
private List<ShoppingListItem> itemsInCategory;
|
||||
private List<ShoppingItem> itemsInCategory;
|
||||
@ManyToOne
|
||||
@JoinColumn(name="list_id", nullable = false)
|
||||
private ShoppingList shoppingList;
|
||||
+2
-2
@@ -14,7 +14,7 @@ import lombok.Setter;
|
||||
@Entity
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ShoppingListItem extends ShoppingElement {
|
||||
public class ShoppingItem extends ShoppingElement {
|
||||
|
||||
@NotBlank
|
||||
private String itemName;
|
||||
@@ -23,7 +23,7 @@ public class ShoppingListItem extends ShoppingElement {
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "category_id", nullable = true)
|
||||
private ShoppingListCategory category;
|
||||
private ShoppingCategory category;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "list_id", nullable = false)
|
||||
@@ -0,0 +1,13 @@
|
||||
package de.timaldinger.einkaufsliste.Repository;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingCategory;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface ShoppingCategoryRepository extends JpaRepository<ShoppingCategory, UUID>{
|
||||
List<ShoppingCategory> findByShoppingList(ShoppingList list);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package de.timaldinger.einkaufsliste.Repository;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingItem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface ShoppingItemRepository extends JpaRepository<ShoppingItem, UUID> {
|
||||
|
||||
List<ShoppingItem> findByListAndCategoryIsNull(Object list);
|
||||
}
|
||||
-13
@@ -1,13 +0,0 @@
|
||||
package de.timaldinger.einkaufsliste.Repository;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingListCategory;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface ShoppingListCategoryRepository extends JpaRepository<ShoppingListCategory, UUID>{
|
||||
List<ShoppingListCategory> findByShoppingList(ShoppingList list);
|
||||
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package de.timaldinger.einkaufsliste.Repository;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingElement;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingListItem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface ShoppingListItemRepository extends JpaRepository<ShoppingListItem, UUID> {
|
||||
|
||||
List<ShoppingListItem> findByListAndCategoryIsNull(Object list);
|
||||
}
|
||||
@@ -1,10 +1,8 @@
|
||||
package de.timaldinger.einkaufsliste.Repository;
|
||||
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingList;
|
||||
import de.timaldinger.einkaufsliste.Models.ShoppingListItem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface ShoppingListRepository extends JpaRepository<ShoppingList, UUID>{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
.displayedList__categoryName--bold {
|
||||
.category__name--bold {
|
||||
font-weight: bold;
|
||||
}
|
||||
.displayedList__categoryName--big {
|
||||
font-size = 3rem;
|
||||
.category__name--big {
|
||||
font-size : 1.5rem;
|
||||
}
|
||||
@@ -1,120 +1,35 @@
|
||||
import { addNewItem } from "./main.js";
|
||||
|
||||
export class ShoppingCategory {
|
||||
|
||||
constructor(categoryName, onDelete, onUpdate) {
|
||||
constructor(categoryName) {
|
||||
this.categoryName = categoryName;
|
||||
this.itemsInCategory = [];
|
||||
this.remove = false;
|
||||
this.isEditing = false;
|
||||
this.onDelete = onDelete;
|
||||
this.onUpdate = onUpdate;
|
||||
this.categoryID = null;
|
||||
}
|
||||
|
||||
static fromJSON(categoryAsJSON) {
|
||||
const category = new ShoppingCategory(categoryAsJSON.categoryName);
|
||||
category.categoryID = categoryAsJSON.id;
|
||||
return category;
|
||||
}
|
||||
|
||||
render() {
|
||||
let element;
|
||||
const outerLi = document.createElement("li");
|
||||
//if (this.itemsInCategory.length == 0) return;
|
||||
const li = document.createElement("li");
|
||||
const span = document.createElement("span");
|
||||
const deleteCategoryButton = document.createElement("button");
|
||||
const deleteAllItemsCheckbox = document.createElement("input");
|
||||
li.id = this.categoryID;
|
||||
li.classList.add("category");
|
||||
|
||||
span.textContent = this.categoryName;
|
||||
span.classList.add("category__name--bold", "category__name--big");
|
||||
|
||||
if (this.isEditing) {
|
||||
element = this.#renderEditing();
|
||||
} else {
|
||||
element = this.#renderNormal();
|
||||
}
|
||||
outerLi.append(element);
|
||||
return outerLi;
|
||||
}
|
||||
deleteCategoryButton.classList.add("category__deleteButton");
|
||||
deleteCategoryButton.textContent = "Kategorie löschen";
|
||||
|
||||
#renderEditing() {
|
||||
//const li = document.createElement("li");
|
||||
const editForm = document.createElement("form");
|
||||
const editCategoryNameField = document.createElement("input");
|
||||
const saveButton = document.createElement("button");
|
||||
const abortButton = document.createElement("button");
|
||||
deleteAllItemsCheckbox.setAttribute("type", "checkbox");
|
||||
|
||||
li.appendChild(span);
|
||||
li.appendChild(deleteCategoryButton);
|
||||
li.appendChild(deleteAllItemsCheckbox);
|
||||
|
||||
editCategoryNameField.setAttribute("name", "newCategoryName");
|
||||
editCategoryNameField.setAttribute("value", this.categoryName);
|
||||
|
||||
|
||||
abortButton.textContent = "Abbrechen";
|
||||
abortButton.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
this.isEditing = false;
|
||||
this.onUpdate();
|
||||
});
|
||||
|
||||
saveButton.textContent = "Speichern";
|
||||
editForm.addEventListener("submit", (event) => {
|
||||
event.preventDefault();
|
||||
|
||||
const editFormData = Object.fromEntries(new FormData(editForm));
|
||||
|
||||
if (!editFormData.newCategoryName) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.categoryName = editFormData.newCategoryName;
|
||||
this.isEditing = false;
|
||||
this.onUpdate();
|
||||
this.onDelete();
|
||||
});
|
||||
|
||||
editForm.appendChild(editCategoryNameField);
|
||||
editForm.appendChild(saveButton);
|
||||
editForm.appendChild(abortButton);
|
||||
//li.appendChild(editForm);
|
||||
|
||||
return editForm;
|
||||
|
||||
}
|
||||
|
||||
#renderNormal() {
|
||||
|
||||
const spanCategoryName = document.createElement("span");
|
||||
const removeCategoryButton = document.createElement("button"); // Entfernen der Kategorie
|
||||
const removeCategoryItemsCheckbox = document.createElement("input"); // alle Gegenstände drunter entfernen oder nicht
|
||||
const removeCategoryItemsText = document.createElement("span");
|
||||
const ul = document.createElement("ul");
|
||||
const items = this.itemsInCategory.filter((item) => !item.remove);
|
||||
|
||||
spanCategoryName.textContent = this.categoryName;
|
||||
spanCategoryName.classList.add("category__name--big", "category__name--bold");
|
||||
spanCategoryName.addEventListener("click", () => {
|
||||
this.isEditing = true;
|
||||
this.onUpdate();
|
||||
});
|
||||
|
||||
removeCategoryItemsCheckbox.setAttribute("type", "checkbox");
|
||||
removeCategoryItemsText.textContent = "Alle Gegenstände in dieser Kategorie löschen? :";
|
||||
|
||||
|
||||
removeCategoryButton.textContent = "Löschen";
|
||||
removeCategoryButton.addEventListener("click", () => {
|
||||
this.remove = true;
|
||||
if (!removeCategoryItemsCheckbox.checked) {
|
||||
this.itemsInCategory.forEach((element) => {
|
||||
addNewItem(element.itemName, element.itemAmount, "");
|
||||
});
|
||||
}
|
||||
this.onUpdate();
|
||||
this.onDelete();
|
||||
|
||||
});
|
||||
|
||||
ul.appendChild(spanCategoryName);
|
||||
ul.appendChild(removeCategoryButton);
|
||||
ul.appendChild(removeCategoryItemsText);
|
||||
ul.appendChild(removeCategoryItemsCheckbox);
|
||||
items.forEach((item, index) => {
|
||||
ul.append(item.render());
|
||||
});
|
||||
|
||||
return ul;
|
||||
}
|
||||
|
||||
addItem(item) {
|
||||
this.itemsInCategory.push(item);
|
||||
return li;
|
||||
}
|
||||
}
|
||||
@@ -12,10 +12,11 @@ function addItem(itemName, itemAmount, categoryID) {
|
||||
ui.addItem();
|
||||
}
|
||||
|
||||
function addCategory(categoryName) {
|
||||
async function addCategory(categoryName) {
|
||||
console.log(`adding category ${categoryName}`)
|
||||
api.addCategory(currentList.id, categoryName);
|
||||
ui.addCategory(categoryName);
|
||||
const categoryAsJSON = await api.addCategory(currentList.id, categoryName);
|
||||
console.log(categoryAsJSON);
|
||||
ui.addCategory(categoryAsJSON);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -37,12 +38,17 @@ function init() {
|
||||
addItem(formData.itemName, formData.itemAmount, formData.itemCategoryID);
|
||||
})
|
||||
|
||||
document.querySelectorAll(".item__buttonDelete").forEach(button => {
|
||||
button.addEventListener("click", event => {
|
||||
const li = button.closest("li");
|
||||
deleteItem(li);
|
||||
})
|
||||
})
|
||||
//event delegation ist schon geil
|
||||
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);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
console.log("javascript initialized!");
|
||||
return 0;
|
||||
|
||||
@@ -1,40 +1,41 @@
|
||||
|
||||
export function addItem(listID, itemName, itemAmount, categoryID) {
|
||||
fetch(`/api/list/${listID}/item`,
|
||||
export async function addItem(listID, itemName, itemAmount, categoryID) {
|
||||
const newItem = await fetch(`/api/item`,
|
||||
{
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
"itemName": itemName,
|
||||
"itemAmount": itemAmount,
|
||||
"categoryID": categoryID
|
||||
"categoryID": categoryID,
|
||||
"listID": listID
|
||||
}),
|
||||
headers: { "Content-Type": "application/json" }
|
||||
}).then(r => console.log("added new item"));
|
||||
});
|
||||
|
||||
|
||||
return 0;
|
||||
return await newItem.json();
|
||||
}
|
||||
|
||||
|
||||
export function deleteItem(itemID) {
|
||||
export async function deleteItem(itemID) {
|
||||
|
||||
fetch(`/api/item/${itemID}`, { method: "DELETE" })
|
||||
const response = await fetch(`/api/item/${itemID}`, { method: "DELETE" })
|
||||
.then(r => console.log("item deleted"));
|
||||
|
||||
return 0;
|
||||
return response;
|
||||
|
||||
}
|
||||
|
||||
export function addCategory(listID, categoryName) {
|
||||
fetch(`/api/list/${listID}/category/`,
|
||||
export async function addCategory(listID, categoryName) {
|
||||
const newCategory = await fetch(`/api/list/${listID}/category/`,
|
||||
{
|
||||
method: "POST"
|
||||
, body: JSON.stringify({ "categoryName": categoryName })
|
||||
, headers: { "Content-Type": "application/json" }
|
||||
}).then(r => console.log("Add new category"));
|
||||
listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList));
|
||||
renderItemList();
|
||||
return 0;
|
||||
});
|
||||
//listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList));
|
||||
//renderItemList();
|
||||
return await newCategory.json();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { ShoppingCategory } from "./ShoppingCategory.js";
|
||||
|
||||
export function addItem() {
|
||||
|
||||
@@ -7,8 +8,11 @@ export function deleteItem(li) {
|
||||
li.remove();
|
||||
}
|
||||
|
||||
export function addCategory() {
|
||||
export function addCategory(categoryAsJSON) {
|
||||
const list = document.querySelector(".displayedList");
|
||||
const category = ShoppingCategory.fromJSON(categoryAsJSON);
|
||||
|
||||
list.appendChild(category.render());
|
||||
}
|
||||
|
||||
export function deleteCategory() {
|
||||
|
||||
@@ -38,15 +38,17 @@
|
||||
|
||||
<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:id="${category.id}">
|
||||
<span class="displayedList__categoryName--bold displayedList__categoryName--big" th:text="${category.categoryName}"></span>
|
||||
<li th:each="category: ${categories}" th:id="${category.id}" class="category">
|
||||
<span class="category__name--big category__name--bold" th:text="${category.categoryName}"></span>
|
||||
<button class="category__deleteButton">Kategorie löschen</button>
|
||||
<input type="checkbox">
|
||||
<!-- Items der Kategorie -->
|
||||
<ul>
|
||||
<li th:each="item: ${category.itemsInCategory}" th:id="${item.id}"> <!-- erstellung von einem Item -->
|
||||
<input type="checkbox" class="item__markAsDone">
|
||||
<span th:text="${item.itemName}"></span>
|
||||
<span th:text="${item.itemAmount}"></span>
|
||||
<button class="item__buttonDelete">Löschen</button>
|
||||
<button class="item__deleteButton">Löschen</button>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@@ -55,7 +57,7 @@
|
||||
<input type="checkbox" class="item__markAsDone">
|
||||
<span th:text="${item.itemName}"></span>
|
||||
<span th:text="${item.itemAmount}"></span>
|
||||
<button class="item__buttonDelete">Löschen</button>
|
||||
<button class="item__deleteButton">Löschen</button>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
Reference in new issue
Block a user