# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1624871227 -7200
# Node ID fce78f57a44dd08013473d8499b3595efa32e7cc
# Parent  89bcab49284a9e5c5aa0ca8b5e3b9734b6c77bb0
Removed water base additions for pH

diff -r 89bcab49284a -r fce78f57a44d www/js/prod_edit.js
--- a/www/js/prod_edit.js	Sun Jun 27 22:10:02 2021 +0200
+++ b/www/js/prod_edit.js	Mon Jun 28 11:07:07 2021 +0200
@@ -260,7 +260,6 @@
  hop_flavour = 0,
  hop_aroma = 0,
  mash_infuse = 0,
- last_base = '',
  last_acid = '',
 
  MMCa = 40.048,
@@ -724,7 +723,7 @@
    $('#wb_ph').val(dataRecord.wb_ph);
    $('#wa_acid_name').val(dataRecord.wa_acid_name);
    $('#wa_acid_perc').val(dataRecord.wa_acid_perc);
-   $('#wa_base_name').val(dataRecord.wa_base_name);
+//   $('#wa_base_name').val(dataRecord.wa_base_name);
    $('#starter_type').val(dataRecord.starter_type);
    $('#starter_sg').val(dataRecord.starter_sg);
    $('#starter_viability').val(dataRecord.starter_viability);
@@ -1275,16 +1274,6 @@
        $('#wa_acid_perc').val(AcidTypeData[3].AcidPrc);
        last_acid = 'Zwavelzuur';
        break;
-      case 'Na2CO3':
-       $('#wa_base_name').val(0);
-       $('#wa_base').val(row.m_amount * 1000);
-       last_base = 'Na2CO3';
-       break;
-      case 'Ca(OH)2':
-       $('#wa_base_name').val(1);
-       $('#wa_base').val(row.m_amount * 1000);
-       last_base = 'Ca(OH)2';
-       break;
      }
     }
     return data;
@@ -2942,10 +2931,6 @@
     case 'Zwavelzuur':
      $('#wa_acid').val(row.m_amount * 1000);
      break;
-    case 'Na2CO3':
-    case 'Ca(OH)2':
-     $('#wa_base').val(row.m_amount * 1000);
-     break;
    }
   }
  };
@@ -3244,7 +3229,7 @@
   frac = 0,
   TpH = 0,
   protonDeficit = 0,
-  AT, BT,
+  AT, /*BT,*/
   r1d, r2d, f1d, f2d, f3d,
   deltapH, deltapd, pd, n,
   Res;
@@ -3327,15 +3312,7 @@
    $('#wa_acid_perc').val(AcidTypeData[AT].AcidPrc);
   }
 
-  if (dataRecord.wa_base_name < 0 || dataRecord.wa_base_name > 3) {
-   $('#wa_base_name').val(0);
-   dataRecord.wa_base_name = 0;
-  }
-  if (last_base == '')
-   last_base = BaseTypeData[dataRecord.wa_base_name].nl;
-
   AT = dataRecord.wa_acid_name;
-  BT = dataRecord.wa_base_name;
 
   /* Note that the next calculations do not correct the pH change by the added salts.
      This pH change is at most 0.1 pH and is a minor difference in Acid amount. */
@@ -3347,9 +3324,6 @@
    protonDeficit = ProtonDeficit(TpH);
    //console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit);
    if (protonDeficit > 0) { // Add acid
-    $('#wa_base').val(0);
-    dataRecord.wa_base = 0;
-    setWaterAgent(last_base, 0);
     frac = CalcFrac(TpH, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3);
     Acid = protonDeficit / frac;
     Acid *= AcidTypeData[AT].MolWt; // mg
@@ -3362,83 +3336,6 @@
 
     bicarbonate = bicarbonate - protonDeficit * frac / liters;
     total_alkalinity = bicarbonate * 50 / 61;
-   } else if (protonDeficit < 0) { //Add base
-    $('#wa_acid').val(0);
-    dataRecord.wa_acid = 0;
-    setWaterAgent(last_acid, 0);
-    r1d = Math.pow(10, (TpH - 6.35));
-    r2d = Math.pow(10, (TpH - 10.33));
-    f1d = 1 / (1 + r1d + r1d * r2d);
-    f2d = f1d * r1d;
-    f3d = f2d * r2d;
-    switch (BT) {
-//     case 0:
-//      RA = -protonDeficit / (f1d - f3d); // Sodiumbicarbonate, mmol totaal
-//      RA = RA * MMNaHCO3 / 1000; //gram
-//      $('#wa_base').val(Round(RA, 2));
-//      setWaterAgent('NaHCO3', Round(RA, 2));
-//      if (liters > 0) {
-//       // Na
-//       RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 +
-//             parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters;
-//       sodium = wg_sodium + RA;
-//       // HCO3
-//       RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000) / liters;
-//       bicarbonate = wg_bicarbonate + RA;
-//       total_alkalinity = bicarbonate * 50 / 61;
-//      }
-//      break;
-     case 0:
-      RA = -protonDeficit / (2 * f1d + f2d); // Sodiumcarbonate, mmol totaal
-      RA = RA * MMNa2CO3 / 1000; //gram
-      $('#wa_base').val(Round(RA, 2));
-      setWaterAgent('Na2CO3', Round(RA, 2));
-      if (liters > 0) {
-       RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000+
-             parseFloat($('#wa_base').jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3 * 1000) / liters;
-       sodium = wg_sodium + RA;
-       // HCO3
-       RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 1000) / liters;
-       bicarbonate = wg_bicarbonate + RA;
-       total_alkalinity = bicarbonate * 50 / 61;
-      }
-      break;
-//     case 2:
-//      RA = -protonDeficit * (f1d - f3d); // Calciumcarbonate, mmol totaal
-//      RA = RA * MMCaCO3 / 1000; //gram
-//      //but only 1/3 is effective, so add 3 times as much
-//      RA = 3 * RA;
-//      $('#wa_base').val(Round(RA, 2));
-//      setWaterAgent('CaCO3', Round(RA, 2));
-//      if (liters > 0) {
-//       //Bicarbonate
-//       RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3 * 1000) / liters;
-//       bicarbonate = wg_bicarbonate + RA;
-//       total_alkalinity = bicarbonate * 50 / 61;
-//       //Ca precipitates out as Ca10(PO4)6(OH)2
-//       RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 +
-//             parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 +
-//             parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters;
-//       calcium = wg_calcium + RA;
-//      }
-//      break;
-     case 1:
-      RA = -protonDeficit / 19.3; // Calciumhydroxide
-      $('#wa_base').val(Round(RA, 2));
-      setWaterAgent('Ca(OH)2', Round(RA, 2));
-      if (liters > 0) {
-       // Bicarbonate
-       RA = -protonDeficit / liters;
-       total_alkalinity = wg_total_alkalinity + RA;
-       bicarbonate = total_alkalinity * 61 / 50;
-       // Calcium
-       RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 +
-             parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 +
-             parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaOH2 * 1000) / liters;
-       calcium = wg_calcium + RA;
-      }
-      break;
-    }
    }
    ph = TpH;
    $('#wb_ph').val(Round(ph, 2));
@@ -3447,40 +3344,6 @@
    /* Manual calculate pH */
    $('.c_mashph').hide();
    console.log('calc_acid no');
-   if (parseFloat($('#wa_base').jqxNumberInput('decimal')) > 0 && liters > 0) {
-    /* First add the base salts */
-    switch (BT) {
-//     case 0:  // Sodiumbicarbonate, Na
-//      RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 +
-//            parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters;
-//      sodium = wg_sodium + RA;
-//      // HCO3
-//      RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000) / liters;
-//      bicarbonate = wg_bicarbonate + RA;
-//      total_alkalinity = bicarbonate * 50 / 61;
-//      break;
-     case 0: // Sodiumcarbonate
-      RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 +
-            parseFloat($('#wa_base').jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3 * 1000) / liters;
-      sodium = wg_sodium + RA;
-      // HCO3
-      RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 1000) / liters;
-      bicarbonate = wg_bicarbonate + RA;
-      total_alkalinity = bicarbonate * 50 / 61;
-      break;
-//     case 2: // Calciumcarbonate: Bicarbonate
-//      RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) / 3 * MMHCO3 * 1000 / MMCaCO3) / liters;
-//      bicarbonate = wg_bicarbonate + RA;
-//      total_alkalinity = bicarbonate * 50 / 61;
-//      // Ca
-//      RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaCl2 +
-//            parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaSO4 +
-//            parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa * 1000/ MMCaCO3) / liters;
-//      calcium = wg_calcium + RA;
-//      break;
-    }
-   }
-
    pHa = Round(ph, 3); // Adjusted water pH
    // Then calculate the new pH with added acids and malts
    console.log('Mash pH: ' + pHa);
@@ -3891,8 +3754,6 @@
   $('#wa_caco3').jqxNumberInput(spinstate);
   $('#mash_ph').jqxNumberInput(spinstate);
   $('#calc_acid').jqxCheckBox(onval);
-  $('#wa_base_name').jqxDropDownList(onval);
-  $('#wa_base').jqxNumberInput(spinstate);
   $('#wa_acid_name').jqxDropDownList(onval);
   $('#wa_acid').jqxNumberInput(spinstate);
   $('#wa_acid_perc').jqxNumberInput(spinsmall);
@@ -4258,22 +4119,6 @@
     calcWater();
    }
   });
-  $('#wa_base_name').on('select', function(event) {
-   if (event.args) {
-    var index = event.args.index;
-    console.log('wa_base_name ' + index);
-    setWaterAgent(last_base, 0);
-    last_base = BaseTypeData[index].nl;
-    setWaterAgent(last_base, parseFloat($('#wa_base').jqxNumberInput('decimal')));
-    dataRecord.wa_base_name = index;
-    calcWater();
-   }
-  });
-  $('#wa_base').on('change', function(event) {
-   var name = BaseTypeData[$('#wa_base_name').val()].nl;
-   setWaterAgent(name, parseFloat(event.args.value));
-   calcWater();
-  });
   $('#wa_acid_name').on('select', function(event) {
    if (event.args) {
     var index = event.args.index;
@@ -4883,7 +4728,7 @@
    wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')),
    wa_acid_name: parseInt($('#wa_acid_name').val()),
    wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')),
-   wa_base_name: parseInt($('#wa_base_name').val()),
+   wa_base_name: 0,
    starter_enable: dataRecord.starter_enable,
    starter_type: $('#starter_type').val(),
    starter_sg: parseFloat($('#starter_sg').jqxNumberInput('decimal')),
@@ -6167,23 +6012,13 @@
  $('#mash_ph').jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'});
  $('#mash_ph').jqxNumberInput(SpinpH);
  $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23 });
- $('#wa_base_name').jqxDropDownList({
-  theme: theme,
-  source: BaseTypeAdapter,
-  valueMember: 'id',
-  displayMember: 'nl',
-  width: 170,
-  height: 23,
-  autoDropDownHeight: true
- });
- $('#wa_base,#wa_acid').jqxNumberInput(Spin2dec);
- $('#wa_base').jqxNumberInput({ symbol: ' gr', symbolPosition: 'right' });
+ $('#wa_acid').jqxNumberInput(Spin2dec);
  $('#wa_acid_name').jqxDropDownList({
   theme: theme,
   source: AcidTypeAdapter,
   valueMember: 'id',
   displayMember: 'nl',
-  width: 170,
+  width: 130,
   height: 23,
   autoDropDownHeight: true
  });
diff -r 89bcab49284a -r fce78f57a44d www/prod_edit.php
--- a/www/prod_edit.php	Sun Jun 27 22:10:02 2021 +0200
+++ b/www/prod_edit.php	Mon Jun 28 11:07:07 2021 +0200
@@ -483,6 +483,11 @@
         </td>
        </tr>
        <tr>
+	<th style="text-align: center;" colspan="2">Brouwzouten</th>
+	<th style="text-align: center;" colspan="2">Maischwater pH</th>
+        <th style="text-align: center;" colspan="2">Spoelwater</th>
+       </tr>
+       <tr>
         <td style="vertical-align: top; float: right; padding: 3px;">Calciumchloride (CaCl2) gr:</td>
 	<td style="padding: 3px;"><div id="wa_cacl2"></div></td>
         <td style="vertical-align: top; float: right; padding: 3px;"><div class='c_mashph'>Maish pH:</div></td>
@@ -501,16 +506,15 @@
        <tr>
         <td style="vertical-align: top; float: right; padding: 3px;">Epsom zout (MgSO4) gr:</td>
 	<td style="padding: 3px;"><div id="wa_mgso4"></div></td>
-        <td style="vertical-align: top; float: right; padding: 3px;">Ontzuren met:</td>
-        <td style="padding: 3px;"><div style="float: left;" id="wa_base_name"></div><div style="float: left; margin-left: 15px;" id="wa_base"></div></td>
+        <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td>
+        <td style="padding: 3px;"><div style="float: left;" id="wa_acid_name"></div><div style="float: left; margin-left: 15px;" id="wa_acid"></div><div style="float: left; margin-left: 15px;" id="wa_acid_perc"></div></td>
         <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater bron:</td>
         <td style="padding: 3px;"><div id="sparge_source"></div></td>
        </tr>
        <tr>
         <td style="vertical-align: top; float: right; padding: 3px;">Keukenzout (NaCl) gr:</td>
 	<td style="padding: 3px;"><div id="wa_nacl"></div></td>
-        <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td>
-        <td style="padding: 3px;"><div style="float: left;" id="wa_acid_name"></div><div style="float: left; margin-left: 15px;" id="wa_acid"></div><div style="float: left; margin-left: 15px;" id="wa_acid_perc"></div></td>
+        <td colspan="2"></td>
         <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater pH:</td>
         <td style="padding: 3px;"><div id="sparge_ph"></div></td>
        </tr>