diff -r 217ba4596c4d -r 3c680d1dea35 www/prod_print.php --- a/www/prod_print.php Mon Oct 14 23:13:40 2019 +0200 +++ b/www/prod_print.php Wed Oct 16 21:05:03 2019 +0200 @@ -1,6 +1,7 @@ w - $this->rMargin - $this->lMargin - 160; $cMargin=$this->cMargin; $this->cMargin=2; @@ -119,9 +120,9 @@ global $bottle_sugar_amount; global $keg_sugar; global $keg_sugar_amount; - $added = array( 'Maischen', 'Koken 10 min', 'Vergisten', 'Nagisten/lageren', 'Bottelen', 'Op fust' ); - $ftype = array( 'Mout', 'Suiker', 'Vloeibaar extract', 'Droog extract', 'Ongemout graan' ); - $mtype = array( 'Basismout', 'Geroosterde mout', 'Cara- of crystalmout', 'Geƫeste mout', 'Zuurmout', 'Speciale mout', 'Geen mout' ); + global $added; + global $fermentabletype; + global $graintype; $vul = $this->w - $this->rMargin - $this->lMargin - 125; $this->Ln(); $this->AddCol($vul,'Mout, granen en suikers','L'); @@ -160,9 +161,9 @@ $pCara += $percent; if ($item['f_type'] == 0) - $soort = iconv('UTF-8','windows-1252',$mtype[$item['f_graintype']]); + $soort = iconv('UTF-8','windows-1252',$graintype[$item['f_graintype']]); else - $soort = iconv('UTF-8','windows-1252',$ftype[$item['f_type']]); + $soort = iconv('UTF-8','windows-1252',$fermentabletype[$item['f_type']]); if ($item['f_added'] == 4) { $bottle_sugar = $name; @@ -218,8 +219,8 @@ global $total_ibus; global $cost_hops; global $preboil_sg; - $hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat', 'Cryo Hop' ); - $hopuse = array( 'Maischen', 'First wort', 'Koken', 'Vlamuit', 'Whirlpool', 'Koudhop' ); + global $hopform; + global $hopuse; $vul = $this->w - $this->rMargin - $this->lMargin - 122; $this->Ln(); $this->AddCol($vul,'Hop','L'); @@ -289,8 +290,8 @@ function TableYeasts($row) { global $cost_yeasts; global $svg; - $yeastform = array( 'Vloeibaar', 'Droog', 'Schuine buis', 'Slurry', 'Ingevroren', 'Depot' ); - $yeastuse = array( 'Hoofdgisting', 'Nagisting', 'Lagering', 'Bottelen' ); + global $yeastform; + global $yeastuse; $vul = $this->w - $this->rMargin - $this->lMargin - 110; $this->Ln(); $this->AddCol($vul,'Gist','L'); @@ -365,8 +366,8 @@ function TableMiscs($row) { global $cost_miscs; - $misctype = array( 'Specerij', 'Kruid', 'Smaakstof', 'Klaringsmiddel', 'Brouwzout', 'Gistvoeding', 'Anders' ); - $miscuse = array( 'Starter', 'Maischen', 'Koken', 'Hoofdvergisting', 'Nagisting/lagering', 'Bottelen' ); + global $misctype; + global $miscuse; $vul = $this->w - $this->rMargin - $this->lMargin - 95; if ($this->GetY() > 200) $this->AddPage(); @@ -436,7 +437,7 @@ global $cost_yeasts; global $svg; global $mashkg; - $mashtype = array( 'Infusie', 'Verwarming', 'Decoctie' ); + global $mashtype; $vul = $this->w - $this->rMargin - $this->lMargin - 137; if ($this->GetY() > 250) $this->AddPage(); @@ -567,8 +568,8 @@ global $cost_miscs; global $cost_yeasts; global $mashkg; - $colormethod = array( 'Morey', 'Mosher', 'Daniels' ); - $ibumethod = array( 'Tinseth', 'Rager', 'Daniels' ); + global $colormethod; + global $ibumethod; /* 2 Columns */ if ($this->GetY() > 200) $this->AddPage(); @@ -662,6 +663,8 @@ global $my_brix_correction; global $my_grain_absorbtion; + global $coolingtype; + global $aerationtype; if ($this->GetY() > 180) $this->AddPage(); @@ -735,7 +738,6 @@ $this->Cell(50,5,sprintf("%.1f", floatval($row['brew_aboil_efficiency']))."%",0,0,'L',true); $this->Ln(7); - $coolingtype = array( '-', 'Dompelkoeler', 'Tegenstroomkoeler', 'Au bain marie', 'Laten afkoelen' ); $this->SetX($this->TableX); $this->Cell(35,5,'Spoelwater temperatuur',0,0,'L',true); $this->Cell(50,5,sprintf("%.1f", $row['sparge_temp']).DEG.'C',0,0,'L',true); @@ -792,7 +794,6 @@ $this->Cell(50,5,density_str(floatval($row['brew_fermenter_sg'])),0,0,'L',true); $this->Ln(7); - $aerationtype = array( 'Geen', 'Lucht', 'Zuurstof' ); $this->SetX($this->TableX); $this->Cell(35,5,'Beluchten met',0,0,'L',true); $this->Cell(50,5,$aerationtype[$row['brew_aeration_type']],0,0,'L',true); @@ -1092,7 +1093,7 @@ function Header() { global $row; global $prdate; - $stage = array( 'Plan', 'Wacht', 'Brouwen', 'Hoofdgisting', 'Nagisting', 'Lagering', 'Afvullen', 'Hergisten', 'Rijpen', 'Proeven', 'Gereed', 'Afgesloten' ); + global $stage; $this->Image('images/logo.png',10,10,30); // Title $this->SetFont('Helvetica','B',18);