Bladeren bron

Ingredient can now be submitted from the backend with sub-ingredients.

Lee Morgan 5 jaren geleden
bovenliggende
commit
422e0aac0e

+ 1 - 0
controllers/ingredientData.js

@@ -137,6 +137,7 @@ module.exports = {
                 return res.json(response[0]);
             })
             .catch((err)=>{
+                console.log(err);
                 if(typeof(err) === "string"){
                     return res.json(err);
                 }

+ 8 - 3
views/dashboardPage/js/modal.js

@@ -161,7 +161,7 @@ let modal = {
         let template = document.getElementById("selectedSubIngredient").content.children[0];
 
         while(left.children.length > 0){
-            left.removeChild(left.firstChid);
+            left.removeChild(left.firstChild);
         }
 
         while(right.children.length > 0){
@@ -224,10 +224,15 @@ let modal = {
         document.getElementById("submitEditSubIngredients").onclick = ()=>{
             let subIngredients = [];
 
-            for(let i = 0; i < right.children.length; i++){
-                subIngredients.push(right.children[i].ingredient);
+            for(let i = 1; i < right.children.length; i++){
+                subIngredients.push({
+                    ingredient: right.children[i].ingredient.id,
+                    quantity: parseFloat(right.children[i].children[1].children[0].value)
+                });
             }
 
+            ingredient.replaceIngredients(subIngredients);
+
             controller.closeModal();
             controller.createBanner("YOUR SUB-INGREDIENTS WILL NOT BE SAVED UNTIL YOU SUBMIT CHANGES", "alert");
         }

+ 12 - 1
views/dashboardPage/js/sidebars/editIngredient.js

@@ -72,7 +72,8 @@ let editIngredient = {
         let data = {
             id: ingredient.ingredient.id,
             name: document.getElementById("editIngName").value,
-            category: document.getElementById("editIngCategory").value
+            category: document.getElementById("editIngCategory").value,
+            ingredients: []
         }
 
         data.quantity = ingredient.convertToBase(quantity);
@@ -86,6 +87,16 @@ let editIngredient = {
             }
         }
 
+        //Add the sub-ingredients
+        for(let i = 0; i < ingredient.ingredient.subIngredients.length; i++){
+            let subIngredient = ingredient.ingredient.subIngredients[i];
+            data.ingredients.push({
+                ingredient: subIngredient.ingredient.id,
+                quantity: subIngredient.quantity 
+            });
+        }
+
+        console.log(data);
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";