Mercurial > bms / file diff

--- a/www/rec_print.php	Fri May 01 21:37:23 2020 +0200
+++ b/www/rec_print.php	Wed May 06 14:14:14 2020 +0200
@@ -391,19 +391,20 @@
                 global $svg;
                 global $mashkg;
                 global $mashtype;
-                $vul = $this->w - $this->rMargin - $this->lMargin - 137;
+                $vul = $this->w - $this->rMargin - $this->lMargin - 138;
                 if ($this->GetY() > 250)
                         $this->AddPage();
                 else
                         $this->Ln();
                 $this->AddCol($vul,'Maisch stap naam','L');
                 $this->AddCol(25,'Stap type','L');
-                $this->AddCol(18,'Start '.DEG.'C','R');
-                $this->AddCol(18,'Eind '.DEG.'C','R');
-                $this->AddCol(18,'Rust min','R');
-                $this->AddCol(18,'Stap min','R');
-                $this->AddCol(20,'L/Kg','R');
-                $this->AddCol(20,'Infusie L','R');
+                $this->AddCol(16,'Start '.DEG.'C','R');
+                $this->AddCol(16,'Eind '.DEG.'C','R');
+                $this->AddCol(15,'Rust min','R');
+                $this->AddCol(15,'Stap min','R');
+                $this->AddCol(15,'L/Kg','R');
+		$this->AddCol(18,'Inf/dec L','R');
+		$this->AddCol(18,'Inf/dec '.DEG.'C','R');
 
                 $cMargin=$this->cMargin;
                 $this->cMargin=2;
@@ -426,12 +427,18 @@
                                 $thick = 0;
                         $this->Cell($vul,5,$item['step_name'],0,0,'L',true);
                         $this->Cell(25,5,$mashtype[$item['step_type']],0,0,'L',true);
-                        $this->Cell(18,5,sprintf("%.1f",$item['step_temp']),0,0,'R',true);
-                        $this->Cell(18,5,sprintf("%.1f",$item['end_temp']),0,0,'R',true);
-                        $this->Cell(18,5,sprintf("%.0f",$item['step_time']),0,0,'R',true);
-                        $this->Cell(18,5,sprintf("%.0f",$item['ramp_time']),0,0,'R',true);
-                        $this->Cell(20,5,sprintf("%.2f",$thick),0,0,'R',true);
-                        $this->Cell(20,5,sprintf("%.1f",$item['step_infuse_amount']),0,0,'R',true);
+                        $this->Cell(16,5,sprintf("%.1f",$item['step_temp']),0,0,'R',true);
+                        $this->Cell(16,5,sprintf("%.1f",$item['end_temp']),0,0,'R',true);
+                        $this->Cell(15,5,sprintf("%.0f",$item['step_time']),0,0,'R',true);
+                        $this->Cell(15,5,sprintf("%.0f",$item['ramp_time']),0,0,'R',true);
+                        $this->Cell(15,5,sprintf("%.2f",$thick),0,0,'R',true);
+			if ($item['step_type'] == 1) {
+				$this->Cell(18,5,' ',0,0,'R',true);
+				$this->Cell(18,5,' ',0,0,'R',true);
+			} else {
+				$this->Cell(18,5,sprintf("%.1f",$item['step_infuse_amount']),0,0,'R',true);
+				$this->Cell(18,5,sprintf("%.1f",$item['step_infuse_temp']),0,0,'R',true);
+			}
                         $this->Ln();
                 }
                 $this->ProcessingTable=false;