Mercurial > bms / changeset

--- a/www/prod_checklist.php	Thu Jun 20 19:58:23 2019 +0200
+++ b/www/prod_checklist.php	Thu Jun 20 20:21:28 2019 +0200
@@ -464,7 +464,7 @@
 		foreach($hops as $item2) {
                         if ($item2['h_useat'] == 5) {
                                 $s = sprintf("%.1f",$item2['h_amount']*1000).' gr `';
-                                $s .= iconv('UTF-8','windows-1252',$item2['h_name']).'` voor';
+                                $s .= iconv('UTF-8','windows-1252',$item2['h_name']).'` voor ';
 				$s .= sprintf("%.0f",$item2['h_time']/1440).' dagen toevoegen';
                                 $this->Checkline($s);
                         }
@@ -498,7 +498,7 @@
 		 */
 		$lines = 0;
 		foreach($ferms as $item1) {
-                        if ($item1['f_added'] == 4)
+                        if ($item1['f_added'] >= 4)
                                 $lines++;
                 }
 		$yeasts = json_decode($row['json_yeasts'], true);
@@ -521,7 +521,18 @@
 		foreach($ferms as $item1) {
                         if ($item1['f_added'] == 4) {
                                 $s = sprintf("%.3f",$item1['f_amount']).' kg `';
-                                $s .= iconv('UTF-8','windows-1252',$item1['f_name']).'` bij bottelen';
+                                $s .= iconv('UTF-8','windows-1252',$item1['f_name']).'`';
+				if ($row['bottle_priming_water'] > 0)
+					$s .= ' met '.sprintf("%.3f",$row['bottle_priming_water']).' liter water';
+				$s .= ' bij bottelen';
+                                $this->Checkline($s);
+                        }
+			if ($item1['f_added'] == 5) {
+                                $s = sprintf("%.3f",$item1['f_amount']).' kg `';
+                                $s .= iconv('UTF-8','windows-1252',$item1['f_name']).'`';
+				if ($row['keg_priming_water'] > 0)
+					$s .= ' met '.sprintf("%.3f",$row['keg_priming_water']).' liter water';
+				$s .= ' bij op fust zetten';
                                 $this->Checkline($s);
                         }
                 }