diff -r a1bcebc61ddd -r 544d7d0183b2 www/prod_forum.php --- a/www/prod_forum.php Fri May 31 22:58:03 2019 +0200 +++ b/www/prod_forum.php Sun Jun 02 12:48:54 2019 +0200 @@ -142,7 +142,9 @@ $ibu = calc_IBU($item['h_useat'], $item['h_form'], $preboil_sg, floatval($row['batch_size']), $amount, $time, $alpha, $row['ibu_method']); $moment = $hopuse[$item['h_useat']]; if ($item['h_useat'] == 2) { // Boil - $moment = "Kook ".$time." minuten"; + $moment = "Koken ".$time." minuten"; + } else if ($item['h_useat'] == 5) { // Dryhop + $moment = 'Koudhop '.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); @@ -224,8 +226,7 @@ itemline("Maischwater", sprintf("%.1f",floatval($row['w1_amount'])).' liter water '.$row['w1_name']); } itemline("Maischwater aanzuren tot pH", $row['mash_ph'].' pH'); -$spoelw = ($row['boil_size'] - $mashwater + $grainabsorbtion + $row['eq_lauter_deadspace']) * 1.03; // A small heat correction -itemline("Spoelwater geschat", sprintf("%.1f", $spoelw)." liter"); +itemline("Spoelwater geschat", sprintf("%.1f", $row['brew_sparge_est'])." liter"); itemline("Spoelwater temperatuur", $row['sparge_temp'].' °C'); itemline("Spoelwater aanzuren tot pH", sprintf("%.1f",$row['sparge_ph']).' pH'); echo PHP_EOL . PHP_EOL;