David Price

Merge branch 'july22-noon'

This diff could not be displayed because it is too large.
...@@ -13,7 +13,7 @@ WHERE { ...@@ -13,7 +13,7 @@ WHERE {
13 }}" 13 }}"
14 > 14 >
15 15
16 -<h1>Monthly Government Report Test 4 : {= ?reportedFieldName } Field, Month Ending {= ?activityEnd}</h1> 16 +<h1>Monthly Government Report Test3 : {= ?reportedFieldName } Field, Month Ending {= ?activityEnd}</h1>
17 <h2>Report title : {# SELECT ?title WHERE { ?report a ep-report:ProductionReport . ?report ep-core:name ?title . } }</h2> 17 <h2>Report title : {# SELECT ?title WHERE { ?report a ep-report:ProductionReport . ?report ep-core:name ?title . } }</h2>
18 <h2>Report version : {# SELECT ?reportVersion 18 <h2>Report version : {# SELECT ?reportVersion
19 WHERE { 19 WHERE {
...@@ -173,11 +173,25 @@ OPTIONAL { ...@@ -173,11 +173,25 @@ OPTIONAL {
173 173
174 </ui:forEach> --> 174 </ui:forEach> -->
175 175
176 - 176 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:GasSales" />
177 177
178 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" /> 178 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" />
179 179
180 - 180 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows_1" />
181 +
182 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
183 +
184 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" />
185 +
186 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" />
187 +
188 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionSales" />
189 +
190 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionFlowsAll" />
191 +
192 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionInventory" />
193 +
194 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:ProductionInventoryOwnership" />
181 195
182 196
183 197
......