Initial set up of DPR2 as DailyProductionReport using DPR-tables

-# Saved by TopBraid on Wed Oct 12 19:50:38 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

-<ui:group
- 		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-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-report:ProductionReport . } }"
+
+let:reportedFieldName="{# SELECT ?reportedFieldName
+WHERE { 
+ ?report a ep-report:ProductionReport .
+
+    ?report ep-report:reportOn ?partOfFacility .
+    ?partOfFacility ep-core:temporalPartOf ?reportedField .
+    ?reportedField npd:name ?reportedFieldName .
+}}"
+ 
+>
+
+<h1>Daily Production Report : {= ?reportedFieldName } Field {# SELECT ?day WHERE { ?partOfFacility ep-activity:existsThroughout ?day . } }</h1>
+<h2>Report title : {# SELECT ?title WHERE { ?report a ep-report:ProductionReport . ?report ep-core:name ?title . } }</h2>
+<h2>Submitted by : {# SELECT ?submittingFieldName WHERE 
+{ 
+
+?report a ep-report:ProductionReport . 
+?report ep-report:reportSubmittedFrom ?submittingFieldState . 
+?submittingFieldState ep-core:temporalPartOf ?submittingField .
+?submittingField npd:name ?submittingFieldName .
+
+} }</h2>
 		
 	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInformation" />
+	<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:PersonnelInformation" />
 	
 </ui:group>
\ No newline at end of file

@@ -28,7 +28,7 @@ arg:template
       rdfs:label "template"^^xsd:string ;
       rdfs:subPropertyOf sp:arg .
 
-<http://www.reportinghub.no/ep/schema/production-report#DailyProductionReport>
+<http://www.reportinghub.no/ep/schema/report#ProductionReport>
       ui:instanceView
               [ rdf:type dprswp:DailyProductionReportView ;
                 arg:report spin:_this
@@ -47,7 +47,7 @@ dprswp:DailyProductionReportView
               [ 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#DailyProductionReport>
+                spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
               ] ;
       ui:headIncludes
               [ rdf:type html:Link ;
@@ -67,7 +67,7 @@ dprswp:Table
                 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#DailyProductionReport>
+                spl:valueType <http://www.reportinghub.no/ep/schema/report#ProductionReport>
               ] ;
       spin:constraint
               [ rdf:type spl:Argument ;