diff -r c0f0bbfefd63 -r ff45488d480e www/includes/db_product.php --- a/www/includes/db_product.php Wed Dec 19 21:58:21 2018 +0100 +++ b/www/includes/db_product.php Sun Dec 23 20:13:36 2018 +0100 @@ -54,8 +54,70 @@ $sql .= "', eq_kettle_volume='" . $_POST['eq_kettle_volume']; $sql .= "', eq_kettle_height='" . $_POST['eq_kettle_height']; $sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume']; + $sql .= "', eq_mash_max='" . $_POST['eq_mash_max']; $sql .= "', eq_efficiency='" . $_POST['eq_efficiency']; + // brew_date_start + // brew_mash_ph + // brew_mash_sg + // brew_sparge_temperature + // brew_sparge_volume + // brew_sparge_ph + // brew_preboil_volume + // brew_preboil_sg + // brew_preboil_ph + // brew_aboil_volume + // brew_aboil_sg + // brew_aboil_ph + // brew_aboil_efficiency + // brew_cooling_method + // brew_cooling_time + // brew_cooling_to + // brew_whirlpool9 + // brew_whirlpool7 + // brew_whirlpool6 + // brew_whirlpool2 + // brew_fermenter_volume + // brew_fermenter_extrawater + // brew_aeration_time + // brew_aeration_speed + // brew_aeration_type + // brew_fermenter_sg + // brew_fermenter_ibu + // brew_date_end + // brew_log_available + // primary_start_temp + // primary_max_temp + // primary_end_temp + // primary_end_sg + // primary_end_date + // secondary_temp + // secondary_end_date + // tertiary_temp + // 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 + // taste_notes + // taste_rate + // taste_date + // taste_color + // taste_transparency + // taste_head + // taste_aroma + // taste_taste + // taste_mouthfeel + // taste_aftertaste syslog(LOG_NOTICE, $sql); if (isset($_POST['insert'])) { $sql .= "';"; @@ -172,6 +234,7 @@ $brew .= ',"eq_kettle_volume":' . floatval($row['eq_kettle_volume']); $brew .= ',"eq_kettle_height":' . floatval($row['eq_kettle_height']); $brew .= ',"eq_mash_volume":' . floatval($row['eq_mash_volume']); + $brew .= ',"eq_mash_max":' . floatval($row['eq_mash_max']); $brew .= ',"eq_efficiency":' . floatval($row['eq_efficiency']); $brew .= ',"eq_top_up_water":' . floatval($row['eq_top_up_water']); $brew .= ',"brew_date_start":"' . $row['brew_date_start']; @@ -267,14 +330,39 @@ $brew .= ',"color_method":"' . $row['color_method']; $brew .= '","est_ibu":' . floatval($row['est_ibu']); $brew .= ',"ibu_method":"' . $row['ibu_method']; - $brew .= '","mash_sparge_temp":' . $row['mash_sparge_temp']; + $brew .= '","sparge_temp":' . floatval($row['sparge_temp']); + $brew .= ',"sparge_ph":' . floatval($row['sparge_ph']); + $brew .= ',"sparge_volume":' . floatval($row['sparge_volume']); + $brew .= ',"sparge_acid_type":"' . $row['sparge_acid_type']; + $brew .= '","sparge_acid_perc":' . floatval($row['sparge_acid_perc']); + $brew .= ',"sparge_acid_amount":' . floatval($row['sparge_acid_amount']); $brew .= ',"mash_ph":' . $row['mash_ph']; $brew .= ',"mash_name":"' . $row['mash_name']; - $brew .= '","fermentables":' . $row['json_fermentables']; + $brew .= '","calc_acid":' . $row['calc_acid']; + $brew .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']); + $brew .= '","w1_amount":' . $row['w1_amount']; + $brew .= ',"w1_calcium":' . $row['w1_calcium']; + $brew .= ',"w1_sulfate":' . $row['w1_sulfate']; + $brew .= ',"w1_chloride":' . $row['w1_chloride']; + $brew .= ',"w1_sodium":' . $row['w1_sodium']; + $brew .= ',"w1_magnesium":' . $row['w1_magnesium']; + $brew .= ',"w1_total_alkalinity":' . $row['w1_total_alkalinity']; + $brew .= ',"w1_ph":' . $row['w1_ph']; + $brew .= ',"w1_cost":' . $row['w1_cost']; + $brew .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']); + $brew .= '","w2_amount":' . $row['w2_amount']; + $brew .= ',"w2_calcium":' . $row['w2_calcium']; + $brew .= ',"w2_sulfate":' . $row['w2_sulfate']; + $brew .= ',"w2_chloride":' . $row['w2_chloride']; + $brew .= ',"w2_sodium":' . $row['w2_sodium']; + $brew .= ',"w2_magnesium":' . $row['w2_magnesium']; + $brew .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity']; + $brew .= ',"w2_ph":' . $row['w2_ph']; + $brew .= ',"w2_cost":' . $row['w2_cost']; + $brew .= ',"fermentables":' . $row['json_fermentables']; $brew .= ',"hops":' . $row['json_hops']; $brew .= ',"miscs":' . $row['json_miscs']; $brew .= ',"yeasts":' . $row['json_yeasts']; - $brew .= ',"waters":' . $row['json_waters']; $brew .= ',"mashs":' . $row['json_mashs']; $brew .= '}'; $brews .= $brew;