Mercurial > bms / file diff

--- a/www/rec_print.php	Wed Nov 14 20:49:19 2018 +0100
+++ b/www/rec_print.php	Thu Nov 15 14:27:37 2018 +0100
@@ -29,7 +29,7 @@
 $svg = 77;
 $colorw = 0;
 $total_ibus = 0;
-
+$preboil_sg = 0;
 
 class PDF_MySQL_Table extends FPDF
 {
@@ -96,6 +96,7 @@
 		global $pSugar;
 		global $pCara;
 		global $colorw;
+		global $preboil_sg;
 		$vul = $this->w - $this->rMargin - $this->lMargin - 132;
 		$this->AddCol($vul,'Grondstof','L');
 		$this->AddCol(30,'Leverancier','L');
@@ -156,6 +157,7 @@
 		}
 
 		$row['est_og'] = estimate_og($sugf, floatval($row['batch_size']));
+		$preboil_sg = estimate_og($sugf, floatval($row['boil_size']));
 		$this->SetFillColor(210,245,255);
 		$this->Cell($vul+62,5,'',0,0,'L',false);
 		$this->Cell(20,5,sprintf("%8.3f",$total_fermentables),0,0,'R',true);
@@ -171,6 +173,7 @@
 		global $total_hops;
 		global $total_ibus;
 		global $cost_hops;
+		global $preboil_sg;
 		$vul = $this->w - $this->rMargin - $this->lMargin - 135;
 		$this->AddCol($vul,'Hop','L');
 		$this->AddCol(35,'Land','L');
@@ -210,7 +213,7 @@
 			if ($useat == "Boil") {
 				$moment   = "Kook@".$time;
 			}
-			$ibu = calc_IBU($useat, $form, floatval($row['est_og']), floatval($row['batch_size']), $mass, $time, $alpha, $row['ibu_method']);
+			$ibu = calc_IBU($useat, $form, /*floatval($row['est_og'])*/ $preboil_sg, floatval($row['batch_size']), $mass, $time, $alpha, $row['ibu_method']);
 			$total_ibus += $ibu;
 
 			$this->Cell($vul,5,$name,0,0,'L',true);