David Price

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

......@@ -404,7 +404,7 @@ mpr-tables:Cargo
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -568,7 +568,7 @@ mpr-tables:CargoOwnership
sp:subject
[ sp:varName "productFlowInMonth"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowDuringMonth> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowInMonth"^^xsd:string
......@@ -1155,7 +1155,7 @@ mpr-tables:Cargo_1
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -1905,7 +1905,7 @@ mpr-tables:GasSales
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -2161,7 +2161,7 @@ mpr-tables:ProductionFlows
sp:subject
[ sp:varName "productFlow"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -2211,7 +2211,7 @@ mpr-tables:ProductionFlows
sp:subject
[ sp:varName "productFlowInPeriod"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#TemporalPartOfAFlowDurationType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#TemporalPartDurationType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowInPeriodDurationType"^^xsd:string
......@@ -2654,7 +2654,7 @@ mpr-tables:ProductionFlowsAll
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -2906,7 +2906,7 @@ mpr-tables:ProductionInventory
sp:subject
[ sp:varName "productInventoryWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productInventoryWholeType"^^xsd:string
......@@ -3149,7 +3149,7 @@ mpr-tables:ProductionInventoryOwnership
sp:subject
[ sp:varName "productInventoryWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productInventoryWholeType"^^xsd:string
......@@ -3486,7 +3486,7 @@ mpr-tables:ProductionSales
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -4546,7 +4546,7 @@ mpr-tables:WellProductionFlows
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -4872,7 +4872,7 @@ mpr-tables:WellProductionFlows_1
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......@@ -5164,7 +5164,7 @@ mpr-tables:WellProductionFlows_2
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
......
......@@ -13,7 +13,7 @@ WHERE {
}}"
>
<h1>Monthly Government Report DavidTest2 : {= ?reportedFieldName } Field, Month Ending {= ?activityEnd}</h1>
<h1>Monthly Government Report Test3 : {= ?reportedFieldName } Field, Month Ending {= ?activityEnd}</h1>
<h2>Report title : {# SELECT ?title WHERE { ?report a ep-report:ProductionReport . ?report ep-core:name ?title . } }</h2>
<h2>Report version : {# SELECT ?reportVersion
WHERE {
......@@ -177,11 +177,11 @@ OPTIONAL {
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" />
<!-- <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows_1" />
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows_1" />
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" /> -->
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" />
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" />
......