comparison: www/import/from_brouwhulp.php
www/import/from_brouwhulp.php
- changeset 100
- 08c92cb740b9
- parent 99
- f433193f7bb6
- child 102
- 679ddf512b65
equal
deleted
inserted
replaced
| 99:f433193f7bb6 | 100:08c92cb740b9 |
|---|---|
| 572 $fermentables .= ',"f_type":"' . $ftype . '"'; | 572 $fermentables .= ',"f_type":"' . $ftype . '"'; |
| 573 $fyield = floatval($fermentable->YIELD); | 573 $fyield = floatval($fermentable->YIELD); |
| 574 $fermentables .= ',"f_yield":' . $fyield; | 574 $fermentables .= ',"f_yield":' . $fyield; |
| 575 if ($fermentable->COLOR) { | 575 if ($fermentable->COLOR) { |
| 576 $srm = floatval($fermentable->COLOR); | 576 $srm = floatval($fermentable->COLOR); |
| 577 $colorw += ($famount * $srm / $batch_size) * 8.34436; /* Kleurwerking */ | |
| 578 $ebc = srm_to_ebc($srm); | 577 $ebc = srm_to_ebc($srm); |
| 579 $fermentables .= ',"f_color":' . $ebc; | 578 } else { |
| 580 } | 579 $srm = 0; |
| 580 $ebc = 0; | |
| 581 } | |
| 582 $colorw += ($famount * $srm / $batch_size) * 8.34436; /* Kleurwerking */ | |
| 583 $fermentables .= ',"f_color":' . $ebc; | |
| 581 if ($fermentable->COARSE_FINE_DIFF) | 584 if ($fermentable->COARSE_FINE_DIFF) |
| 582 $fermentables .= ',"f_coarse_fine_diff":' . floatval($fermentable->COARSE_FINE_DIFF); | 585 $fermentables .= ',"f_coarse_fine_diff":' . floatval($fermentable->COARSE_FINE_DIFF); |
| 583 else | 586 else |
| 584 $fermentables .= ',"f_coarse_fine_diff":0'; | 587 $fermentables .= ',"f_coarse_fine_diff":0'; |
| 585 if ($fermentable->MOISTURE) | 588 if ($fermentable->MOISTURE) |
