Mercurial > bms / file diff

--- a/www/includes/db_product.php	Fri May 31 22:58:03 2019 +0200
+++ b/www/includes/db_product.php	Sun Jun 02 12:48:54 2019 +0200
@@ -76,12 +76,15 @@
 		$sql .= "', brew_date_start='" . $_POST['brew_date_start'] . "'";
 	$sql .=  ", brew_mash_ph='" . $_POST['brew_mash_ph'];
 	$sql .= "', brew_mash_sg='" . $_POST['brew_mash_sg'];
+	$sql .= "', brew_mash_efficiency='" . $_POST['brew_mash_efficiency'];
 	$sql .= "', brew_sparge_temperature='" . $_POST['brew_sparge_temperature'];
 	$sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume'];
+	$sql .= "', brew_sparge_est='" . $_POST['brew_sparge_est'];
 	$sql .= "', brew_sparge_ph='" . $_POST['brew_sparge_ph'];
 	$sql .= "', brew_preboil_volume='" . $_POST['brew_preboil_volume'];
 	$sql .= "', brew_preboil_sg='" . $_POST['brew_preboil_sg'];
 	$sql .= "', brew_preboil_ph='" . $_POST['brew_preboil_ph'];
+	$sql .= "', brew_preboil_efficiency='" . $_POST['brew_preboil_efficiency'];
 	$sql .= "', brew_aboil_volume='" . $_POST['brew_aboil_volume'];
 	$sql .= "', brew_aboil_sg='" . $_POST['brew_aboil_sg'];
 	$sql .= "', brew_aboil_ph='" . $_POST['brew_aboil_ph'];
@@ -220,6 +223,21 @@
 		$sql .= "', w2_ph='" . $_POST['w2_ph'];
 		$sql .= "', w2_cost='" . $_POST['w2_cost'];
 	}
+	$sql .= "', wg_amount='" . $_POST['wg_amount'];
+        $sql .= "', wg_calcium='" . $_POST['wg_calcium'];
+        $sql .= "', wg_sulfate='" . $_POST['wg_sulfate'];
+        $sql .= "', wg_chloride='" . $_POST['wg_chloride'];
+        $sql .= "', wg_sodium='" . $_POST['wg_sodium'];
+        $sql .= "', wg_magnesium='" . $_POST['wg_magnesium'];
+        $sql .= "', wg_total_alkalinity='" . $_POST['wg_total_alkalinity'];
+        $sql .= "', wg_ph='" . $_POST['wg_ph'];
+        $sql .= "', wb_calcium='" . $_POST['wb_calcium'];
+        $sql .= "', wb_sulfate='" . $_POST['wb_sulfate'];
+        $sql .= "', wb_chloride='" . $_POST['wb_chloride'];
+        $sql .= "', wb_sodium='" . $_POST['wb_sodium'];
+        $sql .= "', wb_magnesium='" . $_POST['wb_magnesium'];
+        $sql .= "', wb_total_alkalinity='" . $_POST['wb_total_alkalinity'];
+        $sql .= "', wb_ph='" . $_POST['wb_ph'];
 	$sql .= "', wa_acid_name='" . $_POST['wa_acid_name'];
 	$sql .= "', wa_acid_perc='" . $_POST['wa_acid_perc'];
 	$sql .= "', wa_base_name='" . $_POST['wa_base_name'];
@@ -596,12 +614,15 @@
 		$brew .= ',"brew_date_start":"' . $row['brew_date_start'];
 		$brew .= '","brew_mash_ph":' . floatval($row['brew_mash_ph']);
 		$brew .= ',"brew_mash_sg":' . floatval($row['brew_mash_sg']);
+		$brew .= ',"brew_mash_efficiency":' . floatval($row['brew_mash_efficiency']);
 		$brew .= ',"brew_sparge_temperature":' . floatval($row['brew_sparge_temperature']);
 		$brew .= ',"brew_sparge_volume":' . floatval($row['brew_sparge_volume']);
+		$brew .= ',"brew_sparge_est":' . floatval($row['brew_sparge_est']);
 		$brew .= ',"brew_sparge_ph":' . floatval($row['brew_sparge_ph']);
 		$brew .= ',"brew_preboil_volume":' . floatval($row['brew_preboil_volume']);
 		$brew .= ',"brew_preboil_sg":' . floatval($row['brew_preboil_sg']);
 		$brew .= ',"brew_preboil_ph":' . floatval($row['brew_preboil_ph']);
+		$brew .= ',"brew_preboil_efficiency":' . floatval($row['brew_preboil_efficiency']);
 		$brew .= ',"brew_aboil_volume":' . floatval($row['brew_aboil_volume']);
 		$brew .= ',"brew_aboil_sg":' . floatval($row['brew_aboil_sg']);
 		$brew .= ',"brew_aboil_ph":' . floatval($row['brew_aboil_ph']);
@@ -717,6 +738,21 @@
 		$brew .= ',"w2_total_alkalinity":' . floatval($row['w2_total_alkalinity']);
 		$brew .= ',"w2_ph":' . floatval($row['w2_ph']);
 		$brew .= ',"w2_cost":' . floatval($row['w2_cost']);
+		$brew .= ',"wg_amount":' . floatval($row['wg_amount']);
+                $brew .= ',"wg_calcium":' . floatval($row['wg_calcium']);
+                $brew .= ',"wg_sulfate":' . floatval($row['wg_sulfate']);
+                $brew .= ',"wg_chloride":' . floatval($row['wg_chloride']);
+                $brew .= ',"wg_sodium":' . floatval($row['wg_sodium']);
+                $brew .= ',"wg_magnesium":' . floatval($row['wg_magnesium']);
+                $brew .= ',"wg_total_alkalinity":' . floatval($row['wg_total_alkalinity']);
+                $brew .= ',"wg_ph":' . floatval($row['wg_ph']);
+                $brew .= ',"wb_calcium":' . floatval($row['wb_calcium']);
+                $brew .= ',"wb_sulfate":' . floatval($row['wb_sulfate']);
+                $brew .= ',"wb_chloride":' . floatval($row['wb_chloride']);
+                $brew .= ',"wb_sodium":' . floatval($row['wb_sodium']);
+                $brew .= ',"wb_magnesium":' . floatval($row['wb_magnesium']);
+                $brew .= ',"wb_total_alkalinity":' . floatval($row['wb_total_alkalinity']);
+                $brew .= ',"wb_ph":' . floatval($row['wb_ph']);
 		$brew .= ',"wa_acid_name":' . $row['wa_acid_name'];
 		$brew .= ',"wa_acid_perc":' . $row['wa_acid_perc'];
 		$brew .= ',"wa_base_name":' . $row['wa_base_name'];