diff -r 14e349ff2a10 -r a8aabb63fbcc www/js/global.js --- a/www/js/global.js Tue Jan 29 21:52:08 2019 +0100 +++ b/www/js/global.js Wed Jan 30 16:40:23 2019 +0100 @@ -455,8 +455,7 @@ { name: 'ingredients', type: 'string' }, { name: 'examples', type: 'string' } ], - url: stylesUrl, - async: true + url: stylesUrl }; var styleslist = new $.jqx.dataAdapter(stylesSource); @@ -490,8 +489,7 @@ { name: 'mash_max', type: 'float' }, { name: 'efficiency', type: 'float' } ], - url: equipmentUrl, - async: true + url: equipmentUrl }; var equipmentlist = new $.jqx.dataAdapter(equipmentSource); @@ -511,15 +509,16 @@ { name: 'moisture', type: 'float' }, { name: 'diastatic_power', type: 'float' }, { name: 'protein', type: 'float' }, + { name: 'dissolved_protein', type: 'float' }, { name: 'max_in_batch', type: 'float' }, { name: 'recommend_mash', type: 'int' }, { name: 'graintype', type: 'int' }, { name: 'di_ph', type: 'float' }, + { name: 'acid_to_ph_57', type: 'float' }, { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: "getfermentablesources.php", - async: true + url: "getfermentablesources.php" }; var fermentableinstock = false; var fermentablelist = new $.jqx.dataAdapter(fermentableInvSource, { @@ -558,8 +557,7 @@ { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: "gethopsources.php", - async: true + url: "gethopsources.php" }; var hopinstock = false; var hoplist = new $.jqx.dataAdapter(hopInvSource, { @@ -590,8 +588,7 @@ { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: "getmiscsources.php", - async: true + url: "getmiscsources.php" }; var miscinstock = false; var misclist = new $.jqx.dataAdapter(miscInvSource, { @@ -625,8 +622,7 @@ { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], - url: "getyeastsources.php", - async: true + url: "getyeastsources.php" }; var yeastinstock = false; var yeastlist = new $.jqx.dataAdapter(yeastInvSource, { @@ -661,8 +657,7 @@ { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' }, ], - url: "getwatersources.php", - async: true + url: "getwatersources.php" }; var waterinstock = false; var waterlist = new $.jqx.dataAdapter(waterInvSource, { @@ -695,8 +690,7 @@ { name: 'ph', type: 'float' }, { name: 'total_alkalinity', type: 'float' }, ], - url: "includes/db_profile_water.php", - async: true + url: "includes/db_profile_water.php" }; var waterprofiles = new $.jqx.dataAdapter(waterProfileSource); @@ -708,8 +702,7 @@ { name: 'name', type: 'string' }, { name: 'steps', type: 'array' } ], - url: "include/db_profile_mash.php", - async: true + url: "include/db_profile_mash.php" }; var mashlist = new $.jqx.dataAdapter(mashInvSource);