Ver código fonte

Bug fix: getting the unit multiplier was missing some data for fluid ounces.

Lee Morgan 5 anos atrás
pai
commit
2b4346439e

+ 1 - 0
views/dashboardPage/js/dashboard.js

@@ -505,6 +505,7 @@ controller = {
             case "l": return multiplier;
             case "tsp": return multiplier * 202.8842;
             case "tbsp": return multiplier * 67.6278;
+            case "ozfl": return multiplier * 33.8141;
             case "cup": return multiplier * 4.1667;
             case "pt": return multiplier * 2.1134;
             case "qt": return multiplier * 1.0567

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

@@ -98,11 +98,15 @@ let newIngredient = {
         if(isNaN(newIngredient.ingredient.convert.toMass)) newIngredient.ingredient.convert.toMass = 0;
         if(isNaN(newIngredient.ingredient.convert.toVolume)) newIngredient.ingredient.convert.toVolume = 0;
         if(isNaN(newIngredient.ingredient.convert.toLength)) newIngredient.ingredient.convert.toLength = 0;
-    
+
+        let convert = newIngredient.ingredient.convert;
         switch(controller.getUnitType(unit)){
             case "mass": newIngredient.ingredient.convert.toMass = 1; break;
             case "volume": newIngredient.ingredient.convert.toVolume = 1; break;
             case "length": newIngredient.ingredient.convert.toLength = 1; break;
+            // case "mass": convert.toMass = controller.unitMultiplier(unit, "g"); break;
+            // case "volume": convert.toVolume = controller.unitMultiplier(unit, "l"); break;
+            // case "length": convert.toLength = controller.unitMultiplier(unit, "m"); break;
             case "bottle": 
                 let bottleQuant = document.getElementById("bottleSize").value;
                 let bottleUnit = document.getElementById("bottleUnits").value;