Bug fix everything on the recipes strand including sidebars.

views/dashboardPage/ejs/sidebars/newRecipe.ejs

@@ -30,8 +30,6 @@
             <div id="newRecipeChosenList"></div>
 
             <button id="submitNewRecipe" class="sidebarButton">CREATE</button>
-
-            <button id="recipeFileUpload" class="linkButton">Or, upload a spreadsheet</button>
         </div>
     </div>
 

views/dashboardPage/js/classes/Recipe.js

@@ -167,7 +167,7 @@ class Recipe{
         }
 
         for(let i = 0; i < this._ingredients.length; i++){
-            traverseIngredient(this._ingredients[i]._ingredient, this._ingredients[i].getQuantityAsBase());
+            traverseIngredient(this._ingredients[i]._ingredient, this._ingredients[i].quantity);
         }
     }
 }

views/dashboardPage/js/sidebars/editRecipe.js

@@ -38,6 +38,12 @@ module.exports = {
             ingredient.children[0].children[1].onclick = ()=>{this.removeIngredient(ingredient)};
             ingredient.children[1].children[0].value = recipe.ingredients[i].quantity;
             ingredient.children[1].children[1].value = recipe.ingredients[i].unit;
+
+            let select = ingredient.children[1].children[1];
+            if(recipe.ingredients[i].ingredient.convert.toMass > 0) select.children[0].style.display = "block";
+            if(recipe.ingredients[i].ingredient.convert.toVolume > 0) select.children[1].style.display = "block";
+            if(recipe.ingredients[i].ingredient.convert.toLength > 0) select.children[2].style.display = "block";
+            
             used.appendChild(ingredient);
         }
 
@@ -87,9 +93,9 @@ module.exports = {
         newItem.children[0].children[1].onclick = ()=>{this.removeIngredient(newItem)};
 
         let select = newItem.children[1].children[1];
-        if(ingredient.ingredient.convert.toMass <= 0) select.children[0].style.display = "block";
-        if(ingredient.ingredient.convert.toVolume <= 0) select.children[1].style.display = "block";
-        if(ingredient.ingredient.convert.toLength <= 0) select.children[2].style.display = "block";
+        if(ingredient.ingredient.convert.toMass > 0) select.children[0].style.display = "block";
+        if(ingredient.ingredient.convert.toVolume > 0) select.children[1].style.display = "block";
+        if(ingredient.ingredient.convert.toLength > 0) select.children[2].style.display = "block";
 
         select.value = ingredient.ingredient.unit;
 

views/dashboardPage/js/sidebars/newRecipe.js

@@ -13,7 +13,6 @@ let newRecipe = {
         }
 
         document.getElementById("submitNewRecipe").onclick = ()=>{this.submit()};
-        document.getElementById("recipeFileUpload").onclick = ()=>{controller.openModal("recipeSpreadsheet")};
         document.getElementById("newRecipeSearch").onkeyup = ()=>{this.populateChoices()};
 
         this.unchosen = [];
@@ -61,9 +60,9 @@ let newRecipe = {
         element.ingredient = ingredient;
 
         let select = element.children[1].children[1];
-        if(ingredient.convert.toMass !== undefined) select.children[0].style.display = "block";
-        if(ingredient.convert.toVolume !== undefined) select.children[1].style.display = "block";
-        if(ingredient.convert.toLength !== undefined) select.children[2].style.display = "block";
+        if(ingredient.convert.toMass > 0) select.children[0].style.display = "block";
+        if(ingredient.convert.toVolume > 0) select.children[1].style.display = "block";
+        if(ingredient.convert.toLength > 0) select.children[2].style.display = "block";
 
         select.value = ingredient.unit;
 
@@ -111,46 +110,12 @@ let newRecipe = {
                 }
             })
             .catch((err)=>{
+                console.log(err);
                 controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";
             });
-    },
-
-    submitSpreadsheet: function(){
-        event.preventDefault();
-        controller.closeModal();
-
-        const file = document.getElementById("spreadsheetInput").files[0];
-        let data = new FormData();
-        data.append("recipes", file);
-
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/recipes/create/spreadsheet", {
-            method: "post",
-            body: data
-        })
-            .then(response => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    controller.createBanner(response, "error");
-                }else{
-                    merchant.addRecipes(response);
-                    state.updateRecipes();
-
-                    controller.createBanner("ALL RECIPES SUCCESSFULLY CREATED", "success");
-                    controller.openStrand("recipeBook");
-                }
-            })
-            .catch((err)=>{
-                controller.createBanner("UNABLE TO DISPLAY NEW RECIPES.  PLEASE REFRESH THE PAGE", "error");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
     }
 };