data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Holger Knublauch
02c2fc59 1 parent bc615b85

Progress on log viewer and other admin features

Expand all
Inline Side-by-side
Showing 5 changed files with 98 additions and 20 deletions
...@@ -6498,7 +6498,7 @@ app:keyPropertiesFunctor ...@@ -6498,7 +6498,7 @@ app:keyPropertiesFunctor
6498 6498
6499 app:keyPropertyVarName 6499 app:keyPropertyVarName
6500 rdf:type spin:Function ; 6500 rdf:type spin:Function ;
6501 - rdfs:comment "Creates a SPARQL variable name from a property. The algorithm simply takes the qname and then replaces the : with 'VAR_'. Note that SPARQL variable names should not begin with '_' and therefore the default namespace would be mapped to a blank node otherwise."^^xsd:string ; 6501 + rdfs:comment "Creates a SPARQL variable name from a property. The algorithm simply takes the qname and then replaces the ':' with '_'."^^xsd:string ;
6502 rdfs:label "key property var name"^^xsd:string ; 6502 rdfs:label "key property var name"^^xsd:string ;
6503 rdfs:subClassOf app:Functions ; 6503 rdfs:subClassOf app:Functions ;
6504 spin:body 6504 spin:body
...@@ -6510,7 +6510,7 @@ app:keyPropertyVarName ...@@ -6510,7 +6510,7 @@ app:keyPropertyVarName
6510 ] 6510 ]
6511 ] ; 6511 ] ;
6512 sp:arg2 ":" ; 6512 sp:arg2 ":" ;
6513 - sp:arg3 "VAR_" 6513 + sp:arg3 "_"
6514 ] ; 6514 ] ;
6515 sp:varName "result"^^xsd:string 6515 sp:varName "result"^^xsd:string
6516 ]) ; 6516 ]) ;
......
...@@ -2,34 +2,32 @@ ...@@ -2,34 +2,32 @@
2 let:keyProperties="{= app:getKeyProperties(?type) }" 2 let:keyProperties="{= app:getKeyProperties(?type) }"
3 let:pagerId="{= ui:uniqueId() }" 3 let:pagerId="{= ui:uniqueId() }"
4 let:tableId="{= ui:uniqueId() }"> 4 let:tableId="{= ui:uniqueId() }">
5 - <table id="{= ?tableId }" style="width: 100%"/> 5 + <table id="{= ?tableId }"/>
6 <div id="{= ?pagerId }" /> 6 <div id="{= ?pagerId }" />
7 <script> 7 <script>
8 $("#{= ?tableId }").jqGrid({ 8 $("#{= ?tableId }").jqGrid({
9 <swon:NameValuePair arg:name="url" arg:value="{= fn:concat('getSearchResults?', ?params) }" />, 9 <swon:NameValuePair arg:name="url" arg:value="{= fn:concat('getSearchResults?', ?params) }" />,
10 <swon:NameValuePair arg:name="datatype" arg:value="json" />, 10 <swon:NameValuePair arg:name="datatype" arg:value="json" />,
11 colNames:[ 11 colNames:[
12 - 'Resource' 12 + <ui:if ui:condition="{= bound(?keyProperties) }">
13 - <ui:if ui:condition="{= bound(?keyProperties) }">,
14 <ui:forEach ui:resultSet="{# 13 <ui:forEach ui:resultSet="{#
15 SELECT ?colName 14 SELECT ?colName
16 WHERE { 15 WHERE {
17 GRAPH ui:graph { 16 GRAPH ui:graph {
18 ?keyProperties (rdf:rest*)/rdf:first ?keyProperty . 17 ?keyProperties (rdf:rest*)/rdf:first ?keyProperty .
19 - BIND (spif:titleCase(ui:label(?keyProperty) AS ?colName)) . 18 + BIND (spif:titleCase(ui:label(?keyProperty)) AS ?colName) .
20 } 19 }
21 } 20 }
22 }" ui:separator=","> 21 }" ui:separator=",">
23 '{= ?colName }' 22 '{= ?colName }'
24 </ui:forEach> 23 </ui:forEach>
25 </ui:if> 24 </ui:if>
25 + <ui:else>
26 + 'Resource'
27 + </ui:else>
26 ], 28 ],
27 colModel:[ 29 colModel:[
28 - { 30 + <ui:if ui:condition="{= bound(?keyProperties) }">
29 - name : 'result',
30 - width: 200
31 - }
32 - <ui:if ui:condition="{= bound(?keyProperties) }">,
33 <ui:forEach ui:resultSet="{# 31 <ui:forEach ui:resultSet="{#
34 SELECT ?varName 32 SELECT ?varName
35 WHERE { 33 WHERE {
...@@ -44,6 +42,11 @@ ...@@ -44,6 +42,11 @@
44 } 42 }
45 </ui:forEach> 43 </ui:forEach>
46 </ui:if> 44 </ui:if>
45 + <ui:else>
46 + {
47 + name : 'label'
48 + }
49 + </ui:else>
47 ], 50 ],
48 rowNum: 10, 51 rowNum: 10,
49 rowList:[5,10,20], 52 rowList:[5,10,20],
...@@ -51,7 +54,7 @@ ...@@ -51,7 +54,7 @@
51 viewrecords: true, 54 viewrecords: true,
52 sortorder: "desc", 55 sortorder: "desc",
53 height: "100%", 56 height: "100%",
54 - width: "500" 57 + width: "100%"
55 }).jqGrid('navGrid', '#{= ?pagerId }', { add:false, edit:false, del:false}); 58 }).jqGrid('navGrid', '#{= ?pagerId }', { add:false, edit:false, del:false});
56 </script> 59 </script>
57 </ui:group> 60 </ui:group>
...\ No newline at end of file ...\ No newline at end of file
......
1 +# baseURI: http://www.reportinghub.no/examples/system/exampleLogEvents
2 +# imports: http://www.reportinghub.no/system/schema/logging
3 +
4 +@prefix : <http://www.reportinghub.no/examples/system/exampleLogEvents#> .
5 +@prefix dcterms: <http://purl.org/dc/terms/> .
6 +@prefix log: <http://www.reportinghub.no/system/schema/logging#> .
7 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
8 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
9 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
10 +@prefix report: <http://www.reportinghub.no/system/schema/reporting#> .
11 +@prefix sioc: <http://rdfs.org/sioc/ns#> .
12 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
13 +
14 +<http://www.reportinghub.no/examples/system/exampleLogEvents>
15 + rdf:type owl:Ontology ;
16 + owl:imports <http://www.reportinghub.no/system/schema/logging> ;
17 + owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
18 +
19 +log:FactPagesUpdateEvent_1
20 + rdf:type log:FactPagesUpdateEvent ;
21 + rdfs:label "Fact pages update event 1"^^xsd:string ;
22 + dcterms:created "2011-11-11T00:00:00"^^xsd:dateTime ;
23 + sioc:id "1"^^xsd:string ;
24 + log:initiatedBy "system"^^xsd:string ;
25 + log:onBehalfOf "system"^^xsd:string ;
26 + log:outcome "success"^^xsd:string .
27 +
28 +log:PasswordChangeEvent_1
29 + rdf:type log:PasswordChangeEvent ;
30 + rdfs:label "Password change event 1"^^xsd:string ;
31 + dcterms:created "2011-11-11T00:00:01"^^xsd:dateTime ;
32 + sioc:id "2"^^xsd:string ;
33 + log:initiatedBy "JohnDoe"^^xsd:string ;
34 + log:onBehalfOf "Aldi"^^xsd:string ;
35 + log:outcome "success"^^xsd:string .
36 +
37 +log:ReportDownloadEvent_1
38 + rdf:type log:ReportDownloadEvent ;
39 + rdfs:label "Report download event 1"^^xsd:string ;
40 + dcterms:created "2011-11-13T00:00:00"^^xsd:dateTime ;
41 + sioc:id "3"^^xsd:string ;
42 + log:dateFrom "2011-07-21"^^xsd:date ;
43 + log:dateTo "2011-07-21"^^xsd:date ;
44 + log:initiatedBy "JohnDoe"^^xsd:string ;
45 + log:onBehalfOf "Aldi"^^xsd:string ;
46 + log:outcome "success"^^xsd:string ;
47 + log:ownerId "123"^^xsd:string ;
48 + log:reportType report:DDR ;
49 + report:format report:HTMLFormat ;
50 + report:wellBoreId "1024"^^xsd:string .
51 +
52 +log:ReportUploadEvent_1
53 + rdf:type log:ReportUploadEvent ;
54 + rdfs:label "Report upload event 1"^^xsd:string ;
55 + dcterms:created "2011-11-14T00:00:00"^^xsd:dateTime ;
56 + sioc:id "4"^^xsd:string ;
57 + log:initiatedBy "JohnDoe"^^xsd:string ;
58 + log:onBehalfOf "Aldi"^^xsd:string ;
59 + log:outcome "success"^^xsd:string ;
60 + log:reportType report:DDR ;
61 + log:wellBoreName "XY-2"^^xsd:string ;
62 + report:format report:HTMLFormat .
63 +
64 +log:ReportValidationEvent_1
65 + rdf:type log:ReportValidationEvent ;
66 + rdfs:label "Report validation event 1"^^xsd:string ;
67 + dcterms:created "2011-11-14T00:00:00"^^xsd:dateTime ;
68 + sioc:id "5"^^xsd:string ;
69 + log:initiatedBy "JohnDoe"^^xsd:string ;
70 + log:onBehalfOf "Aldi"^^xsd:string ;
71 + log:outcome "user-error"^^xsd:string ;
72 + log:reportType report:DDR .
...@@ -36,17 +36,17 @@ log:LogEvent ...@@ -36,17 +36,17 @@ log:LogEvent
36 rdfs:subClassOf 36 rdfs:subClassOf
37 [ rdf:type owl:Restriction ; 37 [ rdf:type owl:Restriction ;
38 owl:cardinality "1"^^xsd:nonNegativeInteger ; 38 owl:cardinality "1"^^xsd:nonNegativeInteger ;
39 - owl:onProperty <http://rdfs.org/sioc/ns#id> 39 + owl:onProperty rdfs:comment
40 ] ; 40 ] ;
41 rdfs:subClassOf 41 rdfs:subClassOf
42 [ rdf:type owl:Restriction ; 42 [ rdf:type owl:Restriction ;
43 - owl:allValuesFrom xsd:string ; 43 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
44 owl:onProperty <http://rdfs.org/sioc/ns#id> 44 owl:onProperty <http://rdfs.org/sioc/ns#id>
45 ] ; 45 ] ;
46 rdfs:subClassOf 46 rdfs:subClassOf
47 [ rdf:type owl:Restriction ; 47 [ rdf:type owl:Restriction ;
48 - owl:cardinality "1"^^xsd:nonNegativeInteger ; 48 + owl:allValuesFrom xsd:string ;
49 - owl:onProperty rdfs:comment 49 + owl:onProperty <http://rdfs.org/sioc/ns#id>
50 ] . 50 ] .
51 51
52 log:PasswordChangeEvent 52 log:PasswordChangeEvent
...@@ -66,12 +66,12 @@ log:ReportDownloadEvent ...@@ -66,12 +66,12 @@ log:ReportDownloadEvent
66 rdfs:subClassOf 66 rdfs:subClassOf
67 [ rdf:type owl:Restriction ; 67 [ rdf:type owl:Restriction ;
68 owl:cardinality "1"^^xsd:nonNegativeInteger ; 68 owl:cardinality "1"^^xsd:nonNegativeInteger ;
69 - owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId> 69 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
70 ] ; 70 ] ;
71 rdfs:subClassOf 71 rdfs:subClassOf
72 [ rdf:type owl:Restriction ; 72 [ rdf:type owl:Restriction ;
73 owl:cardinality "1"^^xsd:nonNegativeInteger ; 73 owl:cardinality "1"^^xsd:nonNegativeInteger ;
74 - owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format> 74 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId>
75 ] . 75 ] .
76 76
77 log:ReportEvent 77 log:ReportEvent
...@@ -110,14 +110,14 @@ log:initiatedBy ...@@ -110,14 +110,14 @@ log:initiatedBy
110 rdf:type owl:DatatypeProperty ; 110 rdf:type owl:DatatypeProperty ;
111 rdfs:comment "The name of the user logged in."^^xsd:string ; 111 rdfs:comment "The name of the user logged in."^^xsd:string ;
112 rdfs:domain log:LogEvent ; 112 rdfs:domain log:LogEvent ;
113 - rdfs:label "initiated by"^^xsd:string ; 113 + rdfs:label "user"^^xsd:string ;
114 rdfs:range xsd:string . 114 rdfs:range xsd:string .
115 115
116 log:onBehalfOf 116 log:onBehalfOf
117 rdf:type owl:DatatypeProperty ; 117 rdf:type owl:DatatypeProperty ;
118 rdfs:comment "The name of the company that the user has been logged in for."^^xsd:string ; 118 rdfs:comment "The name of the company that the user has been logged in for."^^xsd:string ;
119 rdfs:domain log:LogEvent ; 119 rdfs:domain log:LogEvent ;
120 - rdfs:label "on behalf of"^^xsd:string ; 120 + rdfs:label "company"^^xsd:string ;
121 rdfs:range xsd:string . 121 rdfs:range xsd:string .
122 122
123 log:outcome 123 log:outcome
...@@ -163,6 +163,9 @@ log:xml ...@@ -163,6 +163,9 @@ log:xml
163 rdfs:label "xml"^^xsd:string ; 163 rdfs:label "xml"^^xsd:string ;
164 rdfs:range xsd:string . 164 rdfs:range xsd:string .
165 165
166 +<http://www.reportinghub.no/system/schema/reporting#format>
167 + rdfs:range <http://www.reportinghub.no/system/schema/reporting#Format> .
168 +
166 <http://www.reportinghub.no/system/schema/reporting#uploadedDocument> 169 <http://www.reportinghub.no/system/schema/reporting#uploadedDocument>
167 rdf:type owl:ObjectProperty ; 170 rdf:type owl:ObjectProperty ;
168 rdfs:domain log:ReportUploadEvent ; 171 rdfs:domain log:ReportUploadEvent ;
......
This diff is collapsed. Click to expand it.