# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1588361843 -7200
# Node ID 029e65ca3678c9b0cfcf0c51b0625377dc048b08
# Parent  17cec1b43923b050cdae74d1682dae27230d1409
In export to forum, suppress diluted water is the name is set but the volume is 0. Add the treated water profile to the output.

diff -r 17cec1b43923 -r 029e65ca3678 www/prod_forum.php
--- a/www/prod_forum.php	Fri May 01 16:23:25 2020 +0200
+++ b/www/prod_forum.php	Fri May 01 21:37:23 2020 +0200
@@ -191,7 +191,7 @@
 $memo .= $tabus.PHP_EOL;
 $memo .= $heads.'Omschrijving'.$heade.$heads.'Waarde'.$heade.PHP_EOL;
 
-if ($row['w1_name'] && $row['w2_name']) {
+if ($row['w1_name'] && $row['w2_name'] && floatval($row['w2_amount']) > 0) {
 	$memo .= $rows.$datas.'Maischwater 1'.$datae.$datas.sprintf("%.1f",floatval($row['w1_amount'])).' liter water '.$row['w1_name'].$datae.$rowe.PHP_EOL;
 	$memo .= $rows.$datas.'Maischwater 2'.$datae.$datas.sprintf("%.1f",floatval($row['w2_amount'])).' liter water '.$row['w2_name'].$datae.$rowe.PHP_EOL;
 } else {
@@ -202,7 +202,18 @@
 $memo .= $rows.$datas.'Spoelwater temperatuur'.$datae.$datas.$row['sparge_temp'].' °C'.$datae.$rowe.PHP_EOL;
 $memo .= $rows.$datas.'Spoelwater aanzuren tot pH'.$datae.$datas.sprintf("%.1f",$row['sparge_ph']).' pH'.$datae.$rowe.PHP_EOL;
 $memo .= $tabue.PHP_EOL;
+$memo .= PHP_EOL;
 
+$memo .= '[u][b]Waterprofiel behandeld water[/b][/u]'.PHP_EOL;
+$memo .= $tabus.PHP_EOL;
+$memo .= $heads.'Ca'.$heade.$heads.'Mg'.$heade.$heads.'Na'.$heade.$heads.'HCO3'.$heade.$heads.'Cl'.$heade.$heads.'SO4'.$heade.PHP_EOL;
+$memo .= $rows.$datas.sprintf("%.1f",floatval($row['wb_calcium'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_magnesium'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_sodium'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_total_alkalinity'])*61/50).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_chloride'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_sulfate'])).$datae.$rowe.PHP_EOL;
+$memo .= $tabue.PHP_EOL;
 
 page_header('Product naar forum', 'prod_forum');
 ?>
diff -r 17cec1b43923 -r 029e65ca3678 www/rec_forum.php
--- a/www/rec_forum.php	Fri May 01 16:23:25 2020 +0200
+++ b/www/rec_forum.php	Fri May 01 21:37:23 2020 +0200
@@ -191,7 +191,7 @@
 $memo .= $tabus.PHP_EOL;
 $memo .= $heads.'Omschrijving'.$heade.$heads.'Waarde'.$heade.PHP_EOL;
 
-if ($row['w1_name'] && $row['w2_name']) {
+if ($row['w1_name'] && $row['w2_name'] && floatval($row['w2_amount']) > 0) {
         $memo .= $rows.$datas.'Maischwater 1'.$datae.$datas.sprintf("%.1f",floatval($row['w1_amount'])).' liter water '.$row['w1_name'].$datae.$rowe.PHP_EOL;
         $memo .= $rows.$datas.'Maischwater 2'.$datae.$datas.sprintf("%.1f",floatval($row['w2_amount'])).' liter water '.$row['w2_name'].$datae.$rowe.PHP_EOL;
 } else {
@@ -203,6 +203,18 @@
 $memo .= $rows.$datas.'Spoelwater temperatuur'.$datae.$datas.$row['sparge_temp'].' °C'.$datae.$rowe.PHP_EOL;
 $memo .= $rows.$datas.'Spoelwater aanzuren tot pH'.$datae.$datas.sprintf("%.1f",$row['sparge_ph']).' pH'.$datae.$rowe.PHP_EOL;
 $memo .= $tabue.PHP_EOL;
+$memo .= PHP_EOL;
+
+$memo .= '[u][b]Waterprofiel behandeld water[/b][/u]'.PHP_EOL;
+$memo .= $tabus.PHP_EOL;
+$memo .= $heads.'Ca'.$heade.$heads.'Mg'.$heade.$heads.'Na'.$heade.$heads.'HCO3'.$heade.$heads.'Cl'.$heade.$heads.'SO4'.$heade.PHP_EOL;
+$memo .= $rows.$datas.sprintf("%.1f",floatval($row['wb_calcium'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_magnesium'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_sodium'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_total_alkalinity'])*61/50).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_chloride'])).$datae;
+$memo .= $datas.sprintf("%.1f",floatval($row['wb_sulfate'])).$datae.$rowe.PHP_EOL;
+$memo .= $tabue.PHP_EOL;
 
 page_header('Recept naar forum', 'rec_forum');
 ?>