Sun, 10 Feb 2019 16:14:48 +0100
Fixed estimate_fg formula. Estimate neede sparge water displayed on the brewday tab. Moved calcSVG, calcFG and calcABV functions into calcFermentables. Calc FG now uses mash data if available. Show estimated fg on the fermentation tab. Cosmetic changes on the brewday tab.
61 | 1 | <?php |
2 | require_once('config.php'); | |
3 | ||
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
61
diff
changeset
|
4 | $query = "SELECT * FROM inventory_yeasts ORDER BY laboratory,product_id,name"; |
61 | 5 | $connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME); |
6 | if (! $connect) { | |
7 | echo "[]"; | |
8 | return; | |
9 | } | |
10 | $result = mysqli_query($connect, $query); | |
11 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { | |
12 | $yeasts[] = array( | |
13 | 'record' => $row['record'], | |
14 | 'name' => $row['name'], | |
15 | 'type' => $row['type'], | |
16 | 'form' => $row['form'], | |
17 | 'laboratory' => $row['laboratory'], | |
18 | 'product_id' => $row['product_id'], | |
19 | 'min_temperature' => $row['min_temperature'], | |
20 | 'max_temperature' => $row['max_temperature'], | |
232
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
141
diff
changeset
|
21 | 'flocculation' => $row['flocculation'], |
61 | 22 | 'attenuation' => $row['attenuation'], |
232
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
141
diff
changeset
|
23 | 'cells' => $row['cells'], |
61 | 24 | 'inventory' => $row['inventory'], |
25 | 'cost' => $row['cost'] | |
26 | ); | |
27 | } | |
28 | echo json_encode($yeasts); |