diff --git a/src/vue-poc/features/adminlog/logs.vue b/src/vue-poc/features/adminlog/logs.vue
index 8e31209..591315b 100644
--- a/src/vue-poc/features/adminlog/logs.vue
+++ b/src/vue-poc/features/adminlog/logs.vue
@@ -2,7 +2,7 @@
-
+
{
this.elapsed=Math.floor(performance.now() - this.start);
this.result=r.data.result
diff --git a/src/vue-poc/features/home.vue b/src/vue-poc/features/home.vue
index 089e422..802987e 100644
--- a/src/vue-poc/features/home.vue
+++ b/src/vue-poc/features/home.vue
@@ -1,7 +1,7 @@
+ height="200px" class="pa-5 indigo">
VUE-POC
v0.0.2
diff --git a/src/vue-poc/features/images/image.vue b/src/vue-poc/features/images/image.vue
index 507a872..1bbefac 100644
--- a/src/vue-poc/features/images/image.vue
+++ b/src/vue-poc/features/images/image.vue
@@ -5,11 +5,23 @@
-->
- Image: {{id}}
+ Image: {{ id }}
+ doc {{ image && image.doc }}
diff --git a/src/vue-poc/features/images/images.vue b/src/vue-poc/features/images/images.vue
index 31252ba..1ebd533 100644
--- a/src/vue-poc/features/images/images.vue
+++ b/src/vue-poc/features/images/images.vue
@@ -6,42 +6,90 @@
-
-
-
+
+
+
+
+
+ Set filter...
+
+ close
+
+
+
+
-
-
+
- Cancel
- Save
+ Cancel
+ Save
-
- Clear
-
- next
- {{query.page}}
- back
+
+
+
+
+
+
+ Apply
+
+
+
+ clear
+
+
+
+
+ Page:{{ query.page+1 }}
+
+ arrow_back
+
+
+ arrow_forward
+
+
+
{{selitem.name}}
- highlight_off
+ highlight_off
blah blah
@@ -91,7 +139,9 @@
keyword:null
},
modal:false, // showing datepicker
-
+ showFilter:false,
+ busy:false,
+ menu2:false,
keywords:[],
showInfo:false,
selitem:"TODO"
@@ -101,14 +151,17 @@
return "data:image/jpeg;base64,"+item.data
},
getImages(){
+ this.busy=true
HTTP.get("images/list",{params:this.query})
.then(r=>{
+ this.busy=false
this.images=r.data.items
})
},
clear(){
this.query.from=null;
this.query.keyword=null;
+ this.query.page=0;
},
selected(image){
this.selitem=image;
@@ -119,6 +172,12 @@
}
},
+ computed:{
+ qtext(){
+ var k=this.query.keyword,f=this.query.from
+ return (k?" keyword:'"+k+"'":"")+ (f?" from:" + f:"")
+ }
+ },
watch:{
"query":{
handler:function(v){
diff --git a/src/vue-poc/features/images/images.xqm b/src/vue-poc/features/images/images.xqm
index d184afb..8e1037c 100644
--- a/src/vue-poc/features/images/images.xqm
+++ b/src/vue-poc/features/images/images.xqm
@@ -8,8 +8,29 @@ import module namespace fw="quodatum:file.walker";
import module namespace entity = 'quodatum.models.generated' at "../../models.gen.xqm";
declare namespace c="http://www.w3.org/ns/xproc-step";
-declare variable $vue-api:PICS:="c:\tmp\";
+declare variable $vue-api:IMAGEDIR:="P:/pictures/";
+declare variable $vue-api:THUMBDIR:="C:/tmp/";
+(:
+declare variable $vue-api:IMAGEDIR:="/mnt/sda1/pictures/";
+declare variable $vue-api:THUMBDIR:="/mnt/sda1/pictures/thumbs/";
+:)
+declare variable $vue-api:entity:=$entity:list("thumbnail");
+(:~
+ : do a thumbnail
+ :)
+declare
+%rest:GET %rest:path("/vue-poc/api/images/list/{ $id }")
+%rest:produces("application/json")
+%output:method("json")
+function vue-api:id( $id as xs:integer)
+{
+ let $image:=db:open-id("vue-poc",$id)
+ return
+ { serialize($image) }
+ { vue-api:get-image($image) }
+
+};
(:~
: do a thumbnail
:)
@@ -27,8 +48,7 @@ $keyword
{
let $a:=trace(($from,$keyword),"----------")
let $rowsPerPage:=24
- let $entity:=$entity:list("thumbnail")
- let $images:=$entity("data")()
+ let $images:=$vue-api:entity("data")()
let $images:=if($from)then $images[datetaken ge $from] else $images
let $images:=if($keyword)then $images[keywords/keyword = $keyword] else $images
let $images:=subsequence($images,1+$rowsPerPage*$page,$rowsPerPage)
@@ -37,7 +57,7 @@ $keyword
{
for $f in $images
return <_ type="object">
- {vue-api:get-image($f,$entity)}
+ {vue-api:get-image($f)}
}
@@ -63,14 +83,15 @@ return
};
-declare function vue-api:get-image($image as element(image),$entity)
+(:~ fields for image for json :)
+declare function vue-api:get-image($image as element(image))
as element(*)*
{
-let $id:=$entity?access?id($image)
-let $path:=$entity?access?path($image)
-let $name:=$entity?access?name($image)
-let $thumb:= $vue-api:PICS || $path
-let $thumb:=if(file:exists($thumb)) then $thumb else "C:\tmp\art.jpg"
+let $id:=$vue-api:entity?access?id($image)
+let $path:=$vue-api:entity?access?path($image)
+let $name:=$vue-api:entity?access?name($image)
+let $thumb:= $vue-api:THUMBDIR || $path
+let $thumb:=if(file:exists($thumb)) then $thumb else $vue-api:THUMBDIR || "missing.jpg"
return ( {$id}
,{$name}
,{fetch:binary($thumb)}
diff --git a/src/vue-poc/features/job/jobs.vue b/src/vue-poc/features/job/jobs.vue
index 93b54ce..c9d0805 100644
--- a/src/vue-poc/features/job/jobs.vue
+++ b/src/vue-poc/features/job/jobs.vue
@@ -1,7 +1,7 @@
-
+
- Simple performance measure. Read or increment a database value.
- Counter:{{counter}}
+
+
+ Simple performance measure
+
+ Reset
+
+
+ Read or increment a database value.
+ Counter:{{counter}}
- Reset
+
+
+
diff --git a/src/vue-poc/lib/vue-compile/vue-compile.xqm b/src/vue-poc/lib/vue-compile/vue-compile.xqm
index 5eb854c..e410ee9 100644
--- a/src/vue-poc/lib/vue-compile/vue-compile.xqm
+++ b/src/vue-poc/lib/vue-compile/vue-compile.xqm
@@ -70,7 +70,7 @@ declare function vue:capitalize-first
:)
declare function vue:compile($proj as xs:string)
{
-let $FEATURES:="features/"=>file:resolve-path($proj)
+let $FEATURES:="features/"=>file:resolve-path($proj=>trace("proj:"))
let $COMPONENTS:="components/"=>file:resolve-path($proj)
let $CORE:="components/core.js"=>file:resolve-path($proj)
let $FILTERS:="components/filters.js"=>file:resolve-path($proj)
diff --git a/src/vue-poc/models.gen.xqm b/src/vue-poc/models.gen.xqm
index 9d0bc2f..6583be9 100644
--- a/src/vue-poc/models.gen.xqm
+++ b/src/vue-poc/models.gen.xqm
@@ -1,5 +1,5 @@
(: entity access maps
- : auto generated from xml files in entities folder at: 2017-08-09T10:36:00.509+01:00
+ : auto generated from xml files in entities folder at: 2017-08-09T12:18:41.183+01:00
:)
module namespace entity = 'quodatum.models.generated';
diff --git a/src/vue-poc/static/app-gen.js b/src/vue-poc/static/app-gen.js
index 79b60ff..aba6293 100644
--- a/src/vue-poc/static/app-gen.js
+++ b/src/vue-poc/static/app-gen.js
@@ -1,4 +1,4 @@
-// generated 2017-08-09T10:37:44.029+01:00
+// generated 2017-08-13T11:45:59.085+01:00
Vue.component('qd-link',{template:`
{{href}}link
`,
@@ -145,7 +145,7 @@ Vue.filter('round', function(value, decimals) {
}
);
- const About=Vue.extend({template:`
+ const About=Vue.extend({template:`
VUE-POC
v0.0.2
@@ -170,7 +170,7 @@ v0.0.2
const Log=Vue.extend({template:`
-
+
refresh
@@ -788,10 +788,9 @@ v0.0.2
},
run(){
- var data={xq:this.xq}
this.showError=this.show=false
this.start = performance.now();
- HTTP.post("eval/execute",Qs.stringify(data))
+ HTTP.post("eval/execute",Qs.stringify({xq:this.xq}))
.then(r=>{
this.elapsed=Math.floor(performance.now() - this.start);
this.result=r.data.result
@@ -857,7 +856,7 @@ v0.0.2