David Price

Well Incident Comment moved from DDR table to HTML

...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 <http://www.reportinghub.no/ep/spin/ddr-tables> 23 <http://www.reportinghub.no/ep/spin/ddr-tables>
24 rdf:type owl:Ontology ; 24 rdf:type owl:Ontology ;
25 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ; 25 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ;
26 - owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> ; 26 + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> ;
27 owl:versionInfo "0.1.0"^^xsd:string . 27 owl:versionInfo "0.1.0"^^xsd:string .
28 28
29 ddr-tables:BitRecord 29 ddr-tables:BitRecord
...@@ -3840,7 +3840,6 @@ ddr-tables:WellControlIncident ...@@ -3840,7 +3840,6 @@ ddr-tables:WellControlIncident
3840 ] [ sp:varName "killingProcd"^^xsd:string 3840 ] [ sp:varName "killingProcd"^^xsd:string
3841 ] [ sp:varName "formation"^^xsd:string 3841 ] [ sp:varName "formation"^^xsd:string
3842 ] [ sp:varName "bHT"^^xsd:string 3842 ] [ sp:varName "bHT"^^xsd:string
3843 - ] [ sp:varName "comment"^^xsd:string
3844 ]) ; 3843 ]) ;
3845 sp:where ([ sp:object 3844 sp:where ([ sp:object
3846 [ sp:varName "reportOn"^^xsd:string 3845 [ sp:varName "reportOn"^^xsd:string
...@@ -4215,7 +4214,7 @@ bar"""^^xsd:string """Shut in drill ...@@ -4215,7 +4214,7 @@ bar"""^^xsd:string """Shut in drill
4215 pipe pressure 4214 pipe pressure
4216 bar"""^^xsd:string """Incident 4215 bar"""^^xsd:string """Incident
4217 class"""^^xsd:string """Killing 4216 class"""^^xsd:string """Killing
4218 -procd"""^^xsd:string "Formation"^^xsd:string "BHT"^^xsd:string "Comment"^^xsd:string) . 4217 +procd"""^^xsd:string "Formation"^^xsd:string "BHT"^^xsd:string) .
4219 4218
4220 ddr-tables:WellTestInformation 4219 ddr-tables:WellTestInformation
4221 rdf:type rhspin:TableTemplate ; 4220 rdf:type rhspin:TableTemplate ;
......
...@@ -118,6 +118,10 @@ ...@@ -118,6 +118,10 @@
118 <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:LithologyInformation" /> 118 <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:LithologyInformation" />
119 119
120 <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:WellControlIncident" /> 120 <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:WellControlIncident" />
121 + <ui:forEach ui:resultSet="{# SELECT DISTINCT ?startedAt ?comment WHERE {?report ep-report:reportOn ?reportOn . ?reportOn ep-core:hasPart ?wci . ?wci a ?wciClass . ?wciClass rdfs:subClassOf ep-activity:WellControlIncident . OPTIONAL { ?wci ep-activity:startedAt ?startedAt . } . ?wci rdfs:comment ?comment . } ORDER BY (?startedAt) }" >
122 + <p>{= ?comment }</p>
123 + </ui:forEach>
124 +
121 125
122 <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:PerforationInformation" /> 126 <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:PerforationInformation" />
123 127
......