David Price

Add DateTime function and use in tables and header

This diff could not be displayed because it is too large.
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
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: {= ?activityEnd}</div> 20 +
21 + <div>Period: {= fn:concat(ep-spin-lib:normalizeDateTime(?activityStart), ' - ', ep-spin-lib:normalizeDateTime(?activityEnd)) } </div>
22 +
21 <hr /> 23 <hr />
22 24
23 25
...@@ -30,7 +32,7 @@ ...@@ -30,7 +32,7 @@
30 <rhswp:NameValuePair arg:name="Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType a ep-report:DailyDrillingReportFinalisationType . ?repType rdfs:label ?repTypeName}}" /> 32 <rhswp:NameValuePair arg:name="Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType a ep-report:DailyDrillingReportFinalisationType . ?repType rdfs:label ?repTypeName}}" />
31 <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" /> 33 <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" />
32 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= rhspin:npdName(?rig) }" /> 34 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= rhspin:npdName(?rig) }" />
33 - <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MM-dd'), ?unbound) }" /> 35 + <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MMM-dd'), ?unbound) }" />
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}}" /> 36 <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}}" />
35 <rhswp:NameValuePair arg:name="Tight well:" arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }" /> 37 <rhswp:NameValuePair arg:name="Tight well:" arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }" />
36 <rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{# SELECT ?buttHolePresVal WHERE {?statusActivityWb ep-well:averageBottomHolePressure ?buttHolePres . ?buttHolePres ep-core:psig ?buttHolePresVal}}" /> 38 <rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{# SELECT ?buttHolePresVal WHERE {?statusActivityWb ep-well:averageBottomHolePressure ?buttHolePres . ?buttHolePres ep-core:psig ?buttHolePresVal}}" />
...@@ -45,14 +47,12 @@ ...@@ -45,14 +47,12 @@
45 </td> 47 </td>
46 <td class="ddrSummaryRight"> 48 <td class="ddrSummaryRight">
47 49
48 - <rhswp:NameValuePair arg:name="Period:" arg:value="{= fn:concat(?activityStart, ' - ', ?activityEnd) }" />
49 -
50 50
51 <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{= rhspin:npdId(?wb) }" /> 51 <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{= rhspin:npdId(?wb) }" />
52 - <rhswp:NameValuePair arg:name="Created date:" arg:value="{= ?createdAt }" /> 52 + <rhswp:NameValuePair arg:name="Created time:" arg:value="{= ep-spin-lib:normalizeDateTime(?createdAt) }" />
53 <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}}" />
54 <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) }" />
55 - <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-MMM-dd'), ?unbound) }" />
56 <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}}" /> 56 <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}}" />
57 <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} }" /> 57 <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} }" />
58 <rhswp:NameValuePair arg:name="Temperature degC:" arg:value="{# SELECT ?buttHoleTempVal WHERE {?statusActivityWb ep-well:averageBottomHoleTemperature ?buttHoleTemp . ?buttHoleTemp ep-core:celsius ?buttHoleTempVal}}" /> 58 <rhswp:NameValuePair arg:name="Temperature degC:" arg:value="{# SELECT ?buttHoleTempVal WHERE {?statusActivityWb ep-well:averageBottomHoleTemperature ?buttHoleTemp . ?buttHoleTemp ep-core:celsius ?buttHoleTempVal}}" />
......