Merge branch 'bob-nov29'

@@ -67,6 +67,7 @@ WHERE {
 	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:HSEInformation" />	
 	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:SafetyInformation" />	
 	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WeatherInformation" />
+	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:SeaWeatherInformation" />
 	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:OperationInformation" />
 	
 	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationActivity" />

@@ -6,12 +6,14 @@
 
 @prefix arg:     <http://spinrdf.org/arg#> .
 @prefix dprswp:  <http://www.reportinghub.no/swp/dpr#> .
+@prefix ep-spin-lib:  <http://www.reportinghub.no/ep/spin/lib#> .
 @prefix html:    <http://uispin.org/html#> .
 @prefix let:     <http://uispin.org/let#> .
 @prefix letrs:   <http://uispin.org/letrs#> .
 @prefix owl:     <http://www.w3.org/2002/07/owl#> .
 @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix rhspin:  <http://www.reportinghub.no/spin/rh#> .
 @prefix sp:      <http://spinrdf.org/sp#> .
 @prefix spin:    <http://spinrdf.org/spin#> .
 @prefix spl:     <http://spinrdf.org/spl#> .
@@ -34,9 +36,12 @@ arg:template
                 arg:report spin:_this
               ] .
 
+<http://www.reportinghub.no/ep/spin/dpr-tables#WeatherInformation>
+      rdfs:comment "rhspin:tableHeaders values come from http://massivemonster.org/prodmltutorial/movingon/operational/weather"^^xsd:string .
+
 <http://www.reportinghub.no/swp/dpr>
       rdf:type owl:Ontology ;
-      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> ;
+      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> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
 dprswp:DailyProductionReportView
@@ -64,15 +69,15 @@ dprswp:Table
       rdfs:subClassOf ui:Element ;
       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#DailyProductionReport>
               ] ;
-      spin:constraint
-              [ rdf:type spl:Argument ;
-                rdfs:comment "The SPIN Template to execute."^^xsd:string ;
-                spl:predicate arg:template ;
-                spl:valueType spin:Template
-              ] ;
       ui:prototype <http://www.reportinghub.no/swp/DPRTable.uispin.html> .