removing CouchDB and PouchDB. PouchDB container is OFF - no SC has been removed until after commit

This commit is contained in:
Wappler 2025-01-08 16:17:58 -06:00
parent c322a87eed
commit 0066e58af1
7 changed files with 73 additions and 27 deletions

View File

@ -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');
})
};

View File

@ -76,7 +76,12 @@
} }
} }
}, },
"db": {} "db": {
"engine": "InnoDB",
"schema": "db_training",
"collation": "utf8mb4_unicode_ci",
"system_versioned": false
}
}, },
"da_meta": { "da_meta": {
"columns": { "columns": {
@ -88,20 +93,22 @@
} }
}, },
"da_id": { "da_id": {
"db_edits": { "db": {
"type": "integer", "type": "integer",
"name": "da_id", "primary": false,
"maxLength": "" "nullable": true
}, }
"status": { },
"new": true "obj_dataStore": {
"db": {
"type": "text",
"maxLength": 65535,
"primary": false,
"nullable": true
} }
} }
}, },
"db": {}, "db": {}
"status": {
"children_modified": true
}
} }
}, },
"views": {}, "views": {},

View File

@ -2,11 +2,9 @@
"meta": { "meta": {
"$_GET": [ "$_GET": [
{ {
"type": "array", "type": "object",
"name": "arrayvalue" "name": "obj_datastore"
} },
],
"$_POST": [
{ {
"type": "text", "type": "text",
"name": "da_id" "name": "da_id"
@ -15,7 +13,7 @@
}, },
"exec": { "exec": {
"steps": { "steps": {
"name": "myinsertmeta", "name": "insert",
"module": "dbupdater", "module": "dbupdater",
"action": "insert", "action": "insert",
"options": { "options": {
@ -26,18 +24,30 @@
{ {
"table": "da_meta", "table": "da_meta",
"column": "da_id", "column": "da_id",
"type": "number",
"value": "{{$_GET.da_id}}"
},
{
"table": "da_meta",
"column": "obj_dataStore",
"type": "text", "type": "text",
"value": "{{$_POST.da_id}}" "value": "{{$_GET.obj_datastore}}"
} }
], ],
"table": "da_meta", "table": "da_meta",
"returning": "id", "returning": "id",
"query": "insert into `da_meta` (`da_id`) values (?)", "query": "insert into `da_meta` (`da_id`, `obj_dataStore`) values (?, ?)",
"params": [ "params": [
{ {
"name": ":P1", "name": ":P1",
"type": "expression", "type": "expression",
"value": "{{$_POST.da_id}}", "value": "{{$_GET.da_id}}",
"test": ""
},
{
"name": ":P2",
"type": "expression",
"value": "{{$_GET.obj_datastore}}",
"test": "" "test": ""
} }
] ]
@ -52,8 +62,7 @@
"name": "affected", "name": "affected",
"type": "number" "type": "number"
} }
], ]
"output": true
} }
} }
} }

View File

@ -0,0 +1,11 @@
{
"name": "query",
"module": "dbconnector",
"action": "single",
"options": {
"connection": "MyDB"
},
"output": true,
"meta": [],
"outputType": "object"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -474,14 +474,15 @@
</div> </div>
</div> </div>
<div class="row justify-content-center border border-2"> <div class="row justify-content-center border border-2">
<h4 class="text-center">Waiting for signature</h4> <h4 class="text-center" dmx-hide="!signatureEncoded.value.isEmpty()">Waiting for signature</h4>
<div class="row justify-content-center"> <div class="row justify-content-center">
<img width="100" class="align-self-start bg-opacity-25 bg-light-subtle w-75" dmx-bind:data-srcset="" dmx-bind:data-src="pouchconnectform1.db_signatureData.value" dmx-bind:src="signatureEncoded.value" dmx-show="!pouchconnectform1.db_signatureData.value.isEmpty()" alt="SignatureCapture" height="75" id="imgSignatureDataCapture"> <img width="100" class="align-self-start bg-opacity-25 bg-light-subtle w-75" dmx-bind:data-srcset="" dmx-bind:data-src="pouchconnectform1.db_signatureData.value" dmx-bind:src="signatureEncoded.value" alt="SignatureCapture" height="75" id="imgSignatureDataCapture">
</div> </div>
</div> </div>
<p></p> <p></p>
<button id="btn1" class="btn btn-lg text-bg-primary text-warning fw-bold text-capitalize" data-bs-toggle="modal" data-bs-target="#SignatureModal1"><span style="font-weight: normal;">Sign</span></button><button id="btn5" class="btn btn-lg text-warning fw-bold text-capitalize text-bg-success ms-4" data-bs-target="#SignatureModal1" dmx-on:click="myDBSeverForm1.submit()">Save&nbsp;</button> <img width="75" height="75" src="/assets/images/icons/signature.png" loading="lazy" dmx-on:click="SignatureModal1.show()">
<button id="btn1" class="btn btn-lg text-bg-primary text-warning fw-bold text-capitalize visually-hidden" data-bs-toggle="modal" data-bs-target="#SignatureModal1"><span style="font-weight: normal;">Sign</span></button><button id="btn5" class="btn btn-lg text-warning fw-bold text-capitalize text-bg-success ms-4" data-bs-target="#SignatureModal1" dmx-on:click="myDBSeverForm1.submit()" dmx-bind:disabled="signatureEncoded.value.isEmpty()">Save&nbsp;</button>
<button id="btn6" class="btn" type="reset">reset</button> <button id="btn6" class="btn" type="reset">reset</button>
</form> </form>

View File

@ -1,6 +1,6 @@
<!-- Wappler include head-page="layouts/main" fontawesome_5="cdn" bootstrap5="local" is="dmx-app" id="observationPage" appConnect="local" components="{dmxBootstrap5TableGenerator:{},dmxMasonry:{},dmxFormatter:{},dmxBootstrap5Popovers:{},dmxBootstrap5Toasts:{},dmxDataTraversal:{},dmxStateManagement:{},dmxDatastore:{},dmxValidator:{},dmxBootstrap5Offcanvas:{},dmxBootstrap5Modal:{},dmxBootstrap5Navigation:{},dmxBootstrap5Tooltips:{},dmxBootbox5:{},dmxNotifications:{},dmxPouchDB:{},dmxBootstrap5Alert:{},dmxBootstrap5Collapse:{}}" jquery_slim_35="cdn" moment_2="cdn" --> <!-- Wappler include head-page="layouts/main" fontawesome_5="cdn" bootstrap5="local" is="dmx-app" id="observationPage" appConnect="local" components="{dmxBootstrap5TableGenerator:{},dmxMasonry:{},dmxFormatter:{},dmxBootstrap5Popovers:{},dmxBootstrap5Toasts:{},dmxDataTraversal:{},dmxStateManagement:{},dmxDatastore:{},dmxValidator:{},dmxBootstrap5Offcanvas:{},dmxBootstrap5Modal:{},dmxBootstrap5Navigation:{},dmxBootstrap5Tooltips:{},dmxBootbox5:{},dmxNotifications:{},dmxPouchDB:{},dmxBootstrap5Alert:{},dmxBootstrap5Collapse:{}}" jquery_slim_35="cdn" moment_2="cdn" -->
<dmx-serverconnect id="MyserverconnectMeta" url="/api/myInsertMeta" noload="true"></dmx-serverconnect> <dmx-serverconnect id="serverconnect2" url="/api/myInsertMeta" noload="true" dmx-param:obj_datastore="datastore1.data" dmx-param:da_id="select1.value"></dmx-serverconnect>
<dmx-array id="arr1"></dmx-array> <dmx-array id="db_observationsArray"></dmx-array>
<dmx-serverconnect id="MyserverconnectQuery" url="/api/myQuery"></dmx-serverconnect> <dmx-serverconnect id="MyserverconnectQuery" url="/api/myQuery"></dmx-serverconnect>
<div is="dmx-pouchdb-detail" id="pouchdbdetail2" dmx-bind:docid="select1.value" db="dbCouch" collection="db_training"></div> <div is="dmx-pouchdb-detail" id="pouchdbdetail2" dmx-bind:docid="select1.value" db="dbCouch" collection="db_training"></div>
<dmx-data-view id="data_view2" dmx-bind:data="datastore1.data" filter="!numSection.isEmpty()&amp;&amp;!pointValue.isEmpty()"></dmx-data-view> <dmx-data-view id="data_view2" dmx-bind:data="datastore1.data" filter="!numSection.isEmpty()&amp;&amp;!pointValue.isEmpty()"></dmx-data-view>
@ -273,6 +273,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<textarea id="text2" class="form-control" dmx-bind:value="datastore1.data.toJSON()"></textarea>
</div> </div>
</div> </div>