David Price

Added updated DPR2 test files, improved PDF a bit.

......@@ -1544,7 +1544,8 @@ ep-core:inchUS
ep-core:inch_64
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
rdfs:domain ep-core:Length ;
rdfs:label "inch/64"^^xsd:string .
rdfs:label "inch/64"^^xsd:string ;
ep-core:unitSymbol "in/64"^^xsd:string .
ep-core:j_cm-2
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
......@@ -3223,7 +3224,8 @@ ep-core:sixteenth_inch
ep-core:sixtyFourth_Inch
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
rdfs:domain ep-core:Length ;
rdfs:label "Sixty-Fourth of an Inch"^^xsd:string .
rdfs:label "Sixty-Fourth of an Inch"^^xsd:string ;
ep-core:unitSymbol "in/64"^^xsd:string .
ep-core:sm3_sm-3
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
......
......@@ -3976,12 +3976,14 @@ dpr-tables:WellInjectionTest
sp:subject
[ sp:varName "wellTestChoke"^^xsd:string
]
] [ sp:object
[ sp:varName "chokeOrificeSizeValue"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "chokeOrificeSize"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#sixtyFourth_Inch> ;
sp:subject
[ sp:varName "chokeOrificeSize"^^xsd:string
sp:variable
[ sp:varName "chokeOrificeSizeValue"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
......@@ -4025,8 +4027,7 @@ Pressure"""^^xsd:string """Wellhead
Flowing
Pressure"""^^xsd:string """Wellhead
Max
Pressure"""^^xsd:string """Choke
64 inch"""^^xsd:string) .
Pressure"""^^xsd:string "Choke"^^xsd:string) .
dpr-tables:WellInjectionTestResults
rdf:type rhspin:TableTemplate ;
......
......@@ -25,9 +25,13 @@ WHERE {
} }</h2>
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:PersonnelInformation" />
<table>
<tr><th>Facility</th><th>Total Beds Available</th></tr>
<ui:forEach ui:resultSet="{# SELECT ?facilityName ?beds
WHERE {
?report a ep-report:ProductionReport .
......@@ -44,9 +48,12 @@ WHERE {
}
}" >
<tr><td>{= ?facilityName }</td><td>{= ?beds}</td></tr>
<tr><td>{= ?facilityName }</td><td>{= ?beds}</td><td>Total Beds Available</td></tr>
</ui:forEach>
</table>
<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:OperationInformation" />
......@@ -80,12 +87,20 @@ WHERE {
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellTest" />
<hr />
<h2>Well Injection Test Information</h2>
<h2>Well Injection Test Information</h2>
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTest" />
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTestResults" />
<h2>Well Fluid Level Test Information</h2>
<h2>Well Fluid Level Test Information</h2>
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellFluidLevelTest" />
......@@ -95,7 +110,14 @@ WHERE {
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellProductionTestResults" />
<h2>Fluid Sample Information</h2>
<ui:if ui:condition="{# ASK WHERE {
?report a ep-report:ProductionReport .
?fluidSampleReport ep-core:partOf ?report .
?fluidSampleReport a ep-report:FluidSampleReport . } }">
<h2>Fluid Sample Information</h2>
</ui:if>
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:FluidSamples" />
......
......@@ -7,7 +7,6 @@
<DocumentDate>2012-03-04T00:00:00.0Z</DocumentDate>
<documentClass namingSystem="EC">Dong E&amp;P Norge AS</documentClass>
<documentClass namingSystem="EC">DPR 2.0</documentClass>
<documentClass namingSystem="ERH">dpr2</documentClass>
<FileCreationInformation>
<FileCreationDate>2012-03-14T00:00:00.0Z</FileCreationDate>
......