Updating bottle type ingredients now functional.

controllers/ingredientData.js

@@ -1,10 +1,5 @@
 const Ingredient = require("../models/ingredient");
 
-const helper = require("./helper.js");
-
-const xlsx = require("xlsx");
-const fs = require("fs");
-
 module.exports = {
     /*
     POST - create a single ingredient and then add to the merchant

views/dashboardPage/ejs/sidebars/editIngredient.ejs

@@ -23,11 +23,11 @@
 
     <label id="editSpecialLabel"></label>
 
-    <div class="lineBorder"></div>
+    <div class="lineBorder bottleHide"></div>
 
-    <h3>DEFAULT UNIT</h3>
+    <h3 class="bottleHide">DEFAULT UNIT</h3>
 
-    <div id="unitButtons"></div>
+    <div class="bottleHide" id="unitButtons"></div>
 
     <div class="lineBorder"></div>
 

views/dashboardPage/js/classes/Ingredient.js

@@ -115,6 +115,7 @@ class Ingredient{
             case "mass": return ["g", "kg", "oz", "lb"];
             case "volume": return ["ml", "l", "tsp", "tbsp", "ozfl", "cup", "pt", "qt", "gal"];
             case "length": return ["mm", "cm", "m", "in", "ft"];
+            default: return [];
         }
     }
 }

views/dashboardPage/js/sidebars/editIngredient.js

@@ -20,6 +20,16 @@ let editIngredient = {
 
         //Populate the unit buttons
         let units = ingredient.ingredient.getPotentialUnits();
+        let hiders = document.querySelectorAll(".bottleHide");
+        if(units.length === 0){
+            for(let i = 0; i < hiders.length; i++){
+                hiders[i].style.display = "none";
+            }
+        }else{
+            for(let i = 0; i < hiders.length; i++){
+                hiders[i].style.display = "flex";
+            }
+        }
 
         for(let i = 0; i < units.length; i++){
             let button = document.createElement("button");
@@ -132,7 +142,7 @@ let editIngredient = {
 
     submit: function(ingredient){
         let quantity = parseFloat(document.getElementById("editIngQuantityLabel").children[0].value);
-        let unit = document.getElementById("unitButtons").querySelector(".unitActive").innerText.toLowerCase();
+        let unit = (ingredient.ingredient.unit === "bottle") ? "bottle" : document.getElementById("unitButtons").querySelector(".unitActive").innerText.toLowerCase();
 
         let massDiv = document.getElementById("editIngMass");
         let volumeDiv = document.getElementById("editIngVolume");
@@ -176,6 +186,11 @@ let editIngredient = {
             case "mass": data.ingredient.convert.toMass = 1; break;
             case "volume": data.ingredient.convert.toVolume = 1; break;
             case "length": data.ingredient.convert.toLength = 1; break;
+            case "bottle":
+                data.quantity = quantity / data.ingredient.convert.toVolume;
+                data.ingredient.convert.toMass = 1 / controller.toBase(rightMass / leftMass);
+                data.ingredient.convert.toVolume = ingredient.ingredient.convert.toVolume;
+                data.ingredient.convert.toLength = 1 / controller.toBase(rightLength / leftLength);
         }
 
         let loader = document.getElementById("loaderContainer");