# HG changeset patch # User Michiel Broek # Date 1571321393 -7200 # Node ID 28670364bd0c841a8323cca7ac7d7c684ea6fbb2 # Parent 9d771385a8a031188d0df816720fc2436d84cf29 Added dried yeast form. diff -r 9d771385a8a0 -r 28670364bd0c www/prod_checklist.php --- a/www/prod_checklist.php Thu Oct 17 16:00:10 2019 +0200 +++ b/www/prod_checklist.php Thu Oct 17 16:09:53 2019 +0200 @@ -323,7 +323,7 @@ if ($item['y_use'] == 0) { // primary if ($item['y_form'] == 0) { // Liquid $this->Checkline($item['y_amount'].' pak '.$item['y_product_id'].', '.$item['y_name'].' gist'); - } else if ($item['y_form'] == 1) { // Dry + } else if ($item['y_form'] == 1 || $item['y_form'] == 6) { // Dry $s = sprintf("%.1f",$item['y_amount']*1000).' gram '.$item['y_product_id'].', '.$item['y_name']; $s .= ' gist'; $dry += $item['y_amount']*10000; diff -r 9d771385a8a0 -r 28670364bd0c www/prod_forum.php --- a/www/prod_forum.php Thu Oct 17 16:00:10 2019 +0200 +++ b/www/prod_forum.php Thu Oct 17 16:09:53 2019 +0200 @@ -168,7 +168,7 @@ if ($item['y_form'] == 0) // Liquid $amount = sprintf("%.0f",floatval($item['y_amount']))." pak"; - else if ($item['y_form'] == 1) // Dry + else if ($item['y_form'] == 1 || $item['y_form'] == 6) // Dry $amount = sprintf("%.1f",floatval($item['y_amount'])*1000)." gr"; else $amount = sprintf("%.0f",floatval($item['y_amount'])*1000)." ml"; diff -r 9d771385a8a0 -r 28670364bd0c www/prod_print.php --- a/www/prod_print.php Thu Oct 17 16:00:10 2019 +0200 +++ b/www/prod_print.php Thu Oct 17 16:09:53 2019 +0200 @@ -323,7 +323,7 @@ $svg = $attenuation; if ($item['y_form'] == 0) // Liquid $amount = sprintf("%.0f",floatval($item['y_amount']))." pak"; - else if ($item['y_form'] == 1) // Dry + else if ($item['y_form'] == 1 || $item['y_form'] == 6) // Dry $amount = sprintf("%.1f",floatval($item['y_amount'])*1000)." gr"; else $amount = sprintf("%.0f",floatval($item['y_amount'])*1000)." ml"; diff -r 9d771385a8a0 -r 28670364bd0c www/rec_forum.php --- a/www/rec_forum.php Thu Oct 17 16:00:10 2019 +0200 +++ b/www/rec_forum.php Thu Oct 17 16:09:53 2019 +0200 @@ -168,7 +168,7 @@ if ($item['y_form'] == 0) // Liquid $amount = sprintf("%.0f",floatval($item['y_amount']))." pak"; - else if ($item['y_form'] == 1) // Dry + else if ($item['y_form'] == 1 || $item['y_form'] == 6) // Dry $amount = sprintf("%.1f",floatval($item['y_amount'])*1000)." gr"; else $amount = sprintf("%.0f",floatval($item['y_amount'])*1000)." ml"; diff -r 9d771385a8a0 -r 28670364bd0c www/rec_print.php --- a/www/rec_print.php Thu Oct 17 16:00:10 2019 +0200 +++ b/www/rec_print.php Thu Oct 17 16:09:53 2019 +0200 @@ -294,7 +294,7 @@ if ($item['y_form'] == 0) // Liquid $amount = sprintf("%.0f",floatval($item['y_amount']))." pak"; - else if ($item['y_form'] == 1) // Dry + else if ($item['y_form'] == 1 || $item['y_form'] == 6) // Dry $amount = sprintf("%.1f",floatval($item['y_amount'])*1000)." gr"; else $amount = sprintf("%.0f",floatval($item['y_amount'])*1000)." ml";