comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 317
- 454851b335ad
- parent 316
- 82c3bb9a40c2
- child 318
- 882d4da1f236
equal
deleted
inserted
replaced
| 316:82c3bb9a40c2 | 317:454851b335ad |
|---|---|
| 2129 $('#boil_time').on('change', function (event) { | 2129 $('#boil_time').on('change', function (event) { |
| 2130 console.log("boil_time change:"+parseFloat(event.args.value)+" old:"+dataRecord.boil_time); | 2130 console.log("boil_time change:"+parseFloat(event.args.value)+" old:"+dataRecord.boil_time); |
| 2131 var old_evap = parseFloat(dataRecord.boil_size) - parseFloat(dataRecord.batch_size); | 2131 var old_evap = parseFloat(dataRecord.boil_size) - parseFloat(dataRecord.batch_size); |
| 2132 var new_evap = old_evap * (parseFloat(event.args.value) / dataRecord.boil_time); | 2132 var new_evap = old_evap * (parseFloat(event.args.value) / dataRecord.boil_time); |
| 2133 var new_boil = parseFloat(dataRecord.batch_size) + new_evap; | 2133 var new_boil = parseFloat(dataRecord.batch_size) + new_evap; |
| 2134 var factor = new_boil / dataRecord.boil_size; | 2134 //var factor = new_boil / dataRecord.boil_size; |
| 2135 dataRecord.boil_time = parseFloat(event.args.value); | 2135 dataRecord.boil_time = parseFloat(event.args.value); |
| 2136 dataRecord.boil_size = new_boil; | 2136 dataRecord.boil_size = new_boil; |
| 2137 $("#est_pre_vol").val(Math.round(new_boil * 1.04 * 100) / 100); | 2137 $("#est_pre_vol").val(Math.round(new_boil * 1.04 * 100) / 100); |
| 2138 $("#boil_size").val(Math.round(new_boil * 100) / 100); | 2138 $("#boil_size").val(Math.round(new_boil * 100) / 100); |
| 2139 calcFermentables(); | 2139 calcFermentables(); |
| 2140 calcIBUs(); | 2140 calcIBUs(); |
| 2141 calcYeast(); | |
| 2141 }); | 2142 }); |
| 2142 $('#efficiency').on('change', function (event) { | 2143 $('#efficiency').on('change', function (event) { |
| 2143 console.log("efficiency change:"+event.args.value); | 2144 var estog = parseFloat($("#est_og").jqxNumberInput('decimal')); |
| 2145 dataRecord.efficiency = parseFloat(event.args.value); | |
| 2146 console.log("efficiency change:"+dataRecord.efficiency+" est_og:"+estog); | |
| 2147 calcFermentablesFromOG(estog); // Keep the OG | |
| 2144 calcFermentables(); | 2148 calcFermentables(); |
| 2145 calcIBUs(); | 2149 calcIBUs(); |
| 2150 calcYeast(); | |
| 2146 }); | 2151 }); |
| 2147 $('#est_og').on('change', function (event) { | 2152 $('#est_og').on('change', function (event) { |
| 2148 console.log("est_og change:"+event.args.value); | 2153 dataRecord.est_og = parseFloat(event.args.value); |
| 2149 $('#est_og2').val(event.args.value); | 2154 console.log("est_og change:"+dataRecord.est_og); |
| 2150 calcFermentablesFromOG(event.args.value); // Adjust fermentables amounts | 2155 $('#est_og2').val(dataRecord.est_og); |
| 2156 calcFermentablesFromOG(dataRecord.est_og); // Adjust fermentables amounts | |
| 2151 calcFermentables(); // Update the recipe details | 2157 calcFermentables(); // Update the recipe details |
| 2152 calcIBUs(); // and the IBU's. | 2158 calcIBUs(); // and the IBU's. |
| 2153 calcYeast(); | 2159 calcYeast(); |
| 2154 }); | 2160 }); |
| 2155 $('#mash_ph').on('change', function (event) { | 2161 $('#mash_ph').on('change', function (event) { |
