# HG changeset patch # User Michiel Broek # Date 1550958995 -3600 # Node ID 0ea9dfb3fce9d2b0ab38eff47a708a8f934543a5 # Parent a93fcd87f561075810fc9743675a7553616d0f30 Fixed save empty dates diff -r a93fcd87f561 -r 0ea9dfb3fce9 www/includes/db_product.php --- a/www/includes/db_product.php Sat Feb 23 21:56:36 2019 +0100 +++ b/www/includes/db_product.php Sat Feb 23 22:56:35 2019 +0100 @@ -69,95 +69,88 @@ $sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume']; $sql .= "', eq_mash_max='" . $_POST['eq_mash_max']; $sql .= "', eq_efficiency='" . $_POST['eq_efficiency']; - - if ($stage > 1) { - $sql .= "', brew_date_start='" . $_POST['brew_date_start']; - } - if ($stage > 0) { - syslog(LOG_NOTICE, "write brewdate data"); - $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_sparge_temperature='" . $_POST['brew_sparge_temperature']; - $sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume']; - $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_aboil_volume='" . $_POST['brew_aboil_volume']; - $sql .= "', brew_aboil_sg='" . $_POST['brew_aboil_sg']; - $sql .= "', brew_aboil_ph='" . $_POST['brew_aboil_ph']; - $sql .= "', brew_aboil_efficiency='" . $_POST['brew_aboil_efficiency']; - $sql .= "', brew_cooling_method='" . $_POST['brew_cooling_method']; - $sql .= "', brew_cooling_time='" . $_POST['brew_cooling_time']; - $sql .= "', brew_cooling_to='" . $_POST['brew_cooling_to']; - $sql .= "', brew_whirlpool9='" . $_POST['brew_whirlpool9']; - $sql .= "', brew_whirlpool7='" . $_POST['brew_whirlpool7']; - $sql .= "', brew_whirlpool6='" . $_POST['brew_whirlpool6']; - $sql .= "', brew_whirlpool2='" . $_POST['brew_whirlpool2']; - $sql .= "', brew_aeration_time='" . $_POST['brew_aeration_time']; - $sql .= "', brew_aeration_speed='" . $_POST['brew_aeration_speed']; - $sql .= "', brew_aeration_type='" . $_POST['brew_aeration_type']; - $sql .= "', brew_fermenter_volume='" . $_POST['brew_fermenter_volume']; - $sql .= "', brew_fermenter_extrawater='" . $_POST['brew_fermenter_extrawater']; - $sql .= "', brew_fermenter_tcloss='" . $_POST['brew_fermenter_tcloss']; - $sql .= "', brew_fermenter_sg='" . $_POST['brew_fermenter_sg']; - $sql .= "', brew_fermenter_ibu='" . $_POST['brew_fermenter_ibu']; - $sql .= "', brew_fermenter_color='" . $_POST['brew_fermenter_color']; - if ($stage > 2) { - syslog(LOG_NOTICE, "write brewdate data end"); - $sql .= "', brew_date_end='" . $_POST['brew_date_end']; - } - } - $sql .= "', og='" . $_POST['og']; + // brewdate + if ($_POST['brew_date_start'] == '') + $sql .= "', brew_date_start=NULL"; + else + $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_sparge_temperature='" . $_POST['brew_sparge_temperature']; + $sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume']; + $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_aboil_volume='" . $_POST['brew_aboil_volume']; + $sql .= "', brew_aboil_sg='" . $_POST['brew_aboil_sg']; + $sql .= "', brew_aboil_ph='" . $_POST['brew_aboil_ph']; + $sql .= "', brew_aboil_efficiency='" . $_POST['brew_aboil_efficiency']; + $sql .= "', brew_cooling_method='" . $_POST['brew_cooling_method']; + $sql .= "', brew_cooling_time='" . $_POST['brew_cooling_time']; + $sql .= "', brew_cooling_to='" . $_POST['brew_cooling_to']; + $sql .= "', brew_whirlpool9='" . $_POST['brew_whirlpool9']; + $sql .= "', brew_whirlpool7='" . $_POST['brew_whirlpool7']; + $sql .= "', brew_whirlpool6='" . $_POST['brew_whirlpool6']; + $sql .= "', brew_whirlpool2='" . $_POST['brew_whirlpool2']; + $sql .= "', brew_aeration_time='" . $_POST['brew_aeration_time']; + $sql .= "', brew_aeration_speed='" . $_POST['brew_aeration_speed']; + $sql .= "', brew_aeration_type='" . $_POST['brew_aeration_type']; + $sql .= "', brew_fermenter_volume='" . $_POST['brew_fermenter_volume']; + $sql .= "', brew_fermenter_extrawater='" . $_POST['brew_fermenter_extrawater']; + $sql .= "', brew_fermenter_tcloss='" . $_POST['brew_fermenter_tcloss']; + $sql .= "', brew_fermenter_sg='" . $_POST['brew_fermenter_sg']; + $sql .= "', brew_fermenter_ibu='" . $_POST['brew_fermenter_ibu']; + $sql .= "', brew_fermenter_color='" . $_POST['brew_fermenter_color']; + if ($_POST['brew_date_end'] == '') + $sql .= "', brew_date_end=NULL"; + else + $sql .= "', brew_date_end='" . $_POST['brew_date_end'] . "'"; + $sql .= ", og='" . $_POST['og']; $sql .= "', fg='" . $_POST['fg']; - - if ($stage > 2) { - syslog(LOG_NOTICE, "write primary data"); - $sql .= "', primary_start_temp='" . $_POST['primary_start_temp']; - $sql .= "', primary_max_temp='" . $_POST['primary_max_temp']; - $sql .= "', primary_end_temp='" . $_POST['primary_end_temp']; - $sql .= "', primary_end_sg='" . $_POST['primary_end_sg']; - $sql .= "', primary_end_date='" . $_POST['primary_end_date']; - } - - if ($stage > 3) { - syslog(LOG_NOTICE, "write secondary data"); - $sql .= "', secondary_temp='" . $_POST['secondary_temp']; - $sql .= "', secondary_end_date='" . $_POST['secondary_end_date']; - $sql .= "', tertiary_temp='" . $_POST['tertiary_temp']; - } - - if ($stage > 4) { - syslog(LOG_NOTICE, "write package data"); - $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']; - $sql .= "', keg_forced_carb='" . $_POST['keg_forced_carb']; - $sql .= "', keg_pressure='" . $_POST['keg_pressure']; - } - - if ($stage > 8) { - syslog(LOG_NOTICE, "write taste data"); - $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']); - } + $sql .= "', primary_start_temp='" . $_POST['primary_start_temp']; + $sql .= "', primary_max_temp='" . $_POST['primary_max_temp']; + $sql .= "', primary_end_temp='" . $_POST['primary_end_temp']; + if ($_POST['primary_end_date'] == '') + $sql .= "', primary_end_date=NULL"; + else + $sql .= "', primary_end_date='" . $_POST['primary_end_date'] ."'"; + $sql .= ", primary_end_sg='" . $_POST['primary_end_sg']; + $sql .= "', secondary_temp='" . $_POST['secondary_temp']; + if ($_POST['secondary_end_date'] == '') + $sql .= "', secondary_end_date=NULL"; + else + $sql .= "', secondary_end_date='" . $_POST['secondary_end_date'] ."'"; + $sql .= ", tertiary_temp='" . $_POST['tertiary_temp']; + if ($_POST['package_date'] == '') + $sql .= "', package_date=NULL"; + else + $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']; + $sql .= "', keg_forced_carb='" . $_POST['keg_forced_carb']; + $sql .= "', keg_pressure='" . $_POST['keg_pressure']; + $sql .= "', taste_notes='" . mysqli_real_escape_string($connect, $_POST['taste_notes']); + $sql .= "', taste_rate='" . $_POST['taste_rate']; + if ($_POST['taste_date'] == '') + $sql .= "', taste_date=NULL"; + else + $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 @@ -276,7 +269,7 @@ $fermentable .= ',"f_percentage":' . $item['f_percentage']; $fermentable .= ',"f_di_ph":' . $item['f_di_ph']; $fermentable .= ',"f_acid_to_ph_57":' . $item['f_acid_to_ph_57'] . '}'; - syslog(LOG_NOTICE, $fermentable); + //syslog(LOG_NOTICE, $fermentable); $fermentables .= $fermentable; } } @@ -307,7 +300,7 @@ $hop .= ',"h_cohumulone":' . $item['h_cohumulone']; $hop .= ',"h_myrcene":' . $item['h_myrcene']; $hop .= ',"h_total_oil":' . $item['h_total_oil'] . '}'; - syslog(LOG_NOTICE, $hop); + //syslog(LOG_NOTICE, $hop); $hops .= $hop; } } @@ -329,7 +322,7 @@ $misc .= ',"m_time":' . $item['m_time']; $misc .= ',"m_amount_is_weight":' . $item['m_amount_is_weight']; $misc .= ',"m_cost":' . $item['m_cost'] . '}'; - syslog(LOG_NOTICE, $misc); + //syslog(LOG_NOTICE, $misc); $miscs .= $misc; } } @@ -358,7 +351,7 @@ $yeast .= ',"y_inventory":' . $item['y_inventory']; $yeast .= ',"y_use":' . $item['y_use']; $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; - syslog(LOG_NOTICE, $yeast); + //syslog(LOG_NOTICE, $yeast); $yeasts .= $yeast; } } @@ -383,7 +376,7 @@ $mash .= ',"step_time":' . $item['step_time']; $mash .= ',"ramp_time":' . $item['ramp_time']; $mash .= ',"end_temp":' . $item['end_temp'] . '}'; - syslog(LOG_NOTICE, $mash); + //syslog(LOG_NOTICE, $mash); $mashs .= $mash; } }