diff --git a/__pycache__/api.cpython-312.pyc b/__pycache__/api.cpython-312.pyc index 5d8f3cf..ad9adda 100644 Binary files a/__pycache__/api.cpython-312.pyc and b/__pycache__/api.cpython-312.pyc differ diff --git a/__pycache__/config.cpython-312.pyc b/__pycache__/config.cpython-312.pyc index f9c3147..10a5f90 100644 Binary files a/__pycache__/config.cpython-312.pyc and b/__pycache__/config.cpython-312.pyc differ diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc index e3334f3..899b7b5 100644 Binary files a/__pycache__/main.cpython-312.pyc and b/__pycache__/main.cpython-312.pyc differ diff --git a/templates/items/item.html b/templates/items/item.html index 3613758..cb915d2 100644 --- a/templates/items/item.html +++ b/templates/items/item.html @@ -88,6 +88,9 @@
+
+ +
@@ -150,7 +153,7 @@
-
+
@@ -209,7 +212,7 @@ let logistics_info = {}; let food_groups = []; let ingrediants = []; - + let tags = []; document.addEventListener('DOMContentLoaded', async function() { document.getElementById("title").innerHTML = String(item[2]) @@ -223,6 +226,8 @@ var elems = document.querySelectorAll('.modal'); var instances = M.Modal.init(elems, {}); + await propagateInfo() + var elem = document.getElementById('food_groups_container'); M.Chips.init(elem, { @@ -231,17 +236,26 @@ onChipDelete: deleteFoodGroup, onChipAdd: addFoodGroup, }); - var elem = document.getElementById('ingrediants_container'); M.Chips.init(elem, { placeholder: 'Add Ingrediant...', secondaryPlaceholder: 'Add Ingrediant...', onChipDelete: deleteIngrediant, + onChipAdd: addIngrediant, + }); + + var elem = document.getElementById('tags_container'); + M.Chips.init(elem, { + placeholder: 'Add Tag...', + secondaryPlaceholder: 'Add Tag...', + onChipDelete: deleteTag, + onChipAdd: addTag, }); await propagateInfo() - refreshFoodGroups() - refreshIngrediants() + //refreshFoodGroups() + refreshChips('food_groups_container', food_groups, item[33]) + refreshChips('ingrediants_container', ingrediants, item[34]) populateReferences(item[23], 'shopping_list') populateReferences(item[24], 'recipe') populateReferences(item[25], 'group') @@ -256,17 +270,20 @@ itemType.value = item[11]; await propagateLinks() - food_groups = item[33]; - ingrediants = item[34]; - } - - function refreshFoodGroups(){ - let instance = M.Chips.getInstance(document.getElementById('food_groups_container')); - for (let i=0; i < food_groups.length; i++){ - instance.addChip({tag: String(food_groups[i])}); - ;} + //food_groups = item[33]; + //ingrediants = item[34]; + tags = item[5]; }; + function refreshChips(elem_id, chips_array, initial_chips){ + let tags_array = []; + let instance = M.Chips.getInstance(document.getElementById(elem_id)); + for (let i=0; i < initial_chips.length; i++){ + instance.addChip({tag: String(initial_chips[i])}); + } + }; + + function addFoodGroup(e, chip){ chipText = chip.textContent.replace('close', '').trim() console.log(chipText) @@ -274,6 +291,20 @@ console.log(food_groups) } + function addIngrediant(e, chip){ + chipText = chip.textContent.replace('close', '').trim() + console.log(chipText) + ingrediants.push(chipText) + console.log(ingrediants) + } + + function addTag(e, chip){ + chipText = chip.textContent.replace('close', '').trim() + console.log(chipText) + tags.push(chipText) + console.log(tags) + } + function deleteFoodGroup(e, chip){ chipText = chip.textContent.replace('close', '').trim() food_groups = food_groups.filter(chip => chip !== chipText); @@ -284,12 +315,10 @@ ingrediants = ingrediants.filter(chip => chip !== chipText); } - function refreshIngrediants(){ - let instance = M.Chips.getInstance(document.getElementById('ingrediants_container')); - for (let i=0; i < ingrediants.length; i++){ - instance.addChip({tag: String(ingrediants[i])}); - ;} - }; + function deleteTag(e, chip){ + chipText = chip.textContent.replace('close', '').trim() + tags = tags.filter(chip => chip !== chipText); + } async function propagateLinks(){ var element = document.getElementById("weblinks");