Browse Source

Bug fix: when saving unit type, "ml" was not handled

Lee Morgan 5 năm trước cách đây
mục cha
commit
69fb7dd6c3

+ 2 - 0
controllers/ingredientData.js

@@ -242,6 +242,7 @@ module.exports = {
                     case "kg": unitType = "mass"; break;
                     case "oz": unitType = "mass"; break;
                     case "lb": unitType = "mass"; break;
+                    case "ml": unitType = "volume"; break;
                     case "l": unitType = "volume"; break;
                     case "tsp": unitType = "volume"; break;
                     case "tbsp": unitType = "volume"; break;
@@ -255,6 +256,7 @@ module.exports = {
                     case "m": unitType = "length"; break;
                     case "in": unitType = "length"; break;
                     case "ft": unitType = "length"; break;
+                    default: unitType = "other";
                 }
 
                 ingredient.unitType = unitType;

+ 4 - 1
views/dashboardPage/bundle.js

@@ -1955,7 +1955,7 @@ let newIngredient = {
         }
     },
 
-    submit: function(Ingredient){
+    submit: function(){
         let unitSelector = document.getElementById("unitSelector");
         let options = document.querySelectorAll("#unitSelector option");
         const quantityValue = parseFloat(document.getElementById("newIngQuantity").value);
@@ -2024,6 +2024,9 @@ let newIngredient = {
         })
             .then(response => response.json())
             .then((response)=>{
+                if(typeof(response) === "string"){
+                    banner.createError(response);
+                }
                 for(let i = 0; i < response.length; i++){
                     merchant.addIngredient(response[i].ingredient, response[i].quantity, response[i].defaultUnit);
                 }

+ 4 - 1
views/dashboardPage/js/sidebars/newIngredient.js

@@ -23,7 +23,7 @@ let newIngredient = {
         }
     },
 
-    submit: function(Ingredient){
+    submit: function(){
         let unitSelector = document.getElementById("unitSelector");
         let options = document.querySelectorAll("#unitSelector option");
         const quantityValue = parseFloat(document.getElementById("newIngQuantity").value);
@@ -92,6 +92,9 @@ let newIngredient = {
         })
             .then(response => response.json())
             .then((response)=>{
+                if(typeof(response) === "string"){
+                    banner.createError(response);
+                }
                 for(let i = 0; i < response.length; i++){
                     merchant.addIngredient(response[i].ingredient, response[i].quantity, response[i].defaultUnit);
                 }