diff --git a/.wappler/targets/Development/databases/MyDB.json b/.wappler/targets/Development/databases/MyDB.json index 1c37ef1..e62839e 100644 --- a/.wappler/targets/Development/databases/MyDB.json +++ b/.wappler/targets/Development/databases/MyDB.json @@ -112,6 +112,22 @@ "primary": false, "nullable": true } + }, + "getStartTime": { + "db": { + "type": "text", + "primary": false, + "nullable": true, + "maxLength": 255 + } + }, + "getEndTime": { + "db": { + "type": "text", + "primary": false, + "nullable": true, + "maxLength": 255 + } } }, "db": {} diff --git a/app/api/myRecordUpdateByID.json b/app/api/myRecordUpdateByID.json index 3ff9351..cdaf897 100644 --- a/app/api/myRecordUpdateByID.json +++ b/app/api/myRecordUpdateByID.json @@ -8,6 +8,14 @@ { "type": "text", "name": "id" + }, + { + "type": "time", + "name": "getStartTime" + }, + { + "type": "time", + "name": "getEndTime" } ] }, @@ -26,6 +34,18 @@ "column": "obj_dataStore", "type": "text", "value": "{{$_POST.obj_datastore}}" + }, + { + "table": "da", + "column": "getStartTime", + "type": "text", + "value": "{{$_POST.getStartTime}}" + }, + { + "table": "da", + "column": "getEndTime", + "type": "text", + "value": "{{$_POST.getEndTime}}" } ], "table": "da", @@ -48,7 +68,7 @@ "valid": true }, "returning": "id", - "query": "update `da` set `obj_dataStore` = ? where `id` = ?", + "query": "update `da` set `obj_dataStore` = ?, `getStartTime` = ?, `getEndTime` = ? where `id` = ?", "params": [ { "name": ":P1", @@ -56,10 +76,22 @@ "value": "{{$_POST.obj_datastore}}", "test": "" }, + { + "name": ":P2", + "type": "expression", + "value": "{{$_POST.getStartTime}}", + "test": "" + }, + { + "name": ":P3", + "type": "expression", + "value": "{{$_POST.getEndTime}}", + "test": "" + }, { "operator": "equal", "type": "expression", - "name": ":P2", + "name": ":P4", "value": "{{$_POST.id}}", "test": "" } diff --git a/public/dmxAppConnect/config - Copy.js b/public/dmxAppConnect/config - Copy.js new file mode 100644 index 0000000..56ce8e4 --- /dev/null +++ b/public/dmxAppConnect/config - Copy.js @@ -0,0 +1,125 @@ +dmx.config({ + "observationPage": { + "flowFinalizeGrades": { + "meta": [ + { + "sub": [ + { + "name": "data", + "type": "object", + "sub": [ + { + "name": "MyRecordUpdate", + "type": "text", + "sub": [ + { + "name": "affected", + "type": "number" + } + ] + } + ] + }, + { + "name": "state", + "type": "object", + "sub": [ + { + "name": "executing", + "type": "boolean" + }, + { + "name": "uploading", + "type": "boolean" + }, + { + "name": "processing", + "type": "boolean" + }, + { + "name": "downloading", + "type": "boolean" + } + ] + }, + { + "name": "uploadProgress", + "type": "object", + "sub": [ + { + "name": "position", + "type": "number" + }, + { + "name": "total", + "type": "number" + }, + { + "name": "percent", + "type": "number" + } + ] + }, + { + "name": "downloadProgress", + "type": "object", + "sub": [ + { + "name": "position", + "type": "number" + }, + { + "name": "total", + "type": "number" + }, + { + "name": "percent", + "type": "number" + } + ] + }, + { + "name": "lastError", + "type": "object", + "sub": [ + { + "name": "status", + "type": "number" + }, + { + "name": "message", + "type": "text" + }, + { + "name": "response", + "type": "text" + } + ] + }, + { + "name": "status", + "type": "number" + } + ], + "name": "sc", + "type": "object" + } + ], + "local": {} + }, + "datastore1": [ + { + "type": "text", + "name": "numSection" + }, + { + "type": "text", + "name": "pointValue" + }, + { + "type": "text", + "name": "description" + } + ] + } +}); diff --git a/public/dmxAppConnect/config.js b/public/dmxAppConnect/config.js index e69de29..56ce8e4 100644 --- a/public/dmxAppConnect/config.js +++ b/public/dmxAppConnect/config.js @@ -0,0 +1,125 @@ +dmx.config({ + "observationPage": { + "flowFinalizeGrades": { + "meta": [ + { + "sub": [ + { + "name": "data", + "type": "object", + "sub": [ + { + "name": "MyRecordUpdate", + "type": "text", + "sub": [ + { + "name": "affected", + "type": "number" + } + ] + } + ] + }, + { + "name": "state", + "type": "object", + "sub": [ + { + "name": "executing", + "type": "boolean" + }, + { + "name": "uploading", + "type": "boolean" + }, + { + "name": "processing", + "type": "boolean" + }, + { + "name": "downloading", + "type": "boolean" + } + ] + }, + { + "name": "uploadProgress", + "type": "object", + "sub": [ + { + "name": "position", + "type": "number" + }, + { + "name": "total", + "type": "number" + }, + { + "name": "percent", + "type": "number" + } + ] + }, + { + "name": "downloadProgress", + "type": "object", + "sub": [ + { + "name": "position", + "type": "number" + }, + { + "name": "total", + "type": "number" + }, + { + "name": "percent", + "type": "number" + } + ] + }, + { + "name": "lastError", + "type": "object", + "sub": [ + { + "name": "status", + "type": "number" + }, + { + "name": "message", + "type": "text" + }, + { + "name": "response", + "type": "text" + } + ] + }, + { + "name": "status", + "type": "number" + } + ], + "name": "sc", + "type": "object" + } + ], + "local": {} + }, + "datastore1": [ + { + "type": "text", + "name": "numSection" + }, + { + "type": "text", + "name": "pointValue" + }, + { + "type": "text", + "name": "description" + } + ] + } +}); diff --git a/views/observationPage.ejs b/views/observationPage.ejs index e6fc601..b8d3cbd 100644 --- a/views/observationPage.ejs +++ b/views/observationPage.ejs @@ -1,4 +1,18 @@ + @@ -262,16 +276,35 @@
-
-
- +
+ + +
+ +
+ + + +
+
+ + +
+ + + +
+
+ + +
+ -

status messages: {{select1.value}}

-
+