David Price

Added fluid and well test clones of dpr tables to mprp

This diff could not be displayed because it is too large.
...@@ -40,9 +40,6 @@ WHERE { ...@@ -40,9 +40,6 @@ WHERE {
40 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:PersonnelInformation" /> 40 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:PersonnelInformation" />
41 41
42 42
43 -
44 -
45 -
46 <table> 43 <table>
47 44
48 <ui:forEach ui:resultSet="{# SELECT ?facilityName ?beds 45 <ui:forEach ui:resultSet="{# SELECT ?facilityName ?beds
......
...@@ -18,37 +18,48 @@ WHERE { ...@@ -18,37 +18,48 @@ WHERE {
18 18
19 <h1>Monthly Partner Report : {= ?reportedFieldName } Field, Month Ending {= ?activityEnd}</h1> 19 <h1>Monthly Partner Report : {= ?reportedFieldName } Field, Month Ending {= ?activityEnd}</h1>
20 <h2>Report title : {# SELECT ?title WHERE { ?report a ep-report:MonthlyProductionReportPartner . ?report ep-core:name ?title . } }</h2> 20 <h2>Report title : {# SELECT ?title WHERE { ?report a ep-report:MonthlyProductionReportPartner . ?report ep-core:name ?title . } }</h2>
21 +<h2>Report Status : {# SELECT ?reportStatusLabel
22 +WHERE {
23 + ?report rdf:type ep-report:ProductionReport .
24 + ?report a ?reportStatus .
25 + ?reportStatus a ep-report:ReportVersionStatus .
26 + ?reportStatus rdfs:label ?reportStatusLabel .
27 +}}</h2>
21 <h2>Submitted by : {# SELECT ?submittingFieldName WHERE 28 <h2>Submitted by : {# SELECT ?submittingFieldName WHERE
22 { 29 {
23 30
24 -?report a ep-report:MonthlyProductionReportPartner . 31 +?report a ep-report:ProductionReport .
25 -?report ep-report:reportSubmittedFrom ?submittingFieldState . 32 +?reportIssueActivity ep-report:issuedReport ?report .
33 +?reportIssueActivity ep-activity:issuedFrom ?submittingFieldState .
26 ?submittingFieldState ep-core:temporalPartOf ?submittingField . 34 ?submittingFieldState ep-core:temporalPartOf ?submittingField .
27 ?submittingField npd:name ?submittingFieldName . 35 ?submittingField npd:name ?submittingFieldName .
28 36
29 } }</h2> 37 } }</h2>
30 -
31 -
32 -
33 38
34 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:GasSales" /> 39 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:GasSales" />
35 40
36 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" /> 41 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" />
37 42
38 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" /> 43 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
39 44
40 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" /> 45 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" />
41 46
42 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionSales" /> 47 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionSales" />
43 48
44 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionFlowsAll" /> 49 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionFlowsAll" />
45 50
46 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionInventory" /> 51 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionInventory" />
47 52
48 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionInventoryOwnership" /> 53 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionInventoryOwnership" />
49 - 54 +
55 +<mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:FluidSamples" />
50 56
57 +<mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:FluidSampleAnalysisResults" />
51 58
59 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellTest" />
60 +
61 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellInjectionTest" />
62 + <mprpswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellInjectionTestResults" />
52 63
53 </ui:group> 64 </ui:group>
54 65
...\ No newline at end of file ...\ No newline at end of file
......