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
[ rdf:type spl:Argument ;
rdfs:comment "The DPR that serves as root of the query."^^xsd:string ;
spl:predicate arg:report ;
spl:valueType <http://www.reportinghub.no/ep/schema/production-report#DailyProductionReport>
spl:valueType <http://www.reportinghub.no/ep/schema/report#DailyProductionReport>
] .
rhspin:GetFields
......@@ -606,7 +606,7 @@ rhspin:MPRGTableTemplates
[ rdf:type spl:Argument ;
rdfs:comment "The MPRG that serves as root of the query."^^xsd:string ;
spl:predicate arg:report ;
spl:valueType <http://www.reportinghub.no/ep/schema/production-report#ProductionReport>
spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
] .
rhspin:TableTemplate
......
<ui:group
let:report="{# SELECT ?report WHERE {?report a ep-prodreport:DailyProductionReport }}"
let:mainAct="{# SELECT ?mainAct WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct}}"
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}}"
let:report="{# SELECT ?report WHERE {?report a ep-report:DailyProductionReport }}"
let:mainAct="{# SELECT ?mainAct WHERE {?report a ep-report:DailyProductionReport . ?report ep-report:reportOn ?mainAct}}"
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}}"
let:opCo="{# SELECT ?opCo WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainFac ep-fac:facilityOperator ?opCo}}"
>
<center>
<h1>{# SELECT ?mfName WHERE {?mainFac rdfs:label ?mfName}}</h1>
<h2>{# SELECT ?ocName WHERE {?opCo rdfs:label ?ocName}}</h2>
<h2>{# SELECT ?docName WHERE {?report rdfs:label ?docName}}</h2>
<h2>Report date: {# SELECT ?docDate WHERE {?report ep-prodreport:dateCoveredByReport ?docDate}}</h2>
<h2>Report date: {# SELECT ?docDate WHERE {?report ep-report:dateCoveredByReport ?docDate}}</h2>
<h2>Issue date: {# SELECT ?createDate WHERE {?report ep-report:createdAt ?createDate}}</h2>
</center>
<hr />
......
<ui:group
let:report="{# SELECT ?report WHERE { ?report a ep-prodreport:ProductionReport . } }"
let:report="{# SELECT ?report WHERE { ?report a ep-report:ProductionReport . } }"
let:fieldName="{# SELECT ?fieldName
WHERE {
?report ep-report:reportOn ?fieldPart .
?fieldPart ep-core:temporalPartOf ?field .
?field npd:name ?fieldName .
}
}"
>
<!--
......@@ -9,7 +17,9 @@ let:facilityName="{# SELECT DISTINCT
-->
<h1>{= ?facilityName } Field</h1>
<h1>{= ?fieldName } Field</h1>
<!-- <ui:forEach ui:resultSet="{#
SELECT
......@@ -29,10 +39,10 @@ SELECT
?grossCalorificValueInMegaJouleMetre_3
WHERE
{
?productionReport a ep-prodreport:ProductionReport .
?productionReport a ep-report:ProductionReport .
?productVolumeReport ep-core:partOf ?productionReport ;
a ep-prodreport:ProductVolumeReport .
a ep-report:ProductVolumeReport .
?productVolumeReport ep-report:reportOn ?productionFlowsInReportingPeriod .
......
......@@ -42,7 +42,7 @@ arg:template
]
] .
<http://www.reportinghub.no/ep/schema/production-report#ProductionReport>
<http://www.reportinghub.no/ep/schema/report#ProductionReport>
ui:instanceView
[ rdf:type mprgswp:MPRGView ;
arg:report spin:_this
......@@ -50,7 +50,7 @@ arg:template
<http://www.reportinghub.no/swp/mprg>
rdf:type owl:Ontology ;
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> ;
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> ;
owl:versionInfo "0.1.0"^^xsd:string .
mprgswp:MPRGView
......@@ -61,7 +61,13 @@ mprgswp:MPRGView
[ rdf:type spl:Argument ;
rdfs:comment "The report to display."^^xsd:string ;
spl:predicate arg:report ;
spl:valueType <http://www.reportinghub.no/ep/schema/production-report#ProductionReport>
spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
] ;
ui:headIncludes
[ rdf:type html:Link ;
html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
html:rel "stylesheet"^^xsd:string ;
html:type "text/css"^^xsd:string
] ;
ui:headIncludes
[ rdf:type html:Title ;
......@@ -71,12 +77,6 @@ mprgswp:MPRGView
ui:text "Monthly Production Report (government)"^^xsd:string
]
] ;
ui:headIncludes
[ rdf:type html:Link ;
html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
html:rel "stylesheet"^^xsd:string ;
html:type "text/css"^^xsd:string
] ;
ui:prototype <http://www.reportinghub.no/swp/MPRG.uispin.html> .
mprgswp:Table
......@@ -86,15 +86,15 @@ mprgswp:Table
rdfs:subClassOf ui:Element ;
spin:constraint
[ rdf:type spl:Argument ;
rdfs:comment "The report that serves as root of the template."^^xsd:string ;
spl:optional "true"^^xsd:boolean ;
spl:predicate arg:report ;
spl:valueType <http://www.reportinghub.no/ep/schema/production-report#MonthlyProductionReport>
] ;
spin:constraint
[ rdf:type spl:Argument ;
rdfs:comment "The SPIN Template to execute."^^xsd:string ;
spl:predicate arg:template ;
spl:valueType spin:Template
] ;
spin:constraint
[ rdf:type spl:Argument ;
rdfs:comment "The report that serves as root of the template."^^xsd:string ;
spl:optional "true"^^xsd:boolean ;
spl:predicate arg:report ;
spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
] ;
ui:prototype <http://www.reportinghub.no/swp/MPRGTable.uispin.html> .
......