Mercurial > bms / changeset

--- a/www/js/prod_edit.js	Sat Feb 29 12:13:32 2020 +0100
+++ b/www/js/prod_edit.js	Sat Feb 29 15:24:02 2020 +0100
@@ -3957,34 +3957,34 @@
     $('#package_volume').val(dataRecord.package_volume);
    }
    tnew = dataRecord.package_volume + dataRecord.package_infuse_amount;
-   diff = tnew - told;
+   diff = Round(tnew - told, 3);
    if (told > 0) {
-    dataRecord.bottle_amount += (dataRecord.bottle_amount / told) * diff;
-    dataRecord.keg_amount += (dataRecord.keg_amount / told) * diff;
+    dataRecord.bottle_amount = Round(dataRecord.bottle_amount + ((dataRecord.bottle_amount / told) * diff), 3);
+    dataRecord.keg_amount = Round(dataRecord.keg_amount + ((dataRecord.keg_amount / told) * diff), 3);
    } else {
     dataRecord.bottle_amount = tnew;
     dataRecord.keg_amount = 0;
    }
-   console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
-   $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount * 1000) / 1000);
-   $('#keg_amount').val(parseFloat(dataRecord.keg_amount * 1000) / 1000);
+   //console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
+   $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount));
+   $('#keg_amount').val(parseFloat(dataRecord.keg_amount));
    calcCarbonation();
   });
   $('#package_infuse_amount').on('change', function(event) {
    var diff, tnew, told = dataRecord.package_volume + dataRecord.package_infuse_amount;
    dataRecord.package_infuse_amount = parseFloat(event.args.value);
    tnew = dataRecord.package_volume + dataRecord.package_infuse_amount;
-   diff = tnew - told;
+   diff = Round(tnew - told, 3);
    if (told > 0) {
-    dataRecord.bottle_amount += (dataRecord.bottle_amount / told) * diff;
-    dataRecord.keg_amount += (dataRecord.keg_amount / told) * diff;
+    dataRecord.bottle_amount = Round(dataRecord.bottle_amount + ((dataRecord.bottle_amount / told) * diff), 3);
+    dataRecord.keg_amount = Round(dataRecord.keg_amount + ((dataRecord.keg_amount / told) * diff), 3);
    } else {
     dataRecord.bottle_amount = tnew;
     dataRecord.keg_amount = 0;
    }
-   console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
-   $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount * 1000) / 1000);
-   $('#keg_amount').val(parseFloat(dataRecord.keg_amount * 1000) / 1000);
+   //console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
+   $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount));
+   $('#keg_amount').val(parseFloat(dataRecord.keg_amount));
    calcCarbonation();
   });
   $('#package_infuse_abv').on('change', function(event) {
@@ -3992,15 +3992,13 @@
    calcCarbonation();
   });
   $('#bottle_amount').on('change', function(event) {
-   var vtot, diff, vnew = parseFloat(event.args.value);
-   vtot = dataRecord.package_volume + dataRecord.package_infuse_amount;
+   var vtot, vnew = parseFloat(event.args.value);
+   vtot = Round(dataRecord.package_volume + dataRecord.package_infuse_amount - dataRecord.keg_amount, 3);
    if (vnew > vtot)
     vnew = vtot;
-   diff = dataRecord.bottle_amount - vnew;
-   dataRecord.bottle_amount = Math.round((dataRecord.bottle_amount - diff) * 1000) / 1000;
-   dataRecord.keg_amount = Math.round((dataRecord.keg_amount + diff) * 1000) / 1000;
+   dataRecord.bottle_amount = Round(vnew, 3);
    $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount));
-   $('#keg_amount').val(parseFloat(dataRecord.keg_amount));
+   console.log('vtot:' + vtot + ' vnew:' + vnew + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
    calcCarbonation();
   });
   $('#bottle_priming_water').on('change', function(event) {
@@ -4008,15 +4006,13 @@
    calcCarbonation();
   });
   $('#keg_amount').on('change', function(event) {
-   var diff, vtot, vnew = parseFloat(event.args.value);
-   vtot = dataRecord.package_volume + dataRecord.package_infuse_amount;
+   var vtot, vnew = parseFloat(event.args.value);
+   vtot = Round(dataRecord.package_volume + dataRecord.package_infuse_amount - dataRecord.bottle_amount, 3);
    if (vnew > vtot)
     vnew = vtot;
-   diff = dataRecord.keg_amount - vnew;
-   dataRecord.bottle_amount = Math.round((dataRecord.bottle_amount + diff) * 1000) / 1000;
-   dataRecord.keg_amount = Math.round((dataRecord.keg_amount - diff) * 1000) / 1000;
-   $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount));
+   dataRecord.keg_amount = Round(vnew, 3);
    $('#keg_amount').val(parseFloat(dataRecord.keg_amount));
+   console.log('vtot:' + vtot + ' vnew:' + vnew + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
    calcCarbonation();
   });
   $('#keg_priming_water').on('change', function(event) {