David Price

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

...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 owl:versionInfo "0.1.0"^^xsd:string . 17 owl:versionInfo "0.1.0"^^xsd:string .
18 18
19 ep-fac:Completion 19 ep-fac:Completion
20 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 20 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
21 rdfs:label "completion"^^xsd:string ; 21 rdfs:label "completion"^^xsd:string ;
22 rdfs:subClassOf ep-fac:TemporalPartOfACompletion . 22 rdfs:subClassOf ep-fac:TemporalPartOfACompletion .
23 23
...@@ -27,50 +27,55 @@ ep-fac:Facility ...@@ -27,50 +27,55 @@ ep-fac:Facility
27 rdfs:subClassOf ep-core:PhysicalObject . 27 rdfs:subClassOf ep-core:PhysicalObject .
28 28
29 ep-fac:Field 29 ep-fac:Field
30 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 30 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
31 rdfs:label "field"^^xsd:string ; 31 rdfs:label "field"^^xsd:string ;
32 rdfs:subClassOf ep-fac:TemporalPartOfAField . 32 rdfs:subClassOf ep-fac:TemporalPartOfAField .
33 33
34 ep-fac:FixedFacility 34 ep-fac:FixedFacility
35 - rdf:type owl:DeprecatedClass ; 35 + rdf:type ep-fac:FixedOrMoveableFacilityType , owl:DeprecatedClass ;
36 rdfs:subClassOf ep-fac:TemporalPartOfAFixedFacility . 36 rdfs:subClassOf ep-fac:TemporalPartOfAFixedFacility .
37 37
38 +ep-fac:FixedOrMoveableFacilityType
39 + rdf:type rdfs:Class ;
40 + rdfs:label "fixed or moveable facility type"^^xsd:string ;
41 + rdfs:subClassOf owl:Class .
42 +
38 ep-fac:FixedOrMoveableRigType 43 ep-fac:FixedOrMoveableRigType
39 rdf:type rdfs:Class ; 44 rdf:type rdfs:Class ;
40 rdfs:label "fixed or moveable rig type"^^xsd:string ; 45 rdfs:label "fixed or moveable rig type"^^xsd:string ;
41 rdfs:subClassOf owl:Class . 46 rdfs:subClassOf owl:Class .
42 47
43 ep-fac:FixedRig 48 ep-fac:FixedRig
44 - rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ; 49 + rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
45 rdfs:label "fixed rig"^^xsd:string ; 50 rdfs:label "fixed rig"^^xsd:string ;
46 - rdfs:subClassOf ep-fac:Rig , ep-fac:FixedFacility . 51 + rdfs:subClassOf ep-fac:FixedFacility , ep-fac:Rig .
47 52
48 ep-fac:Flowline 53 ep-fac:Flowline
49 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 54 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
50 rdfs:label "flowline"^^xsd:string ; 55 rdfs:label "flowline"^^xsd:string ;
51 rdfs:subClassOf ep-fac:TemporalPartOfAFlowline . 56 rdfs:subClassOf ep-fac:TemporalPartOfAFlowline .
52 57
53 ep-fac:Flowline-production 58 ep-fac:Flowline-production
54 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 59 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
55 rdfs:label "flowline - production"^^xsd:string ; 60 rdfs:label "flowline - production"^^xsd:string ;
56 rdfs:subClassOf ep-fac:Flowline . 61 rdfs:subClassOf ep-fac:Flowline .
57 62
58 ep-fac:Lease 63 ep-fac:Lease
59 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 64 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
60 rdfs:label "lease"^^xsd:string ; 65 rdfs:label "lease"^^xsd:string ;
61 rdfs:subClassOf ep-fac:Facility . 66 rdfs:subClassOf ep-fac:Facility .
62 67
63 ep-fac:MoveableFacility 68 ep-fac:MoveableFacility
64 - rdf:type owl:Class ; 69 + rdf:type ep-fac:FixedOrMoveableFacilityType , owl:Class ;
65 rdfs:subClassOf ep-fac:TemporalPartOfAMoveableFacility . 70 rdfs:subClassOf ep-fac:TemporalPartOfAMoveableFacility .
66 71
67 ep-fac:MoveableRig 72 ep-fac:MoveableRig
68 - rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ; 73 + rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
69 rdfs:label "moveable rig"^^xsd:string ; 74 rdfs:label "moveable rig"^^xsd:string ;
70 - rdfs:subClassOf ep-fac:Rig , ep-fac:MoveableFacility . 75 + rdfs:subClassOf ep-fac:MoveableFacility , ep-fac:Rig .
71 76
72 ep-fac:Platform 77 ep-fac:Platform
73 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 78 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
74 rdfs:label "platform"^^xsd:string ; 79 rdfs:label "platform"^^xsd:string ;
75 rdfs:subClassOf ep-fac:TemporalPartOfAPlatform . 80 rdfs:subClassOf ep-fac:TemporalPartOfAPlatform .
76 81
...@@ -85,7 +90,7 @@ ep-fac:ProductionFacilityType ...@@ -85,7 +90,7 @@ ep-fac:ProductionFacilityType
85 rdfs:subClassOf owl:Class . 90 rdfs:subClassOf owl:Class .
86 91
87 ep-fac:Reservoir 92 ep-fac:Reservoir
88 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 93 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
89 rdfs:label "reservoir"^^xsd:string ; 94 rdfs:label "reservoir"^^xsd:string ;
90 rdfs:subClassOf ep-fac:TemporalPartOfAReservoir . 95 rdfs:subClassOf ep-fac:TemporalPartOfAReservoir .
91 96
...@@ -113,7 +118,7 @@ ep-fac:SurroundingWater-meanSeaLevel ...@@ -113,7 +118,7 @@ ep-fac:SurroundingWater-meanSeaLevel
113 rdfs:subClassOf ep-fac:SurroundingWater . 118 rdfs:subClassOf ep-fac:SurroundingWater .
114 119
115 ep-fac:Template 120 ep-fac:Template
116 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 121 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
117 rdfs:label "template"^^xsd:string ; 122 rdfs:label "template"^^xsd:string ;
118 rdfs:subClassOf ep-fac:TemporalPartOfATemplate . 123 rdfs:subClassOf ep-fac:TemporalPartOfATemplate .
119 124
...@@ -163,12 +168,12 @@ ep-fac:TemporalPartOfAZone ...@@ -163,12 +168,12 @@ ep-fac:TemporalPartOfAZone
163 rdfs:subClassOf ep-fac:Facility . 168 rdfs:subClassOf ep-fac:Facility .
164 169
165 ep-fac:Zone 170 ep-fac:Zone
166 - rdf:type owl:Class , ep-fac:ProductionFacilityType ; 171 + rdf:type ep-fac:ProductionFacilityType , owl:Class ;
167 rdfs:label "zone"^^xsd:string ; 172 rdfs:label "zone"^^xsd:string ;
168 rdfs:subClassOf ep-fac:TemporalPartOfAZone . 173 rdfs:subClassOf ep-fac:TemporalPartOfAZone .
169 174
170 ep-fac:depthOfSurroundingWater 175 ep-fac:depthOfSurroundingWater
171 - rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ; 176 + rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
172 rdfs:domain ep-fac:SurroundingWater ; 177 rdfs:domain ep-fac:SurroundingWater ;
173 rdfs:label "depth of surrounding water"^^xsd:string ; 178 rdfs:label "depth of surrounding water"^^xsd:string ;
174 rdfs:range ep-core:Length . 179 rdfs:range ep-core:Length .
......
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
5 let:wbPart="{# SELECT ?wbPart WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-activity:onWellBore ?wbPart}}" 5 let:wbPart="{# SELECT ?wbPart WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-activity:onWellBore ?wbPart}}"
6 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}}" 6 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}}"
7 let:rig="{# SELECT ?rig WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-activity:onRig/ep-core:temporalPartOf ?rig } }" 7 let:rig="{# SELECT ?rig WHERE {?activity a ep-activity:DailyDrillingActivity . ?report ep-report:reportOn ?activity . ?activity ep-activity:onRig/ep-core:temporalPartOf ?rig } }"
8 + let:repType="{# SELECT ?repType WHERE {?report a ?repType . ?repType a ep-report:DailyDrillingReportFinalisationType} }"
9 + let:rigType="{# SELECT ?rigType WHERE { ?rig a ?rigType . ?rigType a ep-fac:FixedOrMoveableFacilityType} }"
10 + let:wbTightType="{# SELECT ?wbTightType WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType} }"
11 + let:wbPTType="{# SELECT ?wbPTType WHERE { ?statusActivityWb a ?wbPTType . ?wbPTType a ep-well:WellBoreHphtType} }"
8 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}" 12 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}"
9 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}" 13 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}"
10 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}}" 14 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 @@ ...@@ -32,17 +36,17 @@
32 <td class="ddrSummaryLeft"> 36 <td class="ddrSummaryLeft">
33 37
34 <rhswp:NameValuePair arg:name="NPD Wellbore Id:" arg:value="{= rhspin:npdId(?wb) }" /> 38 <rhswp:NameValuePair arg:name="NPD Wellbore Id:" arg:value="{= rhspin:npdId(?wb) }" />
35 - <rhswp:NameValuePair arg:name="Report Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType a ep-report:DailyDrillingReportFinalisationType . ?repType rdfs:label ?repTypeName}}" /> 39 + <rhswp:NameValuePair arg:name="Report Status:" arg:value="{= ep-spin-lib:selectDailyDrillingReportFlag(?repType) }" />
36 <rhswp:NameValuePair arg:name="Creation time:" arg:value="{= ep-spin-lib:normalizeDateTime(?createdAt) }" /> 40 <rhswp:NameValuePair arg:name="Creation time:" arg:value="{= ep-spin-lib:normalizeDateTime(?createdAt) }" />
37 <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" /> 41 <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" />
38 <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" /> 42 <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" />
39 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= rhspin:npdName(?rig) }" /> 43 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= rhspin:npdName(?rig) }" />
40 <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= rhspin:npdId(?rig) }" /> 44 <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= rhspin:npdId(?rig) }" />
41 - <rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{# SELECT ?rigTypeName WHERE {?rig a ?rigType . ?rigType rdfs:label ?rigTypeName . ?rigType rdfs:subClassOf ep-fac:Rig}}" /> 45 + <rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{= ep-spin-lib:selectFixedOrMoveableRigFlag(?rigType) }" />
42 <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}}" /> 46 <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}}" />
43 <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}}" /> 47 <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}}" />
44 - <rhswp:NameValuePair arg:name="Tight well:" arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }" /> 48 + <rhswp:NameValuePair arg:name="Tight well:" arg:value="{= ep-spin-lib:selectWellBoreTightnessFlag(?wbTightType) }" />
45 - <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} }" /> 49 + <rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{= ep-spin-lib:selectWellBoreHphtFlag(?wbPTType) }" />
46 <rhswp:NameValuePair arg:name="Temperature degC:" arg:value="{# SELECT ?buttHoleTempVal WHERE {?statusActivityWb ep-well:averageBottomHoleTemperature ?buttHoleTemp . ?buttHoleTemp ep-core:celsius ?buttHoleTempVal}}" /> 50 <rhswp:NameValuePair arg:name="Temperature degC:" arg:value="{# SELECT ?buttHoleTempVal WHERE {?statusActivityWb ep-well:averageBottomHoleTemperature ?buttHoleTemp . ?buttHoleTemp ep-core:celsius ?buttHoleTempVal}}" />
47 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MMM-dd'), ?unbound) }" /> 51 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MMM-dd'), ?unbound) }" />
48 <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MMM-dd'), ?unbound) }" /> 52 <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MMM-dd'), ?unbound) }" />
......