Преглед изворни кода

Update ingredientDetails.js to reflect new bottles data structure.

Lee Morgan пре 5 година
родитељ
комит
b5b0464042
2 измењених фајлова са 2 додато и 10 уклоњено
  1. 1 5
      views/dashboardPage/bundle.js
  2. 1 5
      views/dashboardPage/js/sidebars/ingredientDetails.js

+ 1 - 5
views/dashboardPage/bundle.js

@@ -1858,11 +1858,7 @@ let ingredientDetails = {
 
         let dailyUse = sum / quantities.length;
         const dailyUseDiv = document.getElementById("dailyUse");
-        if(ingredient.ingredient.specialUnit === "bottle"){
-            dailyUseDiv.innerText = `${dailyUse.toFixed(2)} BOTTLES`;
-        }else{
-            dailyUseDiv.innerText = `${dailyUse.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-        }
+        dailyUseDiv.innerText = `${dailyUse.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
 
         //Show recipes that this ingredient is a part of
         let recipeList = document.getElementById("ingredientRecipeList");

+ 1 - 5
views/dashboardPage/js/sidebars/ingredientDetails.js

@@ -26,11 +26,7 @@ let ingredientDetails = {
 
         let dailyUse = sum / quantities.length;
         const dailyUseDiv = document.getElementById("dailyUse");
-        if(ingredient.ingredient.specialUnit === "bottle"){
-            dailyUseDiv.innerText = `${dailyUse.toFixed(2)} BOTTLES`;
-        }else{
-            dailyUseDiv.innerText = `${dailyUse.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-        }
+        dailyUseDiv.innerText = `${dailyUse.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
 
         //Show recipes that this ingredient is a part of
         let recipeList = document.getElementById("ingredientRecipeList");