David Price

Working fix to inventory HTML gen MPRG

...@@ -2039,7 +2039,7 @@ mpr-tables:ProductionInventory ...@@ -2039,7 +2039,7 @@ mpr-tables:ProductionInventory
2039 [ sp:varName "productionInventoryInPeriod"^^xsd:string 2039 [ sp:varName "productionInventoryInPeriod"^^xsd:string
2040 ] 2040 ]
2041 ] [ sp:object 2041 ] [ sp:object
2042 - [ sp:varName "productInventory"^^xsd:string 2042 + [ sp:varName "productInventoryInPeriod"^^xsd:string
2043 ] ; 2043 ] ;
2044 sp:predicate <http://www.reportinghub.no/ep/schema/material#hasComponent> ; 2044 sp:predicate <http://www.reportinghub.no/ep/schema/material#hasComponent> ;
2045 sp:subject 2045 sp:subject
...@@ -2048,13 +2048,6 @@ mpr-tables:ProductionInventory ...@@ -2048,13 +2048,6 @@ mpr-tables:ProductionInventory
2048 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductInventory> ; 2048 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductInventory> ;
2049 sp:predicate rdf:type ; 2049 sp:predicate rdf:type ;
2050 sp:subject 2050 sp:subject
2051 - [ sp:varName "productInventory"^^xsd:string
2052 - ]
2053 - ] [ sp:object
2054 - [ sp:varName "productInventory"^^xsd:string
2055 - ] ;
2056 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2057 - sp:subject
2058 [ sp:varName "productInventoryInPeriod"^^xsd:string 2051 [ sp:varName "productInventoryInPeriod"^^xsd:string
2059 ] 2052 ]
2060 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ; 2053 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ;
...@@ -2087,7 +2080,7 @@ mpr-tables:ProductionInventory ...@@ -2087,7 +2080,7 @@ mpr-tables:ProductionInventory
2087 ]) 2080 ])
2088 ] [ rdf:type sp:Optional ; 2081 ] [ rdf:type sp:Optional ;
2089 sp:elements ([ sp:object 2082 sp:elements ([ sp:object
2090 - [ sp:varName "productInventory"^^xsd:string 2083 + [ sp:varName "productInventoryInPeriod"^^xsd:string
2091 ] ; 2084 ] ;
2092 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 2085 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2093 sp:subject 2086 sp:subject
...@@ -2168,7 +2161,7 @@ mpr-tables:ProductionInventory ...@@ -2168,7 +2161,7 @@ mpr-tables:ProductionInventory
2168 ] ; 2161 ] ;
2169 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 2162 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2170 sp:subject 2163 sp:subject
2171 - [ sp:varName "productInventory"^^xsd:string 2164 + [ sp:varName "productInventoryInPeriod"^^xsd:string
2172 ] 2165 ]
2173 ] [ sp:object 2166 ] [ sp:object
2174 [ sp:varName "productInventoryWholeType"^^xsd:string 2167 [ sp:varName "productInventoryWholeType"^^xsd:string
...@@ -2199,7 +2192,7 @@ mpr-tables:ProductionInventory ...@@ -2199,7 +2192,7 @@ mpr-tables:ProductionInventory
2199 ] [ sp:object 2192 ] [ sp:object
2200 [ sp:varName "productionInventoryWholeName"^^xsd:string 2193 [ sp:varName "productionInventoryWholeName"^^xsd:string
2201 ] ; 2194 ] ;
2202 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ; 2195 + sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ;
2203 sp:subject 2196 sp:subject
2204 [ sp:varName "productionInventoryWhole"^^xsd:string 2197 [ sp:varName "productionInventoryWhole"^^xsd:string
2205 ] 2198 ]
...@@ -2442,7 +2435,7 @@ mpr-tables:ProductionInventoryOwnership ...@@ -2442,7 +2435,7 @@ mpr-tables:ProductionInventoryOwnership
2442 ] [ sp:object 2435 ] [ sp:object
2443 [ sp:varName "productionInventoryWholeName"^^xsd:string 2436 [ sp:varName "productionInventoryWholeName"^^xsd:string
2444 ] ; 2437 ] ;
2445 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ; 2438 + sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ;
2446 sp:subject 2439 sp:subject
2447 [ sp:varName "productionInventoryWhole"^^xsd:string 2440 [ sp:varName "productionInventoryWhole"^^xsd:string
2448 ] 2441 ]
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
17 17
18 <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY> 18 <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY>
19 ep-material:hasComponent 19 ep-material:hasComponent
20 - <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY$OIL_NET$NET> . 20 + <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY$OIL_NET> .
21 21
22 -<http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY$OIL_NET$NET> 22 +<http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY$OIL_NET>
23 - rdf:type ep-flow:ProductInventory , ep-flow:WholeLifeProductInventory . 23 + rdf:type ep-flow:NetProductFlow , ep-flow:ProductInventory , ep-flow:WholeLifeProductInventory , ep-material:Oil-net .
24 24
25 <http://www.reportinghub.no/np/data/npd/Facility-416595> 25 <http://www.reportinghub.no/np/data/npd/Facility-416595>
26 rdf:type ep-fac:ProductionFacility . 26 rdf:type ep-fac:ProductionFacility .
...@@ -159,46 +159,50 @@ ...@@ -159,46 +159,50 @@
159 _:b3 rdf:type ep-flow:ProductInventoryClosingBalance , ep-material:QuantityOfMaterial ; 159 _:b3 rdf:type ep-flow:ProductInventoryClosingBalance , ep-material:QuantityOfMaterial ;
160 ep-core:partOf _:b2 . 160 ep-core:partOf _:b2 .
161 161
162 -_:b2 rdf:type ep-core:PhysicalThingDuringOneMonth , ep-flow:ProductInventory ; 162 +_:b2 rdf:type ep-core:PhysicalThingDuringOneMonth , ep-flow:Inventory , ep-flow:ProductInventory ;
163 + ep-activity:finishedAt
164 + "2012-02-29"^^xsd:date ;
165 + ep-activity:startedAt
166 + "2012-02-01"^^xsd:date ;
163 ep-core:temporalPartOf 167 ep-core:temporalPartOf
164 - _:b4 ; 168 + <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY$OIL_NET> ;
165 ep-flow:massAtAccountingInstant 169 ep-flow:massAtAccountingInstant
166 [ rdf:type ep-core:Mass ; 170 [ rdf:type ep-core:Mass ;
167 ep-core:kilogram "64.55"^^xsd:double 171 ep-core:kilogram "64.55"^^xsd:double
168 ] . 172 ] .
169 173
170 -_:b4 rdf:type ep-flow:Inventory , ep-flow:ProductInventory ;
171 - ep-core:temporalPartOf
172 - <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY$OIL_NET$NET> .
173 -
174 -[] rdf:type ep-flow:Inventory , ep-flow:ProductionInventory ;
175 - ep-core:name "Fredericia allocated inventory volumes"^^xsd:string ;
176 - ep-core:temporalPartOf
177 - <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY> ;
178 - ep-material:hasComponent
179 - _:b4 .
180 -
181 [] rdf:type ep-fac:SurfaceFixedFacility , ep-fac:TemporalPartOfAProductionFacility ; 174 [] rdf:type ep-fac:SurfaceFixedFacility , ep-fac:TemporalPartOfAProductionFacility ;
182 ep-core:temporalPartOf 175 ep-core:temporalPartOf
183 <http://www.reportinghub.no/np/data/npd/Facility-416595> . 176 <http://www.reportinghub.no/np/data/npd/Facility-416595> .
184 177
185 -_:b5 rdf:type ep-flow:ProductionInventoryCollectionToDate ; 178 +_:b4 rdf:type ep-flow:ProductionInventoryCollectionToDate ;
186 ep-activity:finishedAt 179 ep-activity:finishedAt
187 "2012-02-29"^^xsd:date . 180 "2012-02-29"^^xsd:date .
188 181
189 -_:b6 rdf:type ep-flow:ProductionInventoryCollection ; 182 +_:b5 rdf:type ep-flow:ProductionInventoryCollection ;
190 ep-activity:finishedAt 183 ep-activity:finishedAt
191 "2012-02-29"^^xsd:date ; 184 "2012-02-29"^^xsd:date ;
192 ep-activity:startedAt 185 ep-activity:startedAt
193 "2012-02-01"^^xsd:date ; 186 "2012-02-01"^^xsd:date ;
187 + ep-core:hasSpatialPart
188 + [ rdf:type ep-flow:AllocatedFlow , ep-flow:Inventory , ep-flow:ProductionInventory ;
189 + ep-activity:finishedAt
190 + "2012-02-29"^^xsd:date ;
191 + ep-activity:startedAt
192 + "2012-02-01"^^xsd:date ;
193 + ep-core:name "Fredericia allocated inventory volumes"^^xsd:string ;
194 + ep-core:temporalPartOf
195 + <http://www.reportinghub.no/data/erh/Field-18081500-Flow-FRED_ALLLOCATED_INVENTORY> ;
196 + ep-material:hasComponent
197 + _:b2
198 + ] ;
194 ep-core:temporalPartOf 199 ep-core:temporalPartOf
195 - _:b5 . 200 + _:b4 .
196 201
197 [] rdf:type ep-report:ProductVolumeReport , ep-report:Report ; 202 [] rdf:type ep-report:ProductVolumeReport , ep-report:Report ;
198 - rdfs:comment "A whole life production flow has not been found with UID 'FRED_ALLLOCATED_INVENTORY' ." ;
199 ep-core:name "TRYM"^^xsd:string ; 203 ep-core:name "TRYM"^^xsd:string ;
200 ep-core:partOf <https://www.reportinghub.no/ep/data/productionReport/FIELD-18081500$2012-02-01$2012-02-29> ; 204 ep-core:partOf <https://www.reportinghub.no/ep/data/productionReport/FIELD-18081500$2012-02-01$2012-02-29> ;
201 - ep-report:reportOn _:b6 , _:b1 . 205 + ep-report:reportOn _:b5 , _:b1 .
202 206
203 [] rdf:type ep-activity:IssueAReport ; 207 [] rdf:type ep-activity:IssueAReport ;
204 ep-activity:issuedFrom 208 ep-activity:issuedFrom
...@@ -222,7 +226,7 @@ _:b1 rdf:type ep-fac:TemporalPartOfAProductionFacility ; ...@@ -222,7 +226,7 @@ _:b1 rdf:type ep-fac:TemporalPartOfAProductionFacility ;
222 ep-activity:startedAt 226 ep-activity:startedAt
223 "2012-02-01"^^xsd:date ; 227 "2012-02-01"^^xsd:date ;
224 ep-core:hasSpatialPart 228 ep-core:hasSpatialPart
225 - _:b6 ; 229 + _:b5 ;
226 ep-core:temporalPartOf 230 ep-core:temporalPartOf
227 <http://www.reportinghub.no/np/data/npd/Field-18081500> ; 231 <http://www.reportinghub.no/np/data/npd/Field-18081500> ;
228 ep-core:temporalPartOf 232 ep-core:temporalPartOf
...@@ -230,7 +234,7 @@ _:b1 rdf:type ep-fac:TemporalPartOfAProductionFacility ; ...@@ -230,7 +234,7 @@ _:b1 rdf:type ep-fac:TemporalPartOfAProductionFacility ;
230 ep-activity:finishedAt 234 ep-activity:finishedAt
231 "2012-02-29"^^xsd:date ; 235 "2012-02-29"^^xsd:date ;
232 ep-core:hasSpatialPart 236 ep-core:hasSpatialPart
233 - _:b5 ; 237 + _:b4 ;
234 ep-core:temporalPartOf 238 ep-core:temporalPartOf
235 <http://www.reportinghub.no/np/data/npd/Field-18081500> 239 <http://www.reportinghub.no/np/data/npd/Field-18081500>
236 ] . 240 ] .
......