David Price

Started cleanup after DDR refactor

...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
8 <hr /> 8 <hr />
9 <table><tr> 9 <table><tr>
10 <td class="ddrSummaryLeft"> 10 <td class="ddrSummaryLeft">
11 - <rhswp:NameValuePair arg:name="Report Number:" arg:value="{= rhspin:dtypeValue(?this, ddr:reportNo) }" /> 11 + <rhswp:NameValuePair arg:name="Report Number:" arg:value="{= rhspin:dtypeValue(?this, ep-report:dailyDrillingReportNumber) }" />
12 <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{= rhspin:npdName(?wellBore) }" /> 12 <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{= rhspin:npdName(?wellBore) }" />
13 <rhswp:NameValuePair arg:name="Status:" arg:value="{TBD}" /> 13 <rhswp:NameValuePair arg:name="Status:" arg:value="{TBD}" />
14 - <rhswp:NameValuePair arg:name="Operator:" arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:drillingOperator) }" /> 14 + <rhswp:NameValuePair arg:name="Operator:" arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:drillingOperator/ep-core:temporalPartOf) }" />
15 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= ui:label(?rig) }" /> 15 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= ui:label(?rig) }" />
16 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{TBD}" /> 16 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{TBD}" />
17 <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{= rhspin:dtypeValue(?onWellBore, ddr:elevKelly) }" /> 17 <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{= rhspin:dtypeValue(?onWellBore, ddr:elevKelly) }" />
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 <rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvdKickoff) }" /> 40 <rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvdKickoff) }" />
41 <rhswp:NameValuePair arg:name="Depth mMD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:md) }" /> 41 <rhswp:NameValuePair arg:name="Depth mMD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:md) }" />
42 <rhswp:NameValuePair arg:name="Depth mTVD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvd) }" /> 42 <rhswp:NameValuePair arg:name="Depth mTVD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvd) }" />
43 - <rhswp:NameValuePair arg:name="Dist Drilled m:" arg:value="{= rhspin:dtypeValue(?dailyDrillingActivity, ddr:distDrill) }" /> 43 + <rhswp:NameValuePair arg:name="Dist Drilled m:" arg:value="{= rhspin:dtypeValue(?dailyDrillingActivity, ep-activity:distanceDrilled/ep-core:metre) }" />
44 <rhswp:NameValuePair arg:name="Hole Dia in:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:diaHole) }" /> 44 <rhswp:NameValuePair arg:name="Hole Dia in:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:diaHole) }" />
45 <rhswp:NameValuePair arg:name="Formation Strength g/cm3:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:strengthForm) }" /> 45 <rhswp:NameValuePair arg:name="Formation Strength g/cm3:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:strengthForm) }" />
46 <rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvdStrengthForm) }" /> 46 <rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvdStrengthForm) }" />
......