# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1566400613 -7200
# Node ID a1d6b9eec9887e1b68aad1d51bf808fb5258169f
# Parent  e1a4104c609efc739a1504d81701c99df07cc73d
Added Cryo Hop support to the export scripts.

diff -r e1a4104c609e -r a1d6b9eec988 www/prod_beerxml.php
--- a/www/prod_beerxml.php	Wed Aug 21 16:34:07 2019 +0200
+++ b/www/prod_beerxml.php	Wed Aug 21 17:16:53 2019 +0200
@@ -26,7 +26,7 @@
 $recipetype = array( 'Extract', 'Partial Mash', 'All Grain' );
 $styletype = array( 'Lager', 'Ale', 'Mead', 'Wheat', 'Mixed', 'Cider' );
 $hoptype = array( 'Bittering', 'Aroma', 'Both' );
-$hopform = array( 'Pellet', 'Plug', 'Leaf' );
+$hopform = array( 'Pellet', 'Plug', 'Leaf', 'Leaf', 'Leaf' );
 $hopuse = array( 'Mash', 'First wort', 'Boil', 'Aroma', 'Whirlpool', 'Dry hop' );
 $fermentabletype = array( 'Grain', 'Sugar', 'Extract', 'Dry extract', 'Adjunct' );
 $graintype = array( 'Base', 'Roast', 'Crystal', 'Kilned', 'Sour malt', 'Special', 'No malt' );
diff -r e1a4104c609e -r a1d6b9eec988 www/prod_forum.php
--- a/www/prod_forum.php	Wed Aug 21 16:34:07 2019 +0200
+++ b/www/prod_forum.php	Wed Aug 21 17:16:53 2019 +0200
@@ -37,7 +37,7 @@
 $colormethod = array( 'Morey', 'Mosher', 'Daniels' );
 $ibumethod   = array( 'Tinseth', 'Rager', 'Daniels' );
 $added       = array( 'Maischen', 'Koken', 'Vergisten', 'Nagisten/lageren', 'Bottelen' );
-$hopform     = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat' );
+$hopform     = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat', 'Cryo Hop' );
 $hopuse      = array( 'Maischen', 'First wort', 'Koken', 'Vlamuit', 'Whirlpool', 'Koudhop' );
 $misctype    = array( 'Specerij', 'Kruid', 'Smaakstof', 'Klaringsmiddel', 'Brouwzout', 'Gistvoeding', 'Anders' );
 $miscuse     = array( 'Starter', 'Maischen', 'Koken', 'Hoofdvergisting', 'Nagisting/lagering', 'Bottelen' );
@@ -131,8 +131,8 @@
 echo PHP_EOL . PHP_EOL;
 
 
-echo "Hop                                      Vorm      &alpha; %   IBU   Gram Toevoegen moment" . PHP_EOL;
-echo "---------------------------------------- ------- ----- ----- ------ --------------------" . PHP_EOL;
+echo "Hop                                      Vorm       &alpha; %   IBU   Gram Toevoegen moment" . PHP_EOL;
+echo "---------------------------------------- -------- ----- ----- ------ --------------------" . PHP_EOL;
 $arr = json_decode($row['json_hops'], true);
 foreach($arr as $item) {
 	$name   = formatstr($item['h_name'] . " (" . $item['h_origin'] . ")", 40);
@@ -147,7 +147,7 @@
 		$moment = $hopuse[$item['h_useat']].' '.sprintf("%.0f", $time / 1440).' dagen';
         }
 
-	echo sprintf("%s %-7s %5.1f %5.1f %6.1f %-20s", $name, $hopform[$item['h_form']], $alpha, $ibu, $amount, $moment);
+	echo sprintf("%s %-8s %5.1f %5.1f %6.1f %-20s", $name, $hopform[$item['h_form']], $alpha, $ibu, $amount, $moment);
 	echo PHP_EOL;
 }
 echo PHP_EOL . PHP_EOL;
diff -r e1a4104c609e -r a1d6b9eec988 www/prod_print.php
--- a/www/prod_print.php	Wed Aug 21 16:34:07 2019 +0200
+++ b/www/prod_print.php	Wed Aug 21 17:16:53 2019 +0200
@@ -218,7 +218,7 @@
 		global $total_ibus;
 		global $cost_hops;
 		global $preboil_sg;
-		$hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat' );
+		$hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat', 'Cryo Hop' );
 		$hopuse  = array( 'Maischen', 'First wort', 'Koken', 'Vlamuit', 'Whirlpool', 'Koudhop' );
 		$vul = $this->w - $this->rMargin - $this->lMargin - 122;
 		$this->Ln();
diff -r e1a4104c609e -r a1d6b9eec988 www/rec_beerxml.php
--- a/www/rec_beerxml.php	Wed Aug 21 16:34:07 2019 +0200
+++ b/www/rec_beerxml.php	Wed Aug 21 17:16:53 2019 +0200
@@ -26,7 +26,7 @@
 $recipetype = array( 'Extract', 'Partial Mash', 'All Grain' );
 $styletype = array( 'Lager', 'Ale', 'Mead', 'Wheat', 'Mixed', 'Cider' );
 $hoptype = array( 'Bittering', 'Aroma', 'Both' );
-$hopform = array( 'Pellet', 'Plug', 'Leaf' );
+$hopform = array( 'Pellet', 'Plug', 'Leaf', 'Leaf', 'Leaf' );
 $hopuse = array( 'Mash', 'First wort', 'Boil', 'Aroma', 'Whirlpool', 'Dry hop' );
 $fermentabletype = array( 'Grain', 'Sugar', 'Extract', 'Dry extract', 'Adjunct' );
 $graintype = array( 'Base', 'Roast', 'Crystal', 'Kilned', 'Sour malt', 'Special', 'No malt' );
diff -r e1a4104c609e -r a1d6b9eec988 www/rec_forum.php
--- a/www/rec_forum.php	Wed Aug 21 16:34:07 2019 +0200
+++ b/www/rec_forum.php	Wed Aug 21 17:16:53 2019 +0200
@@ -37,7 +37,7 @@
 $colormethod = array( 'Morey', 'Mosher', 'Daniels' );
 $ibumethod   = array( 'Tinseth', 'Rager', 'Daniels' );
 $added       = array( 'Maischen', 'Koken', 'Vergisten', 'Nagisten/lageren', 'Bottelen' );
-$hopform     = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat' );
+$hopform     = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat', 'Cryo Hop' );
 $hopuse      = array( 'Maischen', 'First wort', 'Koken', 'Vlamuit', 'Whirlpool', 'Koudhop' );
 $misctype    = array( 'Specerij', 'Kruid', 'Smaakstof', 'Klaringsmiddel', 'Brouwzout', 'Gistvoeding', 'Anders' );
 $miscuse     = array( 'Starter', 'Maischen', 'Koken', 'Hoofdvergisting', 'Nagisting/lagering', 'Bottelen' );
@@ -131,8 +131,8 @@
 echo PHP_EOL . PHP_EOL;
 
 
-echo "Hop                                      Vorm      &alpha; %   IBU   Gram Toevoegen moment" . PHP_EOL;
-echo "---------------------------------------- ------- ----- ----- ------ --------------------" . PHP_EOL;
+echo "Hop                                      Vorm       &alpha; %   IBU   Gram Toevoegen moment" . PHP_EOL;
+echo "---------------------------------------- -------- ----- ----- ------ --------------------" . PHP_EOL;
 $arr = json_decode($row['json_hops'], true);
 foreach($arr as $item) {
 	$name   = formatstr($item['h_name'] . " (" . $item['h_origin'] . ")", 40);
@@ -147,7 +147,7 @@
 		$moment = $hopuse[$item['h_useat']].' '.sprintf("%.0f", $time / 1440).' dagen';
         }
 
-	echo sprintf("%s %-7s %5.1f %5.1f %6.1f %-20s", $name, $hopform[$item['h_form']], $alpha, $ibu, $amount, $moment);
+	echo sprintf("%s %-8s %5.1f %5.1f %6.1f %-20s", $name, $hopform[$item['h_form']], $alpha, $ibu, $amount, $moment);
 	echo PHP_EOL;
 }
 echo PHP_EOL . PHP_EOL;
diff -r e1a4104c609e -r a1d6b9eec988 www/rec_print.php
--- a/www/rec_print.php	Wed Aug 21 16:34:07 2019 +0200
+++ b/www/rec_print.php	Wed Aug 21 17:16:53 2019 +0200
@@ -188,7 +188,7 @@
 		global $total_ibus;
 		global $cost_hops;
 		global $preboil_sg;
-		$hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat' );
+		$hopform = array( 'Pellets', 'Plugs', 'Bellen', 'Hop nat', 'Cryo Hop' );
 		$hopuse  = array( 'Maischen', 'First wort', 'Koken', 'Vlamuit', 'Whirlpool', 'Koudhop' );
 		$vul = $this->w - $this->rMargin - $this->lMargin - 122;
 		$this->Ln();