From 461e52d3238ce05e4777d013a33a66c864ea8704 Mon Sep 17 00:00:00 2001
From: jndaniels <jndaniels0@gmail.com>
Date: Wed, 30 Oct 2024 21:51:39 -0500
Subject: [PATCH] Migration to SQLite

---
 .../connections/{ERTdb.json => DB.json}       |   7 +-
 .../databases/{ERTdb.json => DB.json}         |   7 +-
 ERTSQlite.db                                  | Bin 16384 -> 16384 bytes
 app/api/DSremove.json                         |   3 -
 app/api/delRecord.json                        |  60 +++++++++
 app/api/insert.json                           | 116 ++++++++++++++++++
 app/api/{dbQuery.json => query.json}          |   3 +-
 .../connections/{ERTdb.json => DB.json}       |   7 +-
 public/ERTSQlite.db                           | Bin 0 -> 16384 bytes
 public/dmxAppConnect/config.js                |  44 -------
 public/trainer.json                           |  11 ++
 views/index.ejs                               | 107 +++++++++-------
 views/layouts/main.ejs                        |   1 -
 13 files changed, 263 insertions(+), 103 deletions(-)
 rename .wappler/targets/Development/app/modules/connections/{ERTdb.json => DB.json} (61%)
 rename .wappler/targets/Development/databases/{ERTdb.json => DB.json} (91%)
 delete mode 100644 app/api/DSremove.json
 create mode 100644 app/api/delRecord.json
 create mode 100644 app/api/insert.json
 rename app/api/{dbQuery.json => query.json} (95%)
 rename app/modules/connections/{ERTdb.json => DB.json} (61%)
 create mode 100644 public/ERTSQlite.db
 create mode 100644 public/trainer.json

diff --git a/.wappler/targets/Development/app/modules/connections/ERTdb.json b/.wappler/targets/Development/app/modules/connections/DB.json
similarity index 61%
rename from .wappler/targets/Development/app/modules/connections/ERTdb.json
rename to .wappler/targets/Development/app/modules/connections/DB.json
index 6afbb54..ceb67ac 100644
--- a/.wappler/targets/Development/app/modules/connections/ERTdb.json
+++ b/.wappler/targets/Development/app/modules/connections/DB.json
@@ -1,13 +1,12 @@
 {
-  "name": "ERTdb",
+  "name": "DB",
   "module": "dbconnector",
   "action": "connect",
   "options": {
     "client": "sqlite3",
     "connection": {
-      "filename": "/ERTSQlite.db"
+      "filename": "/public/ERTSQlite.db"
     },
     "tz": "utc"
-  },
-  "fileName": "ERTdb.json"
+  }
 }
\ No newline at end of file
diff --git a/.wappler/targets/Development/databases/ERTdb.json b/.wappler/targets/Development/databases/DB.json
similarity index 91%
rename from .wappler/targets/Development/databases/ERTdb.json
rename to .wappler/targets/Development/databases/DB.json
index 16fb2ed..a60288a 100644
--- a/.wappler/targets/Development/databases/ERTdb.json
+++ b/.wappler/targets/Development/databases/DB.json
@@ -1,17 +1,20 @@
 {
   "type": "sqlite3",
   "connection": {
-    "filename": "/ERTSQlite.db"
+    "filename": "/public/ERTSQlite.db"
   },
   "direct": true,
   "schema": {
     "tables": {
+      "_da_old_20241029": {
+        "db": {}
+      },
       "da": {
         "db": {},
         "columns": {
           "ID": {
             "db": {
-              "type": "integer",
+              "type": "increments",
               "primary": true,
               "unique": false,
               "nullable": false
diff --git a/ERTSQlite.db b/ERTSQlite.db
index 839dbe593d426381eeb46c50a19e8564f8ab1427..954eec78c25004987d39dc69ed34c9b77e794260 100644
GIT binary patch
delta 67
zcmZo@U~Fh$oFL7}GEv5vk!54T5_vX8{-+H5Pd5t++~${-WMpR$l@w$W^-4`kGc+;=
TqL2u+sUY4agTMUDoGFO_S1=L-

delta 33
pcmZo@U~Fh$oFL7}JW<A(k$Gdn68X(60!#v%*$lq(GjpUQ0sx<C2@(JR

diff --git a/app/api/DSremove.json b/app/api/DSremove.json
deleted file mode 100644
index 18cca0a..0000000
--- a/app/api/DSremove.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exec": {}
-}
\ No newline at end of file
diff --git a/app/api/delRecord.json b/app/api/delRecord.json
new file mode 100644
index 0000000..9c25c84
--- /dev/null
+++ b/app/api/delRecord.json
@@ -0,0 +1,60 @@
+{
+  "meta": {
+    "$_POST": [
+      {
+        "type": "text",
+        "name": "deleteid"
+      }
+    ]
+  },
+  "exec": {
+    "steps": {
+      "name": "delete",
+      "module": "dbupdater",
+      "action": "delete",
+      "options": {
+        "connection": "DB",
+        "sql": {
+          "type": "delete",
+          "table": "da",
+          "wheres": {
+            "condition": "AND",
+            "rules": [
+              {
+                "id": "ID",
+                "field": "ID",
+                "type": "double",
+                "operator": "equal",
+                "value": "{{$_POST.deleteid}}",
+                "data": {
+                  "column": "ID"
+                },
+                "operation": "="
+              }
+            ],
+            "conditional": null,
+            "valid": true
+          },
+          "returning": "ID",
+          "query": "delete from `da` where `ID` = ?",
+          "params": [
+            {
+              "operator": "equal",
+              "type": "expression",
+              "name": ":P1",
+              "value": "{{$_POST.deleteid}}",
+              "test": ""
+            }
+          ]
+        }
+      },
+      "meta": [
+        {
+          "name": "affected",
+          "type": "number"
+        }
+      ],
+      "output": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/api/insert.json b/app/api/insert.json
new file mode 100644
index 0000000..574aef4
--- /dev/null
+++ b/app/api/insert.json
@@ -0,0 +1,116 @@
+{
+  "meta": {
+    "$_POST": [
+      {
+        "type": "text",
+        "name": "db_fullName"
+      },
+      {
+        "type": "text",
+        "name": "db_licenseNumber"
+      },
+      {
+        "type": "text",
+        "name": "db_stateIssue"
+      },
+      {
+        "type": "number",
+        "name": "db_employeeID"
+      },
+      {
+        "type": "text",
+        "name": "owner"
+      }
+    ]
+  },
+  "exec": {
+    "steps": {
+      "name": "insert",
+      "module": "dbupdater",
+      "action": "insert",
+      "options": {
+        "connection": "DB",
+        "sql": {
+          "type": "insert",
+          "values": [
+            {
+              "table": "da",
+              "column": "db_fullName",
+              "type": "text",
+              "value": "{{$_POST.db_fullName}}"
+            },
+            {
+              "table": "da",
+              "column": "db_licenseNumber",
+              "type": "text",
+              "value": "{{$_POST.db_licenseNumber}}"
+            },
+            {
+              "table": "da",
+              "column": "db_stateIssue",
+              "type": "text",
+              "value": "{{$_POST.db_stateIssue}}"
+            },
+            {
+              "table": "da",
+              "column": "db_employeeID",
+              "type": "number",
+              "value": "{{$_POST.db_employeeID}}"
+            },
+            {
+              "table": "da",
+              "column": "owner",
+              "type": "text",
+              "value": "{{$_POST.owner}}"
+            }
+          ],
+          "table": "da",
+          "returning": "ID",
+          "query": "insert into `da` (`db_employeeID`, `db_fullName`, `db_licenseNumber`, `db_stateIssue`, `owner`) values (?, ?, ?, ?, ?) returning `ID`",
+          "params": [
+            {
+              "name": ":P1",
+              "type": "expression",
+              "value": "{{$_POST.db_fullName}}",
+              "test": ""
+            },
+            {
+              "name": ":P2",
+              "type": "expression",
+              "value": "{{$_POST.db_licenseNumber}}",
+              "test": ""
+            },
+            {
+              "name": ":P3",
+              "type": "expression",
+              "value": "{{$_POST.db_stateIssue}}",
+              "test": ""
+            },
+            {
+              "name": ":P4",
+              "type": "expression",
+              "value": "{{$_POST.db_employeeID}}",
+              "test": ""
+            },
+            {
+              "name": ":P5",
+              "type": "expression",
+              "value": "{{$_POST.owner}}",
+              "test": ""
+            }
+          ]
+        }
+      },
+      "meta": [
+        {
+          "name": "identity",
+          "type": "text"
+        },
+        {
+          "name": "affected",
+          "type": "number"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/api/dbQuery.json b/app/api/query.json
similarity index 95%
rename from app/api/dbQuery.json
rename to app/api/query.json
index e53ce8d..aa728d8 100644
--- a/app/api/dbQuery.json
+++ b/app/api/query.json
@@ -17,7 +17,7 @@
       "module": "dbconnector",
       "action": "select",
       "options": {
-        "connection": "ERTdb",
+        "connection": "DB",
         "sql": {
           "type": "select",
           "columns": [],
@@ -27,7 +27,6 @@
           },
           "primary": "ID",
           "joins": [],
-          "orders": [],
           "query": "select * from `da`"
         }
       },
diff --git a/app/modules/connections/ERTdb.json b/app/modules/connections/DB.json
similarity index 61%
rename from app/modules/connections/ERTdb.json
rename to app/modules/connections/DB.json
index 6afbb54..ceb67ac 100644
--- a/app/modules/connections/ERTdb.json
+++ b/app/modules/connections/DB.json
@@ -1,13 +1,12 @@
 {
-  "name": "ERTdb",
+  "name": "DB",
   "module": "dbconnector",
   "action": "connect",
   "options": {
     "client": "sqlite3",
     "connection": {
-      "filename": "/ERTSQlite.db"
+      "filename": "/public/ERTSQlite.db"
     },
     "tz": "utc"
-  },
-  "fileName": "ERTdb.json"
+  }
 }
\ No newline at end of file
diff --git a/public/ERTSQlite.db b/public/ERTSQlite.db
new file mode 100644
index 0000000000000000000000000000000000000000..b55d7c672837dd1268d6cd01175c684404333fd7
GIT binary patch
literal 16384
zcmeI1KTH!*9LL{rgo`A1<uHU02Vc&AkWz$#C?rO!oLVde%8`JB&B47Il4}d}8vhI?
zgu&It!Ijn3mDR8sH@(HUx|%o{@7ni+(t!yb$oI9E`@DDeyZ8NlI$gT7nA->hFIBh8
zZotP`4^tF&mvhFLh>p(apb>NHT%ijmoCO=%-qWKSRQ(%Es75L}VZZ<kzyJ)u01UtY
z48Q;kzyJ)Ku7L%$t3R1kRs(m<7qu-vde1A?#8zEY*4w9@_X~E$vAL7Em$P}>y@M6E
zEQX`Xp`E1;t=}}2U9<5_&-GmOSf%B;79Z5RIk&Pi7SHA#`=MRn`FV%umvcG3P{__@
z3ak9Fy~;Do&U`i>mCxCEXSh-0trbgk-_J+;S=_N#j+Xt6by2B_e7(FTwk;lr7r|jk
zEpP*ot<~!7MWVdvS6>Rz5~W#GeO`&567QgQ5AD2CwEk2|*}c~2s_41Js_zxkqv?sU
z(ezaNyyJMs?UzsL|1k3Z?y|9QtNg+E_Zf<skKfIsmwpTwfB_hQ0T_S*7=Qs7fB_hQ
z0T_URGi*RN9<W~hfF-^po+hS@dE>S*VI&R97%+MaP5-0+(tqkd^soA7{ou4eXILv*
zg8>+T0T_S*7=Qs7fB_hQfq!N|o7S4o)}{z<5!@u0B)CB^K`>5`CKw|aCAdy7LXeVR
ztgv&9?X{#_NjziU8!L%T_K9Gh;3L5Yf<1!w1aAr65WFU+6Ziz{1WyPS2_6yLA($jc
z5nLv?K+sDd`#OKrS99f(sj({;P1T$gr4pZUD;vVEjitw%UuQ+B?9a|<JyaGlnKfiG
zYsh5QkjbnelUYM1vxZD&4VlauGMP1GGHXccJLO)QDj{m2dGmmxvAzMbqc6@%0k6J`
tXYv34O5!(*z8Ek7126ysFaQHE00S@p126ysFaQH*%s`i-nu_O6{{`lq3_}0_

literal 0
HcmV?d00001

diff --git a/public/dmxAppConnect/config.js b/public/dmxAppConnect/config.js
index d9cf58b..e69de29 100644
--- a/public/dmxAppConnect/config.js
+++ b/public/dmxAppConnect/config.js
@@ -1,44 +0,0 @@
-dmx.config({
-  "main": {
-    "datastore1": [
-      {
-        "type": "boolean",
-        "name": "dirty"
-      }
-    ]
-  },
-  "index": {
-    "datastore1": [
-      {
-        "type": "text",
-        "name": "da_fullName"
-      },
-      {
-        "type": "text",
-        "name": "da_driverLicense"
-      },
-      {
-        "type": "text",
-        "name": "da_driverLicenseState"
-      }
-    ],
-    "dataID": {
-      "outputType": "text"
-    },
-    "DSflow1": {
-      "meta": {},
-      "local": [
-        {
-          "name": "DSConfirm",
-          "type": "boolean",
-          "metaData": {
-            "confirmMessage": {
-              "meta": null,
-              "outputType": "text"
-            }
-          }
-        }
-      ]
-    }
-  }
-});
diff --git a/public/trainer.json b/public/trainer.json
new file mode 100644
index 0000000..c05e49e
--- /dev/null
+++ b/public/trainer.json
@@ -0,0 +1,11 @@
+{
+    "Trainer": {
+        "Jeff": {},
+        "Amy": {},
+        "Justin": {},
+        "Teresa": {},
+        "Angie": {},
+        "Valerie": {},
+        "Pree": {}
+    }
+}
\ No newline at end of file
diff --git a/views/index.ejs b/views/index.ejs
index 6af5530..63dfa1b 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1,5 +1,7 @@
 <!-- Wappler include head-page="layouts/main" fontawesome_5="cdn" bootstrap5="local" is="dmx-app" id="index" appConnect="local" components="{dmxBootstrap5Navigation:{},dmxAnimateCSS:{},dmxStateManagement:{},dmxDatastore:{},dmxBootstrap5Modal:{},dmxFormatter:{},dmxBootstrap5TableGenerator:{},dmxBootstrap5Toasts:{}}" -->
-<dmx-serverconnect id="DBSC1" url="/api/dbQuery"></dmx-serverconnect>
+<dmx-serverconnect id="DBInsert" url="/api/insert" noload="true"></dmx-serverconnect>
+<div is="dmx-bs5-toasts" id="toasts1"></div>
+<dmx-serverconnect id="DBSC1" url="/api/query"></dmx-serverconnect>
 <script is="dmx-flow" id="DSflow1" type="text/dmx-flow">{
   confirm: {
     name: "DSConfirm",
@@ -14,7 +16,7 @@
 }</script>
 <dmx-value id="dataID"></dmx-value>
 <dmx-json-datasource id="stateJSON" is="dmx-serverconnect" url="/states.json"></dmx-json-datasource>
-<dmx-datastore id="datastore1"></dmx-datastore>
+<dmx-json-datasource id="trainerJSON" is="dmx-serverconnect" url="/trainer.json"></dmx-json-datasource>
 <div class="modal" id="modal1" is="dmx-bs5-modal" tabindex="-1">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -24,33 +26,45 @@
             </div>
             <div class="modal-body">
                 <div class="container">
-                    <form id="form1">
+                    <form is="dmx-serverconnect-form" id="serverconnectform1" method="post" action="/api/insert" dmx-generator="bootstrap5" dmx-form-type="horizontal" dmx-on:done="modal1.hide()">
                         <div class="form-group mb-3 row">
-                            <label for="input1" class="col-sm-2 col-form-label">Full Name</label>
+                            <label for="inp_db_fullName" class="col-sm-2 col-form-label">full name</label>
                             <div class="col-sm-10">
-                                <input type="text" class="form-control" id="input1" name="input1" aria-describedby="input1_help">
-                                <small id="input1_help" class="form-text text-muted">*Enter your full name</small>
+                                <input type="text" class="form-control" id="inp_db_fullName" name="db_fullName" aria-describedby="inp_db_fullName_help" placeholder="Enter Db full name">
                             </div>
                         </div>
                         <div class="form-group mb-3 row">
-                            <label for="input2" class="col-sm-2 col-form-label">License no.</label>
+                            <label for="inp_db_licenseNumber" class="col-sm-2 col-form-label">license number</label>
                             <div class="col-sm-10">
-                                <input type="text" class="form-control" id="input2" name="input2" aria-describedby="input1_help">
-                                <small id="input1_help1" class="form-text text-muted">*Enter your driver license number</small>
+                                <input type="text" class="form-control" id="inp_db_licenseNumber" name="db_licenseNumber" aria-describedby="inp_db_licenseNumber_help" placeholder="Enter Db license number">
                             </div>
                         </div>
                         <div class="form-group mb-3 row">
-                            <label for="input3" class="col-sm-2 col-form-label">License State</label>
-                            <div class="col">
-                                <div class="form-group mb-3">
-                                    <label for="input3" class="form-label">Select</label>
-                                    <select id="input3" class="form-select" dmx-bind:options="stateJSON.data.states" optiontext="name" optionvalue="abbreviation">
-                                        <option value="1">Option One</option>
-                                        <option value="2">Option Two</option>
-                                        <option value="3">Option Three</option>
-                                    </select>
-                                    <small id="select1Help" class="form-text text-muted">Pick the state your License is issued from</small>
-                                </div>
+                            <label for="inp_db_stateIssue" class="col-sm-2 col-form-label">state issue</label>
+                            <div class="col-sm-10">
+                                <select id="select1" class="form-select" dmx-bind:options="stateJSON.data.states" optiontext="name" optionvalue="abbreviation">
+                                    <option value="1">Option One</option>
+                                    <option value="2">Option Two</option>
+                                    <option value="3">Option Three</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group mb-3 row">
+                            <label for="inp_db_employeeID" class="col-sm-2 col-form-label">Trainer</label>
+                            <div class="col-sm-10">
+                                <input type="number" class="form-control" id="inp_db_employeeID" name="db_employeeID" aria-describedby="inp_db_employeeID_help" placeholder="Enter Db employee">
+                            </div>
+                        </div>
+                        <div class="form-group mb-3 row">
+                            <label for="inp_owner" class="col-sm-2 col-form-label">Owner</label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control" id="inp_owner" name="owner" aria-describedby="inp_owner_help" placeholder="Enter Owner">
+                            </div>
+                        </div>
+                        <div class="form-group mb-3 row">
+                            <div class="col-sm-2">&nbsp;</div>
+                            <div class="col-sm-10">
+                                <button type="submit" class="btn btn-primary" dmx-bind:disabled="state.executing">Save <span class="spinner-border spinner-border-sm" role="status" dmx-show="state.executing"></span></button>
                             </div>
                         </div>
                     </form>
@@ -59,7 +73,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-primary" dmx-on:click="datastore1.insert({da_fullName: form1.input1.value, da_driverLicense: form1.input2.value, da_driverLicenseState: form1.input3.selectedValue})">Save changes</button>
+                <button type="button" class="btn btn-primary" data-bs-toggle="button">Save changes</button>
             </div>
         </div>
     </div>
@@ -78,30 +92,37 @@
         </div>
     </div>
     <div class="row" dmx-hide="datastore1.data.isEmpty()">
-        <table class="table table-striped table-sm">
-            <thead>
-                <tr>
-                    <th>$id</th>
-                    <th>Da full name</th>
-                    <th>Da driver license</th>
-                    <th dmx-on:click="datastore1.clear()">Da driver license state</th>
-                </tr>
-            </thead>
-            <tbody is="dmx-repeat" dmx-generator="bs5table" dmx-bind:repeat="datastore1.data" id="tableRepeat1">
-                <tr>
-                    <td>
-                        <button id="btn3" class="btn btn-sm btn-warning" dmx-bind:value="$id" dmx-on:click="datastore1.delete({$id: $id})" data-bs-toggle="button">{{$id}}</button>
-
-                    </td>
-                    <td dmx-text="da_fullName"></td>
-                    <td dmx-text="da_driverLicense"></td>
-                    <td dmx-text="da_driverLicenseState"></td>
-                </tr>
-            </tbody>
-        </table>
     </div>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Id</th>
+                <th>Db full name</th>
+                <th>Db license number</th>
+                <th>Db state issue</th>
+                <th>Db employee</th>
+                <th>Owner</th>
+            </tr>
+        </thead>
+        <tbody is="dmx-repeat" dmx-generator="bs5table" dmx-bind:repeat="DBSC1.data.query" id="tableRepeat1">
+            <tr>
+                <td>
+                    <form id="IDAction" action="/api/delRecord" method="post" is="dmx-serverconnect-form" dmx-on:success="DBSC1.load({})">
+                        <input id="deleteid" name="deleteid" type="hidden" class="form-control" dmx-bind:value="ID">
+                        <button id="btn3" class="btn btn-sm btn-warning" dmx-text="ID" type="submit" dmx-on:click="btn3.setValue(ID)">Button</button>
+                    </form>
+
+                </td>
+                <td dmx-text="db_fullName"></td>
+                <td dmx-text="db_licenseNumber"></td>
+                <td dmx-text="db_stateIssue"></td>
+                <td dmx-text="db_employeeID"></td>
+                <td dmx-text="owner"></td>
+            </tr>
+        </tbody>
+    </table>
     <div class="row">
-        <h3 dmx-show="datastore1.data.isEmpty()">No Records</h3>
+        <h3>{{DBSC1.data.query.count()+" Records"}}</h3>
     </div>
 </div>
 
diff --git a/views/layouts/main.ejs b/views/layouts/main.ejs
index 049b684..eb6f747 100644
--- a/views/layouts/main.ejs
+++ b/views/layouts/main.ejs
@@ -24,7 +24,6 @@
 </head>
 
 <body is="dmx-app" id="main">
-  <dmx-datastore id="datastore1"></dmx-datastore>
   <div class="container">
     <nav class="navbar navbar-expand-lg">
       <div class="navbar-nav w-100">