comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 789
- e6e696add0b3
- parent 784
- d51b05838ac4
- child 817
- 6ee186182c70
equal
deleted
inserted
replaced
| 788:812ce4c5da2a | 789:e6e696add0b3 |
|---|---|
| 1726 calcViability(); | 1726 calcViability(); |
| 1727 showStarter(); | 1727 showStarter(); |
| 1728 calcYeast(); | 1728 calcYeast(); |
| 1729 calcInit(); | 1729 calcInit(); |
| 1730 calcMash(); | 1730 calcMash(); |
| 1731 calcWater(); | |
| 1731 kookTijd(); | 1732 kookTijd(); |
| 1732 console.log('calculations ready'); | 1733 console.log('calculations ready'); |
| 1733 $('#jqxLoader').jqxLoader('close'); | 1734 $('#jqxLoader').jqxLoader('close'); |
| 1734 $('#jqxTabs').jqxTabs('first'); | 1735 $('#jqxTabs').jqxTabs('first'); |
| 1735 }, | 1736 }, |
| 2304 mashtime += row.step_time + row.ramp_time; | 2305 mashtime += row.step_time + row.ramp_time; |
| 2305 row.step_wg_ratio = Round(infused / mashkg, 6); | 2306 row.step_wg_ratio = Round(infused / mashkg, 6); |
| 2306 $('#mashGrid').jqxGrid('updaterow', i, row); | 2307 $('#mashGrid').jqxGrid('updaterow', i, row); |
| 2307 } | 2308 } |
| 2308 } | 2309 } |
| 2310 if ((dataRecord.w1_amount + dataRecord.w2_amount) == 0) { | |
| 2311 dataRecord.w1_amount = infused; | |
| 2312 $('#w1_amount').val(infused); | |
| 2313 console.log("calcMash() fixed water 1 to " + infused); | |
| 2314 } | |
| 2309 mashvol = Round(mashkg * MaltVolume + infused, 6); | 2315 mashvol = Round(mashkg * MaltVolume + infused, 6); |
| 2310 $('#est_mashvol').val(mashvol); | 2316 $('#est_mashvol').val(mashvol); |
| 2311 h = Math.floor(mashtime / 60); | 2317 h = Math.floor(mashtime / 60); |
| 2312 m = Math.floor(mashtime - (h * 60)); | 2318 m = Math.floor(mashtime - (h * 60)); |
| 2313 if (h < 10) | 2319 if (h < 10) |
| 2940 calcYeast(); | 2946 calcYeast(); |
| 2941 }; | 2947 }; |
| 2942 | 2948 |
| 2943 function adjustWaters(factor) { | 2949 function adjustWaters(factor) { |
| 2944 | 2950 |
| 2945 //console.log('adjustWaters(' + factor + ')'); | 2951 console.log('adjustWaters(' + factor + ')'); |
| 2946 var amount, row, i, rowscount = dataRecord.mashs.length; | 2952 var amount, row, i, rowscount = dataRecord.mashs.length; |
| 2947 if (rowscount == 0) | 2953 if (rowscount == 0) |
| 2948 return; | 2954 return; |
| 2949 mash_infuse = 0; | 2955 mash_infuse = 0; |
| 2950 for (i = 0; i < rowscount; i++) { | 2956 for (i = 0; i < rowscount; i++) { |
| 3225 if (dataRecord.w1_name == '') { | 3231 if (dataRecord.w1_name == '') { |
| 3226 return; | 3232 return; |
| 3227 } | 3233 } |
| 3228 | 3234 |
| 3229 // If there is a dillute water source, mix the waters. | 3235 // If there is a dillute water source, mix the waters. |
| 3230 if (dataRecord.w2_name != '') { | 3236 if ((dataRecord.w2_name != '') && (dataRecord.w2_name != 'Geen mengwater')) { |
| 3237 console.log("calcWater() mixed " + dataRecord.w2_name); | |
| 3231 liters = dataRecord.w1_amount + dataRecord.w2_amount; | 3238 liters = dataRecord.w1_amount + dataRecord.w2_amount; |
| 3232 calcium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_calcium, dataRecord.w2_calcium); | 3239 calcium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_calcium, dataRecord.w2_calcium); |
| 3233 magnesium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_magnesium, dataRecord.w2_magnesium); | 3240 magnesium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_magnesium, dataRecord.w2_magnesium); |
| 3234 sodium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sodium, dataRecord.w2_sodium); | 3241 sodium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sodium, dataRecord.w2_sodium); |
| 3235 chloride = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_chloride, dataRecord.w2_chloride); | 3242 chloride = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_chloride, dataRecord.w2_chloride); |
| 3236 sulfate = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sulfate, dataRecord.w2_sulfate); | 3243 sulfate = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sulfate, dataRecord.w2_sulfate); |
| 3237 total_alkalinity = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_total_alkalinity, dataRecord.w2_total_alkalinity); | 3244 total_alkalinity = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_total_alkalinity, dataRecord.w2_total_alkalinity); |
| 3238 ph = -Math.log10(((Math.pow(10, -dataRecord.w1_ph) * dataRecord.w1_amount) + (Math.pow(10, -dataRecord.w2_ph) * dataRecord.w2_amount)) / liters); | 3245 ph = -Math.log10(((Math.pow(10, -dataRecord.w1_ph) * dataRecord.w1_amount) + (Math.pow(10, -dataRecord.w2_ph) * dataRecord.w2_amount)) / liters); |
| 3239 } else { | 3246 } else { |
| 3247 console.log("calcWater() single"); | |
| 3240 liters = dataRecord.w1_amount; | 3248 liters = dataRecord.w1_amount; |
| 3241 calcium = dataRecord.w1_calcium; | 3249 calcium = dataRecord.w1_calcium; |
| 3242 magnesium = dataRecord.w1_magnesium; | 3250 magnesium = dataRecord.w1_magnesium; |
| 3243 sodium = dataRecord.w1_sodium; | 3251 sodium = dataRecord.w1_sodium; |
| 3244 chloride = dataRecord.w1_chloride; | 3252 chloride = dataRecord.w1_chloride; |
| 4047 calcWater(); | 4055 calcWater(); |
| 4048 }); | 4056 }); |
| 4049 $('#w1_name').jqxDropDownList('selectItem', dataRecord.w1_name); | 4057 $('#w1_name').jqxDropDownList('selectItem', dataRecord.w1_name); |
| 4050 $('#w2_name').jqxDropDownList('selectItem', dataRecord.w2_name); | 4058 $('#w2_name').jqxDropDownList('selectItem', dataRecord.w2_name); |
| 4051 // Fix tap water if zero using mash infuse amount. | 4059 // Fix tap water if zero using mash infuse amount. |
| 4060 console.log("mash_infuse: " + mash_infuse + " w1: " + parseFloat($('#w1_amount').jqxNumberInput('decimal')) + " " + dataRecord.w1_amount); | |
| 4052 if (parseFloat($('#w1_amount').jqxNumberInput('decimal')) == 0 && mash_infuse > 0) { | 4061 if (parseFloat($('#w1_amount').jqxNumberInput('decimal')) == 0 && mash_infuse > 0) { |
| 4053 $('#w1_amount').val(mash_infuse); | 4062 $('#w1_amount').val(mash_infuse); |
| 4054 dataRecord.w1_amount = mash_infuse; | 4063 dataRecord.w1_amount = mash_infuse; |
| 4055 $('#wg_amount').val(mash_infuse); | 4064 $('#wg_amount').val(mash_infuse); |
| 4056 $('#w2_amount').val(0); | 4065 $('#w2_amount').val(0); |
| 5853 $('#w2_amount').val(dataRecord.w2_amount); | 5862 $('#w2_amount').val(dataRecord.w2_amount); |
| 5854 } | 5863 } |
| 5855 $('#wg_amount').val(mash_infuse); | 5864 $('#wg_amount').val(mash_infuse); |
| 5856 console.log('new infuse amount: ' + mash_infuse); | 5865 console.log('new infuse amount: ' + mash_infuse); |
| 5857 calcWater(); | 5866 calcWater(); |
| 5858 // calcMash(); | 5867 calcMash(); |
| 5859 } | 5868 } |
| 5860 }); | 5869 }); |
| 5861 $('#wstep_infuse_temp').on('change', function(event) { | 5870 $('#wstep_infuse_temp').on('change', function(event) { |
| 5862 var prevdata = $('#mashGrid').jqxGrid('getrowdata', mashRow-1); | 5871 var prevdata = $('#mashGrid').jqxGrid('getrowdata', mashRow-1); |
| 5863 var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); | 5872 var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
