--- a/www/prod_print.php Mon Jul 15 15:06:17 2019 +0200
+++ b/www/prod_print.php Sat Sep 14 10:30:26 2019 +0200
@@ -218,7 +218,7 @@
global $total_ibus;
global $cost_hops;
global $preboil_sg;
- $hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat' );
+ $hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat', 'Cryo Hop' );
$hopuse = array( 'Maischen', 'First wort', 'Koken', 'Vlamuit', 'Whirlpool', 'Koudhop' );
$vul = $this->w - $this->rMargin - $this->lMargin - 122;
$this->Ln();
@@ -834,46 +834,50 @@
$this->Cell(45,5,'Hoofdvergisting start temp.',0,0,'L',true);
$this->Cell(45,5,sprintf("%.1f",$row['primary_start_temp']).DEG.'C',0,0,'L',true);
$this->Cell($vul,5,'',0,0,'L',false);
- $this->Cell(45,5,'Navergisting tempertuur',0,0,'L',true);
- $this->Cell(45,5,sprintf("%.1f", $row['secondary_temp']).DEG.'C',0,0,'L',true);
- $this->Ln();
-
- $this->SetX($this->TableX);
$this->Cell(45,5,'Hoofdvergisting piek temp.',0,0,'L',true);
$this->Cell(45,5,sprintf("%.1f",$row['primary_max_temp']).DEG.'C',0,0,'L',true);
- $this->Cell($vul,5,'',0,0,'L',false);
- $this->Cell(45,5,'Navergisting einde',0,0,'L',true);
- $this->Cell(45,5,$row['secondary_end_date'],0,0,'L',true);
$this->Ln();
$this->SetX($this->TableX);
$this->Cell(45,5,'Hoofdvergisting eind temp.',0,0,'L',true);
$this->Cell(45,5,sprintf("%.1f",$row['primary_end_temp']).DEG.'C',0,0,'L',true);
- $this->Cell($vul,5,'',0,0,'L',false);
- $this->Cell(45,5,'Lageren temperatuur',0,0,'L',true);
- $this->Cell(45,5,sprintf("%.1f",$row['tertiary_temp']).DEG.'C',0,0,'L',true);
+ $this->Cell($vul,5,'',0,0,'L',false);
+ $this->Cell(45,5,'Hoofdvergisting densiteit',0,0,'L',true);
+ $this->Cell(45,5,sprintf("%.3f",floatval($row['primary_end_sg'])).' SG',0,0,'L',true);
$this->Ln();
$this->SetX($this->TableX);
- $this->Cell(45,5,'Hoofdvergisting densiteit',0,0,'L',true);
- $this->Cell(45,5,density_str(floatval($row['primary_end_sg'])),0,0,'L',true);
- $this->Cell($vul,5,'',0,0,'L',false);
- $this->Cell(45,5,'Lageren densiteit',0,0,'L',true);
- $this->Cell(45,5,density_str(floatval($row['fg'])),0,0,'L',true);
- $this->Ln();
+ $this->Cell(45,5,'Hoofdvergisting einde',0,0,'L',true);
+ $this->Cell(45,5,$row['primary_end_date'],0,0,'L',true);
+ $this->Ln();
+
+ $this->SetX($this->TableX);
+ $this->Cell(45,5,'Navergisting tempertuur',0,0,'L',true);
+ $this->Cell(45,5,sprintf("%.1f", $row['secondary_temp']).DEG.'C',0,0,'L',true);
+ $this->Cell($vul,5,'',0,0,'L',false);
+ $this->Cell(45,5,'Nagisten densiteit',0,0,'L',true);
+ $this->Cell(45,5,sprintf("%.3f",floatval($row['secondary_end_sg'])).' SG',0,0,'L',true);
+ $this->Ln();
$this->SetX($this->TableX);
- $this->Cell(45,5,'Hoofdvergisting einde',0,0,'L',true);
- $this->Cell(45,5,$row['primary_end_date'],0,0,'L',true);
- $this->Cell($vul,5,'',0,0,'L',false);
+ $this->Cell(45,5,'Nagisten einde',0,0,'L',true);
+ $this->Cell(45,5,$row['secondary_end_date'],0,0,'L',true);
+ $this->Ln();
+
+ $this->SetX($this->TableX);
+ $this->Cell(45,5,'Lageren temperatuur',0,0,'L',true);
+ $this->Cell(45,5,sprintf("%.1f",$row['tertiary_temp']).DEG.'C',0,0,'L',true);
+ $this->Cell($vul,5,'',0,0,'L',false);
+ $this->Cell(45,5,'Lageren densiteit',0,0,'L',true);
+ $this->Cell(45,5,sprintf("%.3f",floatval($row['fg'])).' SG',0,0,'L',true);
+ $this->Ln();
+
+ $this->SetX($this->TableX);
$this->Cell(45,5,'Lageren einde',0,0,'L',true);
$this->Cell(45,5,$row['package_date'],0,0,'L',true);
- $this->Ln();
-
+ $this->Cell($vul,5,'',0,0,'L',false);
$svg = 100 * (floatval($row['brew_fermenter_sg']) - floatval($row['fg'])) / (floatval($row['brew_fermenter_sg']) - 1);
- $this->SetX($this->TableX);
- $this->Cell($vul+90,5,'',0,0,'L',false);
- $this->Cell(45,5,'Schijnbare vergistingsgraad',0,0,'L',true);
+ $this->Cell(45,5,'Schijnbare vergistingsgraad',0,0,'L',true);
$this->Cell(45,5,sprintf("%.1f",$svg).'%',0,0,'L',true);
$this->Ln();
}