Browse Source

Rewrite code for adding an ingredient to inventory

Lee Morgan 6 năm trước cách đây
mục cha
commit
12aed98d57

+ 1 - 1
controllers/home.js

@@ -521,7 +521,7 @@ module.exports = {
                         merchant.save()
                             .then((merchant)=>{
                                 console.log("something");
-                                return res.json(merchant);
+                                return res.json(item);
                             })
                             .catch((err)=>{
                                 console.log(err);

+ 24 - 1
views/inventoryPage/addIngredient.js

@@ -48,8 +48,31 @@ let addIngredientObj = {
                 .catch((err)=>{
                     banner.createError("Something went wrong and the ingredient could not be added");
                 });
+        }
+    },
+
+    submitNew: function(){
+        event.preventDefault();
+
+        let ingredient = {
+            name: document.querySelector("#newName").value,
+            category: document.querySelector("#newCategory").value,
+            unit: document.querySelector("#newUnit").value
+        }
+
+        let quantity = document.querySelector("#newQuantity").value;
 
-            
+        if(validator.ingredient.all(ingredient, quantity)){
+            axios.post("/ingredients/createone", {ingredient: ingredient, quantity: quantity})
+                .then((item)=>{
+                    merchant.inventory.push(item.data);
+
+                    inventoryObj.display();
+                    inventoryObj.filter();
+                })
+                .catch((err)=>{
+                    banner.createError("Something went wrong and the ingredient could not be created");
+                });
         }
     }
 }

+ 31 - 4
views/inventoryPage/inventory.ejs

@@ -36,15 +36,42 @@
 
         <div id="addIngredientStrand" class="add-ingredient">
             <button onclick="inventoryObj.display()">Back to Inventory</button>
+
             <form onsubmit="addIngredientObj.submitAdd()">
                 <h2>Select Ingredient</h2>
-                <select id="addName"></select>
-                <input id="addQuantity" type="number" step="0.01">
+
+                <label>Ingredient
+                    <select id="addName"></select>
+                </label>
+                
+                <label>Quantity
+                    <input id="addQuantity" type="number" step="0.01" required>
+                </label>
+                
                 <input type="submit" value="Add Ingredient">
             </form>
-            <div>
+
+            <form onsubmit="addIngredientObj.submitNew()">
                 <h2>Create New Ingredient</h2>
-            </div>
+
+                <label>Name
+                    <input id="newName" type="text" required>
+                </label>
+
+                <label>Category
+                    <input id="newCategory" type="text" required>
+                </label>
+
+                <label>Unit
+                    <input id="newUnit" type="text" required>
+                </label>
+
+                <label>Quantity
+                    <input id="newQuantity" type="number" step="0.01" required>
+                </label>
+
+                <input type="submit" value="Create Ingredient">
+            </form>
         </div>
 
         <script>let merchant = <%- JSON.stringify(merchant) %>;</script>