comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 660
- 0e9a725354ac
- parent 658
- 945d5eba869a
- child 662
- 4bb005694ce7
equal
deleted
inserted
replaced
| 659:6e373acc5d00 | 660:0e9a725354ac |
|---|---|
| 3949 }); | 3949 }); |
| 3950 | 3950 |
| 3951 $('#batch_size').on('change', function(event) { | 3951 $('#batch_size').on('change', function(event) { |
| 3952 console.log('batch_size change:' + event.args.value + ' old:' + dataRecord.batch_size); | 3952 console.log('batch_size change:' + event.args.value + ' old:' + dataRecord.batch_size); |
| 3953 $('#est_a_vol').val(event.args.value * 1.04); | 3953 $('#est_a_vol').val(event.args.value * 1.04); |
| 3954 var factor, new_boil = parseFloat(event.args.value) + dataRecord.boil_size - dataRecord.batch_size; | 3954 var evap = parseFloat($('#eq_evap_rate').jqxNumberInput('decimal')) * dataRecord.boil_time / 60; |
| 3955 factor = parseFloat(event.args.value) / dataRecord.batch_size; | 3955 dataRecord.boil_size = parseFloat(event.args.value) + evap; |
| 3956 dataRecord.boil_size = new_boil; | 3956 var factor = parseFloat(event.args.value) / dataRecord.batch_size; |
| 3957 $('#boil_size').val(Round(new_boil, 2)); | 3957 $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
| 3958 $('#est_pre_vol').val(Round(new_boil * 1.04, 2)); | 3958 $('#est_pre_vol').val(Round(dataRecord.boil_size * 1.04, 2)); |
| 3959 dataRecord.sparge_volume *= factor; | 3959 dataRecord.sparge_volume *= factor; |
| 3960 $('#sparge_volume').val(dataRecord.sparge_volume); | 3960 $('#sparge_volume').val(dataRecord.sparge_volume); |
| 3961 $('#brew_sparge_volume').val(dataRecord.sparge_volume); | 3961 $('#brew_sparge_volume').val(dataRecord.sparge_volume); |
| 3962 dataRecord.batch_size = parseFloat(event.args.value); | 3962 dataRecord.batch_size = parseFloat(event.args.value); |
| 3963 calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG | 3963 calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG |
| 3970 calcWater(); | 3970 calcWater(); |
| 3971 calcSparge(); | 3971 calcSparge(); |
| 3972 calcMash(); | 3972 calcMash(); |
| 3973 }); | 3973 }); |
| 3974 $('#boil_time').on('change', function(event) { | 3974 $('#boil_time').on('change', function(event) { |
| 3975 var new_boil, new_time, old_time, new_evap, old_evap; | 3975 var new_time, old_time, new_evap; |
| 3976 old_time = parseFloat(dataRecord.boil_time); | 3976 old_time = parseFloat(dataRecord.boil_time); |
| 3977 new_time = parseFloat(event.args.value); | 3977 new_time = parseFloat(event.args.value); |
| 3978 | 3978 console.log('boil_time change:' + new_time + ' old:' + old_time); |
| 3979 if (new_time && old_time) { | 3979 new_evap = parseFloat($('#eq_evap_rate').jqxNumberInput('decimal')) * new_time / 60; |
| 3980 /* normal boiltime change */ | 3980 dataRecord.boil_size = parseFloat(dataRecord.batch_size) + new_evap; |
| 3981 console.log('boil_time change:' + new_time + ' old:' + old_time); | 3981 dataRecord.boil_time = new_time; |
| 3982 old_evap = parseFloat(dataRecord.boil_size) - parseFloat(dataRecord.batch_size); | 3982 $('#est_pre_vol').val(Round(dataRecord.boil_size * 1.04, 2)); |
| 3983 new_evap = old_evap * (new_time / old_time); | 3983 $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
| 3984 new_boil = parseFloat(dataRecord.batch_size) + new_evap; | |
| 3985 dataRecord.boil_time = new_time; | |
| 3986 dataRecord.boil_size = new_boil; | |
| 3987 $('#est_pre_vol').val(Round(new_boil * 1.04, 2)); | |
| 3988 $('#boil_size').val(Round(new_boil, 2)); | |
| 3989 } else if (new_time && ! old_time) { | |
| 3990 /* from noboil to boil */ | |
| 3991 console.log('boil_time change:' + new_time + ' old: noboil'); | |
| 3992 new_evap = parseFloat($('#eq_evap_rate').jqxNumberInput('decimal')) * new_time / 60; | |
| 3993 new_boil = parseFloat(dataRecord.batch_size) + new_evap; | |
| 3994 dataRecord.boil_time = new_time; | |
| 3995 dataRecord.boil_size = new_boil; | |
| 3996 $('#est_pre_vol').val(Round(new_boil * 1.04, 2)); | |
| 3997 $('#boil_size').val(Round(new_boil, 2)); | |
| 3998 } else if (! new_time && old_time) { | |
| 3999 /* from boil to noboil */ | |
| 4000 console.log('boil_time change: noboil, old:' + old_time); | |
| 4001 dataRecord.boil_time = 0; | |
| 4002 dataRecord.boil_size = dataRecord.batch_size; | |
| 4003 $('#est_pre_vol').val(Round(new_boil * 1.04, 2)); | |
| 4004 $('#boil_size').val(Round(dataRecord.boil_size, 2)); | |
| 4005 } | |
| 4006 calcFermentables(); | 3984 calcFermentables(); |
| 4007 calcIBUs(); | 3985 calcIBUs(); |
| 4008 calcYeast(); | 3986 calcYeast(); |
| 4009 calcStage(); | 3987 calcStage(); |
| 4010 kookTijd(); | 3988 kookTijd(); |
