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 118 additions and 108 deletions
This diff could not be displayed because it is too large.
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
......
1 -# baseURI: http://www.reportinghub.no/swp/mprg 1 +# baseURI: http://www.reportinghub.no/swp/mprg
2 -# imports: http://uispin.org/tui 2 +# imports: http://uispin.org/tui
3 -# imports: http://www.reportinghub.no/ep/spin/ddr-tables 3 +# imports: http://www.reportinghub.no/ep/spin/ddr-tables
4 -# imports: http://www.reportinghub.no/ep/spin/mpr-tables 4 +# imports: http://www.reportinghub.no/ep/spin/mpr-tables
5 -# imports: http://www.reportinghub.no/spin/rh 5 +# imports: http://www.reportinghub.no/spin/rh
6 - 6 +
7 -@prefix arg: <http://spinrdf.org/arg#> . 7 +@prefix arg: <http://spinrdf.org/arg#> .
8 -@prefix html: <http://uispin.org/html#> . 8 +@prefix html: <http://uispin.org/html#> .
9 -@prefix let: <http://uispin.org/let#> . 9 +@prefix let: <http://uispin.org/let#> .
10 -@prefix letrs: <http://uispin.org/letrs#> . 10 +@prefix letrs: <http://uispin.org/letrs#> .
11 -@prefix mprgswp: <http://www.reportinghub.no/swp/mprg#> . 11 +@prefix mprgswp: <http://www.reportinghub.no/swp/mprg#> .
12 -@prefix owl: <http://www.w3.org/2002/07/owl#> . 12 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
13 -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 13 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
14 -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 14 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
15 -@prefix sp: <http://spinrdf.org/sp#> . 15 +@prefix sp: <http://spinrdf.org/sp#> .
16 -@prefix spin: <http://spinrdf.org/spin#> . 16 +@prefix spin: <http://spinrdf.org/spin#> .
17 -@prefix spl: <http://spinrdf.org/spl#> . 17 +@prefix spl: <http://spinrdf.org/spl#> .
18 -@prefix ui: <http://uispin.org/ui#> . 18 +@prefix ui: <http://uispin.org/ui#> .
19 -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 19 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
20 - 20 +
21 -arg:report 21 +arg:report
22 - rdf:type rdf:Property ; 22 + rdf:type rdf:Property ;
23 - rdfs:label "report"^^xsd:string ; 23 + rdfs:label "report"^^xsd:string ;
24 - rdfs:subPropertyOf sp:arg . 24 + rdfs:subPropertyOf sp:arg .
25 - 25 +
26 -arg:template 26 +arg:template
27 - rdf:type rdf:Property ; 27 + rdf:type rdf:Property ;
28 - rdfs:label "template"^^xsd:string ; 28 + rdfs:label "template"^^xsd:string ;
29 - rdfs:subPropertyOf sp:arg . 29 + rdfs:subPropertyOf sp:arg .
30 - 30 +
31 -<http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> 31 +<http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow>
32 - ui:instanceView 32 + ui:instanceView
33 - [ rdf:type html:P ; 33 + [ rdf:type html:P ;
34 - ui:child 34 + ui:child
35 - [ rdf:type html:B ; 35 + [ rdf:type html:B ;
36 - ui:child 36 + ui:child
37 - [ rdf:type ui:TextNode ; 37 + [ rdf:type ui:TextNode ;
38 - ui:childIndex 0 ; 38 + ui:childIndex 0 ;
39 - ui:text "this is another test"^^xsd:string 39 + ui:text "this is another test"^^xsd:string
40 - ] ; 40 + ] ;
41 - ui:childIndex 0 41 + ui:childIndex 0
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
49 - ] . 49 + ] .
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
57 - rdf:type ui:NodeClass ; 57 + rdf:type ui:NodeClass ;
58 - rdfs:label "MPRG view"^^xsd:string ; 58 + rdfs:label "MPRG view"^^xsd:string ;
59 - rdfs:subClassOf ui:Element ; 59 + rdfs:subClassOf ui:Element ;
60 - spin:constraint 60 + spin:constraint
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 - ] ; 65 + ] ;
66 - ui:headIncludes 66 + ui:headIncludes
67 - [ rdf:type html:Title ; 67 + [ rdf:type html:Link ;
68 - ui:child 68 + html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
69 - [ rdf:type ui:TextNode ; 69 + html:rel "stylesheet"^^xsd:string ;
70 - ui:childIndex 0 ; 70 + html:type "text/css"^^xsd:string
71 - ui:text "Monthly Production Report (government)"^^xsd:string 71 + ] ;
72 - ] 72 + ui:headIncludes
73 - ] ; 73 + [ rdf:type html:Title ;
74 - ui:headIncludes 74 + ui:child
75 - [ rdf:type html:Link ; 75 + [ rdf:type ui:TextNode ;
76 - html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ; 76 + ui:childIndex 0 ;
77 - html:rel "stylesheet"^^xsd:string ; 77 + ui:text "Monthly Production Report (government)"^^xsd:string
78 - html:type "text/css"^^xsd:string 78 + ]
79 - ] ; 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
83 - rdf:type ui:NodeClass ; 83 + rdf:type ui:NodeClass ;
84 - rdfs:comment "An HTML table displaying the results of a given SPIN template for a given MPRG. The template should also provide rhspin:tableHeaders."^^xsd:string ; 84 + rdfs:comment "An HTML table displaying the results of a given SPIN template for a given MPRG. The template should also provide rhspin:tableHeaders."^^xsd:string ;
85 - rdfs:label "Table"^^xsd:string ; 85 + rdfs:label "Table"^^xsd:string ;
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 ; 89 + rdfs:comment "The SPIN Template to execute."^^xsd:string ;
90 - spl:optional "true"^^xsd:boolean ; 90 + spl:predicate arg:template ;
91 - spl:predicate arg:report ; 91 + spl:valueType spin:Template
92 - spl:valueType <http://www.reportinghub.no/ep/schema/production-report#MonthlyProductionReport> 92 + ] ;
93 - ] ; 93 + spin:constraint
94 - spin:constraint 94 + [ rdf:type spl:Argument ;
95 - [ rdf:type spl:Argument ; 95 + rdfs:comment "The report that serves as root of the template."^^xsd:string ;
96 - rdfs:comment "The SPIN Template to execute."^^xsd:string ; 96 + spl:optional "true"^^xsd:boolean ;
97 - spl:predicate arg:template ; 97 + spl:predicate arg:report ;
98 - spl:valueType spin:Template 98 + spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
99 - ] ; 99 + ] ;
100 - ui:prototype <http://www.reportinghub.no/swp/MPRGTable.uispin.html> . 100 + ui:prototype <http://www.reportinghub.no/swp/MPRGTable.uispin.html> .
......