data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Bob DuCharme
1ca25957 2 parents fa4194c3 e116a637

Merge branch 'bob-nov29'

Expand all
Inline Side-by-side
Showing 3 changed files with 13 additions and 7 deletions
...@@ -67,6 +67,7 @@ WHERE { ...@@ -67,6 +67,7 @@ WHERE {
67 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:HSEInformation" /> 67 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:HSEInformation" />
68 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:SafetyInformation" /> 68 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:SafetyInformation" />
69 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WeatherInformation" /> 69 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WeatherInformation" />
70 + <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:SeaWeatherInformation" />
70 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:OperationInformation" /> 71 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:OperationInformation" />
71 72
72 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationActivity" /> 73 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationActivity" />
......
...@@ -6,12 +6,14 @@ ...@@ -6,12 +6,14 @@
6 6
7 @prefix arg: <http://spinrdf.org/arg#> . 7 @prefix arg: <http://spinrdf.org/arg#> .
8 @prefix dprswp: <http://www.reportinghub.no/swp/dpr#> . 8 @prefix dprswp: <http://www.reportinghub.no/swp/dpr#> .
9 +@prefix ep-spin-lib: <http://www.reportinghub.no/ep/spin/lib#> .
9 @prefix html: <http://uispin.org/html#> . 10 @prefix html: <http://uispin.org/html#> .
10 @prefix let: <http://uispin.org/let#> . 11 @prefix let: <http://uispin.org/let#> .
11 @prefix letrs: <http://uispin.org/letrs#> . 12 @prefix letrs: <http://uispin.org/letrs#> .
12 @prefix owl: <http://www.w3.org/2002/07/owl#> . 13 @prefix owl: <http://www.w3.org/2002/07/owl#> .
13 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 14 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
14 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 15 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
16 +@prefix rhspin: <http://www.reportinghub.no/spin/rh#> .
15 @prefix sp: <http://spinrdf.org/sp#> . 17 @prefix sp: <http://spinrdf.org/sp#> .
16 @prefix spin: <http://spinrdf.org/spin#> . 18 @prefix spin: <http://spinrdf.org/spin#> .
17 @prefix spl: <http://spinrdf.org/spl#> . 19 @prefix spl: <http://spinrdf.org/spl#> .
...@@ -34,9 +36,12 @@ arg:template ...@@ -34,9 +36,12 @@ arg:template
34 arg:report spin:_this 36 arg:report spin:_this
35 ] . 37 ] .
36 38
39 +<http://www.reportinghub.no/ep/spin/dpr-tables#WeatherInformation>
40 + rdfs:comment "rhspin:tableHeaders values come from http://massivemonster.org/prodmltutorial/movingon/operational/weather"^^xsd:string .
41 +
37 <http://www.reportinghub.no/swp/dpr> 42 <http://www.reportinghub.no/swp/dpr>
38 rdf:type owl:Ontology ; 43 rdf:type owl:Ontology ;
39 - owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/spin/dpr-tables> , <http://www.reportinghub.no/spin/rh> ; 44 + owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/dpr-tables> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://uispin.org/tui> ;
40 owl:versionInfo "0.1.0"^^xsd:string . 45 owl:versionInfo "0.1.0"^^xsd:string .
41 46
42 dprswp:DailyProductionReportView 47 dprswp:DailyProductionReportView
...@@ -64,15 +69,15 @@ dprswp:Table ...@@ -64,15 +69,15 @@ dprswp:Table
64 rdfs:subClassOf ui:Element ; 69 rdfs:subClassOf ui:Element ;
65 spin:constraint 70 spin:constraint
66 [ rdf:type spl:Argument ; 71 [ rdf:type spl:Argument ;
72 + rdfs:comment "The SPIN Template to execute."^^xsd:string ;
73 + spl:predicate arg:template ;
74 + spl:valueType spin:Template
75 + ] ;
76 + spin:constraint
77 + [ rdf:type spl:Argument ;
67 rdfs:comment "The report that serves as root of the template."^^xsd:string ; 78 rdfs:comment "The report that serves as root of the template."^^xsd:string ;
68 spl:optional "true"^^xsd:boolean ; 79 spl:optional "true"^^xsd:boolean ;
69 spl:predicate arg:report ; 80 spl:predicate arg:report ;
70 spl:valueType <http://www.reportinghub.no/ep/schema/report#DailyProductionReport> 81 spl:valueType <http://www.reportinghub.no/ep/schema/report#DailyProductionReport>
71 ] ; 82 ] ;
72 - spin:constraint
73 - [ rdf:type spl:Argument ;
74 - rdfs:comment "The SPIN Template to execute."^^xsd:string ;
75 - spl:predicate arg:template ;
76 - spl:valueType spin:Template
77 - ] ;
78 ui:prototype <http://www.reportinghub.no/swp/DPRTable.uispin.html> . 83 ui:prototype <http://www.reportinghub.no/swp/DPRTable.uispin.html> .
......