Explorar o código

Fix display of ingredients strand

Lee Morgan %!s(int64=5) %!d(string=hai) anos
pai
achega
2b8071e094
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 2 2
      views/dashboardPage/bundle.js
  2. 2 2
      views/dashboardPage/js/ingredients.js

+ 2 - 2
views/dashboardPage/bundle.js

@@ -2338,9 +2338,9 @@ let ingredients = {
 
 
                 
                 
                 if(ingredient.ingredient.specialUnit === "bottle"){
                 if(ingredient.ingredient.specialUnit === "bottle"){
-                    ingredientDiv.children[2].innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`
+                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} BOTTLES`
                 }else{
                 }else{
-                    ingredientDiv.children[2].innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
+                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
                 }
                 }
 
 
                 categoryDiv.children[1].appendChild(ingredientDiv);
                 categoryDiv.children[1].appendChild(ingredientDiv);

+ 2 - 2
views/dashboardPage/js/ingredients.js

@@ -54,9 +54,9 @@ let ingredients = {
 
 
                 
                 
                 if(ingredient.ingredient.specialUnit === "bottle"){
                 if(ingredient.ingredient.specialUnit === "bottle"){
-                    ingredientDiv.children[2].innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`
+                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} BOTTLES`
                 }else{
                 }else{
-                    ingredientDiv.children[2].innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
+                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
                 }
                 }
 
 
                 categoryDiv.children[1].appendChild(ingredientDiv);
                 categoryDiv.children[1].appendChild(ingredientDiv);