# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1635688342 -3600
# Node ID 622e31e000c6fc114a90f00e7745b33a35afed23
# Parent  4bb28e67f2b7da3d1315fbe9ede3e63d7ef5cff8
Checklist, added range mash steps. Added pH only measure fields. Several minor improvements.

diff -r 4bb28e67f2b7 -r 622e31e000c6 www/prod_checklist.php
--- a/www/prod_checklist.php	Sun Oct 31 11:45:33 2021 +0100
+++ b/www/prod_checklist.php	Sun Oct 31 14:52:22 2021 +0100
@@ -40,9 +40,13 @@
 	}
 
 	function CheckInput($text, $prompt) {
-		$this->Cell(2, 4,' ',0,0,'L',true);
-		$this->Cell(4, 4,' ',1,0,'L',true);
-		$this->Cell(130, 4,' '.$text,0,0,'L',true);
+		if (strlen($text)) {
+			$this->Cell(2, 4,' ',0,0,'L',true);
+			$this->Cell(4, 4,' ',1,0,'L',true);
+			$this->Cell(130, 4,' '.$text,0,0,'L',true);
+		} else {
+			$this->Cell(136, 4,' ',0,0,'L',true);
+		}
 		$this->Cell(0, 4, 'Gemeten: _________ '.$prompt,0,1,'L',true);
 		$this->Ln(1);
 	}
@@ -169,7 +173,7 @@
 					else
 						$l = $mashwater;
 					$s = sprintf("%.1f",$l).' liter water opwarmen tot ';
-					$s .= sprintf("%.1f",$item['step_infuse_temp']).' '.DEG.'C (';
+					$s .= sprintf("%.1f",$item['step_infuse_temp']).DEG.'C (';
 					$s .= sprintf("%.1f",kettle_cm($l,$row['eq_tun_volume'],$row['eq_tun_height']));
 					$s .= ' cm onder de rand)';
 					$this->Checkline($s);
@@ -191,20 +195,28 @@
 							$this->Checkline($s);
 						}
 					}
-					$this->CheckInput($item['step_time'].' min. bij '.$item['step_temp'].' '.DEG.'C', 'Brix');
+					if ($item['step_temp'] != $item['end_temp']) {
+						$this->CheckInput($item['step_time'].' minuten bij '.$item['step_temp'].DEG.'C'.' tot '.$item['end_temp'].DEG.'C', 'Brix');
+					} else {
+						$this->CheckInput($item['step_time'].' minuten bij '.$item['step_temp'].DEG.'C', 'Brix');
+					}
 					$this->CheckInput('pH meten en bijstellen (doel pH beslag: '.sprintf("%.1f",$row['mash_ph']).' pH)', 'pH');
 				} else {
 					if ($item['step_type'] == 0) {	// Infusion
 						$s = 'toevoegen '.sprintf("%.1f",$item['step_infuse_amount'] * $factor).' liter water van ';
-						$s .= $item['step_infuse_temp'].' '.DEG.'C';
+						$s .= $item['step_infuse_temp'].DEG.'C';
 					} else if ($item['step_type'] == 1) {	// Direct heat
-						$s = 'opwarmen tot '.$item['step_temp'].' '.DEG.'C';
+						$s = 'opwarmen tot '.$item['step_temp'].DEG.'C';
 					} else {	// Decoction
 						$s = 'uitnemen, opwarmen, koken en terugstorten van '.sprintf("%.1f",$item['step_infuse_amount']*$factor);
 						$s .= ' liter deelbeslag';
 					}
 					$this->Checkline($s);
-					$this->CheckInput($item['step_time'].' min. bij '.$item['step_temp'].' '.DEG.'C', 'Brix');
+					if ($item['step_temp'] != $item['end_temp']) {
+						$this->CheckInput($item['step_time'].' minuten bij '.$item['step_temp'].DEG.'C'.' tot '.$item['end_temp'].DEG.'C', 'Brix');
+					} else {
+						$this->CheckInput($item['step_time'].' minuten bij '.$item['step_temp'].DEG.'C', 'Brix');
+					}
 				}
 				$loop++;
 			}
@@ -221,7 +233,7 @@
 			$v = $msugars / $sugardensity + $mvol;
 			$plato = 1000 * $msugars / ($v * 10);	// deg. Plato
 			$mash_sg = plato_to_sg($plato);
-			$this->CheckInput('doel SG eind maischen: '.density_str($mash_sg), 'Brix');
+			$this->CheckInput('doel SG eind maischen: '.density_str($mash_sg), 'SG');
 		}
 		if ($this->GetY() > 200)
 			$this->AddPage();
@@ -229,7 +241,7 @@
 			$this->Ln(5);
 
 		$this->Checkheader('Filteren en spoelen');
-		$s = sprintf("%.1f",$row['sparge_volume'] * $factor).' liter spoelwater opwarmen tot '.sprintf("%.1f",$row['sparge_temp']).' '.DEG.'C';
+		$s = sprintf("%.1f",$row['sparge_volume'] * $factor).' liter spoelwater opwarmen tot '.sprintf("%.1f",$row['sparge_temp']).DEG.'C';
 		$this->Checkline($s);
 		$s = 'spoelwater aanzuren tot pH <= '.sprintf("%.1f",$row['sparge_ph']).' met ';
 		$s .= sprintf("%.2f",$row['sparge_acid_amount']*1000*$factor).' ml. '.$acidtype[$row['sparge_acid_type']];
@@ -240,7 +252,8 @@
 		$s .= sprintf("%.1f",kettle_cm($row['boil_size'] * $factor * 1.04,$row['eq_kettle_volume'],$row['eq_kettle_height'])).' cm onder de rand)';
 		$this->CheckInput($s, 'cm');
 		$pre_sg = estimate_sg($msugars * floatval($row['efficiency']) / 100,floatval($row['boil_size'] * $factor));
-		$this->CheckInput('doel SG in kookketel: '.density_str($pre_sg), 'Brix');
+		$this->CheckInput('doel SG in kookketel: '.density_str($pre_sg), 'SG');
+		$this->CheckInput('', 'pH');
 		foreach($hops as $item2) {
 			if ($item2['h_useat'] == 1) {
 				$s = sprintf("%.1f",$item2['h_amount']*1000*$factor).' gr `';
@@ -301,7 +314,8 @@
 			$s .= sprintf("%.1f",kettle_cm($row['batch_size']*$factor*1.04,$row['eq_kettle_volume'],$row['eq_kettle_height']));
 			$s .= ' cm onder de rand)';
 			$this->CheckInput($s, 'cm');
-			$this->CheckInput('doel SG einde koken: '.density_str($row['est_og3']), 'Brix');
+			$this->CheckInput('doel SG einde koken: '.density_str($row['est_og3']), 'SG');
+			$this->CheckInput('', 'pH');
 			if ($this->Checksplit(2, $row))
 				$factor = 1;
 		} else {
@@ -315,17 +329,17 @@
 		if (($row['brew_whirlpool9'] + $row['brew_whirlpool7'] + $row['brew_whirlpool6'] + $row['brew_whirlpool2']) > 0) {
 			$this->Checkheader('Whirlpool en koelen');
 			if ($row['brew_whirlpool9'] > 0) {
-				$s = 'Whirlpool voor '.$row['brew_whirlpool9'].' min. Temperatuur boven 85 '.DEG.'C houden';
+				$s = 'Whirlpool voor '.$row['brew_whirlpool9'].' min. Temperatuur boven 85'.DEG.'C houden';
 				$this->Checkline($s);
 			}
 			if ($row['brew_whirlpool7'] > 0) {
-				$this->Checkline('koelen tot 79 '.DEG.'C');
-				$s = 'Whirlpool voor '.$row['brew_whirlpool7'].' min. Temperatuur tussen 72 en 79 '.DEG.'C houden';
+				$this->Checkline('koelen tot 79'.DEG.'C');
+				$s = 'Whirlpool voor '.$row['brew_whirlpool7'].' min. Temperatuur tussen 72 en 79'.DEG.'C houden';
 				$this->Checkline($s);
 			}
 			if ($row['brew_whirlpool6'] > 0) {
-				$this->Checkline('koelen tot 66 '.DEG.'C');
-				$s = 'Whirlpool voor '.$row['brew_whirlpool6'].' min. Temperatuur tussen 60 en 66 '.DEG.'C houden';
+				$this->Checkline('koelen tot 66'.DEG.'C');
+				$s = 'Whirlpool voor '.$row['brew_whirlpool6'].' min. Temperatuur tussen 60 en 66'.DEG.'C houden';
 				$this->Checkline($s);
 			}
 			foreach($hops as $item2) {
@@ -336,17 +350,17 @@
 					$this->Checkline($s);
 				}
 			}
-			$this->Checkline('koelen tot '.sprintf("%.1f",$row['brew_cooling_to']).' '.DEG.'C');
+			$this->Checkline('koelen tot '.sprintf("%.1f",$row['brew_cooling_to']).DEG.'C');
 			if ($row['brew_whirlpool2'] > 0) {
 				$s = 'Whirlpool voor '.$row['brew_whirlpool2'].' min.';
 				$this->Checkline($s);
 			}
 		} else {
 			$this->Checkheader('Koelen');
-			$this->Checkline('koelen tot '.sprintf("%.1f",$row['brew_cooling_to']).' '.DEG.'C');
+			$this->Checkline('koelen tot '.sprintf("%.1f",$row['brew_cooling_to']).DEG.'C');
 		}
 		$this->Checkline('gistvat ontsmetten en evt. pomp en slangen ontsmetten');
-		$this->Checkline('wort naar gistvat overbrengen');
+		$this->CheckInput('wort naar gistvat overbrengen', 'Liter');
 		if ($this->Checksplit(3, $row))
 			$factor = 1;
 		if ($this->GetY() > 240)
@@ -374,7 +388,7 @@
 					$this->Checkline($s);
 				}
 				if ($item['y_type'] == 6 && floatval($item['y_pitch_temperature']) > 0) {
-					$s = 'Gist enten bij ' . sprintf("%.1f",floatval($item['y_pitch_temperature'])) . DEG . 'C';
+					$s = 'Gist enten bij ' . sprintf("%.1f",floatval($item['y_pitch_temperature'])).DEG.'C';
 					$this->Checkline($s);
 					$climate = $item['y_pitch_temperature'];
 				}
@@ -401,7 +415,7 @@
 			$this->Ln(5);
 
 		$this->Checkheader('Vergisting starten');
-		$this->Checkline('klimaatkast instellen op '.sprintf("%.1f",$climate).' '.DEG.'C');
+		$this->Checkline('klimaatkast instellen op '.sprintf("%.1f",$climate).DEG.'C');
 
 		/*
 		 * During primary fermentation: fermentables, misc