Holger Knublauch

Log pages progress

...@@ -32,8 +32,7 @@ loggingspin:Overview ...@@ -32,8 +32,7 @@ loggingspin:Overview
32 ] [ sp:varName "onBehalfOf"^^xsd:string 32 ] [ sp:varName "onBehalfOf"^^xsd:string
33 ] [ sp:varName "outcome"^^xsd:string 33 ] [ sp:varName "outcome"^^xsd:string
34 ]) ; 34 ]) ;
35 - sp:where ([ rdf:type sp:NamedGraph ; 35 + sp:where ([ sp:object
36 - sp:elements ([ sp:object
37 [ sp:varName "created"^^xsd:string 36 [ sp:varName "created"^^xsd:string
38 ] ; 37 ] ;
39 sp:predicate <http://purl.org/dc/terms/created> ; 38 sp:predicate <http://purl.org/dc/terms/created> ;
...@@ -77,7 +76,5 @@ loggingspin:Overview ...@@ -77,7 +76,5 @@ loggingspin:Overview
77 sp:variable 76 sp:variable
78 [ sp:varName "type"^^xsd:string 77 [ sp:varName "type"^^xsd:string
79 ] 78 ]
80 - ]) ;
81 - sp:graphNameNode <http://www.reportinghub.no/graph/logging>
82 ]) 79 ])
83 ] . 80 ] .
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 # imports: http://uispin.org/tui 2 # imports: http://uispin.org/tui
3 # imports: http://www.reportinghub.no/system/schema/logging 3 # imports: http://www.reportinghub.no/system/schema/logging
4 4
5 +@prefix afn: <http://jena.hpl.hp.com/ARQ/function#> .
5 @prefix let: <http://uispin.org/let#> . 6 @prefix let: <http://uispin.org/let#> .
6 @prefix letrs: <http://uispin.org/letrs#> . 7 @prefix letrs: <http://uispin.org/letrs#> .
7 @prefix owl: <http://www.w3.org/2002/07/owl#> . 8 @prefix owl: <http://www.w3.org/2002/07/owl#> .
...@@ -34,27 +35,22 @@ ...@@ -34,27 +35,22 @@
34 ui:child 35 ui:child
35 [ rdf:type ui:TextNode ; 36 [ rdf:type ui:TextNode ;
36 ui:childIndex 0 ; 37 ui:childIndex 0 ;
37 - ui:text "Report type "^^xsd:string 38 + ui:text [ rdf:type afn:localname ;
38 - ] ; 39 + sp:arg1 [ rdf:type spl:object ;
39 - ui:child
40 - [ rdf:type ui:TextNode ;
41 - ui:childIndex 1 ;
42 - ui:text [ rdf:type spl:object ;
43 sp:arg1 spin:_this ; 40 sp:arg1 spin:_this ;
44 sp:arg2 <http://www.reportinghub.no/system/schema/logging#reportType> 41 sp:arg2 <http://www.reportinghub.no/system/schema/logging#reportType>
45 ] 42 ]
43 + ]
46 ] ; 44 ] ;
47 ui:child 45 ui:child
48 [ rdf:type ui:TextNode ; 46 [ rdf:type ui:TextNode ;
49 - ui:childIndex 2 ; 47 + ui:childIndex 1 ;
50 ui:text " from "^^xsd:string 48 ui:text " from "^^xsd:string
51 ] ; 49 ] ;
52 ui:child 50 ui:child
53 [ rdf:type ui:TextNode ; 51 [ rdf:type ui:TextNode ;
54 - ui:childIndex 3 ; 52 + ui:childIndex 2 ;
55 - ui:text [ rdf:type ui:label ; 53 + ui:text [ sp:varName "dateFrom"^^xsd:string
56 - sp:arg1 [ sp:varName "dateFrom"^^xsd:string
57 - ]
58 ] 54 ]
59 ] ; 55 ] ;
60 ui:child 56 ui:child
...@@ -67,12 +63,10 @@ ...@@ -67,12 +63,10 @@
67 ui:child 63 ui:child
68 [ rdf:type ui:TextNode ; 64 [ rdf:type ui:TextNode ;
69 ui:childIndex 1 ; 65 ui:childIndex 1 ;
70 - ui:text [ rdf:type ui:label ; 66 + ui:text [ sp:varName "dateTo"^^xsd:string
71 - sp:arg1 [ sp:varName "dateTo"^^xsd:string
72 - ]
73 ] 67 ]
74 ] ; 68 ] ;
75 - ui:childIndex 4 ; 69 + ui:childIndex 3 ;
76 ui:condition 70 ui:condition
77 [ rdf:type sp:bound ; 71 [ rdf:type sp:bound ;
78 sp:arg1 [ sp:varName "dateTo"^^xsd:string 72 sp:arg1 [ sp:varName "dateTo"^^xsd:string
...@@ -84,7 +78,7 @@ ...@@ -84,7 +78,7 @@
84 ui:child 78 ui:child
85 [ rdf:type ui:TextNode ; 79 [ rdf:type ui:TextNode ;
86 ui:childIndex 0 ; 80 ui:childIndex 0 ;
87 - ui:text "with owner id "^^xsd:string 81 + ui:text " with owner id "^^xsd:string
88 ] ; 82 ] ;
89 ui:child 83 ui:child
90 [ rdf:type ui:TextNode ; 84 [ rdf:type ui:TextNode ;
...@@ -92,7 +86,7 @@ ...@@ -92,7 +86,7 @@
92 ui:text [ sp:varName "ownerId"^^xsd:string 86 ui:text [ sp:varName "ownerId"^^xsd:string
93 ] 87 ]
94 ] ; 88 ] ;
95 - ui:childIndex 5 ; 89 + ui:childIndex 4 ;
96 ui:condition 90 ui:condition
97 [ rdf:type sp:bound ; 91 [ rdf:type sp:bound ;
98 sp:arg1 [ sp:varName "ownerId"^^xsd:string 92 sp:arg1 [ sp:varName "ownerId"^^xsd:string
...@@ -102,6 +96,22 @@ ...@@ -102,6 +96,22 @@
102 ui:id "comments"^^xsd:string 96 ui:id "comments"^^xsd:string
103 ] . 97 ] .
104 98
99 +<http://www.reportinghub.no/system/schema/logging#ReportUploadEvent>
100 + ui:instanceView
101 + [ rdf:type ui:group ;
102 + ui:child
103 + [ rdf:type ui:TextNode ;
104 + ui:childIndex 0 ;
105 + ui:text [ rdf:type afn:localname ;
106 + sp:arg1 [ rdf:type spl:object ;
107 + sp:arg1 spin:_this ;
108 + sp:arg2 <http://www.reportinghub.no/system/schema/logging#reportType>
109 + ]
110 + ]
111 + ] ;
112 + ui:id "comments"^^xsd:string
113 + ] .
114 +
105 <http://www.reportinghub.no/system/swp/SWP-logging> 115 <http://www.reportinghub.no/system/swp/SWP-logging>
106 rdf:type owl:Ontology ; 116 rdf:type owl:Ontology ;
107 owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/system/schema/logging> ; 117 owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/system/schema/logging> ;
......