diff --git a/app.js b/app.js index c97cef5..e242e62 100644 --- a/app.js +++ b/app.js @@ -41,9 +41,11 @@ var UI = { apiPost: function (args) { if (!args.db) { console.log('apiPost requires db parameter'); } let methodName = this.apiMethodName(args); - + + let item = js.replaceProperties('{formDataToJson:.form'+args.db+'}'); + console.log(item); //window.args = args; - window[methodName](args.item) + window[methodName](item) .then(function (data) { console.log('apiCall success'); let result = JSON.stringify(data, null, 2); diff --git a/app.json b/app.json index 5f2b715..2194b53 100644 --- a/app.json +++ b/app.json @@ -1,20 +1,5 @@ { "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": { "id": "", "name": "", @@ -650,7 +635,7 @@ "rl:getDb": { "template": "{var db}", "db": "{var db}", - "serverMethod": "{data settings serverMethod}", + "serverMethod": "GET", "localDb": "{data settings localDb}", "localPath": "{data settings localPath}", "token": "{data user token}" @@ -712,7 +697,7 @@ "rl:getDb": { "template": "{arguments:page}", "db": "{arguments:db}", - "serverMethod": "{data settings serverMethod}", + "serverMethod": "GET", "localDb": "{data settings localDb}", "localPath": "{data settings localPath}", "token": "{data user token}" @@ -734,6 +719,24 @@ { "log": "{arguments:data}" }, + { + "if": { + "is": "{arguments:data detail 0}", + "then": [ + { + "log": "apiPostCallback error" + }, + { + "alert": "arguments:data detail 0 msg" + } + ], + "else": [ + { + "log": "apiPostCallback success" + } + ] + } + }, { "apiGet": { "db": "{arguments:db}", @@ -949,7 +952,7 @@ } }, { - "setInterval": { + "setInterval2": { "name": "update", "duration": 5000, "do": [ diff --git a/assets/.DS_Store b/assets/.DS_Store new file mode 100644 index 0000000..1905505 Binary files /dev/null and b/assets/.DS_Store differ diff --git a/assets/api/reslevis.api-1.0.5.json b/assets/api/reslevis.api-1.0.5.json index c47a1e2..945093c 100644 --- a/assets/api/reslevis.api-1.0.5.json +++ b/assets/api/reslevis.api-1.0.5.json @@ -1912,6 +1912,22 @@ "type": "number", "description": "Y" }, + "battery": { + "type": "string", + "description": "Battery" + }, + "temperature": { + "type": "string", + "description": "Battery" + }, + "acceleration": { + "type": "string", + "description": "Battery" + }, + "heartRate": { + "type": "string", + "description": "Battery" + }, "building": { "type": "string", "description": "Building", diff --git a/assets/modules/reslevis.data.json b/assets/modules/reslevis.data.json index 777b063..25f9255 100644 --- a/assets/modules/reslevis.data.json +++ b/assets/modules/reslevis.data.json @@ -1,7 +1,19 @@ { "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": {} } -} - +} \ No newline at end of file diff --git a/assets/templates/Post.html b/assets/templates/Post.html index 68265f8..d20d32f 100644 --- a/assets/templates/Post.html +++ b/assets/templates/Post.html @@ -4,9 +4,9 @@ + onclick='UI.apiPost({method:"DELETE", db:"{arguments:db}", id: "{arguments:fields id}", item: {arguments:fields}})'>Remove + onclick='UI.apiPost({method:"{arguments:method}", db: "{arguments:db}", id: "{arguments:fields id}", item:{arguments:fields}})'>Save