Mercurial > bms / annotate

www/getfermentablesources.php@943fbe0e9fd6 (annotated)

www/getfermentablesources.php

Sun, 10 Feb 2019 16:14:48 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Sun, 10 Feb 2019 16:14:48 +0100
changeset 258
943fbe0e9fd6
parent 221
a8aabb63fbcc
child 296
69fadd1aded2
permissions
-rw-r--r--

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.

57
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1 <?php
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
2 require_once('config.php');
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
3
65
5d5c67818d11 Fermentable editor checks. Fermentables dropdown list shows a frienlier list
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
4 $query = "SELECT * FROM inventory_fermentables ORDER BY supplier,name";
57
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
5 $connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
6 if (! $connect) {
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
7 echo "[]";
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
8 return;
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
9 }
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
10 $result = mysqli_query($connect, $query);
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
11 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
12 $fermentables[] = array(
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
13 'record' => $row['record'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
14 'name' => $row['name'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
15 'type' => $row['type'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
16 'yield' => $row['yield'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
17 'color' => $row['color'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
18 'add_after_boil' => $row['add_after_boil'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
19 'origin' => $row['origin'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
20 'supplier' => $row['supplier'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
21 'coarse_fine_diff' => $row['coarse_fine_diff'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
22 'moisture' => $row['moisture'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
23 'diastatic_power' => $row['diastatic_power'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
24 'protein' => $row['protein'],
221
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 65
diff changeset
25 'dissolved_protein' => $row['dissolved_protein'],
57
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
26 'max_in_batch' => $row['max_in_batch'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
27 'recommend_mash' => $row['recommend_mash'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
28 'graintype' => $row['graintype'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
29 'di_ph' => $row['di_ph'],
221
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 65
diff changeset
30 'acid_to_ph_57' => $row['acid_to_ph_57'],
57
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
31 'inventory' => $row['inventory'],
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
32 'cost' => $row['cost']
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
33 );
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
34 }
221
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 65
diff changeset
35 echo json_encode($fermentables, JSON_UNESCAPED_UNICODE);

Mercurial Repository: bms

mercurial