Mercurial > bms / changeset

--- a/www/inv_equipments.php	Sat May 23 20:53:48 2020 +0200
+++ b/www/inv_equipments.php	Sat May 23 22:00:44 2020 +0200
@@ -29,9 +29,9 @@
        <th style="text-align: center;" colspan="2">Koken</th>
       </tr>
       <tr>
-       <td style="vertical-align: top; float: right;">Maischkuip volume l:</td>
+       <td style="vertical-align: top; float: right;">Maischkuip volume L:</td>
        <td><div id="tun_volume"></div></td>
-       <td style="vertical-align: top; float: right;">Kookketel volume l:</td>
+       <td style="vertical-align: top; float: right;">Kookketel volume L:</td>
        <td><div id="kettle_volume"></div></td>
       </tr>
       <tr>
@@ -43,13 +43,13 @@
       <tr>
        <td style="vertical-align: top; float: right;">Maischkuip gewicht kg:</td>
        <td><div id="tun_weight"></div></td>
-       <td style="vertical-align: top; float: right;">Kook volume l:</td>
+       <td style="vertical-align: top; float: right;">Kook volume L:</td>
        <td><div id="boil_size"></div></td>
       </tr>
       <tr>
        <td style="vertical-align: top; float: right;">Maischkuip materiaal:</td>
        <td><div id="tun_material"></div></td>
-       <td style="vertical-align: top; float: right;">Verdamping per uur l:</td>
+       <td style="vertical-align: top; float: right;">Verdamping per uur L:</td>
        <td><div id="evap_rate"></div></td>
       </tr>
       <tr>
@@ -59,9 +59,9 @@
        <td><div id="boil_time"></div></td>
       </tr>
       <tr>
-       <td style="vertical-align: top; float: right;">Maischwater l:</td>
+       <td style="vertical-align: top; float: right;">Maischwater L:</td>
        <td><div id="mash_volume"></div></td>
-       <td style="vertical-align: top; float: right;">Extra water bij koken l:</td>
+       <td style="vertical-align: top; float: right;">Extra water bij koken L:</td>
        <td><div id="top_up_kettle"></div></td>
       </tr>
       <tr>
@@ -72,30 +72,31 @@
       </tr>
       <tr>
        <th style="text-align: center;" colspan="2">Filteren</th>
-       <td style="vertical-align: top; float: right;">Volume eind koken l:</td>
+       <td style="vertical-align: top; float: right;">Volume eind koken L:</td>
        <td><div id="batch_size"></div></td>
       </tr>
       <tr>
-       <td style="vertical-align: top; float: right;">Filter volume l:</td>
+       <td style="vertical-align: top; float: right;">Filter volume L:</td>
        <td><div id="lauter_volume"></div></td>
        <th style="text-align: center;" colspan="2">Koelen</th>
       </tr>
       <tr>
        <td style="vertical-align: top; float: right;">Filterkuip hoogte cm:</td>
        <td><div id="lauter_height"></div></td>
-       <td style="vertical-align: top; float: right;">Trub verlies kookketel l:</td>
+       <td style="vertical-align: top; float: right;">Trub verlies kookketel L:</td>
        <td><div id="trub_chiller_loss"></div></td>
       </tr>
       <tr>
-       <td style="vertical-align: top; float: right;">Filterkuip verlies l:</td>
+       <td style="vertical-align: top; float: right;">Filterkuip verlies L:</td>
        <td><div id="lauter_deadspace"></div></td>
-       <td style="vertical-align: top; float: right;">Extra water in het gistvat l:</td>
+       <td style="vertical-align: top; float: right;">Extra water in het gistvat L:</td>
        <td><div id="top_up_water"></div></td>
       </tr>
       <tr>
        <td style="vertical-align: top; float: right;">Brouwzaalrendement %:</td>
        <td><div id="efficiency"></div></td>
-       <td colspan="2"></td>
+       <td style="vertical-align: top; float: right;">Volume naar het gistvat L:</td>
+       <td><div id="vol_fermenter"></div></td>
       </tr>
       <tr>
        <td style="padding-top: 20px;" align="right"><input type="button" id="Delete" value="Verwijder" /></td>

--- a/www/js/inv_equipments.js	Sat May 23 20:53:48 2020 +0200
+++ b/www/js/inv_equipments.js	Sat May 23 22:00:44 2020 +0200
@@ -50,12 +50,13 @@
   evap_rate = parseFloat($('#evap_rate').jqxNumberInput('decimal')),
   boil_time = parseFloat($('#boil_time').jqxNumberInput('decimal')),
   top_up = parseFloat($('#top_up_kettle').jqxNumberInput('decimal')),
-  batch;
+  batch = parseFloat($('#batch_size').jqxNumberInput('decimal'));
 
   if (calc) { // If checked, calculate the batch size.
    batch = boil_size - (evap_rate * boil_time / 60) + top_up;
    $('#batch_size').val(batch);
   }
+  $('#vol_fermenter').val((batch / 1.04) + parseFloat($('#top_up_water').jqxNumberInput('decimal')) - parseFloat($('#trub_chiller_loss').jqxNumberInput('decimal')));
  }
 
  // tooltips
@@ -80,6 +81,7 @@
  $('#hop_utilization').jqxTooltip({ content: '100% for smaller installations, higher for large breweries.' });
  $('#batch_size').jqxTooltip({ content: 'Calculated batch size, liters at end of the boil.' });
  $('#trub_chiller_loss').jqxTooltip({ content: 'Standard loss in liters during transfer to the fermenter.' });
+ $('#top_up_water').jqxTooltip({ content: 'Extra water added into the fermenter.' });
 
  var dataRecord = {},
  url = 'includes/db_inventory_equipments.php',
@@ -214,6 +216,7 @@
  $('#mash_volume').jqxNumberInput(Spin1dec);
  $('#mash_max').jqxNumberInput(Spin1dec);
  $('#efficiency').jqxNumberInput(Perc1dec);
+ $('#vol_fermenter').jqxNumberInput(Show2dec);
 
  // initialize jqxGrid
  $('#jqxgrid').jqxGrid({
@@ -240,6 +243,7 @@
     $('#name').val('Nieuwe brouwset');
     $('#boil_size').val(18);
     $('#batch_size').val(15.3);
+    $('#vol_fermenter').val(14.2);
     $('#tun_volume').val(20);
     $('#tun_weight').val(2);
     $('#tun_specific_heat').val(0.11);
@@ -274,6 +278,8 @@
    $('#boil_time').on('change', function(event) { calcBatchVolume(); });
    $('#top_up_kettle').on('change', function(event) { calcBatchVolume(); });
    $('#calc_boil_volume').on('change', function(event) { calcBatchVolume(); });
+   $('#top_up_water').on('change', function(event) { calcBatchVolume(); });
+   $('#trub_chiller_loss').on('change', function(event) { calcBatchVolume(); });
    $('#tun_material').on('select', function(event) {
     dataRecord.tun_specific_heat = MaterialData[event.args.index].sh;
     $('#tun_specific_heat').val(dataRecord.tun_specific_heat);