Ralph Hodgson

Merge branch 'refs/heads/master' of [email protected]:TopQuadrant/EPIM-Ontologies.git

...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 <div id="content"> 27 <div id="content">
28 28
29 <h3>Download a Daily Drilling Report</h3> 29 <h3>Download a Daily Drilling Report</h3>
30 - <form action="ddrFileDownload"> 30 + <form action="download-report">
31 31
32 <table> 32 <table>
33 <tr> 33 <tr>
...@@ -58,16 +58,18 @@ ...@@ -58,16 +58,18 @@
58 <td style="padding-left:20px; vertical-align: top"> 58 <td style="padding-left:20px; vertical-align: top">
59 <div> 59 <div>
60 <div class="formHeader">2. Select Well Bore:</div> 60 <div class="formHeader">2. Select Well Bore:</div>
61 - <select size="5" id="wellBoreSelect" style="width:200px"> 61 + <select size="5" id="wellBoreSelect" name="wellboreId" style="width:200px">
62 </select> 62 </select>
63 </div><br /> 63 </div><br />
64 <div> 64 <div>
65 <div class="formHeader">3. Select Date(s):</div> 65 <div class="formHeader">3. Select Date(s):</div>
66 - <input type="text" id="datepicker1" name="date1" style="width: 90px" />&nbsp;-&nbsp;<input type="text" id="datepicker2" name="date2" style="width: 90px" /> 66 + <input type="hidden" name="timeFrom" id="timeFrom" />
67 + <input type="hidden" name="timeTo" id="timeTo" />
68 + <input type="text" id="datepicker1" style="width: 90px" />&nbsp;-&nbsp;<input type="text" id="datepicker2" style="width: 90px" />
67 <script> 69 <script>
68 $(function() { 70 $(function() {
69 - $("#datepicker1").datepicker(); 71 + $("#datepicker1").datepicker({ altField: '#timeFrom' , altFormat: 'yy-mm-dd' });
70 - $("#datepicker2").datepicker(); 72 + $("#datepicker2").datepicker({ altField: '#timeTo' , altFormat: 'yy-mm-dd' });
71 }); 73 });
72 </script> 74 </script>
73 </div> 75 </div>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 @prefix afn: <http://jena.hpl.hp.com/ARQ/function#> . 11 @prefix afn: <http://jena.hpl.hp.com/ARQ/function#> .
12 @prefix dm: <http://rds.posccaesar.org/2008/02/OWL/ISO-15926-2_2003#> . 12 @prefix dm: <http://rds.posccaesar.org/2008/02/OWL/ISO-15926-2_2003#> .
13 -@prefix npd: <http://www.reportinghub.no/schema/npd#> . 13 +@prefix npd: <http://www.reportinghub.no/np/schema/npd#> .
14 @prefix npdMap: <http://www.reportinghub.no/1.1/schema/NPD-to-15926#> . 14 @prefix npdMap: <http://www.reportinghub.no/1.1/schema/NPD-to-15926#> .
15 @prefix owl: <http://www.w3.org/2002/07/owl#> . 15 @prefix owl: <http://www.w3.org/2002/07/owl#> .
16 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 16 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
......
1 -<html let:reportOn="{= spl:object(?this, ep-activity:reportOn) }"> 1 +<html let:activity="{= spl:object(?this, ep-activity:reportOn) }"
2 + let:onWellBore="{# SELECT ?onWellBore WHERE { ?this ep-activity:reportOn/ep-activity:onWellBore ?onWellBore } }"
3 + let:report="{= ?this }">
2 <head> 4 <head>
3 <link rel="stylesheet" type="text/css" href="lib/rh/ddr.css" /> 5 <link rel="stylesheet" type="text/css" href="lib/rh/ddr.css" />
4 </head> 6 </head>
5 - <body> 7 + <body let:wellBore="{= spl:object(?onWellBore, ep-core:temporalPartOf) }">
6 - <h1>Summary report Wellbore: {# SELECT ?wellBoreName WHERE { ?reportOn ep-activity:onWellBore/ep-core:temporalPartOf/ep-core:npdCode ?wellBoreName } }</h1> 8 + <h1>Summary report Wellbore: {= rhspin:npdName(?wellBore) }</h1>
7 - <div>End time: {= ui:label(spl:object(?reportOn, ep-activity:finishedAt)) }</div> 9 + <div>End time: {= ui:label(spl:object(?activity, ep-activity:finishedAt)) }</div>
8 <hr /> 10 <hr />
9 <table><tr> 11 <table><tr>
10 <td class="ddrSummaryLeft"> 12 <td class="ddrSummaryLeft">
11 - <rhswp:NameValuePair arg:name="Report Number:" arg:value="{ spl:object(?this, ?) }" /> 13 + <rhswp:NameValuePair arg:name="Report Number:" arg:value="{ spl:object(?this, ?) }" />
12 - <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{= SELECT ?wellBoreName WHERE { ?reportOn ep-activity:onWellBore/ep-core:temporalPartOf/ep-core:npdCode ?wellBoreName } }" /> 14 + <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{= rhspin:npdName(?wellBore) }" />
13 - <rhswp:NameValuePair arg:name="Status:" arg:value="{= ui:label(spl:object(?this, rdf:type)) }" /> 15 + <rhswp:NameValuePair arg:name="Status:" arg:value="{= ui:label(spl:object(?this, rdf:type)) }" />
14 - <rhswp:NameValuePair arg:name="Operator:" arg:value="{ spl:object(?this, ???) }" /> 16 + <rhswp:NameValuePair arg:name="Operator:" arg:value="{ spl:object(?this, ???) }" />
15 - <rhswp:NameValuePair arg:name="Rig name:" arg:value="{ spl:object(?this, ???) }" /> 17 + <rhswp:NameValuePair arg:name="Rig name:" arg:value="{ spl:object(?this, ???) }" />
16 - <rhswp:NameValuePair arg:name="Spud date:" arg:value="{ spl:object(?this, ???) }" /> 18 + <rhswp:NameValuePair arg:name="Spud date:" arg:value="{ spl:object(?this, ???) }" />
17 - <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{ spl:object(?this, ???) }" /> 19 + <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{ spl:object(?this, ???) }" />
18 - <rhswp:NameValuePair arg:name="Tight well:" arg:value="{ spl:object(?this, ???) }" /> 20 + <rhswp:NameValuePair arg:name="Tight well:" arg:value="{ spl:object(?this, ???) }" />
19 - <rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{ spl:object(?this, ???) }" /> 21 + <rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{ spl:object(?this, ???) }" />
20 - <rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{ spl:object(?this, ???) }" /> 22 + <rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{ spl:object(?this, ???) }" />
21 - <rhswp:NameValuePair arg:name="Depth at Kick Off mMD:" arg:value="{ spl:object(?this, ???) }" /> 23 + <rhswp:NameValuePair arg:name="Depth at Kick Off mMD:" arg:value="{= rhspin:dtypeValue(?activity, ddr:mdKickoff) }" />
22 - <rhswp:NameValuePair arg:name="Plug Back Depth mMD:" arg:value="{ spl:object(?this, ???) }" /> 24 + <rhswp:NameValuePair arg:name="Plug Back Depth mMD:" arg:value="{= rhspin:dtypeValue(?activity, ddr:mdPlugTop) }" />
23 - <rhswp:NameValuePair arg:name="Penetration Rate m/h:" arg:value="{ spl:object(?this, ???) }" /> 25 + <rhswp:NameValuePair arg:name="Penetration Rate m/h:" arg:value="{ spl:object(?activity, ???) }" />
24 - <rhswp:NameValuePair arg:name="Pressure Test Type:" arg:value="{ spl:object(?this, ???) }" /> 26 + <rhswp:NameValuePair arg:name="Pressure Test Type:" arg:value="{ spl:object(?this, ???) }" />
25 - <rhswp:NameValuePair arg:name="Depth At Formation Strength mMD:" arg:value="{ spl:object(?this, ???) }" /> 27 + <rhswp:NameValuePair arg:name="Depth At Formation Strength mMD:" arg:value="{= rhspin:dtypeValue(?activity, ddr:mdStrengthForm) }" />
26 - <rhswp:NameValuePair arg:name="Dia Last Casing In:" arg:value="{ spl:object(?this, ???) }" /> 28 + <rhswp:NameValuePair arg:name="Dia Last Casing In:" arg:value="{ spl:object(?this, ???) }" />
27 - <rhswp:NameValuePair arg:name="Depth At Last Casing MTVD:" arg:value="{ spl:object(?this, ???) }" /> 29 + <rhswp:NameValuePair arg:name="Depth At Last Casing MTVD:" arg:value="{= rhspin:dtypeValue(?activity, ddr:tvdCsgLast) }" />
28 - </td> 30 + </td>
29 - <td class="ddrSummaryRight"> 31 + <td class="ddrSummaryRight">
30 - <rhswp:NameValuePair arg:name="Period:" arg:value="{= fn:concat(ui:label(spl:object(?reportOn, ep-activity:startedAt)), ' - ', ui:label(spl:object(?reportOn, ep-activity:finishedAt))) }" /> 32 + <rhswp:NameValuePair arg:name="Period:" arg:value="{= fn:concat(ui:label(spl:object(?activity, ep-activity:startedAt)), ' - ', ui:label(spl:object(?activity, ep-activity:finishedAt))) }" />
31 - <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{ SELECT ?wellBoreId WHERE { ?reportOn iso15926:hasPart/ep-activity:onWellBore/iso15926:temporalPartOf/??? ?wellBoreId } }" /> 33 + <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{= rhspin:npdId(?wellBore) }" />
32 - <rhswp:NameValuePair arg:name="Created date:" arg:value="{ spl:object(?this, ep-activity:createdAt) }" /> 34 + <rhswp:NameValuePair arg:name="Created date:" arg:value="{= spl:object(?this, ep-activity:createdAt) }" />
33 - <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{ spl:object(?this, ???) }" /> 35 + <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{ spl:object(?this, ???) }" />
34 - <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{ spl:object(?this, ???) }" /> 36 + <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{ spl:object(?this, ???) }" />
35 - <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{ spl:object(?this, ???) }" /> 37 + <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{ spl:object(?this, ???) }" />
36 - <rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{ spl:object(?this, ???) }" /> 38 + <rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{ spl:object(?this, ???) }" />
37 - <rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{ spl:object(?this, ???) }" /> 39 + <rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{ spl:object(?this, ???) }" />
38 - <rhswp:NameValuePair arg:name="Temprature degC:" arg:value="{ spl:object(?this, ???) }" /> 40 + <rhswp:NameValuePair arg:name="Temprature degC:" arg:value="{ spl:object(?this, ???) }" />
39 - <rhswp:NameValuePair arg:name="Wellbore type:" arg:value="{ spl:object(?this, ???) }" /> 41 + <rhswp:NameValuePair arg:name="Wellbore type:" arg:value="{ spl:object(?this, ???) }" />
40 - <rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" arg:value="{ spl:object(?this, ???) }" /> 42 + <rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" arg:value="{= spl:object(?activity, ddr:tvdKickoff) }" />
41 - <rhswp:NameValuePair arg:name="Depth mTVD:" arg:value="{ spl:object(?this, ???) }" /> 43 + <rhswp:NameValuePair arg:name="Depth mTVD:" arg:value="{= rhspin:dtypeValue(?activity, ddr:tvd) }" />
42 - <rhswp:NameValuePair arg:name="Dist Drilled m:" arg:value="{ spl:object(?this, ???) }" /> 44 + <rhswp:NameValuePair arg:name="Dist Drilled m:" arg:value="{= rhspin:dtypeValue(?activity, ddr:distDrill) }" />
43 - <rhswp:NameValuePair arg:name="Hole Dia in:" arg:value="{ spl:object(?this, ???) }" /> 45 + <rhswp:NameValuePair arg:name="Hole Dia in:" arg:value="{= rhspin:dtypeValue(?activity, ddr:mdDiaHoleStart) }" />
44 - <rhswp:NameValuePair arg:name="Formation Strength g/cm3:" arg:value="{ spl:object(?this, ???) }" /> 46 + <rhswp:NameValuePair arg:name="Formation Strength g/cm3:" arg:value="{= rhspin:dtypeValue(?activity, ddr:tvdStrengthForm) }" />
45 - <rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{ spl:object(?this, ???) }" /> 47 + <rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{ spl:object(?this, ???) }" />
46 - <rhswp:NameValuePair arg:name="Depth At Last Casting mMD:" arg:value="{ spl:object(?this, ???) }" /> 48 + <rhswp:NameValuePair arg:name="Depth At Last Casing mMD:" arg:value="{= rhspin:dtypeValue(?activity, ddr:mdCsgLast) }" />
47 - </td> 49 + </td>
48 </tr></table> 50 </tr></table>
49 </body> 51 </body>
50 -</html>
...\ No newline at end of file ...\ No newline at end of file
52 +</html>
......
1 -<ui:group>
2 - <h1>Summary report Wellbore: {= spl:object(?this, ddr:nameWell) }</h1>
3 - <div>End time: {= ui:label(spl:object(?this, ddr:dTimEnd)) }</div>
4 - <hr />
5 - <div class="ddrSummaryLeft">
6 - <rhswp:NameValuePair arg:name="Report Number:" arg:value="{= spl:object(?this, ???) }" />
7 - <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{= spl:object(?this, ???) }" />
8 - <rhswp:NameValuePair arg:name="Status:" arg:value="{= spl:object(?this, ???) }" />
9 - <rhswp:NameValuePair arg:name="Operator:" arg:value="{= spl:object(?this, ???) }" />
10 - <rhswp:NameValuePair arg:name="Rig name:" arg:value="{= spl:object(?this, ???) }" />
11 - <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= spl:object(?this, ???) }" />
12 - <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{= spl:object(?this, ???) }" />
13 - <rhswp:NameValuePair arg:name="Tight well:" arg:value="{= spl:object(?this, ???) }" />
14 - <rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{= spl:object(?this, ???) }" />
15 - <rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{= spl:object(?this, ???) }" />
16 - <rhswp:NameValuePair arg:name="Depth at Kick Off mMD:" arg:value="{= spl:object(?this, ???) }" />
17 - <rhswp:NameValuePair arg:name="Plug Back Depth mMD:" arg:value="{= spl:object(?this, ???) }" />
18 - <rhswp:NameValuePair arg:name="Penetration Rate m/h:" arg:value="{= spl:object(?this, ???) }" />
19 - <rhswp:NameValuePair arg:name="Pressure Test Type:" arg:value="{= spl:object(?this, ???) }" />
20 - <rhswp:NameValuePair arg:name="Depth At Formation Strength mMD:" arg:value="{= spl:object(?this, ???) }" />
21 - <rhswp:NameValuePair arg:name="Dia Last Casing In:" arg:value="{= spl:object(?this, ???) }" />
22 - <rhswp:NameValuePair arg:name="Depth At Last Casing MTVD:" arg:value="{= spl:object(?this, ???) }" />
23 - </div>
24 - <div class="ddrSummaryRight">
25 - <rhswp:NameValuePair arg:name="Period:" arg:value="{= spl:object(?this, ???) }" />
26 - <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{= spl:object(?this, ???) }" />
27 - <rhswp:NameValuePair arg:name="Created date:" arg:value="{= spl:object(?this, ???) }" />
28 - <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{= spl:object(?this, ???) }" />
29 - <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= spl:object(?this, ???) }" />
30 - <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= spl:object(?this, ???) }" />
31 - <rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{= spl:object(?this, ???) }" />
32 - <rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{= spl:object(?this, ???) }" />
33 - <rhswp:NameValuePair arg:name="Temprature degC:" arg:value="{= spl:object(?this, ???) }" />
34 - <rhswp:NameValuePair arg:name="Wellbore type:" arg:value="{= spl:object(?this, ???) }" />
35 - <rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" arg:value="{= spl:object(?this, ???) }" />
36 - <rhswp:NameValuePair arg:name="Depth mTVD:" arg:value="{= spl:object(?this, ???) }" />
37 - <rhswp:NameValuePair arg:name="Dist Drilled m:" arg:value="{= spl:object(?this, ???) }" />
38 - <rhswp:NameValuePair arg:name="Hole Dia in:" arg:value="{= spl:object(?this, ???) }" />
39 - <rhswp:NameValuePair arg:name="Formation Strength g/cm3:" arg:value="{= spl:object(?this, ???) }" />
40 - <rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{= spl:object(?this, ???) }" />
41 - <rhswp:NameValuePair arg:name="Depth At Last Casting mMD:" arg:value="{= spl:object(?this, ???) }" />
42 - </div>
43 -</ui:group>
...\ No newline at end of file ...\ No newline at end of file