Browse Source

Display unit cost on the ingredient details sidebar.

Lee Morgan 5 years ago
parent
commit
84625ce248

+ 2 - 2
views/dashboardPage/ejs/sidebars/ingredientDetails.ejs

@@ -34,8 +34,8 @@
 
     <div class="lineBorder"></div>
 
-    <label>AVERAGE DAILY USE (30 DAYS)
-        <p id="dailyUse"></p>
+    <label>UNIT COST
+        <p id="unitCostDisplay"></p>
     </label>
 
     <div class="lineBorder"></div>

+ 1 - 1
views/dashboardPage/js/classes/Ingredient.js

@@ -133,7 +133,7 @@ class Ingredient{
             }
         }
 
-        return totalCost / quantity;
+        return (quantity === 0) ? 0 : totalCost / quantity;
     }
 }
 

+ 23 - 13
views/dashboardPage/js/sidebars/ingredientDetails.js

@@ -9,23 +9,33 @@ let ingredientDetails = {
         document.getElementById("ingredientStock").innerText = ingredient.getQuantityDisplay();
 
         //Calculate and display average daily use
-        let quantities = [];
-        let now = new Date();
-        for(let i = 1; i < 31; i++){
-            let endDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i)
-            let startDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i - 1);
+        // let quantities = [];
+        // let now = new Date();
+        // for(let i = 1; i < 31; i++){
+        //     let endDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i)
+        //     let startDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() - i - 1);
 
-            quantities.push(merchant.getSingleIngredientSold(ingredient, startDay, endDay));
-        }
+        //     quantities.push(merchant.getSingleIngredientSold(ingredient, startDay, endDay));
+        // }
+
+        // let sum = 0;
+        // for(let i = 0; i < quantities.length; i++){
+        //     sum += quantities[i];
+        // }
+
+        // let dailyUse = sum / quantities.length;
+        // const dailyUseDiv = document.getElementById("dailyUse");
+        // dailyUseDiv.innerText = `${dailyUse.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
 
-        let sum = 0;
-        for(let i = 0; i < quantities.length; i++){
-            sum += quantities[i];
+        let unitCostElement = document.getElementById("unitCostDisplay");
+        let unitCost = ingredient.ingredient.getUnitCost();
+        if(unitCost === 0){
+            unitCostElement.parentElement.style.display = "none";
+        }else{
+            unitCostElement.parentElement.style.display = "block";
+            unitCostElement.innerText = `$${unitCost.toFixed(2)}`;
         }
 
-        let dailyUse = sum / quantities.length;
-        const dailyUseDiv = document.getElementById("dailyUse");
-        dailyUseDiv.innerText = `${dailyUse.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
 
         let subIngredientList = document.getElementById("subIngredientList");
         let template = document.getElementById("ingredientRecipe").content.children[0];