comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 613
- 26a7a04acef3
- parent 612
- 576128de01e3
- child 615
- 9034e65b0d7a
equal
deleted
inserted
replaced
| 612:576128de01e3 | 613:26a7a04acef3 |
|---|---|
| 3955 if (dataRecord.package_volume > dataRecord.brew_fermenter_volume) { | 3955 if (dataRecord.package_volume > dataRecord.brew_fermenter_volume) { |
| 3956 dataRecord.package_volume = dataRecord.brew_fermenter_volume; | 3956 dataRecord.package_volume = dataRecord.brew_fermenter_volume; |
| 3957 $('#package_volume').val(dataRecord.package_volume); | 3957 $('#package_volume').val(dataRecord.package_volume); |
| 3958 } | 3958 } |
| 3959 tnew = dataRecord.package_volume + dataRecord.package_infuse_amount; | 3959 tnew = dataRecord.package_volume + dataRecord.package_infuse_amount; |
| 3960 diff = tnew - told; | 3960 diff = Round(tnew - told, 3); |
| 3961 if (told > 0) { | 3961 if (told > 0) { |
| 3962 dataRecord.bottle_amount += (dataRecord.bottle_amount / told) * diff; | 3962 dataRecord.bottle_amount = Round(dataRecord.bottle_amount + ((dataRecord.bottle_amount / told) * diff), 3); |
| 3963 dataRecord.keg_amount += (dataRecord.keg_amount / told) * diff; | 3963 dataRecord.keg_amount = Round(dataRecord.keg_amount + ((dataRecord.keg_amount / told) * diff), 3); |
| 3964 } else { | 3964 } else { |
| 3965 dataRecord.bottle_amount = tnew; | 3965 dataRecord.bottle_amount = tnew; |
| 3966 dataRecord.keg_amount = 0; | 3966 dataRecord.keg_amount = 0; |
| 3967 } | 3967 } |
| 3968 console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); | 3968 //console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); |
| 3969 $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount * 1000) / 1000); | 3969 $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); |
| 3970 $('#keg_amount').val(parseFloat(dataRecord.keg_amount * 1000) / 1000); | 3970 $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); |
| 3971 calcCarbonation(); | 3971 calcCarbonation(); |
| 3972 }); | 3972 }); |
| 3973 $('#package_infuse_amount').on('change', function(event) { | 3973 $('#package_infuse_amount').on('change', function(event) { |
| 3974 var diff, tnew, told = dataRecord.package_volume + dataRecord.package_infuse_amount; | 3974 var diff, tnew, told = dataRecord.package_volume + dataRecord.package_infuse_amount; |
| 3975 dataRecord.package_infuse_amount = parseFloat(event.args.value); | 3975 dataRecord.package_infuse_amount = parseFloat(event.args.value); |
| 3976 tnew = dataRecord.package_volume + dataRecord.package_infuse_amount; | 3976 tnew = dataRecord.package_volume + dataRecord.package_infuse_amount; |
| 3977 diff = tnew - told; | 3977 diff = Round(tnew - told, 3); |
| 3978 if (told > 0) { | 3978 if (told > 0) { |
| 3979 dataRecord.bottle_amount += (dataRecord.bottle_amount / told) * diff; | 3979 dataRecord.bottle_amount = Round(dataRecord.bottle_amount + ((dataRecord.bottle_amount / told) * diff), 3); |
| 3980 dataRecord.keg_amount += (dataRecord.keg_amount / told) * diff; | 3980 dataRecord.keg_amount = Round(dataRecord.keg_amount + ((dataRecord.keg_amount / told) * diff), 3); |
| 3981 } else { | 3981 } else { |
| 3982 dataRecord.bottle_amount = tnew; | 3982 dataRecord.bottle_amount = tnew; |
| 3983 dataRecord.keg_amount = 0; | 3983 dataRecord.keg_amount = 0; |
| 3984 } | 3984 } |
| 3985 console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); | 3985 //console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); |
| 3986 $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount * 1000) / 1000); | 3986 $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); |
| 3987 $('#keg_amount').val(parseFloat(dataRecord.keg_amount * 1000) / 1000); | 3987 $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); |
| 3988 calcCarbonation(); | 3988 calcCarbonation(); |
| 3989 }); | 3989 }); |
| 3990 $('#package_infuse_abv').on('change', function(event) { | 3990 $('#package_infuse_abv').on('change', function(event) { |
| 3991 dataRecord.package_infuse_abv = parseFloat(event.args.value); | 3991 dataRecord.package_infuse_abv = parseFloat(event.args.value); |
| 3992 calcCarbonation(); | 3992 calcCarbonation(); |
| 3993 }); | 3993 }); |
| 3994 $('#bottle_amount').on('change', function(event) { | 3994 $('#bottle_amount').on('change', function(event) { |
| 3995 var vtot, diff, vnew = parseFloat(event.args.value); | 3995 var vtot, vnew = parseFloat(event.args.value); |
| 3996 vtot = dataRecord.package_volume + dataRecord.package_infuse_amount; | 3996 vtot = Round(dataRecord.package_volume + dataRecord.package_infuse_amount - dataRecord.keg_amount, 3); |
| 3997 if (vnew > vtot) | 3997 if (vnew > vtot) |
| 3998 vnew = vtot; | 3998 vnew = vtot; |
| 3999 diff = dataRecord.bottle_amount - vnew; | 3999 dataRecord.bottle_amount = Round(vnew, 3); |
| 4000 dataRecord.bottle_amount = Math.round((dataRecord.bottle_amount - diff) * 1000) / 1000; | |
| 4001 dataRecord.keg_amount = Math.round((dataRecord.keg_amount + diff) * 1000) / 1000; | |
| 4002 $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); | 4000 $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); |
| 4003 $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); | 4001 console.log('vtot:' + vtot + ' vnew:' + vnew + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); |
| 4004 calcCarbonation(); | 4002 calcCarbonation(); |
| 4005 }); | 4003 }); |
| 4006 $('#bottle_priming_water').on('change', function(event) { | 4004 $('#bottle_priming_water').on('change', function(event) { |
| 4007 dataRecord.bottle_priming_water = parseFloat(event.args.value); | 4005 dataRecord.bottle_priming_water = parseFloat(event.args.value); |
| 4008 calcCarbonation(); | 4006 calcCarbonation(); |
| 4009 }); | 4007 }); |
| 4010 $('#keg_amount').on('change', function(event) { | 4008 $('#keg_amount').on('change', function(event) { |
| 4011 var diff, vtot, vnew = parseFloat(event.args.value); | 4009 var vtot, vnew = parseFloat(event.args.value); |
| 4012 vtot = dataRecord.package_volume + dataRecord.package_infuse_amount; | 4010 vtot = Round(dataRecord.package_volume + dataRecord.package_infuse_amount - dataRecord.bottle_amount, 3); |
| 4013 if (vnew > vtot) | 4011 if (vnew > vtot) |
| 4014 vnew = vtot; | 4012 vnew = vtot; |
| 4015 diff = dataRecord.keg_amount - vnew; | 4013 dataRecord.keg_amount = Round(vnew, 3); |
| 4016 dataRecord.bottle_amount = Math.round((dataRecord.bottle_amount + diff) * 1000) / 1000; | |
| 4017 dataRecord.keg_amount = Math.round((dataRecord.keg_amount - diff) * 1000) / 1000; | |
| 4018 $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); | |
| 4019 $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); | 4014 $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); |
| 4015 console.log('vtot:' + vtot + ' vnew:' + vnew + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); | |
| 4020 calcCarbonation(); | 4016 calcCarbonation(); |
| 4021 }); | 4017 }); |
| 4022 $('#keg_priming_water').on('change', function(event) { | 4018 $('#keg_priming_water').on('change', function(event) { |
| 4023 dataRecord.keg_priming_water = parseFloat(event.args.value); | 4019 dataRecord.keg_priming_water = parseFloat(event.args.value); |
| 4024 calcCarbonation(); | 4020 calcCarbonation(); |
