Mercurial > bms / changeset

--- a/README.design	Fri Jun 28 20:12:54 2019 +0200
+++ b/README.design	Sun Jun 30 13:18:36 2019 +0200
@@ -13,8 +13,6 @@
 
 Bug: bij veranderen vergistbare ingredienten springt het totaalgewicht op NaN
 
-Wens: koppel spoelwater gegevens watertab en brouwdag tab.
-
 Extra:
 
 Gisten: = Cultures?

--- a/www/import/from_brouwhulp.php	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/import/from_brouwhulp.php	Sun Jun 30 13:18:36 2019 +0200
@@ -1611,12 +1611,10 @@
 				$sql .= "', brew_mash_ph='" . floatval($recipe->PH_ADJUSTED);
 			if (floatval($recipe->SG_END_MASH) != 1.0)
 				$sql .= "', brew_mash_sg='" . floatval($recipe->SG_END_MASH);
-			if ($recipe->MASH->SPARGE_TEMP)
-				$sql .= "', brew_sparge_temperature='" . floatval($recipe->MASH->SPARGE_TEMP);
 			if ($recipe->MASH->PH)
 				$sql .= "', brew_sparge_ph='" . floatval($recipe->MASH->PH);
 			if ($recipe->VOLUME_HLT)
-				$sql .= "', brew_sparge_volume='" . floatval($recipe->VOLUME_HLT);
+				$sql .= "', sparge_volume='" . floatval($recipe->VOLUME_HLT);
 			if ($recipe->VOLUME_BEFORE_BOIL)
 				$sql .= "', brew_preboil_volume='" . sprintf("%.5f",floatval($recipe->VOLUME_BEFORE_BOIL) * 1.04);
 			if (floatval($recipe->OG_BEFORE_BOIL) != 1.0)
@@ -1791,10 +1789,10 @@
 do_hops();
 do_yeasts();
 do_miscs();
-//do_waters();
-//do_equipments();
-//do_styles();
-//do_mash();
+do_waters();
+do_equipments();
+do_styles();
+do_mash();
 do_recipes();
 do_brews();
 

--- a/www/includes/db_product.php	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/includes/db_product.php	Sun Jun 30 13:18:36 2019 +0200
@@ -75,8 +75,6 @@
 	$sql .=  ", brew_mash_ph='" . $_POST['brew_mash_ph'];
 	$sql .= "', brew_mash_sg='" . $_POST['brew_mash_sg'];
 	$sql .= "', brew_mash_efficiency='" . $_POST['brew_mash_efficiency'];
-	$sql .= "', brew_sparge_temperature='" . $_POST['brew_sparge_temperature'];
-	$sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume'];
 	$sql .= "', brew_sparge_est='" . $_POST['brew_sparge_est'];
 	$sql .= "', brew_sparge_ph='" . $_POST['brew_sparge_ph'];
 	$sql .= "', brew_preboil_volume='" . $_POST['brew_preboil_volume'];
@@ -676,8 +674,6 @@
 		$brew .= '","brew_mash_ph":' . floatval($row['brew_mash_ph']);
 		$brew .= ',"brew_mash_sg":' . floatval($row['brew_mash_sg']);
 		$brew .= ',"brew_mash_efficiency":' . floatval($row['brew_mash_efficiency']);
-		$brew .= ',"brew_sparge_temperature":' . floatval($row['brew_sparge_temperature']);
-		$brew .= ',"brew_sparge_volume":' . floatval($row['brew_sparge_volume']);
 		$brew .= ',"brew_sparge_est":' . floatval($row['brew_sparge_est']);
 		$brew .= ',"brew_sparge_ph":' . floatval($row['brew_sparge_ph']);
 		$brew .= ',"brew_preboil_volume":' . floatval($row['brew_preboil_volume']);

--- a/www/js/prod_edit.js	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/js/prod_edit.js	Sun Jun 30 13:18:36 2019 +0200
@@ -2045,10 +2045,8 @@
 			$("#brew_aboil_sg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#brew_preboil_volume").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#brew_aboil_volume").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
-			$("#brew_sparge_temperature").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#brew_whirlpool9").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#brew_cooling_to").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
-			$("#brew_sparge_volume").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#brew_whirlpool7").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 			$("#brew_cooling_method").jqxDropDownList({ disabled: true });
 			$("#brew_whirlpool6").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
@@ -2338,6 +2336,7 @@
 			$("#est_pre_vol").val(Math.round(new_boil * 1.04 * 100) / 100);
 			dataRecord.sparge_volume *= factor;
 			$("#sparge_volume").val(dataRecord.sparge_volume);
+			$("#brew_sparge_volume").val(dataRecord.sparge_volume);
 			dataRecord.batch_size = parseFloat(event.args.value);
 			calcFermentablesFromOG(parseFloat($("#est_og").jqxNumberInput('decimal')));     // Keep the OG
 			adjustWaters(factor);
@@ -2394,8 +2393,13 @@
 		});
 		$('#sparge_volume').on('change', function (event) {
 			dataRecord.sparge_volume = parseFloat(event.args.value);
+			$('#brew_sparge_volume').val(dataRecord.sparge_volume);
 			calcSparge();
 		});
+		$("#sparge_temp").on('change', function (event) {
+			dataRecord.sparge_temp = parseFloat(event.args.value);
+			$('#brew_sparge_temperature').val(dataRecord.sparge_temp);
+		});
 		$('#sparge_source').on('change', function (event) {
 			if (event.args) {
 				var index = event.args.index;
@@ -2674,6 +2678,7 @@
 
 			dataRecord.sparge_volume = Math.round(datarecord.boil_size * 5) / 10;
 			$("#sparge_volume").val(dataRecord.sparge_volume);
+			$("#brew_sparge_volume").val(dataRecord.sparge_volume);
 			$("#est_pre_vol").val(datarecord.boil_size * 1.04);
 			calcFermentablesFromOG(parseFloat($("#est_og").jqxNumberInput('decimal')));     // Keep the OG
 			adjustWaters(factor);
@@ -2734,8 +2739,6 @@
 			brew_mash_ph: parseFloat($("#brew_mash_ph").jqxNumberInput('decimal')),
 			brew_mash_sg: parseFloat($("#brew_mash_sg").jqxNumberInput('decimal')),
 			brew_mash_efficiency: parseFloat($("#brew_mash_efficiency").jqxNumberInput('decimal')),
-			brew_sparge_temperature: parseFloat($("#brew_sparge_temperature").jqxNumberInput('decimal')),
-			brew_sparge_volume: parseFloat($("#brew_sparge_volume").jqxNumberInput('decimal')),
 			brew_sparge_est: parseFloat($("#brew_sparge_est").jqxNumberInput('decimal')),
 			brew_sparge_ph: parseFloat($("#brew_sparge_ph").jqxNumberInput('decimal')),
 			brew_preboil_volume: parseFloat($("#brew_preboil_volume").jqxNumberInput('decimal')),
@@ -2962,8 +2965,6 @@
 			{ name: 'brew_mash_ph', type: 'float' },
 			{ name: 'brew_mash_sg', type: 'float' },
 			{ name: 'brew_mash_efficiency', type: 'float' },
-			{ name: 'brew_sparge_temperature', type: 'float' },
-			{ name: 'brew_sparge_volume', type: 'float' },
 			{ name: 'brew_sparge_est', type: 'float' },
 			{ name: 'brew_sparge_ph', type: 'float' },
 			{ name: 'brew_preboil_volume', type: 'float' },
@@ -3163,8 +3164,8 @@
 			$("#brew_mash_sg").val(dataRecord.brew_mash_sg);
 			$("#brew_mash_efficiency").val(dataRecord.brew_mash_efficiency);
 			// Header Spoelen en filteren
-			$("#brew_sparge_temperature").val(dataRecord.brew_sparge_temperature);
-			$("#brew_sparge_volume").val(dataRecord.brew_sparge_volume);
+			$("#brew_sparge_temperature").val(dataRecord.sparge_temp);
+			$("#brew_sparge_volume").val(dataRecord.sparge_volume);
 			$("#brew_sparge_est").val(dataRecord.brew_sparge_est);
 			$("#brew_sparge_ph").val(dataRecord.brew_sparge_ph);
 			// Header Beluchten
@@ -5729,8 +5730,10 @@
 	$("#brew_preboil_efficiency").jqxNumberInput( Show1dec );
 	$("#brew_aboil_efficiency").jqxTooltip({ content: 'Het bereikte rendement na het koken.' });
 	$("#brew_aboil_efficiency").jqxNumberInput( Show1dec );
-	$("#brew_sparge_temperature").jqxNumberInput( Spin1dec );
-	$("#brew_sparge_volume").jqxNumberInput( Spin1dec );
+	$("#brew_sparge_temperature").jqxTooltip({ content: 'De spoelwater temperatuur, in te stellen in de Water tab.' });
+	$("#brew_sparge_temperature").jqxNumberInput( Show1dec );
+	$("#brew_sparge_volume").jqxTooltip({ content: 'Het spoelwater voorraad volume, in te stellen in de Water tab.' });
+	$("#brew_sparge_volume").jqxNumberInput( Show1dec );
 	$("#brew_sparge_est").jqxNumberInput( Show1dec );
 	$("#brew_whirlpool9").jqxNumberInput( PosInt );
 	$("#brew_whirlpool9").jqxNumberInput({ max: 120 });

--- a/www/js/prod_new.js	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/js/prod_new.js	Sun Jun 30 13:18:36 2019 +0200
@@ -286,8 +286,6 @@
 					brew_date_start: '',
 					brew_mash_ph: 0.0,
 					brew_mash_sg: 1.000,
-					brew_sparge_temperature: 0,
-					brew_sparge_volume: 0,
 					brew_sparge_ph: 0.0,
 					brew_preboil_volume: 0,
 					brew_preboil_sg: 0,

--- a/www/prod_duplicate.php	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/prod_duplicate.php	Sun Jun 30 13:18:36 2019 +0200
@@ -64,8 +64,6 @@
 $sql .= "', brew_date_start=NULL";
 $sql .=  ", brew_mash_ph='0.0";
 $sql .= "', brew_mash_sg='1.000";
-$sql .= "', brew_sparge_temperature='" . $row['brew_sparge_temperature'];
-$sql .= "', brew_sparge_volume='" . $row['brew_sparge_volume'];
 $sql .= "', brew_sparge_ph='" . $row['brew_sparge_ph'];
 $sql .= "', brew_preboil_volume='0";
 $sql .= "', brew_preboil_sg='0";

--- a/www/prod_edit.php	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/prod_edit.php	Sun Jun 30 13:18:36 2019 +0200
@@ -463,7 +463,7 @@
 	<td style="padding: 3px;"><div id="wa_cacl2"></div></td>
         <td style="vertical-align: top; float: right; padding: 3px;">Maish pH:</td>
         <td style="padding: 3px;"><div id="mash_ph"></div></td>
-        <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater liters:</td>
+        <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater voorraad l:</td>
         <td style="padding: 3px;"><div id="sparge_volume"></div></td>
        </tr>
        <tr>

--- a/www/prod_print.php	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/prod_print.php	Sun Jun 30 13:18:36 2019 +0200
@@ -738,7 +738,7 @@
 		$coolingtype = array( '-', 'Dompelkoeler', 'Tegenstroomkoeler', 'Au bain marie', 'Laten afkoelen' );
 		$this->SetX($this->TableX);
                 $this->Cell(35,5,'Spoelwater temperatuur',0,0,'L',true);
-                $this->Cell(50,5,sprintf("%.1f", $row['brew_sparge_temperature']).DEG.'C',0,0,'L',true);
+                $this->Cell(50,5,sprintf("%.1f", $row['sparge_temp']).DEG.'C',0,0,'L',true);
                 $this->Cell($vul,5,'',0,0,'L',false);
                 $this->Cell(35,5,'Koel methode',0,0,'L',true);
                 $this->Cell(50,5,$coolingtype[$row['brew_cooling_method']],0,0,'L',true);

--- a/www/rec_toproduct.php	Fri Jun 28 20:12:54 2019 +0200
+++ b/www/rec_toproduct.php	Sun Jun 30 13:18:36 2019 +0200
@@ -46,7 +46,7 @@
 $sql .= "', eq_kettle_height='20', eq_mash_volume='18', eq_mash_max='6', eq_efficiency='75";
 // brewdate
 $sql .= "', brew_date_start=NULL, brew_mash_ph='0.0', brew_mash_sg='1.000";
-$sql .= "', brew_sparge_temperature='0', brew_sparge_volume='0', brew_sparge_ph='0.0";
+$sql .= "', brew_sparge_ph='0.0";
 $sql .= "', brew_preboil_volume='0', brew_preboil_sg='0', brew_preboil_ph='0.0";
 $sql .= "', brew_aboil_volume='0', brew_aboil_sg='0', brew_aboil_ph='0.0', brew_aboil_efficiency='0";
 $sql .= "', brew_cooling_method='0', brew_cooling_time='0', brew_cooling_to='20";