--- a/www/includes/db_product.php Tue Jan 01 16:24:17 2019 +0100
+++ b/www/includes/db_product.php Wed Jan 02 14:49:17 2019 +0100
@@ -56,7 +56,7 @@
$sql .= "', code='" . mysqli_real_escape_string($connect, $_POST['code']);
$sql .= "', birth='" . $_POST['birth'];
$sql .= "', stage='" . $_POST['stage'];
- $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']);
+// $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']);
($_POST['log_brew'] == 'true') ? $sql .= "', log_brew='1" : $sql .= "', log_brew='0";
($_POST['log_fermentation'] == 'true') ? $sql .= "', log_fermentation='1" : $sql .= "', log_fermentation='0";
($_POST['inventory_reduced'] == 'true') ? $sql .= "', inventory_reduced='1" : $sql .= "', inventory_reduced='0";
@@ -77,7 +77,7 @@
$sql .= "', eq_calc_boil_volume='" . $_POST['eq_calc_boil_volume'];
$sql .= "', eq_top_up_kettle='" . $_POST['eq_top_up_kettle'];
$sql .= "', eq_hop_utilization='" . $_POST['eq_hop_utilization'];
- $sql .= "', eq_notes='" . mysqli_real_escape_string($connect, $_POST['eq_notes']);
+// $sql .= "', eq_notes='" . mysqli_real_escape_string($connect, $_POST['eq_notes']);
$sql .= "', eq_lauter_volume='" . $_POST['eq_lauter_volume'];
$sql .= "', eq_lauter_height='" . $_POST['eq_lauter_height'];
$sql .= "', eq_lauter_deadspace='" . $_POST['eq_lauter_deadspace'];
@@ -118,6 +118,8 @@
// brew_date_end
// brew_log_available
}
+ $sql .= "', og='" . $_POST['og'];
+ $sql .= "', fg='" . $_POST['fg'];
if ($stageno >= 3) {
// primary_start_temp
@@ -127,54 +129,42 @@
// primary_end_date
}
- if ($stageno >= 4) {
- // secondary_temp
- // secondary_end_date
- }
-
- if ($stageno >= 5) {
- // tertiary_temp
- }
-
- if ($stageno >= 6) {
- // package_date
- // bottle_amount
- // bottle_carbonation
- // bottle_priming_sugar
- // bottle_priming_amount
- // bottle_carbonation_temp
- // keg_amount
- // keg_carbonation
- // keg_priming_sugar
- // keg_priming_amount
- // keg_carbonation_temp
- // keg_forced_carb
- // keg_pressure
- // keg_priming_factor
- }
-
- if ($stageno >= 9) {
- // taste_notes
- // taste_rate
- // taste_date
- // taste_color
- // taste_transparency
- // taste_head
- // taste_aroma
- // taste_taste
- // taste_mouthfeel
- // taste_aftertaste
- }
+ $sql .= "', secondary_temp='" . $_POST['secondary_temp'];
+ $sql .= "', secondary_end_date='" . $_POST['secondary_end_date'];
+ $sql .= "', tertiary_temp='" . $_POST['tertiary_temp'];
+ $sql .= "', package_date='" . $_POST['package_date'];
+ $sql .= "', bottle_amount='" . $_POST['bottle_amount'];
+ $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation'];
+ $sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar'];
+ $sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount'];
+ $sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp'];
+ $sql .= "', keg_amount='" . $_POST['keg_amount'];
+ $sql .= "', keg_carbonation='" . $_POST['keg_carbonation'];
+ $sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar'];
+ $sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount'];
+ $sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp'];
+ ($_POST['keg_forced_carb'] == 'true') ? $sql .= "', keg_forced_carb='1" : $sql .= "', keg_forced_carb='0";
+ $sql .= "', keg_pressure='" . $_POST['keg_pressure'];
+ $sql .= "', taste_notes='" . mysqli_real_escape_string($connect, $_POST['taste_notes']);
+ $sql .= "', taste_rate='" . $_POST['taste_rate'];
+ $sql .= "', taste_date='" . $_POST['taste_date'];
+ $sql .= "', taste_color='" . mysqli_real_escape_string($connect, $_POST['taste_color']);
+ $sql .= "', taste_transparency='" . mysqli_real_escape_string($connect, $_POST['taste_transparency']);
+ $sql .= "', taste_head='" . mysqli_real_escape_string($connect, $_POST['taste_head']);
+ $sql .= "', taste_aroma='" . mysqli_real_escape_string($connect, $_POST['taste_aroma']);
+ $sql .= "', taste_taste='" . mysqli_real_escape_string($connect, $_POST['taste_taste']);
+ $sql .= "', taste_mouthfeel='" . mysqli_real_escape_string($connect, $_POST['taste_mouthfeel']);
+ $sql .= "', taste_aftertaste='" . mysqli_real_escape_string($connect, $_POST['taste_aftertaste']);
/*
* Recipe part
*/
-// $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']);
-// $sql .= "', st_letter='" . mysqli_real_escape_string($connect, $_POST['st_letter']);
-// $sql .= "', st_guide='" . mysqli_real_escape_string($connect, $_POST['st_guide']);
-// $sql .= "', st_type='" . mysqli_real_escape_string($connect, $_POST['st_type']);
-// $sql .= "', st_category='" . mysqli_real_escape_string($connect, $_POST['st_category']);
-// $sql .= "', st_category_number='" . $_POST['st_category_number'];
+ $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']);
+ $sql .= "', st_letter='" . mysqli_real_escape_string($connect, $_POST['st_letter']);
+ $sql .= "', st_guide='" . mysqli_real_escape_string($connect, $_POST['st_guide']);
+ $sql .= "', st_type='" . mysqli_real_escape_string($connect, $_POST['st_type']);
+ $sql .= "', st_category='" . mysqli_real_escape_string($connect, $_POST['st_category']);
+ $sql .= "', st_category_number='" . $_POST['st_category_number'];
$sql .= "', st_og_min='" . $_POST['st_og_min'];
$sql .= "', st_og_max='" . $_POST['st_og_max'];
$sql .= "', st_fg_min='" . $_POST['st_fg_min'];
@@ -426,6 +416,8 @@
$brew .= ',"brew_fermenter_ibu":' . floatval($row['brew_fermenter_ibu']);
$brew .= ',"brew_date_end":"' . $row['brew_date_end'];
$brew .= '","brew_log_available":' . $row['brew_log_available'];
+ $brew .= ',"og":' . floatval($row['og']);
+ $brew .= ',"fg":' . floatval($row['fg']);
$brew .= ',"primary_start_temp":' . floatval($row['primary_start_temp']);
$brew .= ',"primary_max_temp":' . floatval($row['primary_max_temp']);
$brew .= ',"primary_end_temp":' . floatval($row['primary_end_temp']);
@@ -447,7 +439,6 @@
$brew .= ',"keg_carbonation_temp":' . floatval($row['keg_carbonation_temp']);
$brew .= ',"keg_forced_carb":' . floatval($row['keg_forced_carb']);
$brew .= ',"keg_pressure":' . floatval($row['keg_pressure']);
- $brew .= ',"keg_priming_factor":' . floatval($row['keg_priming_factor']);
$brew .= ',"taste_notes":"' . str_replace($escapers, $replacements, $row['taste_notes']);
$brew .= '","taste_rate":' . floatval($row['taste_rate']);
$brew .= ',"taste_date":"' . str_replace($escapers, $replacements, $row['taste_date']);