From 5946f6f76d3662015a3b0254680090c38cb04bcf Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Wed, 30 Sep 2020 18:29:01 +0100 Subject: [PATCH] [MOD] beef up models --- src/vue-poc/app.vue | 17 +- src/vue-poc/components/qd-autoheight.vue | 2 +- src/vue-poc/components/qd-search.vue | 25 +- src/vue-poc/components/vp-entitylink.vue | 2 +- src/vue-poc/components/vp-favorite.vue | 32 +- src/vue-poc/components/vp-paramform.vue | 6 +- .../data/vue-poc/entities/favorites.xml | 25 + .../{ => quodatum}/quodatum.logfile.xml | 0 .../entities/{ => quodatum}/quodatum.task.xml | 0 src/vue-poc/data/vue-poc/favorites.xml | 8 + src/vue-poc/features/about/routes2.vue | 6 +- .../features/collection/documentation.vue | 118 +--- src/vue-poc/features/collection/xqdocs.vue | 98 +++ src/vue-poc/features/components/tree2.vue | 9 +- src/vue-poc/features/edit/edit.md | 9 + src/vue-poc/features/edit/edit.xqm | 7 +- src/vue-poc/features/job/jobs.vue | 1 + src/vue-poc/features/model/entity.vue | 4 +- src/vue-poc/features/model/entity1.vue | 2 +- src/vue-poc/features/model/mimetype.vue | 109 +++ src/vue-poc/features/model/schema.vue | 109 +++ src/vue-poc/features/model/taxonomy.vue | 109 +++ src/vue-poc/features/model/xqdocs.xml | 7 - src/vue-poc/features/tasks/readme.md | 7 + src/vue-poc/features/tasks/runtask.vue | 2 + .../features/tasks/task/tx-dbimport.xq | 25 - .../features/tasks/task/tx-dbimport2.xq | 14 +- src/vue-poc/features/tasks/taskdef.xml | 12 +- src/vue-poc/features/tasks/taskhistory.vue | 3 + src/vue-poc/features/tasks/tasks.vue | 2 + src/vue-poc/features/tasks/tasks1.vue | 52 +- src/vue-poc/imp1.js | 12 + src/vue-poc/lib/dbtools.xqm | 17 +- src/vue-poc/lib/history.xqm | 3 + src/vue-poc/lib/query-a.xqm | 3 +- src/vue-poc/models.gen.xqm | 40 +- src/vue-poc/package.json | 2 +- src/vue-poc/router.js | 59 +- src/vue-poc/static/app-gen.js | 660 +++++++++++++----- src/vue-poc/static/app.html | 4 +- .../tasks/{virus.xq => corona-ukdata.xq} | 0 src/vue-poc/tasks/primes.xq | 18 +- tests/vue-poc/data/schema/dtd-default.xml | 16 + tests/vue-poc/data/schema/readme.md | 1 + 44 files changed, 1248 insertions(+), 409 deletions(-) create mode 100644 src/vue-poc/data/vue-poc/entities/favorites.xml rename src/vue-poc/data/vue-poc/entities/{ => quodatum}/quodatum.logfile.xml (100%) rename src/vue-poc/data/vue-poc/entities/{ => quodatum}/quodatum.task.xml (100%) create mode 100644 src/vue-poc/data/vue-poc/favorites.xml create mode 100644 src/vue-poc/features/collection/xqdocs.vue create mode 100644 src/vue-poc/features/model/mimetype.vue create mode 100644 src/vue-poc/features/model/schema.vue create mode 100644 src/vue-poc/features/model/taxonomy.vue delete mode 100644 src/vue-poc/features/model/xqdocs.xml delete mode 100644 src/vue-poc/features/tasks/task/tx-dbimport.xq create mode 100644 src/vue-poc/imp1.js rename src/vue-poc/tasks/{virus.xq => corona-ukdata.xq} (100%) create mode 100644 tests/vue-poc/data/schema/dtd-default.xml create mode 100644 tests/vue-poc/data/schema/readme.md diff --git a/src/vue-poc/app.vue b/src/vue-poc/app.vue index 624f0c8..6c1502a 100644 --- a/src/vue-poc/app.vue +++ b/src/vue-poc/app.vue @@ -142,13 +142,14 @@ frmfav: false, items: [ - {href: '/',text: 'Dashboard', icon: 'dashboard' }, + {href: '/',text: 'Dashboard', icon: 'home' }, { icon: 'input', text: 'Actions' , model: false, children: [ {href: '/eval',text: 'Query',icon: 'play_circle_outline'}, + {href: '/tasks',text: 'Tasks',icon: 'update'}, {href: '/edit',text: 'Edit',icon: 'mode_edit'}, {href: '/tabs',text: 'Tabs',icon: 'switch_camera'}, {href: '/validate',text: 'Validate',icon: 'playlist_add_check'}, @@ -163,8 +164,8 @@ children: [ {href: '/database', text: 'Databases',icon: 'developer_mode' }, {href: '/files', text: 'File system',icon: 'folder' }, - - {href: '/tasks',text: 'Tasks',icon: 'update'}, + {href: '/documentation', text: 'Documentation',icon: 'library_books' }, + {href: '/logdate',text: 'XML logs',icon: 'dns'}, {href: '/history/files',text: 'history',icon: 'history'} ]}, @@ -173,9 +174,11 @@ text: 'Models' , model: false, children: [ - {href: '/entity', text: 'Entities',icon: 'redeem' }, - {href: '/documentation', text: 'Documentation',icon: 'library_books' }, - {href: '/namespace', text: 'Namespaces',icon: 'label' }, + {href: '/model/entity', text: 'Entities',icon: 'redeem' }, + {href: '/model/namespace', text: 'Namespaces',icon: 'dns' }, + {href: '/model/schema', text: 'Schemas',icon: 'verified' }, + {href: '/model/taxonomy', text: 'Taxonomies',icon: 'local_offer' }, + {href: '/model/mimetype', text: 'Mimetypes',icon: 'assignment' }, ]}, { @@ -225,7 +228,7 @@ children: [ {href: '/labs/scratch',text: 'Scratch pad',icon: 'filter_frames'}, {href: '/labs/form',text: 'Forms',icon: 'subtitles' }, - {href: '/labs/timeline',text: 'Time line',icon: 'timelapse'}, + {href: '/labs/timeline',text: 'Time line',icon: 'event_note'}, {href: '/labs/svg',text: 'SVG',icon: 'extension'}, {href: '/labs/svg2',text: 'SVG2',icon: 'extension'}, {href: '/labs/tree',text: 'Tree',icon: 'nature'}, diff --git a/src/vue-poc/components/qd-autoheight.vue b/src/vue-poc/components/qd-autoheight.vue index 5b2d1dc..48d7c5d 100644 --- a/src/vue-poc/components/qd-autoheight.vue +++ b/src/vue-poc/components/qd-autoheight.vue @@ -20,7 +20,7 @@ var e=el; // console.log("top",e.offsetTop,e.getBoundingClientRect().top,window.innerHeight); var h=window.innerHeight - e.getBoundingClientRect().top -10; - var h=Math.max(1,h) ; + h=Math.max(1,h) ; // console.log("h",h) e.style.height=h +"px"; } diff --git a/src/vue-poc/components/qd-search.vue b/src/vue-poc/components/qd-search.vue index 36da6b4..95ae959 100644 --- a/src/vue-poc/components/qd-search.vue +++ b/src/vue-poc/components/qd-search.vue @@ -17,18 +17,17 @@ > @@ -51,7 +50,7 @@ this.loading = true // Simulated ajax query setTimeout(() => { - this.items2 = this.si?this.matchItems(this.si.toLowerCase()):[], + this.items2 = this.si?this.matchItems(this.si.toLowerCase()):[] this.loading = false }, 500) }, @@ -62,8 +61,8 @@ matchItems(typed){ var hits=this.titles; - var typed=typed.toLowerCase(); - hits=hits.filter(item=>item.title.indexOf(typed) !== -1) + typed=typed.toLowerCase(); + hits=hits.filter(item=>item.title.indexOf(typed) !== -1) return hits.map(r=>{return {text:r.title, value:r.path} }); diff --git a/src/vue-poc/components/vp-entitylink.vue b/src/vue-poc/components/vp-entitylink.vue index 5bb5de9..2fb3cac 100644 --- a/src/vue-poc/components/vp-entitylink.vue +++ b/src/vue-poc/components/vp-entitylink.vue @@ -3,7 +3,7 @@ show a entity link --> diff --git a/src/vue-poc/components/vp-paramform.vue b/src/vue-poc/components/vp-paramform.vue index f49e4dc..a1a1ae7 100644 --- a/src/vue-poc/components/vp-paramform.vue +++ b/src/vue-poc/components/vp-paramform.vue @@ -1,7 +1,7 @@