Mercurial > bms / file diff

--- a/www/prod_print.php	Fri Jun 18 15:26:55 2021 +0200
+++ b/www/prod_print.php	Fri Jun 18 21:26:28 2021 +0200
@@ -558,27 +558,29 @@
 		$this->Cell(15,5,sprintf("%.1f", $row['w1_chloride']),0,0,'R',true);
 		$this->Cell(15,5,sprintf("%.1f", $row['w1_sulfate']),0,0,'R',true);
 		$this->Cell(15,5,sprintf("%.1f", $row['w1_ph']),0,0,'R',true);
-                $this->Ln();
-		$this->Cell($vul,5,$row['w2_name'],0,0,'L',true);
-                $this->Cell(20,5,sprintf("%.1f", $row['w2_amount']).' L',0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['w2_calcium']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['w2_magnesium']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['w2_sodium']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['w2_total_alkalinity']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['w2_chloride']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['w2_sulfate']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['w2_ph']),0,0,'R',true);
-                $this->Ln();
-		$this->Cell($vul,5,'Gemengd water',0,0,'L',true);
-                $this->Cell(20,5,sprintf("%.1f", $row['wg_amount']).' L',0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['wg_calcium']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['wg_magnesium']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['wg_sodium']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['wg_total_alkalinity']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['wg_chloride']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['wg_sulfate']),0,0,'R',true);
-                $this->Cell(15,5,sprintf("%.1f", $row['wg_ph']),0,0,'R',true);
-                $this->Ln();
+		$this->Ln();
+		if ($row['w2_name'] && floatval($row['w2_amount'])) {
+			$this->Cell($vul,5,$row['w2_name'],0,0,'L',true);
+                	$this->Cell(20,5,sprintf("%.1f", $row['w2_amount']).' L',0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['w2_calcium']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['w2_magnesium']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['w2_sodium']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['w2_total_alkalinity']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['w2_chloride']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['w2_sulfate']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['w2_ph']),0,0,'R',true);
+                	$this->Ln();
+			$this->Cell($vul,5,'Gemengd water',0,0,'L',true);
+                	$this->Cell(20,5,sprintf("%.1f", $row['wg_amount']).' L',0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['wg_calcium']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['wg_magnesium']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['wg_sodium']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['wg_total_alkalinity']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['wg_chloride']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['wg_sulfate']),0,0,'R',true);
+                	$this->Cell(15,5,sprintf("%.1f", $row['wg_ph']),0,0,'R',true);
+			$this->Ln();
+		}
 		$this->Cell($vul,5,'Behandeld water',0,0,'L',true);
                 $this->Cell(20,5,'',0,0,'R',true);
                 $this->Cell(15,5,sprintf("%.1f", $row['wb_calcium']),0,0,'R',true);