data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
f905d757 2 parents 79d59132 c409933b

Merge branch 'master' of https://github.com/TopQuadrant/EPIM-Ontologies

Inline Side-by-side
Showing 2 changed files with 22 additions and 20 deletions
...@@ -89,11 +89,6 @@ arg:kindRef ...@@ -89,11 +89,6 @@ arg:kindRef
89 ] ; 89 ] ;
90 spin:constraint 90 spin:constraint
91 [ rdf:type mpr-proxy-constraints:CheckId ; 91 [ rdf:type mpr-proxy-constraints:CheckId ;
92 - arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_field> ;
93 - arg:type <http://www.reportinghub.no/ep/schema/facility#Field>
94 - ] ;
95 - spin:constraint
96 - [ rdf:type mpr-proxy-constraints:CheckId ;
97 arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ; 92 arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ;
98 arg:type <http://www.reportinghub.no/ep/schema/facility#Platform> 93 arg:type <http://www.reportinghub.no/ep/schema/facility#Platform>
99 ] ; 94 ] ;
...@@ -109,6 +104,11 @@ arg:kindRef ...@@ -109,6 +104,11 @@ arg:kindRef
109 ] ; 104 ] ;
110 spin:constraint 105 spin:constraint
111 [ rdf:type mpr-proxy-constraints:CheckName ; 106 [ rdf:type mpr-proxy-constraints:CheckName ;
107 + arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_field> ;
108 + arg:type <http://www.reportinghub.no/ep/schema/facility#Field>
109 + ] ;
110 + spin:constraint
111 + [ rdf:type mpr-proxy-constraints:CheckName ;
112 arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ; 112 arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ;
113 arg:type <http://www.reportinghub.no/ep/schema/facility#Platform> 113 arg:type <http://www.reportinghub.no/ep/schema/facility#Platform>
114 ] ; 114 ] ;
...@@ -324,7 +324,7 @@ mpr-proxy-constraints:CheckIdAndNameMatch ...@@ -324,7 +324,7 @@ mpr-proxy-constraints:CheckIdAndNameMatch
324 ] 324 ]
325 ] [ rdf:type sp:Filter ; 325 ] [ rdf:type sp:Filter ;
326 sp:expression 326 sp:expression
327 - [ rdf:type sp:or ; 327 + [ rdf:type sp:and ;
328 sp:arg1 [ rdf:type sp:or ; 328 sp:arg1 [ rdf:type sp:or ;
329 sp:arg1 [ rdf:type sp:bound ; 329 sp:arg1 [ rdf:type sp:bound ;
330 sp:arg1 [ sp:varName "byId"^^xsd:string 330 sp:arg1 [ sp:varName "byId"^^xsd:string
......
...@@ -5,25 +5,27 @@ ...@@ -5,25 +5,27 @@
5 <ui:setContext ui:queryGraph="&lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt;"> 5 <ui:setContext ui:queryGraph="&lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt;">
6 <h2>{= ui:label(?template) }</h2> 6 <h2>{= ui:label(?template) }</h2>
7 </ui:setContext> 7 </ui:setContext>
8 - <table class="ddrTable"> 8 + <table class="ddrTable" letrs:hrs="{#
9 - <ui:setContext ui:queryGraph="&lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt;"> 9 + SELECT ?header ?left
10 - <tr class="ddrTR">
11 - <ui:forEach ui:resultSet="{#
12 - SELECT ?header
13 WHERE { 10 WHERE {
14 - ?template rhspin:tableHeaders ?list . 11 + GRAPH &lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt; {
15 - ?list &lt;http://jena.hpl.hp.com/ARQ/list#member&gt; ?header . 12 + ?template rhspin:tableHeaders ?list .
13 + ?list &lt;http://jena.hpl.hp.com/ARQ/list#member&gt; ?str .
14 + BIND (fn:starts-with(?str, '*') AS ?left) .
15 + BIND (IF(?left, fn:substring(?str, 2), ?str) AS ?header) .
16 + }
16 } 17 }
17 }"> 18 }">
18 - <th class="ddrTH" style="{= IF(fn:starts-with(?header, '*'), 'text-align: left', ?none) }" 19 + <tr class="ddrTR">
19 - let:h="{= IF(fn:starts-with(?header, '*'), fn:substring(?header, 2), ?header) }"><ui:parse ui:str="{= html:encodeBRs(spif:replaceAll(?h, ' ', '&nbsp;')) }" /></th> 20 + <ui:forEach ui:resultSet="{= ?hrs }">
20 - </ui:forEach> 21 + <th class="ddrTH" style="text-align: {= IF(?left, 'left', 'center') }"
21 - </tr> 22 + ><ui:parse ui:str="{= html:encodeBRs(spif:replaceAll(?header, ' ', '&nbsp;')) }" /></th>
22 - </ui:setContext> 23 + </ui:forEach>
24 + </tr>
23 <ui:forEach ui:resultSet="{# SELECT ?row ?rowIndex WHERE { ?rs spr:rowIndices ?rowIndex } }"> 25 <ui:forEach ui:resultSet="{# SELECT ?row ?rowIndex WHERE { ?rs spr:rowIndices ?rowIndex } }">
24 <tr class="ddrTR"> 26 <tr class="ddrTR">
25 - <ui:forEach ui:resultSet="{# SELECT ?cell WHERE { (?rs ?rowIndex) spr:rowCells (?cell ?cellIndex) } }"> 27 + <ui:forEach ui:resultSet="{# SELECT ?cell ?colIndex WHERE { (?rs ?rowIndex) spr:rowCells (?cell ?colIndex) } }">
26 - <td class="ddrTD">{= ?cell }</td> 28 + <td class="ddrTD" style="text-align: {= IF(spr:cell(?hrs, ?colIndex, 1), 'left', 'center') }">{= ?cell }</td>
27 </ui:forEach> 29 </ui:forEach>
28 </tr> 30 </tr>
29 </ui:forEach> 31 </ui:forEach>
......