| @@ -41,9 +41,11 @@ var UI = { | |||||
| apiPost: function (args) { | apiPost: function (args) { | ||||
| if (!args.db) { console.log('apiPost requires db parameter'); } | if (!args.db) { console.log('apiPost requires db parameter'); } | ||||
| let methodName = this.apiMethodName(args); | let methodName = this.apiMethodName(args); | ||||
| let item = js.replaceProperties('{formDataToJson:.form'+args.db+'}'); | |||||
| console.log(item); | |||||
| //window.args = args; | //window.args = args; | ||||
| window[methodName](args.item) | |||||
| window[methodName](item) | |||||
| .then(function (data) { | .then(function (data) { | ||||
| console.log('apiCall success'); | console.log('apiCall success'); | ||||
| let result = JSON.stringify(data, null, 2); | let result = JSON.stringify(data, null, 2); | ||||
| @@ -1,20 +1,5 @@ | |||||
| { | { | ||||
| "data": { | "data": { | ||||
| "settings": { | |||||
| "version": "1.1.1", | |||||
| "debug": true, | |||||
| "unit": 1, | |||||
| "authRequired": false, | |||||
| "localDb": "0", | |||||
| "localWebhook": "", | |||||
| "localWebhookPlayground": "", | |||||
| "localPath": "db/reslevis", | |||||
| "serverUrl": "https://10.251.0.30:5050/frontend/api/reslevis", | |||||
| "serverMethod": "GET", | |||||
| "serverTokenUrl": "", | |||||
| "serverClientSecret": "", | |||||
| "updateInterval": 50000 | |||||
| }, | |||||
| "user": { | "user": { | ||||
| "id": "", | "id": "", | ||||
| "name": "", | "name": "", | ||||
| @@ -650,7 +635,7 @@ | |||||
| "rl:getDb": { | "rl:getDb": { | ||||
| "template": "{var db}", | "template": "{var db}", | ||||
| "db": "{var db}", | "db": "{var db}", | ||||
| "serverMethod": "{data settings serverMethod}", | |||||
| "serverMethod": "GET", | |||||
| "localDb": "{data settings localDb}", | "localDb": "{data settings localDb}", | ||||
| "localPath": "{data settings localPath}", | "localPath": "{data settings localPath}", | ||||
| "token": "{data user token}" | "token": "{data user token}" | ||||
| @@ -712,7 +697,7 @@ | |||||
| "rl:getDb": { | "rl:getDb": { | ||||
| "template": "{arguments:page}", | "template": "{arguments:page}", | ||||
| "db": "{arguments:db}", | "db": "{arguments:db}", | ||||
| "serverMethod": "{data settings serverMethod}", | |||||
| "serverMethod": "GET", | |||||
| "localDb": "{data settings localDb}", | "localDb": "{data settings localDb}", | ||||
| "localPath": "{data settings localPath}", | "localPath": "{data settings localPath}", | ||||
| "token": "{data user token}" | "token": "{data user token}" | ||||
| @@ -734,6 +719,24 @@ | |||||
| { | { | ||||
| "log": "{arguments:data}" | "log": "{arguments:data}" | ||||
| }, | }, | ||||
| { | |||||
| "if": { | |||||
| "is": "{arguments:data detail 0}", | |||||
| "then": [ | |||||
| { | |||||
| "log": "apiPostCallback error" | |||||
| }, | |||||
| { | |||||
| "alert": "arguments:data detail 0 msg" | |||||
| } | |||||
| ], | |||||
| "else": [ | |||||
| { | |||||
| "log": "apiPostCallback success" | |||||
| } | |||||
| ] | |||||
| } | |||||
| }, | |||||
| { | { | ||||
| "apiGet": { | "apiGet": { | ||||
| "db": "{arguments:db}", | "db": "{arguments:db}", | ||||
| @@ -949,7 +952,7 @@ | |||||
| } | } | ||||
| }, | }, | ||||
| { | { | ||||
| "setInterval": { | |||||
| "setInterval2": { | |||||
| "name": "update", | "name": "update", | ||||
| "duration": 5000, | "duration": 5000, | ||||
| "do": [ | "do": [ | ||||
| @@ -1912,6 +1912,22 @@ | |||||
| "type": "number", | "type": "number", | ||||
| "description": "Y" | "description": "Y" | ||||
| }, | }, | ||||
| "battery": { | |||||
| "type": "string", | |||||
| "description": "Battery" | |||||
| }, | |||||
| "temperature": { | |||||
| "type": "string", | |||||
| "description": "Battery" | |||||
| }, | |||||
| "acceleration": { | |||||
| "type": "string", | |||||
| "description": "Battery" | |||||
| }, | |||||
| "heartRate": { | |||||
| "type": "string", | |||||
| "description": "Battery" | |||||
| }, | |||||
| "building": { | "building": { | ||||
| "type": "string", | "type": "string", | ||||
| "description": "Building", | "description": "Building", | ||||
| @@ -1,7 +1,19 @@ | |||||
| { | { | ||||
| "data": { | "data": { | ||||
| "db": { | |||||
| } | |||||
| "settings": { | |||||
| "version": "1.1.2", | |||||
| "debug": true, | |||||
| "unit": 1, | |||||
| "authRequired": false, | |||||
| "localDb": "1", | |||||
| "localWebhook": "", | |||||
| "localWebhookPlayground": "", | |||||
| "localPath": "db/reslevis", | |||||
| "serverUrl": "https://10.251.0.30:5050/frontend/api/reslevis", | |||||
| "serverTokenUrl": "", | |||||
| "serverClientSecret": "", | |||||
| "updateInterval": 50000 | |||||
| }, | |||||
| "db": {} | |||||
| } | } | ||||
| } | |||||
| } | |||||
| @@ -4,9 +4,9 @@ | |||||
| <button type="button" class="closeButton btn btn-outline btn-ghost" | <button type="button" class="closeButton btn btn-outline btn-ghost" | ||||
| onclick="js.part({'do':'{arguments:close}',arguments:{db: '{arguments:db}'}})">Close</button> | onclick="js.part({'do':'{arguments:close}',arguments:{db: '{arguments:db}'}})">Close</button> | ||||
| <button type="submit" class="removeButton btn btn-outline btn-secondary" | <button type="submit" class="removeButton btn btn-outline btn-secondary" | ||||
| onclick="UI.apiPost({method:'DELETE', db:{name: '{arguments:db}', id: '{arguments:fields id}', item: {arguments:fields}}})">Remove</button> | |||||
| onclick='UI.apiPost({method:"DELETE", db:"{arguments:db}", id: "{arguments:fields id}", item: {arguments:fields}})'>Remove</button> | |||||
| <button type="submit" class="saveButton btn btn-outline btn-primary" | <button type="submit" class="saveButton btn btn-outline btn-primary" | ||||
| onclick="UI.apiPost({method:'{arguments:method}', db: '{arguments:db}', id: '{arguments:fields id}', item:{arguments:fields}})">Save</button> | |||||
| onclick='UI.apiPost({method:"{arguments:method}", db: "{arguments:db}", id: "{arguments:fields id}", item:{arguments:fields}})'>Save</button> | |||||
| </div> | </div> | ||||
| <div class="fields my-[20px]"> | <div class="fields my-[20px]"> | ||||
| </div> | </div> | ||||