Mercurial > bms / changeset

--- a/www/js/prod_edit.js	Sun Jun 27 16:56:52 2021 +0200
+++ b/www/js/prod_edit.js	Sun Jun 27 22:10:02 2021 +0200
@@ -272,6 +272,7 @@
  MMCaSO4 = 172.171,
  MMCaCl2 = 147.015,
  MMCaCO3 = 100.087,
+ MMMgCl2 = 95.211,	/* Since 27-06-2021 */
  MMMgSO4 = 246.475,
  MMNaHCO3 = 84.007,
  MMNa2CO3 = 105.996,
@@ -1241,6 +1242,9 @@
       case 'NaCl':
        $('#wa_nacl').val(row.m_amount * 1000);
        break;
+      case 'MgCl2':
+       $('#wa_mgcl2').val(row.m_amount * 1000);
+       break;
       case 'NaHCO3':
        $('#wa_nahco3').val(row.m_amount * 1000);
        break;
@@ -2923,6 +2927,9 @@
     case 'NaCl':
      $('#wa_nacl').val(row.m_amount * 1000);
      break;
+    case 'MgCl2':
+     $('#wa_mgcl2').val(row.m_amount * 1000);
+     break;
     case 'NaHCO3':
      $('#wa_nahco3').val(row.m_amount * 1000);
      break;
@@ -3293,13 +3300,15 @@
    calcium += (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 +
     parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 +
     parseFloat($('#wa_caco3').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters;
-   magnesium += (parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMMg / MMMgSO4 * 1000) / liters;
+   magnesium += (parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMMg / MMMgSO4 * 1000 +
+    parseFloat($('#wa_mgcl2').jqxNumberInput('decimal')) * MMMg / MMMgCl2 * 1000) / liters;
    sodium += (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 +
     parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters;
    sulfate += (parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 * 1000 +
     parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMSO4 / MMMgSO4 * 1000) / liters;
    chloride += (2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 * 1000 +
-    parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl * 1000) / liters;
+    parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl * 1000 +
+    parseFloat($('#wa_mgcl2').jqxNumberInput('decimal')) * MMCl / MMMgCl2 * 1000) / liters;
    bicarbonate += (parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000 +
     parseFloat($('#wa_caco3').jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3 * 1000) / liters;
   }
@@ -3877,6 +3886,7 @@
   $('#wa_caso4').jqxNumberInput(spinstate);
   $('#wa_mgso4').jqxNumberInput(spinstate);
   $('#wa_nacl').jqxNumberInput(spinstate);
+  $('#wa_mgcl2').jqxNumberInput(spinstate);
   $('#wa_nahco3').jqxNumberInput(spinstate);
   $('#wa_caco3').jqxNumberInput(spinstate);
   $('#mash_ph').jqxNumberInput(spinstate);
@@ -4227,6 +4237,13 @@
     calcWater();
    }
   });
+  $('#wa_mgcl2').on('change', function(event) {
+   if (event.args) {
+    setWaterAgent('MgCl2', 0);
+    setWaterAgent('MgCl2', event.args.value);
+    calcWater();
+   }
+  });
   $('#wa_nahco3').on('change', function(event) {
    if (event.args) {
     setWaterAgent('NaHCO3', 0);
@@ -6143,9 +6160,10 @@
   content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. ' +
   'Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.'
  });
+ $('#wa_mgcl2').jqxTooltip({ content: 'Magnesiumchloride'});
  $('#wa_nahco3').jqxTooltip({ content: 'Baksoda'});
  $('#wa_caco3').jqxTooltip({ content: 'Kalk'});
- $('#wa_cacl2,#wa_caso4,#wa_mgso4,#wa_nacl,#wa_nahco3,#wa_caco3').jqxNumberInput(Spin1dec);
+ $('#wa_cacl2,#wa_caso4,#wa_mgso4,#wa_nacl,#wa_mgcl2,#wa_nahco3,#wa_caco3').jqxNumberInput(Spin1dec);
  $('#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 });

--- a/www/prod_edit.php	Sun Jun 27 16:56:52 2021 +0200
+++ b/www/prod_edit.php	Sun Jun 27 22:10:02 2021 +0200
@@ -515,21 +515,23 @@
         <td style="padding: 3px;"><div id="sparge_ph"></div></td>
        </tr>
        <tr>
-        <td style="vertical-align: top; float: right; padding: 3px;">Baksoda (NaHCO3) gr:</td>
-        <td style="padding: 3px;"><div id="wa_nahco3"></div></td>
+        <td style="vertical-align: top; float: right; padding: 3px;">Magnesiumchloride (MgCl2) gr:</td>
+        <td style="padding: 3px;"><div id="wa_mgcl2"></div></td>
         <td colspan="2"></td>
         <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td>
         <td style="padding: 3px;"><div id="sparge_acid_type"></div></td>
        </tr>
        <tr>
-        <td style="vertical-align: top; float: right; padding: 3px;">Kalk (CaCO3) gr:</td>
-        <td style="padding: 3px;"><div id="wa_caco3"></div></td>
+        <td style="vertical-align: top; float: right; padding: 3px;">Baksoda (NaHCO3) gr:</td>
+        <td style="padding: 3px;"><div id="wa_nahco3"></div></td>
         <td colspan="2"></td>
         <td style="vertical-align: top; float: right; padding: 3px;">Sterkte %:</td>
         <td style="padding: 3px;"><div id="sparge_acid_perc"></div></td>
        </tr>
        <tr>
-        <td colspan="4"></td>
+        <td style="vertical-align: top; float: right; padding: 3px;">Kalk (CaCO3) gr:</td>
+        <td style="padding: 3px;"><div id="wa_caco3"></div></td>
+        <td colspan="2"></td>
         <td style="vertical-align: top; float: right; padding: 3px;">Benodigd:</td>
         <td style="padding: 3px;"><div id="sparge_acid_amount"></div></td>
        </tr>