Wed, 16 Oct 2019 21:05:03 +0200
Added dutch array strings to a global php script. Changed fermentables, hops, yeast and misc inventory scripts to use these strings between the database scripts and javascript scripts. This makes filtering on types strings useable. Added these changes to the product/recipe forum and print exports too.
181
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | /***************************************************************************** |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | * Copyright (C) 2019 |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | * |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | * Michiel Broek <mbroek at mbse dot eu> |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | * |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | * This file is part of BMS |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | * |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | * This is free software; you can redistribute it and/or modify it |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | * under the terms of the GNU General Public License as published by the |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | * Free Software Foundation; either version 2, or (at your option) any |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | * later version. |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | * |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | * Brewery Management System istributed in the hope that it will be useful, but |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | * General Public License for more details. |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | * |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | * along with ThermFerm; see the file COPYING. If not, write to the Free |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | *****************************************************************************/ |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
24 | $(document).ready(function () { |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
25 | |
494
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
26 | var url = "getnode.php?uuid='" + my_uuid + "'", |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
27 | source = { |
181
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
28 | datatype: "json", |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
29 | datafields: [ |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
30 | { name: 'record', type: 'int' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
31 | { name: 'uuid', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
32 | { name: 'node', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
33 | { name: 'online', type: 'bool' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
34 | { name: 'group_id', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
35 | { name: 'hardwaremake', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
36 | { name: 'hardwaremodel', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
37 | { name: 'os', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
38 | { name: 'os_version', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
39 | { name: 'firmware', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
40 | { name: 'firstseen', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
41 | { name: 'lastseen', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
42 | { name: 'temperature', type: 'float' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
43 | { name: 'humidity', type: 'float' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
44 | { name: 'barometer', type: 'float' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
45 | { name: 'gps_latitude', type: 'float' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
46 | { name: 'gps_longitude', type: 'float' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
47 | { name: 'gps_altitude', type: 'float' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
48 | { name: 'net_address', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
49 | { name: 'net_ifname', type: 'string' }, |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
50 | { name: 'net_rssi', type: 'int' } |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
51 | ], |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
52 | id: 'record', |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
53 | url: url |
494
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
54 | }, |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
55 | dataAdapter = new $.jqx.dataAdapter(source, { |
181
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
56 | loadComplete: function (records) { |
494
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
57 | var record = dataAdapter.records[0], |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
58 | html = "<div id='node_table'>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
59 | html += "<table style='width: 100%; padding: 10px;'>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
60 | html += "<tr><th colspan=2>Systeem overzicht</th></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
61 | html += "<tr><td>Uuid</td><td>" + record.uuid + "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
62 | html += "<tr><td>Systeem</td><td>" + record.node + "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
63 | html += "<tr><td>Online</td><td>" + record.online + "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
64 | html += "<tr><td>Type</td><td>" + record.group_id + "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
65 | html += "<tr><td>Eerst gezien</td><td>" + record.firstseen + "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
66 | html += "<tr><td>Laatst gezien</td><td>" + record.lastseen + "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
67 | html += "<tr><td>Hardware maker</td><td>" + record.hardwaremake+ "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
68 | html += "<tr><td>Hardware model</td><td>" + record.hardwaremodel+ "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
69 | html += "<tr><td>OS</td><td>" + record.os + " versie: " + record.os_version + "</td></tr>"; |
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
181
diff
changeset
|
70 | html += "<tr><td>Firmware</td><td>" + record.firmware + "</td></tr>"; |
181
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
71 | if (record.online) { |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
72 | html += "<tr><td>Temperatuur</td><td>" + record.temperature.toFixed(1) + "°C</td></tr>"; |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
73 | if (record.humidity > 0) { |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
74 | html += "<tr><td>Vochtigheid</td><td>" + record.humidity.toFixed(1) + "%</td></tr>"; |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
75 | } |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
76 | if (record.barometer > 0) { |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
77 | html += "<tr><td>Luchtdruk</td><td>" + record.barometer.toFixed(0) + "</td></tr>"; |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
78 | } |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
79 | if ((record.gps_latitude != 0) && (record.gps_longitude != 0)) { |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
80 | html += "<tr><td>GPS</td><td>"+ record.gps_latitude + " " + record.gps_longitude + " " + record.gps_altitude + "</td></tr>"; |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
81 | } |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
82 | html += "<tr><td>Netwerk</td><td>"+ record.net_ifname + " " + record.net_address + "</td></tr>"; |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
83 | } |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
84 | html += "</<table>"; |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
85 | html += "</div>"; |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
86 | $("#ContentPanel").html(html); |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
87 | } |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
88 | }); |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
89 | |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
90 | // Get the data immediatly and then at regular intervals to refresh. |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
91 | dataAdapter.dataBind(); |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
92 | setInterval(function(){ |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
93 | dataAdapter.dataBind(); |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
94 | }, 30000); |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
95 | }); |
db4e62482d0b
Moved javascript out of mon_node.php
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
96 |