# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1582974812 -3600
# Node ID 576128de01e32c24808e10f01a86044ff67fd5b7
# Parent  c583f446d6ca1ebd712b3bf158fb858198001b5c
Fixed mash infuse amount division

diff -r c583f446d6ca -r 576128de01e3 www/js/prod_edit.js
--- a/www/js/prod_edit.js	Thu Feb 27 16:12:07 2020 +0100
+++ b/www/js/prod_edit.js	Sat Feb 29 12:13:32 2020 +0100
@@ -2527,7 +2527,7 @@
   for (i = 0; i < rowscount; i++) {
    row = $('#mashGrid').jqxGrid('getrowdata', i);
    if (row.step_type == 0) { // Infusion
-    amount = Round(row.step_infuse_amount * factor, 1);
+    amount = Round(parseFloat(row.step_infuse_amount) * factor, 1);
     $('#mashGrid').jqxGrid('setcellvalue', i, 'step_infuse_amount', amount);
     mash_infuse += amount;
    }
@@ -2536,8 +2536,10 @@
    dataRecord.w1_amount = mash_infuse;
    $('#w1_amount').val(mash_infuse);
   } else {
-   dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
-   dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+   var w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+   var w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+   dataRecord.w1_amount = Round(w1_amount, 3);
+   dataRecord.w2_amount = Round(w2_amount, 3);
    $('#w1_amount').val(dataRecord.w1_amount);
    $('#w2_amount').val(dataRecord.w2_amount);
   }
@@ -5534,8 +5536,10 @@
    dataRecord.w1_amount = mash_infuse;
    $('#w1_amount').val(mash_infuse);
   } else {
-   dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
-   dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+   var w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+   var w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse;
+   dataRecord.w1_amount = Round(w1_amount, 3);
+   dataRecord.w2_amount = Round(w2_amount, 3);
    $('#w1_amount').val(dataRecord.w1_amount);
    $('#w2_amount').val(dataRecord.w2_amount);
   }
@@ -5625,7 +5629,7 @@
  $('#w2_amount').jqxTooltip({ content: 'De verdeling van het hoofd en meng water. Het totale maisch water volume blijft gelijk.'});
  $('#w2_amount').jqxNumberInput({
   inputMode: 'simple', spinMode: 'simple', theme: theme, width: 94, height: 23, min: 0, max: 0, decimalDigits: 1,
-  spinButtons: true, spinButtonsStep: 0.5, readOnly: true
+  spinButtons: true, spinButtonsStep: 0.1, readOnly: true
  });
  $('#w2_calcium,#w2_magnesium,#w2_sodium,#w2_total_alkalinity,#w2_chloride,#w2_sulfate,#w2_ph').jqxNumberInput(Show1wat);
  // Water mixed