David Price

repaired mprg html. Fixed renamed class to ep-material:ReportingProductType in MPR tables.

...@@ -404,7 +404,7 @@ mpr-tables:Cargo ...@@ -404,7 +404,7 @@ mpr-tables:Cargo
404 sp:subject 404 sp:subject
405 [ sp:varName "productFlowWhole"^^xsd:string 405 [ sp:varName "productFlowWhole"^^xsd:string
406 ] 406 ]
407 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 407 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
408 sp:predicate rdf:type ; 408 sp:predicate rdf:type ;
409 sp:subject 409 sp:subject
410 [ sp:varName "productFlowMaterialType"^^xsd:string 410 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -568,7 +568,7 @@ mpr-tables:CargoOwnership ...@@ -568,7 +568,7 @@ mpr-tables:CargoOwnership
568 sp:subject 568 sp:subject
569 [ sp:varName "productFlowInMonth"^^xsd:string 569 [ sp:varName "productFlowInMonth"^^xsd:string
570 ] 570 ]
571 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowDuringMonth> ; 571 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ;
572 sp:predicate rdf:type ; 572 sp:predicate rdf:type ;
573 sp:subject 573 sp:subject
574 [ sp:varName "productFlowInMonth"^^xsd:string 574 [ sp:varName "productFlowInMonth"^^xsd:string
...@@ -1155,7 +1155,7 @@ mpr-tables:Cargo_1 ...@@ -1155,7 +1155,7 @@ mpr-tables:Cargo_1
1155 sp:subject 1155 sp:subject
1156 [ sp:varName "productFlowWhole"^^xsd:string 1156 [ sp:varName "productFlowWhole"^^xsd:string
1157 ] 1157 ]
1158 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 1158 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
1159 sp:predicate rdf:type ; 1159 sp:predicate rdf:type ;
1160 sp:subject 1160 sp:subject
1161 [ sp:varName "productFlowMaterialType"^^xsd:string 1161 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -1905,7 +1905,7 @@ mpr-tables:GasSales ...@@ -1905,7 +1905,7 @@ mpr-tables:GasSales
1905 sp:subject 1905 sp:subject
1906 [ sp:varName "productFlowWhole"^^xsd:string 1906 [ sp:varName "productFlowWhole"^^xsd:string
1907 ] 1907 ]
1908 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 1908 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
1909 sp:predicate rdf:type ; 1909 sp:predicate rdf:type ;
1910 sp:subject 1910 sp:subject
1911 [ sp:varName "productFlowMaterialType"^^xsd:string 1911 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -2161,7 +2161,7 @@ mpr-tables:ProductionFlows ...@@ -2161,7 +2161,7 @@ mpr-tables:ProductionFlows
2161 sp:subject 2161 sp:subject
2162 [ sp:varName "productFlow"^^xsd:string 2162 [ sp:varName "productFlow"^^xsd:string
2163 ] 2163 ]
2164 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 2164 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
2165 sp:predicate rdf:type ; 2165 sp:predicate rdf:type ;
2166 sp:subject 2166 sp:subject
2167 [ sp:varName "productFlowMaterialType"^^xsd:string 2167 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -2211,7 +2211,7 @@ mpr-tables:ProductionFlows ...@@ -2211,7 +2211,7 @@ mpr-tables:ProductionFlows
2211 sp:subject 2211 sp:subject
2212 [ sp:varName "productFlowInPeriod"^^xsd:string 2212 [ sp:varName "productFlowInPeriod"^^xsd:string
2213 ] 2213 ]
2214 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#TemporalPartOfAFlowDurationType> ; 2214 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#TemporalPartDurationType> ;
2215 sp:predicate rdf:type ; 2215 sp:predicate rdf:type ;
2216 sp:subject 2216 sp:subject
2217 [ sp:varName "productFlowInPeriodDurationType"^^xsd:string 2217 [ sp:varName "productFlowInPeriodDurationType"^^xsd:string
...@@ -2654,7 +2654,7 @@ mpr-tables:ProductionFlowsAll ...@@ -2654,7 +2654,7 @@ mpr-tables:ProductionFlowsAll
2654 sp:subject 2654 sp:subject
2655 [ sp:varName "productFlowWhole"^^xsd:string 2655 [ sp:varName "productFlowWhole"^^xsd:string
2656 ] 2656 ]
2657 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 2657 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
2658 sp:predicate rdf:type ; 2658 sp:predicate rdf:type ;
2659 sp:subject 2659 sp:subject
2660 [ sp:varName "productFlowMaterialType"^^xsd:string 2660 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -2906,7 +2906,7 @@ mpr-tables:ProductionInventory ...@@ -2906,7 +2906,7 @@ mpr-tables:ProductionInventory
2906 sp:subject 2906 sp:subject
2907 [ sp:varName "productInventoryWhole"^^xsd:string 2907 [ sp:varName "productInventoryWhole"^^xsd:string
2908 ] 2908 ]
2909 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 2909 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
2910 sp:predicate rdf:type ; 2910 sp:predicate rdf:type ;
2911 sp:subject 2911 sp:subject
2912 [ sp:varName "productInventoryWholeType"^^xsd:string 2912 [ sp:varName "productInventoryWholeType"^^xsd:string
...@@ -3149,7 +3149,7 @@ mpr-tables:ProductionInventoryOwnership ...@@ -3149,7 +3149,7 @@ mpr-tables:ProductionInventoryOwnership
3149 sp:subject 3149 sp:subject
3150 [ sp:varName "productInventoryWhole"^^xsd:string 3150 [ sp:varName "productInventoryWhole"^^xsd:string
3151 ] 3151 ]
3152 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 3152 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
3153 sp:predicate rdf:type ; 3153 sp:predicate rdf:type ;
3154 sp:subject 3154 sp:subject
3155 [ sp:varName "productInventoryWholeType"^^xsd:string 3155 [ sp:varName "productInventoryWholeType"^^xsd:string
...@@ -3486,7 +3486,7 @@ mpr-tables:ProductionSales ...@@ -3486,7 +3486,7 @@ mpr-tables:ProductionSales
3486 sp:subject 3486 sp:subject
3487 [ sp:varName "productFlowWhole"^^xsd:string 3487 [ sp:varName "productFlowWhole"^^xsd:string
3488 ] 3488 ]
3489 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 3489 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
3490 sp:predicate rdf:type ; 3490 sp:predicate rdf:type ;
3491 sp:subject 3491 sp:subject
3492 [ sp:varName "productFlowMaterialType"^^xsd:string 3492 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -4546,7 +4546,7 @@ mpr-tables:WellProductionFlows ...@@ -4546,7 +4546,7 @@ mpr-tables:WellProductionFlows
4546 sp:subject 4546 sp:subject
4547 [ sp:varName "productFlowWhole"^^xsd:string 4547 [ sp:varName "productFlowWhole"^^xsd:string
4548 ] 4548 ]
4549 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 4549 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
4550 sp:predicate rdf:type ; 4550 sp:predicate rdf:type ;
4551 sp:subject 4551 sp:subject
4552 [ sp:varName "productFlowMaterialType"^^xsd:string 4552 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -4872,7 +4872,7 @@ mpr-tables:WellProductionFlows_1 ...@@ -4872,7 +4872,7 @@ mpr-tables:WellProductionFlows_1
4872 sp:subject 4872 sp:subject
4873 [ sp:varName "productFlowWhole"^^xsd:string 4873 [ sp:varName "productFlowWhole"^^xsd:string
4874 ] 4874 ]
4875 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 4875 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
4876 sp:predicate rdf:type ; 4876 sp:predicate rdf:type ;
4877 sp:subject 4877 sp:subject
4878 [ sp:varName "productFlowMaterialType"^^xsd:string 4878 [ sp:varName "productFlowMaterialType"^^xsd:string
...@@ -5164,7 +5164,7 @@ mpr-tables:WellProductionFlows_2 ...@@ -5164,7 +5164,7 @@ mpr-tables:WellProductionFlows_2
5164 sp:subject 5164 sp:subject
5165 [ sp:varName "productFlowWhole"^^xsd:string 5165 [ sp:varName "productFlowWhole"^^xsd:string
5166 ] 5166 ]
5167 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 5167 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
5168 sp:predicate rdf:type ; 5168 sp:predicate rdf:type ;
5169 sp:subject 5169 sp:subject
5170 [ sp:varName "productFlowMaterialType"^^xsd:string 5170 [ sp:varName "productFlowMaterialType"^^xsd:string
......
...@@ -13,7 +13,7 @@ WHERE { ...@@ -13,7 +13,7 @@ WHERE {
13 }}" 13 }}"
14 > 14 >
15 15
16 -<h1>Monthly Government Report DavidTest2 : {= ?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 {
...@@ -177,11 +177,11 @@ OPTIONAL { ...@@ -177,11 +177,11 @@ OPTIONAL {
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 - <!-- <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows_1" /> 180 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows_1" />
181 181
182 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" /> 182 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
183 183
184 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" /> --> 184 + <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" />
185 185
186 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" /> 186 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" />
187 187
......