diff --git a/.wappler/migrations/MyDB/20250108195546_adding da_meta fields.js b/.wappler/migrations/MyDB/20250108195546_adding da_meta fields.js new file mode 100644 index 0000000..ef40fe8 --- /dev/null +++ b/.wappler/migrations/MyDB/20250108195546_adding da_meta fields.js @@ -0,0 +1,17 @@ + +exports.up = function(knex) { + return knex.schema + .table('da_meta', async function (table) { + table.integer('da_id'); + table.text('obj_dataStore'); + }) + +}; + +exports.down = function(knex) { + return knex.schema + .table('da_meta', async function (table) { + table.dropColumn('da_id'); + table.dropColumn('obj_dataStore'); + }) +}; diff --git a/.wappler/targets/Development/databases/MyDB.json b/.wappler/targets/Development/databases/MyDB.json index f4e52b0..c27b117 100644 --- a/.wappler/targets/Development/databases/MyDB.json +++ b/.wappler/targets/Development/databases/MyDB.json @@ -76,7 +76,12 @@ } } }, - "db": {} + "db": { + "engine": "InnoDB", + "schema": "db_training", + "collation": "utf8mb4_unicode_ci", + "system_versioned": false + } }, "da_meta": { "columns": { @@ -88,20 +93,22 @@ } }, "da_id": { - "db_edits": { + "db": { "type": "integer", - "name": "da_id", - "maxLength": "" - }, - "status": { - "new": true + "primary": false, + "nullable": true + } + }, + "obj_dataStore": { + "db": { + "type": "text", + "maxLength": 65535, + "primary": false, + "nullable": true } } }, - "db": {}, - "status": { - "children_modified": true - } + "db": {} } }, "views": {}, diff --git a/app/api/myInsertMeta.json b/app/api/myInsertMeta.json index 6c0fe3a..a4771ca 100644 --- a/app/api/myInsertMeta.json +++ b/app/api/myInsertMeta.json @@ -2,11 +2,9 @@ "meta": { "$_GET": [ { - "type": "array", - "name": "arrayvalue" - } - ], - "$_POST": [ + "type": "object", + "name": "obj_datastore" + }, { "type": "text", "name": "da_id" @@ -15,7 +13,7 @@ }, "exec": { "steps": { - "name": "myinsertmeta", + "name": "insert", "module": "dbupdater", "action": "insert", "options": { @@ -26,18 +24,30 @@ { "table": "da_meta", "column": "da_id", + "type": "number", + "value": "{{$_GET.da_id}}" + }, + { + "table": "da_meta", + "column": "obj_dataStore", "type": "text", - "value": "{{$_POST.da_id}}" + "value": "{{$_GET.obj_datastore}}" } ], "table": "da_meta", "returning": "id", - "query": "insert into `da_meta` (`da_id`) values (?)", + "query": "insert into `da_meta` (`da_id`, `obj_dataStore`) values (?, ?)", "params": [ { "name": ":P1", "type": "expression", - "value": "{{$_POST.da_id}}", + "value": "{{$_GET.da_id}}", + "test": "" + }, + { + "name": ":P2", + "type": "expression", + "value": "{{$_GET.obj_datastore}}", "test": "" } ] @@ -52,8 +62,7 @@ "name": "affected", "type": "number" } - ], - "output": true + ] } } } \ No newline at end of file diff --git a/app/api/mySingleQueryByID.json b/app/api/mySingleQueryByID.json new file mode 100644 index 0000000..fb0fb0b --- /dev/null +++ b/app/api/mySingleQueryByID.json @@ -0,0 +1,11 @@ +{ + "name": "query", + "module": "dbconnector", + "action": "single", + "options": { + "connection": "MyDB" + }, + "output": true, + "meta": [], + "outputType": "object" +} \ No newline at end of file diff --git a/public/assets/images/wait-for-signature.png b/public/assets/images/wait-for-signature.png new file mode 100644 index 0000000..80be8f5 Binary files /dev/null and b/public/assets/images/wait-for-signature.png differ diff --git a/views/index0.ejs b/views/index0.ejs index 6a44ab6..961132b 100644 --- a/views/index0.ejs +++ b/views/index0.ejs @@ -474,14 +474,15 @@
-

Waiting for signature

+

Waiting for signature

- SignatureCapture + SignatureCapture

- + + diff --git a/views/observationPage.ejs b/views/observationPage.ejs index 2171756..63a14bc 100644 --- a/views/observationPage.ejs +++ b/views/observationPage.ejs @@ -1,6 +1,6 @@ - - + +
@@ -273,6 +273,7 @@
+