comparison: www/includes/db_product.php
www/includes/db_product.php
- changeset 285
- 0ea9dfb3fce9
- parent 278
- dc22dd5d77fd
- child 290
- 12aa92828e24
equal
deleted
inserted
replaced
| 284:a93fcd87f561 | 285:0ea9dfb3fce9 |
|---|---|
| 67 $sql .= "', eq_kettle_volume='" . $_POST['eq_kettle_volume']; | 67 $sql .= "', eq_kettle_volume='" . $_POST['eq_kettle_volume']; |
| 68 $sql .= "', eq_kettle_height='" . $_POST['eq_kettle_height']; | 68 $sql .= "', eq_kettle_height='" . $_POST['eq_kettle_height']; |
| 69 $sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume']; | 69 $sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume']; |
| 70 $sql .= "', eq_mash_max='" . $_POST['eq_mash_max']; | 70 $sql .= "', eq_mash_max='" . $_POST['eq_mash_max']; |
| 71 $sql .= "', eq_efficiency='" . $_POST['eq_efficiency']; | 71 $sql .= "', eq_efficiency='" . $_POST['eq_efficiency']; |
| 72 | 72 // brewdate |
| 73 if ($stage > 1) { | 73 if ($_POST['brew_date_start'] == '') |
| 74 $sql .= "', brew_date_start='" . $_POST['brew_date_start']; | 74 $sql .= "', brew_date_start=NULL"; |
| 75 } | 75 else |
| 76 if ($stage > 0) { | 76 $sql .= "', brew_date_start='" . $_POST['brew_date_start'] . "'"; |
| 77 syslog(LOG_NOTICE, "write brewdate data"); | 77 $sql .= ", brew_mash_ph='" . $_POST['brew_mash_ph']; |
| 78 $sql .= "', brew_date_start='" . $_POST['brew_date_start']; | 78 $sql .= "', brew_mash_sg='" . $_POST['brew_mash_sg']; |
| 79 $sql .= "', brew_mash_ph='" . $_POST['brew_mash_ph']; | 79 $sql .= "', brew_sparge_temperature='" . $_POST['brew_sparge_temperature']; |
| 80 $sql .= "', brew_mash_sg='" . $_POST['brew_mash_sg']; | 80 $sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume']; |
| 81 $sql .= "', brew_sparge_temperature='" . $_POST['brew_sparge_temperature']; | 81 $sql .= "', brew_sparge_ph='" . $_POST['brew_sparge_ph']; |
| 82 $sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume']; | 82 $sql .= "', brew_preboil_volume='" . $_POST['brew_preboil_volume']; |
| 83 $sql .= "', brew_sparge_ph='" . $_POST['brew_sparge_ph']; | 83 $sql .= "', brew_preboil_sg='" . $_POST['brew_preboil_sg']; |
| 84 $sql .= "', brew_preboil_volume='" . $_POST['brew_preboil_volume']; | 84 $sql .= "', brew_preboil_ph='" . $_POST['brew_preboil_ph']; |
| 85 $sql .= "', brew_preboil_sg='" . $_POST['brew_preboil_sg']; | 85 $sql .= "', brew_aboil_volume='" . $_POST['brew_aboil_volume']; |
| 86 $sql .= "', brew_preboil_ph='" . $_POST['brew_preboil_ph']; | 86 $sql .= "', brew_aboil_sg='" . $_POST['brew_aboil_sg']; |
| 87 $sql .= "', brew_aboil_volume='" . $_POST['brew_aboil_volume']; | 87 $sql .= "', brew_aboil_ph='" . $_POST['brew_aboil_ph']; |
| 88 $sql .= "', brew_aboil_sg='" . $_POST['brew_aboil_sg']; | 88 $sql .= "', brew_aboil_efficiency='" . $_POST['brew_aboil_efficiency']; |
| 89 $sql .= "', brew_aboil_ph='" . $_POST['brew_aboil_ph']; | 89 $sql .= "', brew_cooling_method='" . $_POST['brew_cooling_method']; |
| 90 $sql .= "', brew_aboil_efficiency='" . $_POST['brew_aboil_efficiency']; | 90 $sql .= "', brew_cooling_time='" . $_POST['brew_cooling_time']; |
| 91 $sql .= "', brew_cooling_method='" . $_POST['brew_cooling_method']; | 91 $sql .= "', brew_cooling_to='" . $_POST['brew_cooling_to']; |
| 92 $sql .= "', brew_cooling_time='" . $_POST['brew_cooling_time']; | 92 $sql .= "', brew_whirlpool9='" . $_POST['brew_whirlpool9']; |
| 93 $sql .= "', brew_cooling_to='" . $_POST['brew_cooling_to']; | 93 $sql .= "', brew_whirlpool7='" . $_POST['brew_whirlpool7']; |
| 94 $sql .= "', brew_whirlpool9='" . $_POST['brew_whirlpool9']; | 94 $sql .= "', brew_whirlpool6='" . $_POST['brew_whirlpool6']; |
| 95 $sql .= "', brew_whirlpool7='" . $_POST['brew_whirlpool7']; | 95 $sql .= "', brew_whirlpool2='" . $_POST['brew_whirlpool2']; |
| 96 $sql .= "', brew_whirlpool6='" . $_POST['brew_whirlpool6']; | 96 $sql .= "', brew_aeration_time='" . $_POST['brew_aeration_time']; |
| 97 $sql .= "', brew_whirlpool2='" . $_POST['brew_whirlpool2']; | 97 $sql .= "', brew_aeration_speed='" . $_POST['brew_aeration_speed']; |
| 98 $sql .= "', brew_aeration_time='" . $_POST['brew_aeration_time']; | 98 $sql .= "', brew_aeration_type='" . $_POST['brew_aeration_type']; |
| 99 $sql .= "', brew_aeration_speed='" . $_POST['brew_aeration_speed']; | 99 $sql .= "', brew_fermenter_volume='" . $_POST['brew_fermenter_volume']; |
| 100 $sql .= "', brew_aeration_type='" . $_POST['brew_aeration_type']; | 100 $sql .= "', brew_fermenter_extrawater='" . $_POST['brew_fermenter_extrawater']; |
| 101 $sql .= "', brew_fermenter_volume='" . $_POST['brew_fermenter_volume']; | 101 $sql .= "', brew_fermenter_tcloss='" . $_POST['brew_fermenter_tcloss']; |
| 102 $sql .= "', brew_fermenter_extrawater='" . $_POST['brew_fermenter_extrawater']; | 102 $sql .= "', brew_fermenter_sg='" . $_POST['brew_fermenter_sg']; |
| 103 $sql .= "', brew_fermenter_tcloss='" . $_POST['brew_fermenter_tcloss']; | 103 $sql .= "', brew_fermenter_ibu='" . $_POST['brew_fermenter_ibu']; |
| 104 $sql .= "', brew_fermenter_sg='" . $_POST['brew_fermenter_sg']; | 104 $sql .= "', brew_fermenter_color='" . $_POST['brew_fermenter_color']; |
| 105 $sql .= "', brew_fermenter_ibu='" . $_POST['brew_fermenter_ibu']; | 105 if ($_POST['brew_date_end'] == '') |
| 106 $sql .= "', brew_fermenter_color='" . $_POST['brew_fermenter_color']; | 106 $sql .= "', brew_date_end=NULL"; |
| 107 if ($stage > 2) { | 107 else |
| 108 syslog(LOG_NOTICE, "write brewdate data end"); | 108 $sql .= "', brew_date_end='" . $_POST['brew_date_end'] . "'"; |
| 109 $sql .= "', brew_date_end='" . $_POST['brew_date_end']; | 109 $sql .= ", og='" . $_POST['og']; |
| 110 } | |
| 111 } | |
| 112 $sql .= "', og='" . $_POST['og']; | |
| 113 $sql .= "', fg='" . $_POST['fg']; | 110 $sql .= "', fg='" . $_POST['fg']; |
| 114 | 111 $sql .= "', primary_start_temp='" . $_POST['primary_start_temp']; |
| 115 if ($stage > 2) { | 112 $sql .= "', primary_max_temp='" . $_POST['primary_max_temp']; |
| 116 syslog(LOG_NOTICE, "write primary data"); | 113 $sql .= "', primary_end_temp='" . $_POST['primary_end_temp']; |
| 117 $sql .= "', primary_start_temp='" . $_POST['primary_start_temp']; | 114 if ($_POST['primary_end_date'] == '') |
| 118 $sql .= "', primary_max_temp='" . $_POST['primary_max_temp']; | 115 $sql .= "', primary_end_date=NULL"; |
| 119 $sql .= "', primary_end_temp='" . $_POST['primary_end_temp']; | 116 else |
| 120 $sql .= "', primary_end_sg='" . $_POST['primary_end_sg']; | 117 $sql .= "', primary_end_date='" . $_POST['primary_end_date'] ."'"; |
| 121 $sql .= "', primary_end_date='" . $_POST['primary_end_date']; | 118 $sql .= ", primary_end_sg='" . $_POST['primary_end_sg']; |
| 122 } | 119 $sql .= "', secondary_temp='" . $_POST['secondary_temp']; |
| 123 | 120 if ($_POST['secondary_end_date'] == '') |
| 124 if ($stage > 3) { | 121 $sql .= "', secondary_end_date=NULL"; |
| 125 syslog(LOG_NOTICE, "write secondary data"); | 122 else |
| 126 $sql .= "', secondary_temp='" . $_POST['secondary_temp']; | 123 $sql .= "', secondary_end_date='" . $_POST['secondary_end_date'] ."'"; |
| 127 $sql .= "', secondary_end_date='" . $_POST['secondary_end_date']; | 124 $sql .= ", tertiary_temp='" . $_POST['tertiary_temp']; |
| 128 $sql .= "', tertiary_temp='" . $_POST['tertiary_temp']; | 125 if ($_POST['package_date'] == '') |
| 129 } | 126 $sql .= "', package_date=NULL"; |
| 130 | 127 else |
| 131 if ($stage > 4) { | 128 $sql .= "', package_date='" . $_POST['package_date'] ."'"; |
| 132 syslog(LOG_NOTICE, "write package data"); | 129 $sql .= ", bottle_amount='" . $_POST['bottle_amount']; |
| 133 $sql .= "', package_date='" . $_POST['package_date']; | 130 $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation']; |
| 134 $sql .= "', bottle_amount='" . $_POST['bottle_amount']; | 131 $sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar']; |
| 135 $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation']; | 132 $sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount']; |
| 136 $sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar']; | 133 $sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp']; |
| 137 $sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount']; | 134 $sql .= "', keg_amount='" . $_POST['keg_amount']; |
| 138 $sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp']; | 135 $sql .= "', keg_carbonation='" . $_POST['keg_carbonation']; |
| 139 $sql .= "', keg_amount='" . $_POST['keg_amount']; | 136 $sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar']; |
| 140 $sql .= "', keg_carbonation='" . $_POST['keg_carbonation']; | 137 $sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount']; |
| 141 $sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar']; | 138 $sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp']; |
| 142 $sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount']; | 139 $sql .= "', keg_forced_carb='" . $_POST['keg_forced_carb']; |
| 143 $sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp']; | 140 $sql .= "', keg_pressure='" . $_POST['keg_pressure']; |
| 144 $sql .= "', keg_forced_carb='" . $_POST['keg_forced_carb']; | 141 $sql .= "', taste_notes='" . mysqli_real_escape_string($connect, $_POST['taste_notes']); |
| 145 $sql .= "', keg_pressure='" . $_POST['keg_pressure']; | 142 $sql .= "', taste_rate='" . $_POST['taste_rate']; |
| 146 } | 143 if ($_POST['taste_date'] == '') |
| 147 | 144 $sql .= "', taste_date=NULL"; |
| 148 if ($stage > 8) { | 145 else |
| 149 syslog(LOG_NOTICE, "write taste data"); | 146 $sql .= "', taste_date='" . $_POST['taste_date'] . "'"; |
| 150 $sql .= "', taste_notes='" . mysqli_real_escape_string($connect, $_POST['taste_notes']); | 147 $sql .= ", taste_color='" . mysqli_real_escape_string($connect, $_POST['taste_color']); |
| 151 $sql .= "', taste_rate='" . $_POST['taste_rate']; | 148 $sql .= "', taste_transparency='" . mysqli_real_escape_string($connect, $_POST['taste_transparency']); |
| 152 $sql .= "', taste_date='" . $_POST['taste_date']; | 149 $sql .= "', taste_head='" . mysqli_real_escape_string($connect, $_POST['taste_head']); |
| 153 $sql .= "', taste_color='" . mysqli_real_escape_string($connect, $_POST['taste_color']); | 150 $sql .= "', taste_aroma='" . mysqli_real_escape_string($connect, $_POST['taste_aroma']); |
| 154 $sql .= "', taste_transparency='" . mysqli_real_escape_string($connect, $_POST['taste_transparency']); | 151 $sql .= "', taste_taste='" . mysqli_real_escape_string($connect, $_POST['taste_taste']); |
| 155 $sql .= "', taste_head='" . mysqli_real_escape_string($connect, $_POST['taste_head']); | 152 $sql .= "', taste_mouthfeel='" . mysqli_real_escape_string($connect, $_POST['taste_mouthfeel']); |
| 156 $sql .= "', taste_aroma='" . mysqli_real_escape_string($connect, $_POST['taste_aroma']); | 153 $sql .= "', taste_aftertaste='" . mysqli_real_escape_string($connect, $_POST['taste_aftertaste']); |
| 157 $sql .= "', taste_taste='" . mysqli_real_escape_string($connect, $_POST['taste_taste']); | |
| 158 $sql .= "', taste_mouthfeel='" . mysqli_real_escape_string($connect, $_POST['taste_mouthfeel']); | |
| 159 $sql .= "', taste_aftertaste='" . mysqli_real_escape_string($connect, $_POST['taste_aftertaste']); | |
| 160 } | |
| 161 | 154 |
| 162 /* | 155 /* |
| 163 * Recipe part | 156 * Recipe part |
| 164 */ | 157 */ |
| 165 $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']); | 158 $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']); |
| 274 $fermentable .= ',"f_add_after_boil":' . $item['f_add_after_boil']; | 267 $fermentable .= ',"f_add_after_boil":' . $item['f_add_after_boil']; |
| 275 $fermentable .= ',"f_adjust_to_total_100":' . $item['f_adjust_to_total_100']; | 268 $fermentable .= ',"f_adjust_to_total_100":' . $item['f_adjust_to_total_100']; |
| 276 $fermentable .= ',"f_percentage":' . $item['f_percentage']; | 269 $fermentable .= ',"f_percentage":' . $item['f_percentage']; |
| 277 $fermentable .= ',"f_di_ph":' . $item['f_di_ph']; | 270 $fermentable .= ',"f_di_ph":' . $item['f_di_ph']; |
| 278 $fermentable .= ',"f_acid_to_ph_57":' . $item['f_acid_to_ph_57'] . '}'; | 271 $fermentable .= ',"f_acid_to_ph_57":' . $item['f_acid_to_ph_57'] . '}'; |
| 279 syslog(LOG_NOTICE, $fermentable); | 272 //syslog(LOG_NOTICE, $fermentable); |
| 280 $fermentables .= $fermentable; | 273 $fermentables .= $fermentable; |
| 281 } | 274 } |
| 282 } | 275 } |
| 283 $fermentables .= ']'; | 276 $fermentables .= ']'; |
| 284 $sql .= "', json_fermentables='" . $fermentables; | 277 $sql .= "', json_fermentables='" . $fermentables; |
| 305 $hop .= ',"h_humulene":' . $item['h_humulene']; | 298 $hop .= ',"h_humulene":' . $item['h_humulene']; |
| 306 $hop .= ',"h_caryophyllene":' . $item['h_caryophyllene']; | 299 $hop .= ',"h_caryophyllene":' . $item['h_caryophyllene']; |
| 307 $hop .= ',"h_cohumulone":' . $item['h_cohumulone']; | 300 $hop .= ',"h_cohumulone":' . $item['h_cohumulone']; |
| 308 $hop .= ',"h_myrcene":' . $item['h_myrcene']; | 301 $hop .= ',"h_myrcene":' . $item['h_myrcene']; |
| 309 $hop .= ',"h_total_oil":' . $item['h_total_oil'] . '}'; | 302 $hop .= ',"h_total_oil":' . $item['h_total_oil'] . '}'; |
| 310 syslog(LOG_NOTICE, $hop); | 303 //syslog(LOG_NOTICE, $hop); |
| 311 $hops .= $hop; | 304 $hops .= $hop; |
| 312 } | 305 } |
| 313 } | 306 } |
| 314 $hops .= ']'; | 307 $hops .= ']'; |
| 315 $sql .= "', json_hops='" . $hops; | 308 $sql .= "', json_hops='" . $hops; |
| 327 $misc .= ',"m_type":' . $item['m_type']; | 320 $misc .= ',"m_type":' . $item['m_type']; |
| 328 $misc .= ',"m_use_use":' . $item['m_use_use']; | 321 $misc .= ',"m_use_use":' . $item['m_use_use']; |
| 329 $misc .= ',"m_time":' . $item['m_time']; | 322 $misc .= ',"m_time":' . $item['m_time']; |
| 330 $misc .= ',"m_amount_is_weight":' . $item['m_amount_is_weight']; | 323 $misc .= ',"m_amount_is_weight":' . $item['m_amount_is_weight']; |
| 331 $misc .= ',"m_cost":' . $item['m_cost'] . '}'; | 324 $misc .= ',"m_cost":' . $item['m_cost'] . '}'; |
| 332 syslog(LOG_NOTICE, $misc); | 325 //syslog(LOG_NOTICE, $misc); |
| 333 $miscs .= $misc; | 326 $miscs .= $misc; |
| 334 } | 327 } |
| 335 } | 328 } |
| 336 $miscs .= ']'; | 329 $miscs .= ']'; |
| 337 $sql .= "', json_miscs='" . $miscs; | 330 $sql .= "', json_miscs='" . $miscs; |
| 356 $yeast .= ',"y_attenuation":' . $item['y_attenuation']; | 349 $yeast .= ',"y_attenuation":' . $item['y_attenuation']; |
| 357 $yeast .= ',"y_cells":' . $item['y_cells']; | 350 $yeast .= ',"y_cells":' . $item['y_cells']; |
| 358 $yeast .= ',"y_inventory":' . $item['y_inventory']; | 351 $yeast .= ',"y_inventory":' . $item['y_inventory']; |
| 359 $yeast .= ',"y_use":' . $item['y_use']; | 352 $yeast .= ',"y_use":' . $item['y_use']; |
| 360 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; | 353 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; |
| 361 syslog(LOG_NOTICE, $yeast); | 354 //syslog(LOG_NOTICE, $yeast); |
| 362 $yeasts .= $yeast; | 355 $yeasts .= $yeast; |
| 363 } | 356 } |
| 364 } | 357 } |
| 365 $yeasts .= ']'; | 358 $yeasts .= ']'; |
| 366 $sql .= "', json_yeasts='" . $yeasts; | 359 $sql .= "', json_yeasts='" . $yeasts; |
| 381 $mash .= ',"step_infuse_amount":0'; | 374 $mash .= ',"step_infuse_amount":0'; |
| 382 $mash .= ',"step_temp":' . $item['step_temp']; | 375 $mash .= ',"step_temp":' . $item['step_temp']; |
| 383 $mash .= ',"step_time":' . $item['step_time']; | 376 $mash .= ',"step_time":' . $item['step_time']; |
| 384 $mash .= ',"ramp_time":' . $item['ramp_time']; | 377 $mash .= ',"ramp_time":' . $item['ramp_time']; |
| 385 $mash .= ',"end_temp":' . $item['end_temp'] . '}'; | 378 $mash .= ',"end_temp":' . $item['end_temp'] . '}'; |
| 386 syslog(LOG_NOTICE, $mash); | 379 //syslog(LOG_NOTICE, $mash); |
| 387 $mashs .= $mash; | 380 $mashs .= $mash; |
| 388 } | 381 } |
| 389 } | 382 } |
| 390 $mashs .= ']'; | 383 $mashs .= ']'; |
| 391 $sql .= "', json_mashs='" . $mashs; | 384 $sql .= "', json_mashs='" . $mashs; |
