David Price

Fixed header depth and report type and datetime form

...@@ -17,19 +17,21 @@ ...@@ -17,19 +17,21 @@
17 > 17 >
18 18
19 <h1>Summary report Wellbore: {= rhspin:npdName(?wb) }</h1> 19 <h1>Summary report Wellbore: {= rhspin:npdName(?wb) }</h1>
20 - <div>End time: <ui:if ui:condition="{= bound(?activityEnd) }">{= spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm') }</ui:if></div> 20 + <div>End time: {= ?activityEnd}</div>
21 <hr /> 21 <hr />
22 +
23 +
22 <table> 24 <table>
23 25
24 <tr> 26 <tr>
25 <td class="ddrSummaryLeft"> 27 <td class="ddrSummaryLeft">
26 <rhswp:NameValuePair arg:name="Report Number:" arg:value="{# SELECT ?repNum WHERE {?report ep-report:dailyDrillingReportNumber ?repNum}}" /> 28 <rhswp:NameValuePair arg:name="Report Number:" arg:value="{# SELECT ?repNum WHERE {?report ep-report:dailyDrillingReportNumber ?repNum}}" />
27 <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{= rhspin:npdName(?wb) }" /> 29 <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{= rhspin:npdName(?wb) }" />
28 - <rhswp:NameValuePair arg:name="Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType rdfs:label ?repTypeName}}" /> 30 + <rhswp:NameValuePair arg:name="Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType a ep-report:DailyDrillingReportFinalisationType . ?repType rdfs:label ?repTypeName}}" />
29 <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" /> 31 <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" />
30 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= rhspin:npdName(?rig) }" /> 32 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= rhspin:npdName(?rig) }" />
31 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MM-dd'), ?unbound) }" /> 33 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MM-dd'), ?unbound) }" />
32 - <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{# SELECT ?kellyElevVMeas 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}}" /> 34 + <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}}" />
33 <rhswp:NameValuePair arg:name="Tight well:" arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }" /> 35 <rhswp:NameValuePair arg:name="Tight well:" arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }" />
34 <rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{# SELECT ?buttHolePresVal WHERE {?statusActivityWb ep-well:averageBottomHolePressure ?buttHolePres . ?buttHolePres ep-core:psig ?buttHolePresVal}}" /> 36 <rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{# SELECT ?buttHolePresVal WHERE {?statusActivityWb ep-well:averageBottomHolePressure ?buttHolePres . ?buttHolePres ep-core:psig ?buttHolePresVal}}" />
35 <rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{# SELECT ?rigTypeName WHERE {?rig a ?rigType . ?rigType rdfs:label ?rigTypeName . ?rigType rdfs:subClassOf ep-fac:Rig}}" /> 37 <rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{# SELECT ?rigTypeName WHERE {?rig a ?rigType . ?rigType rdfs:label ?rigTypeName . ?rigType rdfs:subClassOf ep-fac:Rig}}" />
...@@ -43,11 +45,11 @@ ...@@ -43,11 +45,11 @@
43 </td> 45 </td>
44 <td class="ddrSummaryRight"> 46 <td class="ddrSummaryRight">
45 47
46 - <rhswp:NameValuePair arg:name="Period:" arg:value="{= fn:concat(spif:dateFormat(?activityStart, 'yyyy-MM-dd HH:mm'), ' - ', spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm')) }" /> 48 + <rhswp:NameValuePair arg:name="Period:" arg:value="{= fn:concat(?activityStart, ' - ', ?activityEnd) }" />
47 49
48 50
49 <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{= rhspin:npdId(?wb) }" /> 51 <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{= rhspin:npdId(?wb) }" />
50 - <rhswp:NameValuePair arg:name="Created date:" arg:value="{= IF(bound(?createdAt), spif:dateFormat(?createdAt, 'yyyy-MM-dd HH:mm'), ?unbound) }" /> 52 + <rhswp:NameValuePair arg:name="Created date:" arg:value="{= ?createdAt }" />
51 <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" /> 53 <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" />
52 <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= rhspin:npdId(?rig) }" /> 54 <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= rhspin:npdId(?rig) }" />
53 <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MM-dd'), ?unbound) }" /> 55 <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MM-dd'), ?unbound) }" />
......