David Price

Most DDR PDF fixed from SpiraTest Issues 1806, 1807 and 1811

......@@ -17,7 +17,7 @@
owl:versionInfo "0.1.0"^^xsd:string .
ep-fac:Completion
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "completion"^^xsd:string ;
rdfs:subClassOf ep-fac:TemporalPartOfACompletion .
......@@ -27,50 +27,55 @@ ep-fac:Facility
rdfs:subClassOf ep-core:PhysicalObject .
ep-fac:Field
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "field"^^xsd:string ;
rdfs:subClassOf ep-fac:TemporalPartOfAField .
ep-fac:FixedFacility
rdf:type owl:DeprecatedClass ;
rdf:type ep-fac:FixedOrMoveableFacilityType , owl:DeprecatedClass ;
rdfs:subClassOf ep-fac:TemporalPartOfAFixedFacility .
ep-fac:FixedOrMoveableFacilityType
rdf:type rdfs:Class ;
rdfs:label "fixed or moveable facility type"^^xsd:string ;
rdfs:subClassOf owl:Class .
ep-fac:FixedOrMoveableRigType
rdf:type rdfs:Class ;
rdfs:label "fixed or moveable rig type"^^xsd:string ;
rdfs:subClassOf owl:Class .
ep-fac:FixedRig
rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ;
rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
rdfs:label "fixed rig"^^xsd:string ;
rdfs:subClassOf ep-fac:Rig , ep-fac:FixedFacility .
rdfs:subClassOf ep-fac:FixedFacility , ep-fac:Rig .
ep-fac:Flowline
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "flowline"^^xsd:string ;
rdfs:subClassOf ep-fac:TemporalPartOfAFlowline .
ep-fac:Flowline-production
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "flowline - production"^^xsd:string ;
rdfs:subClassOf ep-fac:Flowline .
ep-fac:Lease
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "lease"^^xsd:string ;
rdfs:subClassOf ep-fac:Facility .
ep-fac:MoveableFacility
rdf:type owl:Class ;
rdf:type ep-fac:FixedOrMoveableFacilityType , owl:Class ;
rdfs:subClassOf ep-fac:TemporalPartOfAMoveableFacility .
ep-fac:MoveableRig
rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ;
rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
rdfs:label "moveable rig"^^xsd:string ;
rdfs:subClassOf ep-fac:Rig , ep-fac:MoveableFacility .
rdfs:subClassOf ep-fac:MoveableFacility , ep-fac:Rig .
ep-fac:Platform
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "platform"^^xsd:string ;
rdfs:subClassOf ep-fac:TemporalPartOfAPlatform .
......@@ -85,7 +90,7 @@ ep-fac:ProductionFacilityType
rdfs:subClassOf owl:Class .
ep-fac:Reservoir
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "reservoir"^^xsd:string ;
rdfs:subClassOf ep-fac:TemporalPartOfAReservoir .
......@@ -113,7 +118,7 @@ ep-fac:SurroundingWater-meanSeaLevel
rdfs:subClassOf ep-fac:SurroundingWater .
ep-fac:Template
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "template"^^xsd:string ;
rdfs:subClassOf ep-fac:TemporalPartOfATemplate .
......@@ -163,12 +168,12 @@ ep-fac:TemporalPartOfAZone
rdfs:subClassOf ep-fac:Facility .
ep-fac:Zone
rdf:type owl:Class , ep-fac:ProductionFacilityType ;
rdf:type ep-fac:ProductionFacilityType , owl:Class ;
rdfs:label "zone"^^xsd:string ;
rdfs:subClassOf ep-fac:TemporalPartOfAZone .
ep-fac:depthOfSurroundingWater
rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
rdfs:domain ep-fac:SurroundingWater ;
rdfs:label "depth of surrounding water"^^xsd:string ;
rdfs:range ep-core:Length .
......
......@@ -5,6 +5,10 @@
let:wbPart="{# SELECT ?wbPart WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-activity:onWellBore ?wbPart}}"
let:wb="{# SELECT ?wb WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-activity:onWellBore ?wbPart . ?wbPart ep-core:temporalPartOf ?wb}}"
let:rig="{# SELECT ?rig WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-activity:onRig/ep-core:temporalPartOf ?rig } }"
let:repType="{# SELECT ?repType WHERE {?report a ?repType . ?repType a ep-report:DailyDrillingReportFinalisationType} }"
let:rigType="{# SELECT ?rigType WHERE { ?rig a ?rigType . ?rigType a ep-fac:FixedOrMoveableFacilityType} }"
let:wbTightType="{# SELECT ?wbTightType WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType} }"
let:wbPTType="{# SELECT ?wbPTType WHERE { ?statusActivityWb a ?wbPTType . ?wbPTType a ep-well:WellBoreHphtType} }"
let:firstActivity="{# SELECT ?firstActivity WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-core:hasPart ?firstActivity . ?firstActivity a ep-activity:DrillingActivity . ?firstActivity ep-activity:startedAt ?startedAt} ORDER BY (?startedAt) LIMIT 1}"
let:lastActivity="{# SELECT ?firstActivity WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-core:hasPart ?firstActivity . ?firstActivity a ep-activity:DrillingActivity . ?firstActivity ep-activity:startedAt ?startedAt} ORDER BY DESC(?startedAt) LIMIT 1}"
let:statusActivity="{# SELECT ?statusActivity WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-core:hasPart ?statusActivity . ?statusActivity a ep-activity:DailyDrillingActivityToStatus}}"
......@@ -32,17 +36,17 @@
<td class="ddrSummaryLeft">
<rhswp:NameValuePair arg:name="NPD Wellbore Id:" arg:value="{= rhspin:npdId(?wb) }" />
<rhswp:NameValuePair arg:name="Report Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType a ep-report:DailyDrillingReportFinalisationType . ?repType rdfs:label ?repTypeName}}" />
<rhswp:NameValuePair arg:name="Report Status:" arg:value="{= ep-spin-lib:selectDailyDrillingReportFlag(?repType) }" />
<rhswp:NameValuePair arg:name="Creation time:" arg:value="{= ep-spin-lib:normalizeDateTime(?createdAt) }" />
<rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" />
<rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" />
<rhswp:NameValuePair arg:name="Rig name:" arg:value="{= rhspin:npdName(?rig) }" />
<rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= rhspin:npdId(?rig) }" />
<rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{# SELECT ?rigTypeName WHERE {?rig a ?rigType . ?rigType rdfs:label ?rigTypeName . ?rigType rdfs:subClassOf ep-fac:Rig}}" />
<rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{= ep-spin-lib:selectFixedOrMoveableRigFlag(?rigType) }" />
<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{# SELECT ?kellyElevMeas WHERE {?activity ep-activity:onRig ?rigState . ?rigState ep-core:hasPart ?kellyBushing . ?kellyBushing a ep-eqt:KellyBushing . ?kellyBushing ep-eqt:elevationOfKellyBushing ?kellyElev . ?kellyElev ep-core:metre ?kellyElevMeas}}" />
<rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{# SELECT ?waterDepthVal WHERE {?activity ep-activity:onRig ?rigState . ?rigState a ep-fac:TemporalPartOfARig . ?rigState ep-core:hasPart ?water . ?water a ep-fac:SurroundingWater . ?water ep-fac:depthOfSurroundingWater ?waterDepth . ?waterDepth ep-core:metre ?waterDepthVal}}" />
<rhswp:NameValuePair arg:name="Tight well:" arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }" />
<rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{# SELECT ?wbPTTypeLabel WHERE { ?statusActivityWb a ?wbPTType . ?wbPTType a ep-well:WellBoreHphtType . ?wbPTType rdfs:label ?wbPTTypeLabel} }" />
<rhswp:NameValuePair arg:name="Tight well:" arg:value="{= ep-spin-lib:selectWellBoreTightnessFlag(?wbTightType) }" />
<rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{= ep-spin-lib:selectWellBoreHphtFlag(?wbPTType) }" />
<rhswp:NameValuePair arg:name="Temperature degC:" arg:value="{# SELECT ?buttHoleTempVal WHERE {?statusActivityWb ep-well:averageBottomHoleTemperature ?buttHoleTemp . ?buttHoleTemp ep-core:celsius ?buttHoleTempVal}}" />
<rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MMM-dd'), ?unbound) }" />
<rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MMM-dd'), ?unbound) }" />
......