comparison: www/import/from_brouwhulp.php
www/import/from_brouwhulp.php
- changeset 175
- da16371538c3
- parent 163
- 4a4cc3497a57
- child 195
- 2ac491548d8d
equal
deleted
inserted
replaced
| 174:12aacf0da982 | 175:da16371538c3 |
|---|---|
| 568 if ($fermentable->ADDED) | 568 if ($fermentable->ADDED) |
| 569 $fadded = mysqli_real_escape_string($db, $fermentable->ADDED); | 569 $fadded = mysqli_real_escape_string($db, $fermentable->ADDED); |
| 570 else | 570 else |
| 571 $fadded = "Mash"; | 571 $fadded = "Mash"; |
| 572 $fermentables .= ',"f_added":"'.$fadded.'"'; | 572 $fermentables .= ',"f_added":"'.$fadded.'"'; |
| 573 ($fermentable->ADD_AFTER_BOIL== "TRUE") ? $fermentables .= ',"f_add_after_boil":true' : $fermentables .= ',"f_add_after_boil":false'; | 573 ($fermentable->ADD_AFTER_BOIL== "TRUE") ? $fermentables .= ',"f_add_after_boil":1' : $fermentables .= ',"f_add_after_boil":0'; |
| 574 ($fermentable->RECOMMEND_MASH== "TRUE") ? $fermentables .= ',"f_recommend_mash":true' : $fermentables .= ',"f_recommend_mash":false'; | 574 ($fermentable->RECOMMEND_MASH== "TRUE") ? $fermentables .= ',"f_recommend_mash":1' : $fermentables .= ',"f_recommend_mash":0'; |
| 575 if ($fermentable->DISSOLVED_PROTEIN) | 575 if ($fermentable->DISSOLVED_PROTEIN) |
| 576 $fermentables .= ',"f_dissolved_protein":' . floatval($fermentable->DISSOLVED_PROTEIN); | 576 $fermentables .= ',"f_dissolved_protein":' . floatval($fermentable->DISSOLVED_PROTEIN); |
| 577 else | 577 else |
| 578 $fermentables .= ',"f_dissolved_protein":0'; | 578 $fermentables .= ',"f_dissolved_protein":0'; |
| 579 ($fermentable->ADJUST_TO_TOTAL_100 == "TRUE") ? $fermentables .= ',"f_adjust_to_total_100":true' : $fermentables .= ',"f_adjust_to_total_100":false'; | 579 ($fermentable->ADJUST_TO_TOTAL_100 == "TRUE") ? $fermentables .= ',"f_adjust_to_total_100":1' : $fermentables .= ',"f_adjust_to_total_100":0'; |
| 580 $percent = floatval($fermentable->PERCENTAGE); | 580 $percent = floatval($fermentable->PERCENTAGE); |
| 581 $fermentables .= ',"f_percentage":' . round($percent * 10) / 10.0; | 581 $fermentables .= ',"f_percentage":' . round($percent * 10) / 10.0; |
| 582 if ($fermentable->DI_pH) | 582 if ($fermentable->DI_pH) |
| 583 $fermentables .= ',"f_di_ph":' . floatval($fermentable->DI_pH); | 583 $fermentables .= ',"f_di_ph":' . floatval($fermentable->DI_pH); |
| 584 else | 584 else |
| 666 $miscs .= ',"m_cost":0'; | 666 $miscs .= ',"m_cost":0'; |
| 667 } | 667 } |
| 668 } | 668 } |
| 669 $miscs .= ',"m_type":"' . mysqli_real_escape_string($db, $misc->TYPE) . '"'; | 669 $miscs .= ',"m_type":"' . mysqli_real_escape_string($db, $misc->TYPE) . '"'; |
| 670 $miscs .= ',"m_use_use":"' . mysqli_real_escape_string($db, $misc->USE) . '"'; | 670 $miscs .= ',"m_use_use":"' . mysqli_real_escape_string($db, $misc->USE) . '"'; |
| 671 ($misc->AMOUNT_IS_WEIGHT== "TRUE") ? $miscs .= ',"m_amount_is_weight":true' : $miscs.= ',"m_amount_is_weight":false'; | 671 ($misc->AMOUNT_IS_WEIGHT== "TRUE") ? $miscs .= ',"m_amount_is_weight":1' : $miscs.= ',"m_amount_is_weight":0'; |
| 672 if ($misc->TIME) { | 672 if ($misc->TIME) { |
| 673 if (mysqli_real_escape_string($db, $misc->USE) == "Secondary") | 673 if (mysqli_real_escape_string($db, $misc->USE) == "Secondary") |
| 674 $miscs .= ',"m_time":' . floatval($misc->TIME) / 1440; | 674 $miscs .= ',"m_time":' . floatval($misc->TIME) / 1440; |
| 675 else | 675 else |
| 676 $miscs .= ',"m_time":' . floatval($misc->TIME); | 676 $miscs .= ',"m_time":' . floatval($misc->TIME); |
| 705 $yeasts .= ',"y_cost":0'; | 705 $yeasts .= ',"y_cost":0'; |
| 706 $yeasts .= ',"y_laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"'; | 706 $yeasts .= ',"y_laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"'; |
| 707 $yeasts .= ',"y_product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"'; | 707 $yeasts .= ',"y_product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"'; |
| 708 $yeasts .= ',"y_type":"' . mysqli_real_escape_string($db, $yeast->TYPE) . '"'; | 708 $yeasts .= ',"y_type":"' . mysqli_real_escape_string($db, $yeast->TYPE) . '"'; |
| 709 $yeasts .= ',"y_form":"' . mysqli_real_escape_string($db, $yeast->FORM) . '"'; | 709 $yeasts .= ',"y_form":"' . mysqli_real_escape_string($db, $yeast->FORM) . '"'; |
| 710 ($yeast->AMOUNT_IS_WEIGHT== "TRUE") ? $yeasts .= ',"y_amount_is_weight":true' : $yeasts.= ',"y_amount_is_weight":false'; | 710 ($yeast->AMOUNT_IS_WEIGHT== "TRUE") ? $yeasts .= ',"y_amount_is_weight":1' : $yeasts.= ',"y_amount_is_weight":0'; |
| 711 if ($yeast->ADD_TO_SECONDARY=="FALSE") { | 711 if ($yeast->ADD_TO_SECONDARY=="FALSE") { |
| 712 $yeasts .= ',"y_use":"Primary"'; | 712 $yeasts .= ',"y_use":"Primary"'; |
| 713 $svg = floatval($yeast->ATTENUATION); | 713 $svg = floatval($yeast->ATTENUATION); |
| 714 } else if ($yeast->PRODUCT_ID=="F2") { | 714 } else if ($yeast->PRODUCT_ID=="F2") { |
| 715 $yeasts .= ',"y_use":"Bottle"'; | 715 $yeasts .= ',"y_use":"Bottle"'; |
