Mercurial > bms / changeset

--- a/www/import/from_brouwhulp.php	Sun Oct 30 16:46:03 2022 +0100
+++ b/www/import/from_brouwhulp.php	Sat Jan 14 11:25:20 2023 +0100
@@ -457,7 +457,7 @@
 			echo "Unknown TUN_SPECIFIC_HEAT" . $equipment->TUN_SPECIFIC_HEAT . PHP_EOL;
 		$sql .= "', tun_height='" . floatval($equipment->TUN_HEIGHT);
 		$sql .= "', top_up_water='" . floatval($equipment->TOP_UP_WATER);
-		$sql .= "', trub_chiller_loss='" . floatval($equipment->TRUB_CHILLER_LOSS);
+		$sql .= "', trub_loss='" . floatval($equipment->TRUB_CHILLER_LOSS);
 		/*
 		 * Brouwhulp uses a percentage for the evaporation rate. This is wrong
 		 * but was made so because the beerxml standard requires this. What we
@@ -1568,7 +1568,7 @@
 			$sql .= "', eq_tun_height='" . floatval($recipe->EQUIPMENT->TUN_HEIGHT);
 			if ($recipe->EQUIPMENT->TOP_UP_WATER)
 				$sql .= "', eq_top_up_water='" . floatval($recipe->EQUIPMENT->TOP_UP_WATER);
-			$sql .= "', eq_trub_chiller_loss='" . floatval($recipe->EQUIPMENT->TRUB_CHILLER_LOSS);
+			$sql .= "', eq_trub_loss='" . floatval($recipe->EQUIPMENT->TRUB_CHILLER_LOSS);
 			/*
 			 * Brouwhulp uses a percentage for the evaporation rate. This is wrong
 			 * but was made so because the beerxml standard requires this. What we

--- a/www/includes/db_inventory_equipments.php	Sun Oct 30 16:46:03 2022 +0100
+++ b/www/includes/db_inventory_equipments.php	Sat Jan 14 11:25:20 2023 +0100
@@ -39,7 +39,7 @@
 	$sql .= "', tun_material='" . $_POST['tun_material'];
 	$sql .= "', tun_height='" . floatval($_POST['tun_height']) / 100.0;
 	$sql .= "', top_up_water='" . $_POST['top_up_water'];
-	$sql .= "', trub_chiller_loss='" . $_POST['trub_chiller_loss'];
+	$sql .= "', trub_loss='" . $_POST['trub_loss'];
 	$sql .= "', evap_rate='" . $_POST['evap_rate'];
 	$sql .= "', boil_time='" . $_POST['boil_time'];
 	($_POST['calc_boil_volume'] == 'true') ? $sql .= "', calc_boil_volume='1" : $sql .= "', calc_boil_volume='0";
@@ -114,7 +114,7 @@
 			'tun_material' => $row['tun_material'],
 			'tun_height' => floatval($row['tun_height']) * 100.0,
 			'top_up_water' => $row['top_up_water'],
-			'trub_chiller_loss' => $row['trub_chiller_loss'],
+			'trub_loss' => $row['trub_loss'],
 			'evap_rate' => $row['evap_rate'],
 			'boil_time' => $row['boil_time'],
 			'calc_boil_volume' => $row['calc_boil_volume'],

--- a/www/includes/db_product.php	Sun Oct 30 16:46:03 2022 +0100
+++ b/www/includes/db_product.php	Sat Jan 14 11:25:20 2023 +0100
@@ -59,7 +59,7 @@
 	$sql .= "', eq_tun_material='" . $_POST['eq_tun_material'];
 	$sql .= "', eq_tun_height='" . $_POST['eq_tun_height'];
 	$sql .= "', eq_top_up_water='" . $_POST['eq_top_up_water'];
-	$sql .= "', eq_trub_chiller_loss='" . $_POST['eq_trub_chiller_loss'];
+	$sql .= "', eq_trub_loss='" . $_POST['eq_trub_loss'];
 	$sql .= "', eq_evap_rate='" . $_POST['eq_evap_rate'];
 	$sql .= "', eq_boil_time='" . $_POST['eq_boil_time'];
 	$sql .= "', eq_calc_boil_volume='" . $_POST['eq_calc_boil_volume'];
@@ -699,7 +699,7 @@
 		$brew .= ',"eq_tun_material":' . $row['eq_tun_material'];
 		$brew .= ',"eq_tun_height":' . floatval($row['eq_tun_height']);
 		$brew .= ',"eq_top_up_water":' . floatval($row['eq_top_up_water']);
-		$brew .= ',"eq_trub_chiller_loss":' . floatval($row['eq_trub_chiller_loss']);
+		$brew .= ',"eq_trub_loss":' . floatval($row['eq_trub_loss']);
 		$brew .= ',"eq_evap_rate":' . floatval($row['eq_evap_rate']);
 		$brew .= ',"eq_boil_time":' . floatval($row['eq_boil_time']);
 		$brew .= ',"xeq_calc_boil_volume":' . floatval($row['eq_calc_boil_volume']);

--- a/www/js/global.js	Sun Oct 30 16:46:03 2022 +0100
+++ b/www/js/global.js	Sat Jan 14 11:25:20 2023 +0100
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2014-2022
+ * Copyright (C) 2014-2023
  *
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -498,7 +498,7 @@
   { name: 'tun_material', type: 'int' },
   { name: 'tun_height', type: 'float' },
   { name: 'top_up_water', type: 'float' },
-  { name: 'trub_chiller_loss', type: 'float' },
+  { name: 'trub_loss', type: 'float' },
   { name: 'evap_rate', type: 'float' },
   { name: 'boil_time', type: 'float' },
   { name: 'calc_boil_volume', type: 'int' },

--- a/www/js/prod_view.js	Sun Oct 30 16:46:03 2022 +0100
+++ b/www/js/prod_view.js	Sat Jan 14 11:25:20 2023 +0100
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2018-2022
+ * Copyright (C) 2018-2023
  *
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -158,7 +158,7 @@
    { name: 'eq_tun_material', type: 'int' },
    { name: 'eq_tun_height', type: 'float' },
    { name: 'eq_top_up_water', type: 'float' },
-   { name: 'eq_trub_chiller_loss', type: 'float' },
+   { name: 'eq_trub_loss', type: 'float' },
    { name: 'eq_evap_rate', type: 'float' },
    { name: 'eq_boil_time', type: 'float' },
    { name: 'xeq_calc_boil_volume', type: 'int' },
@@ -374,7 +374,7 @@
    $('#eq_batch_size').val(dataRecord.eq_batch_size);
    $('#eq_tun_volume').val(dataRecord.eq_tun_volume);
    $('#eq_top_up_water').val(dataRecord.eq_top_up_water);
-   $('#eq_trub_chiller_loss').val(dataRecord.eq_trub_chiller_loss);
+   $('#eq_trub_loss').val(dataRecord.eq_trub_loss);
    $('#eq_evap_rate').val(dataRecord.eq_evap_rate);
    $('#eq_boil_time').val(dataRecord.eq_boil_time);
    $('#eq_top_up_kettle').val(dataRecord.eq_top_up_kettle);
@@ -389,7 +389,7 @@
    $('#eq_chiller_volume').val(dataRecord.eq_chiller_volume);
    $('#eq_chiller_lpm').val(dataRecord.eq_chiller_lpm);
    $('#eq_chiller_loss').val(dataRecord.eq_chiller_loss);
-   $('#eq_fermenter_volume').val((dataRecord.eq_batch_size / 1.04) - dataRecord.eq_trub_chiller_loss - dataRecord.eq_chiller_loss );
+   $('#eq_fermenter_volume').val((dataRecord.eq_batch_size / 1.04) - dataRecord.eq_trub_loss - dataRecord.eq_chiller_loss );
    // Brewdate
    $('#brew_date_start').val(dataRecord.brew_date_start);
    $('#brew_mash_ph').val(dataRecord.brew_mash_ph);
@@ -1378,7 +1378,7 @@
   if (dataRecord.brew_aboil_volume > 0)
    aboil_volume = dataRecord.brew_aboil_volume / 1.04;     // volume @ 20 degrees
   if (dataRecord.brew_fermenter_tcloss == 0) {
-   dataRecord.brew_fermenter_tcloss = dataRecord.eq_trub_chiller_loss;
+   dataRecord.brew_fermenter_tcloss = dataRecord.eq_trub_loss;
    $('#brew_fermenter_tcloss').val(dataRecord.brew_fermenter_tcloss);
   }
   dataRecord.brew_fermenter_volume = aboil_volume - dataRecord.brew_fermenter_tcloss + dataRecord.brew_fermenter_extrawater;
@@ -1577,7 +1577,7 @@
 
   volume = dataRecord.brew_fermenter_volume;
   if (volume <= 0)
-   volume = dataRecord.batch_size - dataRecord.eq_trub_chiller_loss;
+   volume = dataRecord.batch_size - dataRecord.eq_trub_loss;
 
   return dataRecord.yeast_pitchrate * volume * plato;
  }
@@ -1939,7 +1939,7 @@
    if (dataRecord.brew_fermenter_extrawater > 0)
     volume += dataRecord.brew_fermenter_extrawater;
   } else {
-   volume = dataRecord.batch_size - dataRecord.eq_trub_chiller_loss;
+   volume = dataRecord.batch_size - dataRecord.eq_trub_loss;
   }
 
   // Also in calcFermentables()
@@ -2914,7 +2914,7 @@
  $('#eq_batch_size').jqxTooltip({ content: 'Berekende batch grootte in liters aan het eind van de kook.' });
  $('#eq_tun_volume').jqxTooltip({ content: 'Maisch ketel volume.' });
  $('#eq_top_up_water').jqxTooltip({ content: 'Extra water in het gistvat.' });
- $('#eq_trub_chiller_loss').jqxTooltip({ content: 'Standaard verlies bij het overbrengen naar het gistvat.' });
+ $('#eq_trub_loss').jqxTooltip({ content: 'Standaard verlies bij het overbrengen naar het gistvat.' });
  $('#eq_evap_rate').jqxTooltip({ content: 'Verdamping in liters per uur.' });
  $('#eq_boil_time').jqxTooltip({ content: 'Normale kooktijd in minuten, 0 voor no-boil recepten.' });
  $('#eq_top_up_kettle').jqxTooltip({ content: 'Extra water toevoegen tijdens de kook.' });
@@ -2930,7 +2930,7 @@
  $('#eq_evap_rate').jqxNumberInput(Show2dec);
  $('#eq_boil_time').jqxNumberInput(Show0dec);
  $('#eq_notes').jqxInput({ theme: theme, width: 960, height: 200 });
- $('#eq_boil_size,#eq_batch_size,#eq_tun_volume,#eq_top_up_water,#eq_trub_chiller_loss,#eq_top_up_kettle').jqxNumberInput(Show1dec);
+ $('#eq_boil_size,#eq_batch_size,#eq_tun_volume,#eq_top_up_water,#eq_trub_loss,#eq_top_up_kettle').jqxNumberInput(Show1dec);
  $('#eq_lauter_deadspace,#eq_kettle_volume,#eq_mash_volume,#eq_mash_max,#eq_efficiency').jqxNumberInput(Show1dec);
  $('#eq_chiller_type').jqxInput({ theme: theme, width: 180, height: 23 });
  $('#eq_chiller_to79').jqxNumberInput(Show0dec);

--- a/www/prod_view.php	Sun Oct 30 16:46:03 2022 +0100
+++ b/www/prod_view.php	Sat Jan 14 11:25:20 2023 +0100
@@ -147,7 +147,7 @@
         <td style="vertical-align: top; float: right;">Maischwater L:</td>
 	<td><div id="eq_mash_volume"></div></td>
         <td style="vertical-align: top; float: right;">Trub verlies kookketel L:</td>
-        <td><div id="eq_trub_chiller_loss"></div></td>
+        <td><div id="eq_trub_loss"></div></td>
         <td style="vertical-align: top; float: right;">Minuten koelen tot 79&deg;C:</td>
         <td><div id="eq_chiller_to79"></div></td>
        </tr>