diff --git a/.wappler/migrations/DB/20241205001920_Mod db_signatureData to Text from String.js b/.wappler/migrations/DB/20241205001920_Mod db_signatureData to Text from String.js new file mode 100644 index 0000000..029fa8b --- /dev/null +++ b/.wappler/migrations/DB/20241205001920_Mod db_signatureData to Text from String.js @@ -0,0 +1,15 @@ + +exports.up = function(knex) { + return knex.schema + .table('da', async function (table) { + table.text('db_SignatureData').alter(); + }) + +}; + +exports.down = function(knex) { + return knex.schema + .table('da', async function (table) { + table.string('db_SignatureData', 255).alter(); + }) +}; diff --git a/.wappler/targets/Development/databases/DB.json b/.wappler/targets/Development/databases/DB.json index 26ebae5..b20dd74 100644 --- a/.wappler/targets/Development/databases/DB.json +++ b/.wappler/targets/Development/databases/DB.json @@ -9,73 +9,6 @@ "_da_old_20241029": { "db": {} }, - "da": { - "db": {}, - "columns": { - "ID": { - "db": { - "type": "increments", - "primary": true, - "unique": false, - "nullable": false - } - }, - "db_fullName": { - "db": { - "type": "text", - "primary": false, - "unique": false, - "nullable": true - } - }, - "db_licenseNumber": { - "db": { - "type": "text", - "primary": false, - "unique": false, - "nullable": true - } - }, - "db_stateIssue": { - "db": { - "type": "text", - "primary": false, - "unique": false, - "nullable": true - } - }, - "db_employeeID": { - "db": { - "type": "integer", - "primary": false, - "unique": false, - "nullable": true - } - }, - "owner": { - "db": { - "type": "text", - "primary": false, - "unique": false, - "nullable": true - } - }, - "db_SignatureData": { - "ui": { - "label": "Signature", - "help": "Base64 encoded image " - }, - "meta": [], - "db": { - "type": "string", - "maxLength": 255, - "primary": false, - "unique": false, - "nullable": true - } - } - } - }, "_tSections_old_20241031": { "db": {} }, @@ -228,6 +161,73 @@ } }, "db": {} + }, + "da": { + "db": {}, + "columns": { + "ID": { + "db": { + "type": "increments", + "primary": true, + "unique": false, + "nullable": false + } + }, + "db_fullName": { + "db": { + "type": "text", + "primary": false, + "unique": false, + "nullable": true + } + }, + "db_licenseNumber": { + "db": { + "type": "text", + "primary": false, + "unique": false, + "nullable": true + } + }, + "db_stateIssue": { + "db": { + "type": "text", + "primary": false, + "unique": false, + "nullable": true + } + }, + "db_employeeID": { + "db": { + "type": "integer", + "primary": false, + "unique": false, + "nullable": true + } + }, + "owner": { + "db": { + "type": "text", + "primary": false, + "unique": false, + "nullable": true + } + }, + "db_SignatureData": { + "ui": { + "label": "Signature", + "help": "Base64 encoded image " + }, + "meta": [], + "db": { + "type": "text", + "maxLength": 255, + "primary": false, + "unique": false, + "nullable": true + } + } + } } }, "views": {} diff --git a/app/config/routes.json b/app/config/routes.json index 374c2fd..81802f9 100644 --- a/app/config/routes.json +++ b/app/config/routes.json @@ -50,6 +50,11 @@ "path": "/buckets", "page": "buckets", "layout": "main" + }, + { + "path": "/success", + "page": "success", + "layout": "main" } ] } \ No newline at end of file diff --git a/fonts/DroidSans.ttf b/fonts/DroidSans.ttf new file mode 100644 index 0000000..efd1f8b Binary files /dev/null and b/fonts/DroidSans.ttf differ diff --git a/fonts/DroidSerif.ttf b/fonts/DroidSerif.ttf new file mode 100644 index 0000000..90cdfff Binary files /dev/null and b/fonts/DroidSerif.ttf differ diff --git a/fonts/Lato-Regular.ttf b/fonts/Lato-Regular.ttf new file mode 100644 index 0000000..04ea8ef Binary files /dev/null and b/fonts/Lato-Regular.ttf differ diff --git a/fonts/Lora-Regular.ttf b/fonts/Lora-Regular.ttf new file mode 100644 index 0000000..233ae75 Binary files /dev/null and b/fonts/Lora-Regular.ttf differ diff --git a/fonts/Montserrat-Regular.ttf b/fonts/Montserrat-Regular.ttf new file mode 100644 index 0000000..b436863 Binary files /dev/null and b/fonts/Montserrat-Regular.ttf differ diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf new file mode 100644 index 0000000..db43334 Binary files /dev/null and b/fonts/OpenSans-Regular.ttf differ diff --git a/fonts/Oswald-Regular.ttf b/fonts/Oswald-Regular.ttf new file mode 100644 index 0000000..0798e24 Binary files /dev/null and b/fonts/Oswald-Regular.ttf differ diff --git a/fonts/Raleway-Regular.ttf b/fonts/Raleway-Regular.ttf new file mode 100644 index 0000000..e570a2d Binary files /dev/null and b/fonts/Raleway-Regular.ttf differ diff --git a/fonts/Roboto-Regular.ttf b/fonts/Roboto-Regular.ttf new file mode 100644 index 0000000..8c082c8 Binary files /dev/null and b/fonts/Roboto-Regular.ttf differ diff --git a/fonts/RobotoCondensed-Regular.ttf b/fonts/RobotoCondensed-Regular.ttf new file mode 100644 index 0000000..c2304c1 Binary files /dev/null and b/fonts/RobotoCondensed-Regular.ttf differ diff --git a/fonts/Slabo27px-Regular.ttf b/fonts/Slabo27px-Regular.ttf new file mode 100644 index 0000000..4d73e09 Binary files /dev/null and b/fonts/Slabo27px-Regular.ttf differ diff --git a/fonts/SourceSansPro-Regular.ttf b/fonts/SourceSansPro-Regular.ttf new file mode 100644 index 0000000..91e9ea5 Binary files /dev/null and b/fonts/SourceSansPro-Regular.ttf differ diff --git a/public/ERTSQlite.db b/public/ERTSQlite.db index 9d03c97..affe425 100644 Binary files a/public/ERTSQlite.db and b/public/ERTSQlite.db differ diff --git a/public/dmxAppConnect/config.js b/public/dmxAppConnect/config.js index 6e50e2a..a78b474 100644 --- a/public/dmxAppConnect/config.js +++ b/public/dmxAppConnect/config.js @@ -105,6 +105,19 @@ dmx.config({ } } ] + }, + "signatureEncodeFlow": { + "meta": [ + { + "name": "signatureEncoded", + "type": "text" + }, + { + "name": "submitServerConnect", + "type": "text" + } + ], + "local": {} } } }); diff --git a/views/.wappler_folder.json b/views/.wappler_folder.json index 2e7cb11..3e8efab 100644 --- a/views/.wappler_folder.json +++ b/views/.wappler_folder.json @@ -34,5 +34,9 @@ "buckets.ejs": { "layoutPage": "main", "description": "" + }, + "success.ejs": { + "layoutPage": "main", + "description": "" } } \ No newline at end of file diff --git a/views/index0.ejs b/views/index0.ejs index 9a7fd6d..f95d65e 100644 --- a/views/index0.ejs +++ b/views/index0.ejs @@ -1,4 +1,28 @@ + diff --git a/views/success.ejs b/views/success.ejs new file mode 100644 index 0000000..3292a8c --- /dev/null +++ b/views/success.ejs @@ -0,0 +1,14 @@ + + +
+
+
+ + + +

All Done
Thank you

+

Thank you for filling out the forms. Your trainer will get with you when its your turn

+ Return home +
+
+
\ No newline at end of file