소스 검색

Add conversion to backend data for sub-ingredients.
Display only current unit type for one of the sub-ingredient select boxes.

Lee Morgan 5 년 전
부모
커밋
02435aaf6c
1개의 변경된 파일11개의 추가작업 그리고 19개의 파일을 삭제
  1. 11 19
      views/dashboardPage/js/modal.js

+ 11 - 19
views/dashboardPage/js/modal.js

@@ -205,15 +205,11 @@ let modal = {
             }
             div.children[1].children[0].children[1].value = newIngredient.unit;
 
-            if(ingredient.convert.toMass !== undefined){
-                createOptGroup(div.children[1].children[2].children[1], "Mass", ["g", "kg", "oz", "lb"])
-            }
-            if(ingredient.convert.toVolume !== undefined){
-                createOptGroup(div.children[1].children[2].children[1], "Volume", ["ml", "l", "tsp", "tbsp", "ozfl", "cup", "pt", "qt", "gal"]);
-            }
-            if(ingredient.convert.toLength !== undefined){
-                createOptGroup(div.children[1].children[2].children[1], "Length", ["mm", "cm", "m", "in", "ft"]);
-            }
+            createOptGroup(
+                div.children[1].children[2].children[1],
+                ingredient.unitType,
+                ingredient.getPotentialUnits()    
+            );
             div.children[1].children[2].children[1].value = ingredient.unit;
         }
 
@@ -252,16 +248,12 @@ let modal = {
                     }
                     div.children[1].children[0].children[1].value = merchant.inventory[i].ingredient.unit;
 
-                    conversions = ingredient.convert;
-                    if(conversions.toMass !== undefined){
-                        createOptGroup(div.children[1].children[2].children[1], "Mass", ["g", "kg", "oz", "lb"]);
-                    }
-                    if(conversions.toVolume !== undefined){
-                        createOptGroup(div.children[1].children[2].children[1], "Volume", ["ml", "l", "tsp", "tbsp", "ozfl", "cup", "pt", "qt", "gal"]);
-                    }
-                    if(conversions.toLength !== undefined){
-                        createOptGroup(div.children[1].children[2].children[1], "Length", ["mm", "cm", "m", "in", "ft"]);
-                    }
+
+                    createOptGroup(
+                        div.children[1].children[2].children[1],
+                        ingredient.unitType,
+                        ingredient.getPotentialUnits()    
+                    );
                     div.children[1].children[2].children[1].value = merchant.inventory[i].ingredient.unit;
 
                     skip = true;