Mercurial > bms / changeset

--- a/www/prod_beerxml.php	Thu Jan 16 22:38:56 2020 +0100
+++ b/www/prod_beerxml.php	Sat Jan 18 19:45:22 2020 +0100
@@ -96,6 +96,36 @@
 xmlwriter_text($xw, sprintf("%.3f",floatval($row['fg'])));
 xmlwriter_end_element($xw);
 
+if (floatval($row['est_og']) > 0) {
+        xmlwriter_start_element($xw, 'EST_OG');
+        xmlwriter_text($xw, sprintf("%.3f",floatval($row['est_og'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_fg']) > 0) {
+        xmlwriter_start_element($xw, 'EST_FG');
+        xmlwriter_text($xw, sprintf("%.3f",floatval($row['est_fg'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_abv']) > 0) {
+        xmlwriter_start_element($xw, 'EST_ABV');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_abv'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_color']) > 0) {
+        xmlwriter_start_element($xw, 'EST_COLOR');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_color'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_ibu']) > 0) {
+        xmlwriter_start_element($xw, 'EST_IBU');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_ibu'])));
+        xmlwriter_end_element($xw);
+}
+
 if ($row['brew_cooling_to'] > 0) {
 	xmlwriter_start_element($xw, 'BMS_COOLING_TO');
 	xmlwriter_text($xw, sprintf("%.1f",floatval($row['brew_cooling_to'])));

--- a/www/rec_beerxml.php	Thu Jan 16 22:38:56 2020 +0100
+++ b/www/rec_beerxml.php	Sat Jan 18 19:45:22 2020 +0100
@@ -1,6 +1,4 @@
 <?php
-//require_once('config.php');
-//require_once('includes/formulas.php');
 require_once($_SERVER['DOCUMENT_ROOT'].'/config.php');
 require_once($_SERVER['DOCUMENT_ROOT'].'/includes/formulas.php');
 
@@ -87,6 +85,36 @@
 xmlwriter_text($xw, sprintf("%.1f",floatval($row['efficiency'])));
 xmlwriter_end_element($xw);
 
+if (floatval($row['est_og']) > 0) {
+	xmlwriter_start_element($xw, 'EST_OG');
+	xmlwriter_text($xw, sprintf("%.3f",floatval($row['est_og'])));
+	xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_fg']) > 0) {
+        xmlwriter_start_element($xw, 'EST_FG');
+        xmlwriter_text($xw, sprintf("%.3f",floatval($row['est_fg'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_abv']) > 0) {
+        xmlwriter_start_element($xw, 'EST_ABV');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_abv'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_color']) > 0) {
+        xmlwriter_start_element($xw, 'EST_COLOR');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_color'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_ibu']) > 0) {
+        xmlwriter_start_element($xw, 'EST_IBU');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_ibu'])));
+        xmlwriter_end_element($xw);
+}
+
 
 // Style
 xmlwriter_start_element($xw, 'STYLE');