diff -r a5ade45597d8 -r 945d5eba869a www/prod_checklist.php --- a/www/prod_checklist.php Sat Apr 18 15:56:40 2020 +0200 +++ b/www/prod_checklist.php Tue Apr 21 16:11:26 2020 +0200 @@ -240,57 +240,63 @@ } if ($this->Checksplit(1, $row)) $factor = 1; - if ($this->GetY() > 200) + if ($this->GetY() > 200 && $row['boil_time'] > 0) + $this->AddPage(); + else if ($this->GetY() > 270 && $row['boil_time'] == 0) $this->AddPage(); else $this->Ln(5); $this->Checkheader('Koken'); - $this->Checkline('totale kooktijd: '.$row['boil_time'].' min.'); - for ($i = $row['boil_time']; $i >= 0; $i--) { - if ($i == 10) { - foreach($ferms as $item1) { - if ($item1['f_added'] == 1) { - $s = sprintf("%.3f",$item1['f_amount']*$factor).' kg `'; - $s .= iconv('UTF-8','windows-1252',$item1['f_name']).'` bij 10 minuten voor einde koken'; + if ($row['boil_time'] > 0) { + $this->Checkline('totale kooktijd: '.$row['boil_time'].' min.'); + for ($i = $row['boil_time']; $i >= 0; $i--) { + if ($i == 10) { + foreach($ferms as $item1) { + if ($item1['f_added'] == 1) { + $s = sprintf("%.3f",$item1['f_amount']*$factor).' kg `'; + $s .= iconv('UTF-8','windows-1252',$item1['f_name']).'` bij 10 minuten voor einde koken'; + $this->Checkline($s); + } + } + if ($row['brew_cooling_method'] == 1) + $this->Checkline('Plaats dompelkoeler bij 10 minuten voor einde koken'); + } + foreach($hops as $item2) { + if (($item2['h_useat'] == 2 || $item2['h_useat'] == 3) && ($item2['h_time'] == $i)) { + $s = sprintf("%.2f",$item2['h_amount']*1000*$factor).' gr `'; + $s .= iconv('UTF-8','windows-1252',$item2['h_name']).'` bij '; + if ($i > 0) + $s .= $i.' minuten voor einde koken'; + else + $s .= 'vlamuit'; $this->Checkline($s); } } - if ($row['brew_cooling_method'] == 1) - $this->Checkline('Plaats dompelkoeler bij 10 minuten voor einde koken'); - } - foreach($hops as $item2) { - if (($item2['h_useat'] == 2 || $item2['h_useat'] == 3) && ($item2['h_time'] == $i)) { - $s = sprintf("%.2f",$item2['h_amount']*1000*$factor).' gr `'; - $s .= iconv('UTF-8','windows-1252',$item2['h_name']).'` bij '; - if ($i > 0) - $s .= $i.' minuten voor einde koken'; - else - $s .= 'vlamuit'; - $this->Checkline($s); + foreach($miscs as $item3) { + if ($item3['m_use_use'] == 2 && $item3['m_time'] == $i) { + $unit = ($item3['m_amount_is_weight']) ? " gr ":" ml "; + $s = sprintf("%.2f",$item3['m_amount']*1000*$factor).$unit.'`'; + $s .= iconv('UTF-8','windows-1252',$item3['m_name']).'` bij '; + if ($i > 0) + $s .= $i.' minuten voor einde koken'; + else + $s .= 'vlamuit'; + $this->Checkline($s); + } } + } - foreach($miscs as $item3) { - if ($item3['m_use_use'] == 2 && $item3['m_time'] == $i) { - $unit = ($item3['m_amount_is_weight']) ? " gr ":" ml "; - $s = sprintf("%.2f",$item3['m_amount']*1000*$factor).$unit.'`'; - $s .= iconv('UTF-8','windows-1252',$item3['m_name']).'` bij '; - if ($i > 0) - $s .= $i.' minuten voor einde koken'; - else - $s .= 'vlamuit'; - $this->Checkline($s); - } - } - + $s = 'doelvolume einde koken: '.sprintf("%.1f",$row['batch_size']*$factor*1.04).' liter ('; + $s .= sprintf("%.1f",kettle_cm($row['batch_size']*$factor*1.04,$row['eq_kettle_volume'],$row['eq_kettle_height'])); + $s .= ' cm onder de rand)'; + $this->Checkline($s); + $this->Checkline('doel SG einde koken: '.density_str($row['est_og3'])); + if ($this->Checksplit(2, $row)) + $factor = 1; + } else { + $this->Checkline('Dit is een `no-boil\' recept'); } - $s = 'doelvolume einde koken: '.sprintf("%.1f",$row['batch_size']*$factor*1.04).' liter ('; - $s .= sprintf("%.1f",kettle_cm($row['batch_size']*$factor*1.04,$row['eq_kettle_volume'],$row['eq_kettle_height'])); - $s .= ' cm onder de rand)'; - $this->Checkline($s); - $this->Checkline('doel SG einde koken: '.density_str($row['est_og3'])); - if ($this->Checksplit(2, $row)) - $factor = 1; if ($this->GetY() > 200) $this->AddPage(); else