Mercurial > bms / annotate

www/getfermenter.php@a8aabb63fbcc (annotated)

www/getfermenter.php

Wed, 30 Jan 2019 16:40:23 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Wed, 30 Jan 2019 16:40:23 +0100
changeset 221
a8aabb63fbcc
parent 180
a5aa3502310c
child 296
69fadd1aded2
permissions
-rw-r--r--

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.

4
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1 <?php
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
2
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
3 require_once('config.php');
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
4
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
5 if (isset($_GET["uuid"]))
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
6 $uuid = $_GET["uuid"];
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
7 else
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
8 $uuid = "'ef166f25-1bb4-4bef-b112-a867af77f766'";
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
9
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
10
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
11 $mysqli = new mysqli(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);
43
dcb9ff8846fa Renamed monitor database tables
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
12 $query = "SELECT * FROM mon_fermenters WHERE uuid=".$uuid."";
4
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
13 $result = $mysqli->query($query);
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
14 $resultArray = $result->fetch_array(MYSQLI_ASSOC);
7
59048cd5f00d Fixes boolean values and only display valid fields in node view.
Michiel Broek <mbroek@mbse.eu>
parents: 4
diff changeset
15 if ($resultArray['online'] == 'Y') {
180
a5aa3502310c Updated README. Getfermenter and getnode scripts return 0 and 1 instead of false and true for boolean values. Global variable my_uuid added. Moved the javascript out of mon_fermenter.php. Added log chart view button in the fermenter monitor.
Michiel Broek <mbroek@mbse.eu>
parents: 43
diff changeset
16 $resultArray['online'] = 1;
7
59048cd5f00d Fixes boolean values and only display valid fields in node view.
Michiel Broek <mbroek@mbse.eu>
parents: 4
diff changeset
17 } else {
180
a5aa3502310c Updated README. Getfermenter and getnode scripts return 0 and 1 instead of false and true for boolean values. Global variable my_uuid added. Moved the javascript out of mon_fermenter.php. Added log chart view button in the fermenter monitor.
Michiel Broek <mbroek@mbse.eu>
parents: 43
diff changeset
18 $resultArray['online'] = 0;
7
59048cd5f00d Fixes boolean values and only display valid fields in node view.
Michiel Broek <mbroek@mbse.eu>
parents: 4
diff changeset
19 }
4
1750b6cae48e Web pages nodes display works.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
20 echo json_encode($resultArray);

Mercurial Repository: bms

mercurial