comparison: www/includes/db_divides.php
www/includes/db_divides.php
- changeset 722
- c4457e10d968
- parent 650
- fd7da9570810
- child 754
- 30abc8024afe
equal
deleted
inserted
replaced
| 721:4d7394ced1c3 | 722:c4457e10d968 |
|---|---|
| 55 if ($index == 0) { | 55 if ($index == 0) { |
| 56 /* | 56 /* |
| 57 * Update the main record | 57 * Update the main record |
| 58 */ | 58 */ |
| 59 $sql = "UPDATE `products` SET "; | 59 $sql = "UPDATE `products` SET "; |
| 60 $sql .= "brew_sparge_volume='" . sprintf("%.1f", $row['brew_sparge_volume'] * $factor); | 60 $sql .= " brew_sparge_est='" . sprintf("%.1f", $row['brew_sparge_est'] * $factor); |
| 61 $sql .= "', brew_sparge_est='" . sprintf("%.1f", $row['brew_sparge_est'] * $factor); | |
| 62 $sql .= "', brew_preboil_volume='" . sprintf("%.1f", $row['brew_preboil_volume'] * $factor); | 61 $sql .= "', brew_preboil_volume='" . sprintf("%.1f", $row['brew_preboil_volume'] * $factor); |
| 63 $sql .= "', brew_aboil_volume='" . sprintf("%.1f", $row['brew_aboil_volume'] * $factor); | 62 $sql .= "', brew_aboil_volume='" . sprintf("%.1f", $row['brew_aboil_volume'] * $factor); |
| 64 $sql .= "', brew_fermenter_volume='" . sprintf("%.1f", $row['brew_fermenter_volume'] * $factor); | 63 $sql .= "', brew_fermenter_volume='" . sprintf("%.1f", $row['brew_fermenter_volume'] * $factor); |
| 65 $sql .= "', brew_fermenter_extrawater='" . sprintf("%.1f", $row['brew_fermenter_extrawater'] * $factor); | 64 $sql .= "', brew_fermenter_extrawater='" . sprintf("%.1f", $row['brew_fermenter_extrawater'] * $factor); |
| 66 $sql .= "', brew_fermenter_tcloss='" . sprintf("%.1f", $row['brew_fermenter_tcloss'] * $factor); | 65 $sql .= "', brew_fermenter_tcloss='" . sprintf("%.1f", $row['brew_fermenter_tcloss'] * $factor); |
| 137 else | 136 else |
| 138 $sql .= "', brew_date_start=NULL"; | 137 $sql .= "', brew_date_start=NULL"; |
| 139 $sql .= ", brew_mash_ph='" . $row['brew_mash_ph']; | 138 $sql .= ", brew_mash_ph='" . $row['brew_mash_ph']; |
| 140 $sql .= "', brew_mash_sg='" . $row['brew_mash_sg']; | 139 $sql .= "', brew_mash_sg='" . $row['brew_mash_sg']; |
| 141 $sql .= "', brew_mash_efficiency='" . $row['brew_mash_efficiency']; | 140 $sql .= "', brew_mash_efficiency='" . $row['brew_mash_efficiency']; |
| 142 $sql .= "', brew_sparge_temperature='" . $row['brew_sparge_temperature']; | |
| 143 $sql .= "', brew_sparge_volume='" . sprintf("%.1f", $row['brew_sparge_volume'] * $factor); | |
| 144 $sql .= "', brew_sparge_est='" . sprintf("%.1f", $row['brew_sparge_est'] * $factor); | 141 $sql .= "', brew_sparge_est='" . sprintf("%.1f", $row['brew_sparge_est'] * $factor); |
| 145 $sql .= "', brew_sparge_ph='" . $row['brew_sparge_ph']; | 142 $sql .= "', brew_sparge_ph='" . $row['brew_sparge_ph']; |
| 146 $sql .= "', brew_preboil_volume='" . sprintf("%.1f", $row['brew_preboil_volume'] * $factor); | 143 $sql .= "', brew_preboil_volume='" . sprintf("%.1f", $row['brew_preboil_volume'] * $factor); |
| 147 $sql .= "', brew_preboil_sg='" . $row['brew_preboil_sg']; | 144 $sql .= "', brew_preboil_sg='" . $row['brew_preboil_sg']; |
| 148 $sql .= "', brew_preboil_ph='" . $row['brew_preboil_ph']; | 145 $sql .= "', brew_preboil_ph='" . $row['brew_preboil_ph']; |
| 318 $sql .= "', divide_type='" . $divide_type; | 315 $sql .= "', divide_type='" . $divide_type; |
| 319 $sql .= "', divide_parts='" . $divide_parts; | 316 $sql .= "', divide_parts='" . $divide_parts; |
| 320 $sql .= "', divide_part='" . $index; | 317 $sql .= "', divide_part='" . $index; |
| 321 $sql .= "', divide_size='" . floatval($split['size']); | 318 $sql .= "', divide_size='" . floatval($split['size']); |
| 322 $sql .= "', divide_factor='". $factor; | 319 $sql .= "', divide_factor='". $factor; |
| 323 syslog(LOG_NOTICE, "db_divide: index " . $index . " " . $sql); | 320 // syslog(LOG_NOTICE, "db_divide: index " . $index . " " . $sql); |
| 324 } | 321 } |
| 325 | 322 |
| 326 $fermentables = json_decode($row['json_fermentables'], true); | 323 $fermentables = json_decode($row['json_fermentables'], true); |
| 327 for ($i = 0; $i < count($fermentables); $i++) { | 324 for ($i = 0; $i < count($fermentables); $i++) { |
| 328 $fermentables[$i]['f_amount'] = sprintf("%.5f", $fermentables[$i]['f_amount'] * $factor); | 325 $fermentables[$i]['f_amount'] = sprintf("%.5f", $fermentables[$i]['f_amount'] * $factor); |
| 353 | 350 |
| 354 $mashs = json_decode($row['json_mashs'], true); | 351 $mashs = json_decode($row['json_mashs'], true); |
| 355 for ($i = 0; $i < count($mashs); $i++) { | 352 for ($i = 0; $i < count($mashs); $i++) { |
| 356 $mashs[$i]['step_infuse_amount'] = sprintf("%.5f", $mashs[$i]['step_infuse_amount'] * $factor); | 353 $mashs[$i]['step_infuse_amount'] = sprintf("%.5f", $mashs[$i]['step_infuse_amount'] * $factor); |
| 357 } | 354 } |
| 358 syslog(LOG_NOTICE, "db_divide: " . str_replace($rescapers,$rreplacements,json_encode($mashs, JSON_UNESCAPED_UNICODE))); | 355 // syslog(LOG_NOTICE, "db_divide: " . str_replace($rescapers,$rreplacements,json_encode($mashs, JSON_UNESCAPED_UNICODE))); |
| 359 $sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,json_encode($mashs, JSON_UNESCAPED_UNICODE)); | 356 $sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,json_encode($mashs, JSON_UNESCAPED_UNICODE)); |
| 360 | 357 |
| 361 if ($index == 0) { | 358 if ($index == 0) { |
| 362 $sql .= "' WHERE record='" . $record . "';"; | 359 $sql .= "' WHERE record='" . $record . "';"; |
| 363 $result2 = mysqli_query($link, $sql); | 360 $result2 = mysqli_query($link, $sql); |
