David Price

Basic Stock table working again.

...@@ -1936,23 +1936,23 @@ mpr-tables:ProductionInventory ...@@ -1936,23 +1936,23 @@ mpr-tables:ProductionInventory
1936 [ sp:varName "productVolumeReport"^^xsd:string 1936 [ sp:varName "productVolumeReport"^^xsd:string
1937 ] 1937 ]
1938 ] [ sp:object 1938 ] [ sp:object
1939 - [ sp:varName "productionInventorysInPeriod"^^xsd:string 1939 + [ sp:varName "productionInventoryCollection"^^xsd:string
1940 ] ; 1940 ] ;
1941 sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ; 1941 sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
1942 sp:subject 1942 sp:subject
1943 [ sp:varName "productVolumeReport"^^xsd:string 1943 [ sp:varName "productVolumeReport"^^xsd:string
1944 ] 1944 ]
1945 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionInventory> ; 1945 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionInventoryCollection> ;
1946 sp:predicate rdf:type ; 1946 sp:predicate rdf:type ;
1947 sp:subject 1947 sp:subject
1948 - [ sp:varName "productionInventorysInPeriod"^^xsd:string 1948 + [ sp:varName "productionInventoryCollection"^^xsd:string
1949 ] 1949 ]
1950 ] [ sp:object 1950 ] [ sp:object
1951 [ sp:varName "productionInventoryInPeriod"^^xsd:string 1951 [ sp:varName "productionInventoryInPeriod"^^xsd:string
1952 ] ; 1952 ] ;
1953 sp:predicate <http://www.reportinghub.no/ep/schema/core#hasSpatialPart> ; 1953 sp:predicate <http://www.reportinghub.no/ep/schema/core#hasSpatialPart> ;
1954 sp:subject 1954 sp:subject
1955 - [ sp:varName "productionInventorysInPeriod"^^xsd:string 1955 + [ sp:varName "productionInventoryCollection"^^xsd:string
1956 ] 1956 ]
1957 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionInventory> ; 1957 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionInventory> ;
1958 sp:predicate rdf:type ; 1958 sp:predicate rdf:type ;
...@@ -1966,6 +1966,11 @@ mpr-tables:ProductionInventory ...@@ -1966,6 +1966,11 @@ mpr-tables:ProductionInventory
1966 sp:subject 1966 sp:subject
1967 [ sp:varName "productionInventoryInPeriod"^^xsd:string 1967 [ sp:varName "productionInventoryInPeriod"^^xsd:string
1968 ] 1968 ]
1969 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductInventory> ;
1970 + sp:predicate rdf:type ;
1971 + sp:subject
1972 + [ sp:varName "component"^^xsd:string
1973 + ]
1969 ] [ sp:object 1974 ] [ sp:object
1970 [ sp:varName "component"^^xsd:string 1975 [ sp:varName "component"^^xsd:string
1971 ] ; 1976 ] ;
...@@ -1978,20 +1983,13 @@ mpr-tables:ProductionInventory ...@@ -1978,20 +1983,13 @@ mpr-tables:ProductionInventory
1978 sp:subject 1983 sp:subject
1979 [ sp:varName "monthobject"^^xsd:string 1984 [ sp:varName "monthobject"^^xsd:string
1980 ] 1985 ]
1981 - ] [ sp:object
1982 - [ sp:varName "materialInventory"^^xsd:string
1983 - ] ;
1984 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialInInventory> ;
1985 - sp:subject
1986 - [ sp:varName "monthobject"^^xsd:string
1987 - ]
1988 ] [ rdf:type sp:Optional ; 1986 ] [ rdf:type sp:Optional ;
1989 sp:elements ([ sp:object 1987 sp:elements ([ sp:object
1990 [ sp:varName "materialQuantityValue"^^xsd:string 1988 [ sp:varName "materialQuantityValue"^^xsd:string
1991 ] ; 1989 ] ;
1992 - sp:predicate rdf:type ; 1990 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#summedDailyMass> ;
1993 sp:subject 1991 sp:subject
1994 - [ sp:varName "materialInventory"^^xsd:string 1992 + [ sp:varName "monthobject"^^xsd:string
1995 ] 1993 ]
1996 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mass> ; 1994 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mass> ;
1997 sp:predicate rdf:type ; 1995 sp:predicate rdf:type ;
...@@ -2050,7 +2048,7 @@ mpr-tables:ProductionInventory ...@@ -2050,7 +2048,7 @@ mpr-tables:ProductionInventory
2050 ]) 2048 ])
2051 ] [ rdf:type sp:Optional ; 2049 ] [ rdf:type sp:Optional ;
2052 sp:elements ([ sp:object 2050 sp:elements ([ sp:object
2053 - [ sp:varName "materialInventory"^^xsd:string 2051 + [ sp:varName "monthobject"^^xsd:string
2054 ] ; 2052 ] ;
2055 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 2053 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2056 sp:subject 2054 sp:subject
...@@ -2108,7 +2106,7 @@ mpr-tables:ProductionInventory ...@@ -2108,7 +2106,7 @@ mpr-tables:ProductionInventory
2108 ]) 2106 ])
2109 ] [ rdf:type sp:Optional ; 2107 ] [ rdf:type sp:Optional ;
2110 sp:elements ([ sp:object 2108 sp:elements ([ sp:object
2111 - [ sp:varName "materialInventory"^^xsd:string 2109 + [ sp:varName "monthobject"^^xsd:string
2112 ] ; 2110 ] ;
2113 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 2111 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2114 sp:subject 2112 sp:subject
...@@ -2166,25 +2164,18 @@ mpr-tables:ProductionInventory ...@@ -2166,25 +2164,18 @@ mpr-tables:ProductionInventory
2166 ]) 2164 ])
2167 ] [ rdf:type sp:Optional ; 2165 ] [ rdf:type sp:Optional ;
2168 sp:elements ([ sp:object 2166 sp:elements ([ sp:object
2169 - [ sp:varName "piPart"^^xsd:string 2167 + [ sp:varName "productInventoryWhole"^^xsd:string
2170 - ] ;
2171 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2172 - sp:subject
2173 - [ sp:varName "monthobject"^^xsd:string
2174 - ]
2175 - ] [ sp:object
2176 - [ sp:varName "piWholeMaterial"^^xsd:string
2177 ] ; 2168 ] ;
2178 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 2169 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2179 sp:subject 2170 sp:subject
2180 - [ sp:varName "piPart"^^xsd:string 2171 + [ sp:varName "component"^^xsd:string
2181 ] 2172 ]
2182 ] [ sp:object 2173 ] [ sp:object
2183 [ sp:varName "wholeType"^^xsd:string 2174 [ sp:varName "wholeType"^^xsd:string
2184 ] ; 2175 ] ;
2185 sp:predicate rdf:type ; 2176 sp:predicate rdf:type ;
2186 sp:subject 2177 sp:subject
2187 - [ sp:varName "piWholeMaterial"^^xsd:string 2178 + [ sp:varName "productInventoryWhole"^^xsd:string
2188 ] 2179 ]
2189 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 2180 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
2190 sp:predicate rdf:type ; 2181 sp:predicate rdf:type ;
...@@ -2199,18 +2190,18 @@ mpr-tables:ProductionInventory ...@@ -2199,18 +2190,18 @@ mpr-tables:ProductionInventory
2199 [ sp:varName "wholeType"^^xsd:string 2190 [ sp:varName "wholeType"^^xsd:string
2200 ] 2191 ]
2201 ] [ sp:object 2192 ] [ sp:object
2202 - [ sp:varName "piWholeMaterial"^^xsd:string 2193 + [ sp:varName "productInventoryWhole"^^xsd:string
2203 ] ; 2194 ] ;
2204 sp:predicate <http://www.reportinghub.no/ep/schema/material#hasComponent> ; 2195 sp:predicate <http://www.reportinghub.no/ep/schema/material#hasComponent> ;
2205 sp:subject 2196 sp:subject
2206 - [ sp:varName "piWhole"^^xsd:string 2197 + [ sp:varName "productionInventoryWhole"^^xsd:string
2207 ] 2198 ]
2208 ] [ sp:object 2199 ] [ sp:object
2209 [ sp:varName "wholeName"^^xsd:string 2200 [ sp:varName "wholeName"^^xsd:string
2210 ] ; 2201 ] ;
2211 sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ; 2202 sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
2212 sp:subject 2203 sp:subject
2213 - [ sp:varName "piWhole"^^xsd:string 2204 + [ sp:varName "productionInventoryWhole"^^xsd:string
2214 ] 2205 ]
2215 ] [ rdf:type sp:Optional ; 2206 ] [ rdf:type sp:Optional ;
2216 sp:elements ([ sp:object 2207 sp:elements ([ sp:object
...@@ -2218,7 +2209,7 @@ mpr-tables:ProductionInventory ...@@ -2218,7 +2209,7 @@ mpr-tables:ProductionInventory
2218 ] ; 2209 ] ;
2219 sp:predicate rdf:type ; 2210 sp:predicate rdf:type ;
2220 sp:subject 2211 sp:subject
2221 - [ sp:varName "piWhole"^^xsd:string 2212 + [ sp:varName "productionInventoryWhole"^^xsd:string
2222 ] 2213 ]
2223 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionInventoryDefinitionType> ; 2214 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionInventoryDefinitionType> ;
2224 sp:predicate rdf:type ; 2215 sp:predicate rdf:type ;
......