data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
df3c8bf4 1 parent d44427df

Fixup after moving ProductionReport, etc. into schema/ep/report from schema/ep/production-report

Inline Side-by-side
Showing 4 changed files with 36 additions and 26 deletions
...@@ -176,7 +176,7 @@ rhspin:DPRTableTemplates ...@@ -176,7 +176,7 @@ rhspin:DPRTableTemplates
176 [ rdf:type spl:Argument ; 176 [ rdf:type spl:Argument ;
177 rdfs:comment "The DPR that serves as root of the query."^^xsd:string ; 177 rdfs:comment "The DPR that serves as root of the query."^^xsd:string ;
178 spl:predicate arg:report ; 178 spl:predicate arg:report ;
179 - spl:valueType <http://www.reportinghub.no/ep/schema/production-report#DailyProductionReport> 179 + spl:valueType <http://www.reportinghub.no/ep/schema/report#DailyProductionReport>
180 ] . 180 ] .
181 181
182 rhspin:GetFields 182 rhspin:GetFields
...@@ -606,7 +606,7 @@ rhspin:MPRGTableTemplates ...@@ -606,7 +606,7 @@ rhspin:MPRGTableTemplates
606 [ rdf:type spl:Argument ; 606 [ rdf:type spl:Argument ;
607 rdfs:comment "The MPRG that serves as root of the query."^^xsd:string ; 607 rdfs:comment "The MPRG that serves as root of the query."^^xsd:string ;
608 spl:predicate arg:report ; 608 spl:predicate arg:report ;
609 - spl:valueType <http://www.reportinghub.no/ep/schema/production-report#ProductionReport> 609 + spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
610 ] . 610 ] .
611 611
612 rhspin:TableTemplate 612 rhspin:TableTemplate
......
1 <ui:group 1 <ui:group
2 - let:report="{# SELECT ?report WHERE {?report a ep-prodreport:DailyProductionReport }}" 2 + let:report="{# SELECT ?report WHERE {?report a ep-report:DailyProductionReport }}"
3 - let:mainAct="{# SELECT ?mainAct WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct}}" 3 + let:mainAct="{# SELECT ?mainAct WHERE {?report a ep-report:DailyProductionReport . ?report ep-report:reportOn ?mainAct}}"
4 - let:mainFac="{# SELECT ?mainFac WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainAct ep-prodact:involvement ?epMainFacTempPart . ?mainFac ep-core:hasTemporalPart ?epMainFacTempPart}}" 4 + let:mainFac="{# SELECT ?mainFac WHERE {?report a ep-report:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainAct ep-prodact:involvement ?epMainFacTempPart . ?mainFac ep-core:hasTemporalPart ?epMainFacTempPart}}"
5 let:opCo="{# SELECT ?opCo WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainFac ep-fac:facilityOperator ?opCo}}" 5 let:opCo="{# SELECT ?opCo WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainFac ep-fac:facilityOperator ?opCo}}"
6 > 6 >
7 <center> 7 <center>
8 <h1>{# SELECT ?mfName WHERE {?mainFac rdfs:label ?mfName}}</h1> 8 <h1>{# SELECT ?mfName WHERE {?mainFac rdfs:label ?mfName}}</h1>
9 <h2>{# SELECT ?ocName WHERE {?opCo rdfs:label ?ocName}}</h2> 9 <h2>{# SELECT ?ocName WHERE {?opCo rdfs:label ?ocName}}</h2>
10 <h2>{# SELECT ?docName WHERE {?report rdfs:label ?docName}}</h2> 10 <h2>{# SELECT ?docName WHERE {?report rdfs:label ?docName}}</h2>
11 - <h2>Report date: {# SELECT ?docDate WHERE {?report ep-prodreport:dateCoveredByReport ?docDate}}</h2> 11 + <h2>Report date: {# SELECT ?docDate WHERE {?report ep-report:dateCoveredByReport ?docDate}}</h2>
12 <h2>Issue date: {# SELECT ?createDate WHERE {?report ep-report:createdAt ?createDate}}</h2> 12 <h2>Issue date: {# SELECT ?createDate WHERE {?report ep-report:createdAt ?createDate}}</h2>
13 </center> 13 </center>
14 <hr /> 14 <hr />
......
1 <ui:group 1 <ui:group
2 -let:report="{# SELECT ?report WHERE { ?report a ep-prodreport:ProductionReport . } }" 2 +let:report="{# SELECT ?report WHERE { ?report a ep-report:ProductionReport . } }"
3 +
4 +let:fieldName="{# SELECT ?fieldName
5 +WHERE {
6 +?report ep-report:reportOn ?fieldPart .
7 +?fieldPart ep-core:temporalPartOf ?field .
8 +?field npd:name ?fieldName .
9 +}
10 + }"
3 > 11 >
4 12
5 <!-- 13 <!--
...@@ -9,7 +17,9 @@ let:facilityName="{# SELECT DISTINCT ...@@ -9,7 +17,9 @@ let:facilityName="{# SELECT DISTINCT
9 17
10 --> 18 -->
11 19
12 -<h1>{= ?facilityName } Field</h1> 20 +
21 +
22 +<h1>{= ?fieldName } Field</h1>
13 23
14 <!-- <ui:forEach ui:resultSet="{# 24 <!-- <ui:forEach ui:resultSet="{#
15 SELECT 25 SELECT
...@@ -29,10 +39,10 @@ SELECT ...@@ -29,10 +39,10 @@ SELECT
29 ?grossCalorificValueInMegaJouleMetre_3 39 ?grossCalorificValueInMegaJouleMetre_3
30 WHERE 40 WHERE
31 { 41 {
32 -?productionReport a ep-prodreport:ProductionReport . 42 +?productionReport a ep-report:ProductionReport .
33 43
34 ?productVolumeReport ep-core:partOf ?productionReport ; 44 ?productVolumeReport ep-core:partOf ?productionReport ;
35 - a ep-prodreport:ProductVolumeReport . 45 + a ep-report:ProductVolumeReport .
36 46
37 ?productVolumeReport ep-report:reportOn ?productionFlowsInReportingPeriod . 47 ?productVolumeReport ep-report:reportOn ?productionFlowsInReportingPeriod .
38 48
......
...@@ -42,7 +42,7 @@ arg:template ...@@ -42,7 +42,7 @@ arg:template
42 ] 42 ]
43 ] . 43 ] .
44 44
45 -<http://www.reportinghub.no/ep/schema/production-report#ProductionReport> 45 +<http://www.reportinghub.no/ep/schema/report#ProductionReport>
46 ui:instanceView 46 ui:instanceView
47 [ rdf:type mprgswp:MPRGView ; 47 [ rdf:type mprgswp:MPRGView ;
48 arg:report spin:_this 48 arg:report spin:_this
...@@ -50,7 +50,7 @@ arg:template ...@@ -50,7 +50,7 @@ arg:template
50 50
51 <http://www.reportinghub.no/swp/mprg> 51 <http://www.reportinghub.no/swp/mprg>
52 rdf:type owl:Ontology ; 52 rdf:type owl:Ontology ;
53 - owl:imports <http://www.reportinghub.no/ep/spin/mpr-tables> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/ddr-tables> , <http://uispin.org/tui> ; 53 + owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/ep/spin/ddr-tables> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/mpr-tables> ;
54 owl:versionInfo "0.1.0"^^xsd:string . 54 owl:versionInfo "0.1.0"^^xsd:string .
55 55
56 mprgswp:MPRGView 56 mprgswp:MPRGView
...@@ -61,7 +61,13 @@ mprgswp:MPRGView ...@@ -61,7 +61,13 @@ mprgswp:MPRGView
61 [ rdf:type spl:Argument ; 61 [ rdf:type spl:Argument ;
62 rdfs:comment "The report to display."^^xsd:string ; 62 rdfs:comment "The report to display."^^xsd:string ;
63 spl:predicate arg:report ; 63 spl:predicate arg:report ;
64 - spl:valueType <http://www.reportinghub.no/ep/schema/production-report#ProductionReport> 64 + spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
65 + ] ;
66 + ui:headIncludes
67 + [ rdf:type html:Link ;
68 + html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
69 + html:rel "stylesheet"^^xsd:string ;
70 + html:type "text/css"^^xsd:string
65 ] ; 71 ] ;
66 ui:headIncludes 72 ui:headIncludes
67 [ rdf:type html:Title ; 73 [ rdf:type html:Title ;
...@@ -71,12 +77,6 @@ mprgswp:MPRGView ...@@ -71,12 +77,6 @@ mprgswp:MPRGView
71 ui:text "Monthly Production Report (government)"^^xsd:string 77 ui:text "Monthly Production Report (government)"^^xsd:string
72 ] 78 ]
73 ] ; 79 ] ;
74 - ui:headIncludes
75 - [ rdf:type html:Link ;
76 - html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
77 - html:rel "stylesheet"^^xsd:string ;
78 - html:type "text/css"^^xsd:string
79 - ] ;
80 ui:prototype <http://www.reportinghub.no/swp/MPRG.uispin.html> . 80 ui:prototype <http://www.reportinghub.no/swp/MPRG.uispin.html> .
81 81
82 mprgswp:Table 82 mprgswp:Table
...@@ -86,15 +86,15 @@ mprgswp:Table ...@@ -86,15 +86,15 @@ mprgswp:Table
86 rdfs:subClassOf ui:Element ; 86 rdfs:subClassOf ui:Element ;
87 spin:constraint 87 spin:constraint
88 [ rdf:type spl:Argument ; 88 [ rdf:type spl:Argument ;
89 - rdfs:comment "The report that serves as root of the template."^^xsd:string ;
90 - spl:optional "true"^^xsd:boolean ;
91 - spl:predicate arg:report ;
92 - spl:valueType <http://www.reportinghub.no/ep/schema/production-report#MonthlyProductionReport>
93 - ] ;
94 - spin:constraint
95 - [ rdf:type spl:Argument ;
96 rdfs:comment "The SPIN Template to execute."^^xsd:string ; 89 rdfs:comment "The SPIN Template to execute."^^xsd:string ;
97 spl:predicate arg:template ; 90 spl:predicate arg:template ;
98 spl:valueType spin:Template 91 spl:valueType spin:Template
99 ] ; 92 ] ;
93 + spin:constraint
94 + [ rdf:type spl:Argument ;
95 + rdfs:comment "The report that serves as root of the template."^^xsd:string ;
96 + spl:optional "true"^^xsd:boolean ;
97 + spl:predicate arg:report ;
98 + spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
99 + ] ;
100 ui:prototype <http://www.reportinghub.no/swp/MPRGTable.uispin.html> . 100 ui:prototype <http://www.reportinghub.no/swp/MPRGTable.uispin.html> .
......