diff --git a/cookbook/helper/fdc_helper.py b/cookbook/helper/fdc_helper.py
new file mode 100644
index 00000000..09e0f292
--- /dev/null
+++ b/cookbook/helper/fdc_helper.py
@@ -0,0 +1,19 @@
+import json
+
+
+def get_all_nutrient_types():
+ f = open('') # <--- download the foundation food or any other dataset and retrieve all nutrition ID's from it https://fdc.nal.usda.gov/download-datasets.html
+ json_data = json.loads(f.read())
+
+ nutrients = {}
+ for food in json_data['FoundationFoods']:
+ for entry in food['foodNutrients']:
+ nutrients[entry['nutrient']['id']] = entry['nutrient']['name']
+
+ nutrient_ids = list(nutrients.keys())
+ nutrient_ids.sort()
+ for nid in nutrient_ids:
+ print('{', f'value: {nid}, text: "{nutrients[nid]} ({nid})"', '},')
+
+
+get_all_nutrient_types()
diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 6a841a31..ff4e2dfc 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -19,6 +19,7 @@ from oauth2_provider.models import AccessToken
from PIL import Image
from rest_framework import serializers
from rest_framework.exceptions import NotFound, ValidationError
+from rest_framework.fields import IntegerField
from cookbook.helper.CustomStorageClass import CachedS3Boto3Storage
from cookbook.helper.HelperFunctions import str2bool
@@ -524,6 +525,7 @@ class SupermarketSerializer(UniqueFieldsMixin, SpacedModelSerializer, OpenDataMo
class PropertyTypeSerializer(OpenDataModelMixin, WritableNestedModelSerializer, UniqueFieldsMixin):
id = serializers.IntegerField(required=False)
+ order = IntegerField(default=0, required=False)
def create(self, validated_data):
validated_data['name'] = validated_data['name'].strip()
diff --git a/vue/src/apps/PropertyEditorView/PropertyEditorView.vue b/vue/src/apps/PropertyEditorView/PropertyEditorView.vue
index b785fa09..bf413773 100644
--- a/vue/src/apps/PropertyEditorView/PropertyEditorView.vue
+++ b/vue/src/apps/PropertyEditorView/PropertyEditorView.vue
@@ -15,10 +15,11 @@
-
+
+
{{$t('FDC_Search')}}
-
+
{{ $t('Name') }} |
@@ -26,7 +27,11 @@
{{ $t('Properties_Food_Amount') }} |
{{ $t('Properties_Food_Unit') }} |
- {{ pt.name }} ({{ pt.unit }})
+ {{ pt.name }}
+ ({{ pt.unit }})
+ FDC
+ FDC
+
|
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 0a4dfb09..d775f7c3 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -84,7 +84,9 @@
"Properties_Food_Amount": "Properties Food Amount",
"Properties_Food_Unit": "Properties Food Unit",
"FDC_ID": "FDC ID",
+ "FDC_Search": "FDC Search",
"FDC_ID_help": "FDC database ID",
+ "property_type_fdc_hint": "Only property types with an FDC ID can automatically pull data from the FDC database",
"Data_Import_Info": "Enhance your Space by importing a community curated list of foods, units and more to improve your recipe collection.",
"Update_Existing_Data": "Update Existing Data",
"Use_Metric": "Use Metric Units",
diff --git a/vue/src/utils/models.js b/vue/src/utils/models.js
index 6b18821d..41adb748 100644
--- a/vue/src/utils/models.js
+++ b/vue/src/utils/models.js
@@ -23,7 +23,7 @@ export class Models {
false: undefined,
},
},
- tree: { default: undefined },
+ tree: {default: undefined},
},
},
delete: {
@@ -50,7 +50,7 @@ export class Models {
type: "lookup",
field: "target",
list: "self",
- sticky_options: [{ id: 0, name: "tree_root" }],
+ sticky_options: [{id: 0, name: "tree_root"}],
},
},
},
@@ -71,7 +71,7 @@ export class Models {
food_onhand: true,
shopping: true,
},
- tags: [{ field: "supermarket_category", label: "name", color: "info" }],
+ tags: [{field: "supermarket_category", label: "name", color: "info"}],
// REQUIRED: unordered array of fields that can be set during create
create: {
// if not defined partialUpdate will use the same parameters, prepending 'id'
@@ -177,7 +177,7 @@ export class Models {
field: "substitute_siblings",
label: "substitute_siblings", // form.label always translated in utils.getForm()
help_text: "substitute_siblings_help", // form.help_text always translated
- condition: { field: "parent", value: true, condition: "field_exists" },
+ condition: {field: "parent", value: true, condition: "field_exists"},
},
substitute_children: {
form_field: true,
@@ -186,7 +186,7 @@ export class Models {
field: "substitute_children",
label: "substitute_children",
help_text: "substitute_children_help",
- condition: { field: "numchild", value: 0, condition: "gt" },
+ condition: {field: "numchild", value: 0, condition: "gt"},
},
inherit_fields: {
form_field: true,
@@ -196,7 +196,7 @@ export class Models {
field: "inherit_fields",
list: "FOOD_INHERIT_FIELDS",
label: "InheritFields",
- condition: { field: "food_children_exist", value: true, condition: "preference_equals" },
+ condition: {field: "food_children_exist", value: true, condition: "preference_equals"},
help_text: "InheritFields_help",
},
child_inherit_fields: {
@@ -207,7 +207,7 @@ export class Models {
field: "child_inherit_fields",
list: "FOOD_INHERIT_FIELDS",
label: "ChildInheritFields", // form.label always translated in utils.getForm()
- condition: { field: "numchild", value: 0, condition: "gt" },
+ condition: {field: "numchild", value: 0, condition: "gt"},
help_text: "ChildInheritFields_help", // form.help_text always translated
},
reset_inherit: {
@@ -217,7 +217,7 @@ export class Models {
field: "reset_inherit",
label: "reset_children",
help_text: "reset_children_help",
- condition: { field: "numchild", value: 0, condition: "gt" },
+ condition: {field: "numchild", value: 0, condition: "gt"},
},
form_function: "FoodCreateDefault",
},
@@ -304,24 +304,24 @@ export class Models {
form_field: true,
type: "choice",
options: [
- { value: "g", text: "g" },
- { value: "kg", text: "kg" },
- { value: "ounce", text: "ounce" },
- { value: "pound", text: "pound" },
- { value: "ml", text: "ml" },
- { value: "l", text: "l" },
- { value: "fluid_ounce", text: "fluid_ounce" },
- { value: "pint", text: "pint" },
- { value: "quart", text: "quart" },
- { value: "gallon", text: "gallon" },
- { value: "tbsp", text: "tbsp" },
- { value: "tsp", text: "tsp" },
- { value: "imperial_fluid_ounce", text: "imperial_fluid_ounce" },
- { value: "imperial_pint", text: "imperial_pint" },
- { value: "imperial_quart", text: "imperial_quart" },
- { value: "imperial_gallon", text: "imperial_gallon" },
- { value: "imperial_tbsp", text: "imperial_tbsp" },
- { value: "imperial_tsp", text: "imperial_tsp" },
+ {value: "g", text: "g"},
+ {value: "kg", text: "kg"},
+ {value: "ounce", text: "ounce"},
+ {value: "pound", text: "pound"},
+ {value: "ml", text: "ml"},
+ {value: "l", text: "l"},
+ {value: "fluid_ounce", text: "fluid_ounce"},
+ {value: "pint", text: "pint"},
+ {value: "quart", text: "quart"},
+ {value: "gallon", text: "gallon"},
+ {value: "tbsp", text: "tbsp"},
+ {value: "tsp", text: "tsp"},
+ {value: "imperial_fluid_ounce", text: "imperial_fluid_ounce"},
+ {value: "imperial_pint", text: "imperial_pint"},
+ {value: "imperial_quart", text: "imperial_quart"},
+ {value: "imperial_gallon", text: "imperial_gallon"},
+ {value: "imperial_tbsp", text: "imperial_tbsp"},
+ {value: "imperial_tsp", text: "imperial_tsp"},
],
field: "base_unit",
label: "Base Unit",
@@ -457,7 +457,7 @@ export class Models {
static SUPERMARKET = {
name: "Supermarket",
apiName: "Supermarket",
- ordered_tags: [{ field: "category_to_supermarket", label: "category::name", color: "info" }],
+ ordered_tags: [{field: "category_to_supermarket", label: "category::name", color: "info"}],
create: {
params: [["name", "description", "category_to_supermarket"]],
form: {
@@ -540,16 +540,16 @@ export class Models {
form_field: true,
type: "choice",
options: [
- { value: "FOOD_ALIAS", text: "Food_Alias" },
- { value: "UNIT_ALIAS", text: "Unit_Alias" },
- { value: "KEYWORD_ALIAS", text: "Keyword_Alias" },
- { value: "NAME_REPLACE", text: "Name_Replace" },
- { value: "DESCRIPTION_REPLACE", text: "Description_Replace" },
- { value: "INSTRUCTION_REPLACE", text: "Instruction_Replace" },
- { value: "FOOD_REPLACE", text: "Food_Replace" },
- { value: "UNIT_REPLACE", text: "Unit_Replace" },
- { value: "NEVER_UNIT", text: "Never_Unit" },
- { value: "TRANSPOSE_WORDS", text: "Transpose_Words" },
+ {value: "FOOD_ALIAS", text: "Food_Alias"},
+ {value: "UNIT_ALIAS", text: "Unit_Alias"},
+ {value: "KEYWORD_ALIAS", text: "Keyword_Alias"},
+ {value: "NAME_REPLACE", text: "Name_Replace"},
+ {value: "DESCRIPTION_REPLACE", text: "Description_Replace"},
+ {value: "INSTRUCTION_REPLACE", text: "Instruction_Replace"},
+ {value: "FOOD_REPLACE", text: "Food_Replace"},
+ {value: "UNIT_REPLACE", text: "Unit_Replace"},
+ {value: "NEVER_UNIT", text: "Never_Unit"},
+ {value: "TRANSPOSE_WORDS", text: "Transpose_Words"},
],
field: "type",
label: "Type",
@@ -700,7 +700,7 @@ export class Models {
},
},
create: {
- params: [["name", "unit", "description", "order"]],
+ params: [["name", "unit", "description", "order", "fdc_id"]],
form: {
show_help: true,
name: {
@@ -733,17 +733,240 @@ export class Models {
field: "order",
label: "Order",
placeholder: "",
- optional: false,
+ optional: true,
help_text: "OrderInformation",
},
fdc_id: {
form_field: true,
type: "choice",
options: [
- { value: 1008, text: "Calories (1008)" },
- { value: 1005, text: "Carbohydrates (1005)" },
- { value: 1003, text: "Protein (1003)" },
- { value: 1004, text: "Fat (1004)" },
+ {value: 1002, text: "Nitrogen (1002)"},
+ {value: 1003, text: "Protein (1003)"},
+ {value: 1004, text: "Total lipid (fat) (1004)"},
+ {value: 1005, text: "Carbohydrate, by difference (1005)"},
+ {value: 1007, text: "Ash (1007)"},
+ {value: 1008, text: "Energy (1008)"},
+ {value: 1009, text: "Starch (1009)"},
+ {value: 1010, text: "Sucrose (1010)"},
+ {value: 1011, text: "Glucose (1011)"},
+ {value: 1012, text: "Fructose (1012)"},
+ {value: 1013, text: "Lactose (1013)"},
+ {value: 1014, text: "Maltose (1014)"},
+ {value: 1024, text: "Specific Gravity (1024)"},
+ {value: 1032, text: "Citric acid (1032)"},
+ {value: 1039, text: "Malic acid (1039)"},
+ {value: 1041, text: "Oxalic acid (1041)"},
+ {value: 1043, text: "Pyruvic acid (1043)"},
+ {value: 1044, text: "Quinic acid (1044)"},
+ {value: 1050, text: "Carbohydrate, by summation (1050)"},
+ {value: 1051, text: "Water (1051)"},
+ {value: 1062, text: "Energy (1062)"},
+ {value: 1063, text: "Sugars, Total (1063)"},
+ {value: 1075, text: "Galactose (1075)"},
+ {value: 1076, text: "Raffinose (1076)"},
+ {value: 1077, text: "Stachyose (1077)"},
+ {value: 1079, text: "Fiber, total dietary (1079)"},
+ {value: 1082, text: "Fiber, soluble (1082)"},
+ {value: 1084, text: "Fiber, insoluble (1084)"},
+ {value: 1085, text: "Total fat (NLEA) (1085)"},
+ {value: 1087, text: "Calcium, Ca (1087)"},
+ {value: 1089, text: "Iron, Fe (1089)"},
+ {value: 1090, text: "Magnesium, Mg (1090)"},
+ {value: 1091, text: "Phosphorus, P (1091)"},
+ {value: 1092, text: "Potassium, K (1092)"},
+ {value: 1093, text: "Sodium, Na (1093)"},
+ {value: 1094, text: "Sulfur, S (1094)"},
+ {value: 1095, text: "Zinc, Zn (1095)"},
+ {value: 1097, text: "Cobalt, Co (1097)"},
+ {value: 1098, text: "Copper, Cu (1098)"},
+ {value: 1100, text: "Iodine, I (1100)"},
+ {value: 1101, text: "Manganese, Mn (1101)"},
+ {value: 1102, text: "Molybdenum, Mo (1102)"},
+ {value: 1103, text: "Selenium, Se (1103)"},
+ {value: 1105, text: "Retinol (1105)"},
+ {value: 1106, text: "Vitamin A, RAE (1106)"},
+ {value: 1107, text: "Carotene, beta (1107)"},
+ {value: 1108, text: "Carotene, alpha (1108)"},
+ {value: 1109, text: "Vitamin E (alpha-tocopherol) (1109)"},
+ {value: 1110, text: "Vitamin D (D2 + D3), International Units (1110)"},
+ {value: 1111, text: "Vitamin D2 (ergocalciferol) (1111)"},
+ {value: 1112, text: "Vitamin D3 (cholecalciferol) (1112)"},
+ {value: 1113, text: "25-hydroxycholecalciferol (1113)"},
+ {value: 1114, text: "Vitamin D (D2 + D3) (1114)"},
+ {value: 1116, text: "Phytoene (1116)"},
+ {value: 1117, text: "Phytofluene (1117)"},
+ {value: 1118, text: "Carotene, gamma (1118)"},
+ {value: 1119, text: "Zeaxanthin (1119)"},
+ {value: 1120, text: "Cryptoxanthin, beta (1120)"},
+ {value: 1121, text: "Lutein (1121)"},
+ {value: 1122, text: "Lycopene (1122)"},
+ {value: 1123, text: "Lutein + zeaxanthin (1123)"},
+ {value: 1125, text: "Tocopherol, beta (1125)"},
+ {value: 1126, text: "Tocopherol, gamma (1126)"},
+ {value: 1127, text: "Tocopherol, delta (1127)"},
+ {value: 1128, text: "Tocotrienol, alpha (1128)"},
+ {value: 1129, text: "Tocotrienol, beta (1129)"},
+ {value: 1130, text: "Tocotrienol, gamma (1130)"},
+ {value: 1131, text: "Tocotrienol, delta (1131)"},
+ {value: 1137, text: "Boron, B (1137)"},
+ {value: 1146, text: "Nickel, Ni (1146)"},
+ {value: 1159, text: "cis-beta-Carotene (1159)"},
+ {value: 1160, text: "cis-Lycopene (1160)"},
+ {value: 1161, text: "cis-Lutein/Zeaxanthin (1161)"},
+ {value: 1162, text: "Vitamin C, total ascorbic acid (1162)"},
+ {value: 1165, text: "Thiamin (1165)"},
+ {value: 1166, text: "Riboflavin (1166)"},
+ {value: 1167, text: "Niacin (1167)"},
+ {value: 1170, text: "Pantothenic acid (1170)"},
+ {value: 1175, text: "Vitamin B-6 (1175)"},
+ {value: 1176, text: "Biotin (1176)"},
+ {value: 1177, text: "Folate, total (1177)"},
+ {value: 1178, text: "Vitamin B-12 (1178)"},
+ {value: 1180, text: "Choline, total (1180)"},
+ {value: 1183, text: "Vitamin K (Menaquinone-4) (1183)"},
+ {value: 1184, text: "Vitamin K (Dihydrophylloquinone) (1184)"},
+ {value: 1185, text: "Vitamin K (phylloquinone) (1185)"},
+ {value: 1188, text: "5-methyl tetrahydrofolate (5-MTHF) (1188)"},
+ {value: 1191, text: "10-Formyl folic acid (10HCOFA) (1191)"},
+ {value: 1192, text: "5-Formyltetrahydrofolic acid (5-HCOH4 (1192)"},
+ {value: 1194, text: "Choline, free (1194)"},
+ {value: 1195, text: "Choline, from phosphocholine (1195)"},
+ {value: 1196, text: "Choline, from phosphotidyl choline (1196)"},
+ {value: 1197, text: "Choline, from glycerophosphocholine (1197)"},
+ {value: 1198, text: "Betaine (1198)"},
+ {value: 1199, text: "Choline, from sphingomyelin (1199)"},
+ {value: 1210, text: "Tryptophan (1210)"},
+ {value: 1211, text: "Threonine (1211)"},
+ {value: 1212, text: "Isoleucine (1212)"},
+ {value: 1213, text: "Leucine (1213)"},
+ {value: 1214, text: "Lysine (1214)"},
+ {value: 1215, text: "Methionine (1215)"},
+ {value: 1216, text: "Cystine (1216)"},
+ {value: 1217, text: "Phenylalanine (1217)"},
+ {value: 1218, text: "Tyrosine (1218)"},
+ {value: 1219, text: "Valine (1219)"},
+ {value: 1220, text: "Arginine (1220)"},
+ {value: 1221, text: "Histidine (1221)"},
+ {value: 1222, text: "Alanine (1222)"},
+ {value: 1223, text: "Aspartic acid (1223)"},
+ {value: 1224, text: "Glutamic acid (1224)"},
+ {value: 1225, text: "Glycine (1225)"},
+ {value: 1226, text: "Proline (1226)"},
+ {value: 1227, text: "Serine (1227)"},
+ {value: 1228, text: "Hydroxyproline (1228)"},
+ {value: 1232, text: "Cysteine (1232)"},
+ {value: 1253, text: "Cholesterol (1253)"},
+ {value: 1257, text: "Fatty acids, total trans (1257)"},
+ {value: 1258, text: "Fatty acids, total saturated (1258)"},
+ {value: 1259, text: "SFA 4:0 (1259)"},
+ {value: 1260, text: "SFA 6:0 (1260)"},
+ {value: 1261, text: "SFA 8:0 (1261)"},
+ {value: 1262, text: "SFA 10:0 (1262)"},
+ {value: 1263, text: "SFA 12:0 (1263)"},
+ {value: 1264, text: "SFA 14:0 (1264)"},
+ {value: 1265, text: "SFA 16:0 (1265)"},
+ {value: 1266, text: "SFA 18:0 (1266)"},
+ {value: 1267, text: "SFA 20:0 (1267)"},
+ {value: 1268, text: "MUFA 18:1 (1268)"},
+ {value: 1269, text: "PUFA 18:2 (1269)"},
+ {value: 1270, text: "PUFA 18:3 (1270)"},
+ {value: 1271, text: "PUFA 20:4 (1271)"},
+ {value: 1272, text: "PUFA 22:6 n-3 (DHA) (1272)"},
+ {value: 1273, text: "SFA 22:0 (1273)"},
+ {value: 1276, text: "PUFA 18:4 (1276)"},
+ {value: 1277, text: "MUFA 20:1 (1277)"},
+ {value: 1278, text: "PUFA 20:5 n-3 (EPA) (1278)"},
+ {value: 1279, text: "MUFA 22:1 (1279)"},
+ {value: 1280, text: "PUFA 22:5 n-3 (DPA) (1280)"},
+ {value: 1281, text: "TFA 14:1 t (1281)"},
+ {value: 1284, text: "Ergosterol (1284)"},
+ {value: 1285, text: "Stigmasterol (1285)"},
+ {value: 1286, text: "Campesterol (1286)"},
+ {value: 1287, text: "Brassicasterol (1287)"},
+ {value: 1288, text: "Beta-sitosterol (1288)"},
+ {value: 1289, text: "Campestanol (1289)"},
+ {value: 1292, text: "Fatty acids, total monounsaturated (1292)"},
+ {value: 1293, text: "Fatty acids, total polyunsaturated (1293)"},
+ {value: 1294, text: "Beta-sitostanol (1294)"},
+ {value: 1296, text: "Delta-5-avenasterol (1296)"},
+ {value: 1298, text: "Phytosterols, other (1298)"},
+ {value: 1299, text: "SFA 15:0 (1299)"},
+ {value: 1300, text: "SFA 17:0 (1300)"},
+ {value: 1301, text: "SFA 24:0 (1301)"},
+ {value: 1303, text: "TFA 16:1 t (1303)"},
+ {value: 1304, text: "TFA 18:1 t (1304)"},
+ {value: 1305, text: "TFA 22:1 t (1305)"},
+ {value: 1306, text: "TFA 18:2 t not further defined (1306)"},
+ {value: 1311, text: "PUFA 18:2 CLAs (1311)"},
+ {value: 1312, text: "MUFA 24:1 c (1312)"},
+ {value: 1313, text: "PUFA 20:2 n-6 c,c (1313)"},
+ {value: 1314, text: "MUFA 16:1 c (1314)"},
+ {value: 1315, text: "MUFA 18:1 c (1315)"},
+ {value: 1316, text: "PUFA 18:2 n-6 c,c (1316)"},
+ {value: 1317, text: "MUFA 22:1 c (1317)"},
+ {value: 1321, text: "PUFA 18:3 n-6 c,c,c (1321)"},
+ {value: 1323, text: "MUFA 17:1 (1323)"},
+ {value: 1325, text: "PUFA 20:3 (1325)"},
+ {value: 1329, text: "Fatty acids, total trans-monoenoic (1329)"},
+ {value: 1330, text: "Fatty acids, total trans-dienoic (1330)"},
+ {value: 1331, text: "Fatty acids, total trans-polyenoic (1331)"},
+ {value: 1333, text: "MUFA 15:1 (1333)"},
+ {value: 1334, text: "PUFA 22:2 (1334)"},
+ {value: 1335, text: "SFA 11:0 (1335)"},
+ {value: 1340, text: "Daidzein (1340)"},
+ {value: 1341, text: "Genistein (1341)"},
+ {value: 1404, text: "PUFA 18:3 n-3 c,c,c (ALA) (1404)"},
+ {value: 1405, text: "PUFA 20:3 n-3 (1405)"},
+ {value: 1406, text: "PUFA 20:3 n-6 (1406)"},
+ {value: 1409, text: "PUFA 18:3i (1409)"},
+ {value: 1411, text: "PUFA 22:4 (1411)"},
+ {value: 1414, text: "PUFA 20:3 n-9 (1414)"},
+ {value: 2000, text: "Sugars, total including NLEA (2000)"},
+ {value: 2003, text: "SFA 5:0 (2003)"},
+ {value: 2004, text: "SFA 7:0 (2004)"},
+ {value: 2005, text: "SFA 9:0 (2005)"},
+ {value: 2006, text: "SFA 21:0 (2006)"},
+ {value: 2007, text: "SFA 23:0 (2007)"},
+ {value: 2008, text: "MUFA 12:1 (2008)"},
+ {value: 2009, text: "MUFA 14:1 c (2009)"},
+ {value: 2010, text: "MUFA 17:1 c (2010)"},
+ {value: 2012, text: "MUFA 20:1 c (2012)"},
+ {value: 2013, text: "TFA 20:1 t (2013)"},
+ {value: 2014, text: "MUFA 22:1 n-9 (2014)"},
+ {value: 2015, text: "MUFA 22:1 n-11 (2015)"},
+ {value: 2016, text: "PUFA 18:2 c (2016)"},
+ {value: 2017, text: "TFA 18:2 t (2017)"},
+ {value: 2018, text: "PUFA 18:3 c (2018)"},
+ {value: 2019, text: "TFA 18:3 t (2019)"},
+ {value: 2020, text: "PUFA 20:3 c (2020)"},
+ {value: 2021, text: "PUFA 22:3 (2021)"},
+ {value: 2022, text: "PUFA 20:4c (2022)"},
+ {value: 2023, text: "PUFA 20:5c (2023)"},
+ {value: 2024, text: "PUFA 22:5 c (2024)"},
+ {value: 2025, text: "PUFA 22:6 c (2025)"},
+ {value: 2026, text: "PUFA 20:2 c (2026)"},
+ {value: 2028, text: "trans-beta-Carotene (2028)"},
+ {value: 2029, text: "trans-Lycopene (2029)"},
+ {value: 2032, text: "Cryptoxanthin, alpha (2032)"},
+ {value: 2033, text: "Total dietary fiber (AOAC 2011.25) (2033)"},
+ {value: 2038, text: "High Molecular Weight Dietary Fiber (HMWDF) (2038)"},
+ {value: 2047, text: "Energy (Atwater General Factors) (2047)"},
+ {value: 2048, text: "Energy (Atwater Specific Factors) (2048)"},
+ {value: 2049, text: "Daidzin (2049)"},
+ {value: 2050, text: "Genistin (2050)"},
+ {value: 2051, text: "Glycitin (2051)"},
+ {value: 2052, text: "Delta-7-Stigmastenol (2052)"},
+ {value: 2053, text: "Stigmastadiene (2053)"},
+ {value: 2057, text: "Ergothioneine (2057)"},
+ {value: 2058, text: "Beta-glucan (2058)"},
+ {value: 2059, text: "Vitamin D4 (2059)"},
+ {value: 2060, text: "Ergosta-7-enol (2060)"},
+ {value: 2061, text: " Ergosta-7,22-dienol (2061)"},
+ {value: 2062, text: " Ergosta-5,7-dienol (2062)"},
+ {value: 2063, text: "Verbascose (2063)"},
+ {value: 2065, text: "Low Molecular Weight Dietary Fiber (LMWDF) (2065)"},
+ {value: 2066, text: "Vitamin A (2066)"},
+ {value: 2069, text: "Glutathione (2069)"}
],
field: "fdc_id",
label: "FDC_ID",
@@ -1026,7 +1249,7 @@ export class Actions {
},
],
},
- ok_label: { function: "translate", phrase: "Save" },
+ ok_label: {function: "translate", phrase: "Save"},
},
}
static UPDATE = {
@@ -1061,7 +1284,7 @@ export class Actions {
},
],
},
- ok_label: { function: "translate", phrase: "Delete" },
+ ok_label: {function: "translate", phrase: "Delete"},
instruction: {
form_field: true,
type: "instruction",
@@ -1088,17 +1311,17 @@ export class Actions {
suffix: "s",
params: ["query", "page", "pageSize", "options"],
config: {
- query: { default: undefined },
- page: { default: 1 },
- pageSize: { default: 25 },
+ query: {default: undefined},
+ page: {default: 1},
+ pageSize: {default: 25},
},
}
static MERGE = {
function: "merge",
params: ["source", "target"],
config: {
- source: { type: "string" },
- target: { type: "string" },
+ source: {type: "string"},
+ target: {type: "string"},
},
form: {
title: {
@@ -1113,7 +1336,7 @@ export class Actions {
},
],
},
- ok_label: { function: "translate", phrase: "Merge" },
+ ok_label: {function: "translate", phrase: "Merge"},
instruction: {
form_field: true,
type: "instruction",
@@ -1147,8 +1370,8 @@ export class Actions {
function: "move",
params: ["source", "target"],
config: {
- source: { type: "string" },
- target: { type: "string" },
+ source: {type: "string"},
+ target: {type: "string"},
},
form: {
title: {
@@ -1163,7 +1386,7 @@ export class Actions {
},
],
},
- ok_label: { function: "translate", phrase: "Move" },
+ ok_label: {function: "translate", phrase: "Move"},
instruction: {
form_field: true,
type: "instruction",