comparison: www/js/rec_edit.js
www/js/rec_edit.js
- changeset 660
- 0e9a725354ac
- parent 648
- ee69b01fcb0e
- child 662
- 4bb005694ce7
equal
deleted
inserted
replaced
| 659:6e373acc5d00 | 660:0e9a725354ac |
|---|---|
| 2532 calcFermentables(); | 2532 calcFermentables(); |
| 2533 calcIBUs(); | 2533 calcIBUs(); |
| 2534 }); | 2534 }); |
| 2535 $('#batch_size').on('change', function(event) { | 2535 $('#batch_size').on('change', function(event) { |
| 2536 console.log('batch_size change:' + event.args.value + ' old:' + dataRecord.batch_size); | 2536 console.log('batch_size change:' + event.args.value + ' old:' + dataRecord.batch_size); |
| 2537 var factor, new_boil = parseFloat(event.args.value) + dataRecord.boil_size - dataRecord.batch_size; | 2537 var evap = (0.1 * parseFloat(event.args.value)) * dataRecord.boil_time / 60; |
| 2538 factor = parseFloat(event.args.value) / dataRecord.batch_size; | 2538 dataRecord.boil_size = parseFloat(event.args.value) + evap; |
| 2539 dataRecord.boil_size = new_boil; | 2539 var factor = parseFloat(event.args.value) / dataRecord.batch_size; |
| 2540 $('#boil_size').val(Round(new_boil, 2)); | 2540 $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
| 2541 dataRecord.sparge_volume *= factor; | 2541 dataRecord.sparge_volume *= factor; |
| 2542 $('#sparge_volume').val(dataRecord.sparge_volume); | 2542 $('#sparge_volume').val(dataRecord.sparge_volume); |
| 2543 dataRecord.batch_size = parseFloat(event.args.value); | 2543 dataRecord.batch_size = parseFloat(event.args.value); |
| 2544 calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG | 2544 calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG |
| 2545 adjustWaters(factor); | 2545 adjustWaters(factor); |
| 2552 calcSparge(); | 2552 calcSparge(); |
| 2553 calcMash(); | 2553 calcMash(); |
| 2554 }); | 2554 }); |
| 2555 $('#boil_time').on('change', function(event) { | 2555 $('#boil_time').on('change', function(event) { |
| 2556 console.log('boil_time change:' + parseFloat(event.args.value) + ' old:' + dataRecord.boil_time); | 2556 console.log('boil_time change:' + parseFloat(event.args.value) + ' old:' + dataRecord.boil_time); |
| 2557 var new_boil, new_evap, old_evap = parseFloat(dataRecord.boil_size) - parseFloat(dataRecord.batch_size); | 2557 var new_evap = (0.1 * parseFloat(dataRecord.batch_size)) * parseFloat(event.args.value) / 60; |
| 2558 new_evap = old_evap * (parseFloat(event.args.value) / dataRecord.boil_time); | 2558 dataRecord.boil_size = parseFloat(dataRecord.batch_size) + new_evap; |
| 2559 new_boil = parseFloat(dataRecord.batch_size) + new_evap; | |
| 2560 dataRecord.boil_time = parseFloat(event.args.value); | 2559 dataRecord.boil_time = parseFloat(event.args.value); |
| 2561 dataRecord.boil_size = new_boil; | 2560 $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
| 2562 $('#boil_size').val(Round(new_boil, 2)); | |
| 2563 calcFermentables(); | 2561 calcFermentables(); |
| 2564 // TODO: adjust the hops, miscs, yeast, water. | |
| 2565 calcIBUs(); | 2562 calcIBUs(); |
| 2566 }); | 2563 }); |
| 2567 $('#efficiency').on('change', function(event) { | 2564 $('#efficiency').on('change', function(event) { |
| 2568 var estog = parseFloat($('#est_og').jqxNumberInput('decimal')); | 2565 var estog = parseFloat($('#est_og').jqxNumberInput('decimal')); |
| 2569 dataRecord.efficiency = parseFloat(event.args.value); | 2566 dataRecord.efficiency = parseFloat(event.args.value); |
