Mercurial > bms / changeset

--- a/www/import/from_brouwhulp.php	Thu Oct 13 08:50:31 2022 +0200
+++ b/www/import/from_brouwhulp.php	Sat Oct 22 15:27:50 2022 +0200
@@ -468,7 +468,6 @@
 		$sql .= "', boil_time='" . floatval($equipment->BOIL_TIME);
 		($equipment->CALC_BOIL_VOLUME == 'TRUE') ? $sql .= "', calc_boil_volume='1" : $sql .= "', calc_boil_volume='0";
 		$sql .= "', top_up_kettle='" . floatval($equipment->TOP_UP_KETTLE);
-		$sql .= "', hop_utilization='" . floatval($equipment->HOP_UTILIZATION);
 		if ($equipment->NOTES)
 			$sql .= "', notes='" . mysqli_real_escape_string($db, $equipment->NOTES);
 		$sql .= "', lauter_volume='" . floatval($equipment->LAUTER_VOLUME);
@@ -1581,7 +1580,6 @@
 			($recipe->EQUIPMENT->CALC_BOIL_VOLUME == 'TRUE') ? $sql .= "', eq_calc_boil_volume='1" : $sql .= "', eq_calc_boil_volume='0";
 			if ($recipe->EQUIPMENT->TOP_UP_KETTLE)
 				$sql .= "', eq_top_up_kettle='" . floatval($recipe->EQUIPMENT->TOP_UP_KETTLE);
-			$sql .= "', eq_hop_utilization='" . floatval($recipe->EQUIPMENT->HOP_UTILIZATION);
 			$sql .= "', eq_lauter_volume='" . floatval($recipe->EQUIPMENT->LAUTER_VOLUME);
 			$sql .= "', eq_lauter_height='" . floatval($recipe->EQUIPMENT->LAUTER_HEIGHT);
 			$sql .= "', eq_lauter_deadspace='" . floatval($recipe->EQUIPMENT->LAUTER_DEADSPACE);

--- a/www/includes/db_inventory_equipments.php	Thu Oct 13 08:50:31 2022 +0200
+++ b/www/includes/db_inventory_equipments.php	Sat Oct 22 15:27:50 2022 +0200
@@ -44,7 +44,6 @@
 	$sql .= "', boil_time='" . $_POST['boil_time'];
 	($_POST['calc_boil_volume'] == 'true') ? $sql .= "', calc_boil_volume='1" : $sql .= "', calc_boil_volume='0";
 	$sql .= "', top_up_kettle='" . $_POST['top_up_kettle'];
-	$sql .= "', hop_utilization='" . $_POST['hop_utilization'];
 	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']);
 	$sql .= "', lauter_volume='" . $_POST['lauter_volume'];
 	$sql .= "', lauter_height='" . floatval($_POST['lauter_height']) / 100.0;
@@ -120,7 +119,6 @@
 			'boil_time' => $row['boil_time'],
 			'calc_boil_volume' => $row['calc_boil_volume'],
 			'top_up_kettle' => $row['top_up_kettle'],
-			'hop_utilization' => $row['hop_utilization'],
 			'notes' => $row['notes'],
 			'lauter_volume' => $row['lauter_volume'],
 			'lauter_height' => floatval($row['lauter_height']) * 100.0,

--- a/www/includes/db_product.php	Thu Oct 13 08:50:31 2022 +0200
+++ b/www/includes/db_product.php	Sat Oct 22 15:27:50 2022 +0200
@@ -64,7 +64,6 @@
 	$sql .= "', eq_boil_time='" . $_POST['eq_boil_time'];
 	$sql .= "', eq_calc_boil_volume='" . $_POST['eq_calc_boil_volume'];
 	$sql .= "', eq_top_up_kettle='" . $_POST['eq_top_up_kettle'];
-	$sql .= "', eq_hop_utilization='" . $_POST['eq_hop_utilization'];
 	$sql .= "', eq_notes='" . mysqli_real_escape_string($connect, $_POST['eq_notes']);
 	$sql .= "', eq_lauter_volume='" . $_POST['eq_lauter_volume'];
 	$sql .= "', eq_lauter_height='" . $_POST['eq_lauter_height'];
@@ -727,7 +726,6 @@
 		$brew .= ',"eq_calc_boil_volume":' . $row['eq_calc_boil_volume'];
 		$brew .= ',"eq_calc_boil_volume":' . floatval($row['eq_calc_boil_volume']);
 		$brew .= ',"eq_top_up_kettle":' . floatval($row['eq_top_up_kettle']);
-		$brew .= ',"eq_hop_utilization":' . floatval($row['eq_hop_utilization']);
 		$brew .= ',"eq_lauter_volume":' . floatval($row['eq_lauter_volume']);
 		$brew .= ',"eq_lauter_height":' . floatval($row['eq_lauter_height']);
 		$brew .= ',"eq_lauter_deadspace":' . floatval($row['eq_lauter_deadspace']);

--- a/www/js/global.js	Thu Oct 13 08:50:31 2022 +0200
+++ b/www/js/global.js	Sat Oct 22 15:27:50 2022 +0200
@@ -503,7 +503,6 @@
   { name: 'boil_time', type: 'float' },
   { name: 'calc_boil_volume', type: 'int' },
   { name: 'top_up_kettle', type: 'float' },
-  { name: 'hop_utilization', type: 'float' },
   { name: 'notes', type: 'string' },
   { name: 'lauter_volume', type: 'float' },
   { name: 'lauter_height', type: 'float' },

--- a/www/js/prod_view.js	Thu Oct 13 08:50:31 2022 +0200
+++ b/www/js/prod_view.js	Sat Oct 22 15:27:50 2022 +0200
@@ -163,7 +163,6 @@
    { name: 'eq_boil_time', type: 'float' },
    { name: 'eq_calc_boil_volume', type: 'int' },
    { name: 'eq_top_up_kettle', type: 'float' },
-   { name: 'eq_hop_utilization', type: 'float' },
    { name: 'eq_notes', type: 'string' },
    { name: 'eq_lauter_volume', type: 'float' },
    { name: 'eq_lauter_height', type: 'float' },
@@ -374,7 +373,6 @@
    $('#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);
-   $('#eq_hop_utilization').val(dataRecord.eq_hop_utilization);
    $('#eq_lauter_volume').val(dataRecord.eq_lauter_volume);
    $('#eq_lauter_deadspace').val(dataRecord.eq_lauter_deadspace);
    $('#eq_kettle_volume').val(dataRecord.eq_kettle_volume);
@@ -2909,7 +2907,6 @@
  $('#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.' });
- $('#eq_hop_utilization').jqxTooltip({ content: '100% voor kleine installaties, hoger voor grote brouwerijen.' });
  $('#eq_notes').jqxTooltip({ content: 'Opmerkingen over deze apparatuur.' });
  $('#eq_lauter_volume').jqxTooltip({ content: 'Filterkuip volume.' });
  $('#eq_lauter_deadspace').jqxTooltip({ content: 'Filterkuip verlies in liters.' });
@@ -2920,7 +2917,7 @@
 
  $('#eq_name').jqxInput({ theme: theme, width: 250, height: 23 });
  $('#eq_evap_rate').jqxNumberInput(Show2dec);
- $('#eq_boil_time,#eq_hop_utilization').jqxNumberInput(Show0dec);
+ $('#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_lauter_volume,#eq_lauter_deadspace,#eq_kettle_volume,#eq_mash_volume,#eq_mash_max,#eq_efficiency').jqxNumberInput(Show1dec);

--- a/www/prod_view.php	Thu Oct 13 08:50:31 2022 +0200
+++ b/www/prod_view.php	Sat Oct 22 15:27:50 2022 +0200
@@ -166,8 +166,7 @@
        <tr>
         <td style="vertical-align: top; float: right;">Filterkuip verlies L:</td>
         <td><div id="eq_lauter_deadspace"></div></td>
-        <td style="vertical-align: top; float: right;">Hopfactor %:</td>
-        <td><div id="eq_hop_utilization"></div></td>
+        <td colspan="2"></td>
        </tr>
        <tr>
         <th style="text-align: center;" colspan="2">Koelen</th>