David Price

Got well prroduction report working again

...@@ -3893,6 +3893,20 @@ mpr-tables:WellProductionFlows ...@@ -3893,6 +3893,20 @@ mpr-tables:WellProductionFlows
3893 [ sp:varName "productionFlowWhole"^^xsd:string 3893 [ sp:varName "productionFlowWhole"^^xsd:string
3894 ] 3894 ]
3895 ] [ rdf:type sp:NotExists ; 3895 ] [ rdf:type sp:NotExists ;
3896 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#SaleableFlow> ;
3897 + sp:predicate rdf:type ;
3898 + sp:subject
3899 + [ sp:varName "productionFlowWhole"^^xsd:string
3900 + ]
3901 + ])
3902 + ] [ rdf:type sp:NotExists ;
3903 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#HydrocarbonAccountingFlow> ;
3904 + sp:predicate rdf:type ;
3905 + sp:subject
3906 + [ sp:varName "productionFlowWhole"^^xsd:string
3907 + ]
3908 + ])
3909 + ] [ rdf:type sp:NotExists ;
3896 sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowToSale> ; 3910 sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowToSale> ;
3897 sp:predicate rdf:type ; 3911 sp:predicate rdf:type ;
3898 sp:subject 3912 sp:subject
...@@ -3931,40 +3945,33 @@ mpr-tables:WellProductionFlows ...@@ -3931,40 +3945,33 @@ mpr-tables:WellProductionFlows
3931 [ sp:varName "productionFlowMixedPart"^^xsd:string 3945 [ sp:varName "productionFlowMixedPart"^^xsd:string
3932 ] 3946 ]
3933 ] [ sp:object 3947 ] [ sp:object
3934 - [ sp:varName "productionFlowMixedPart"^^xsd:string 3948 + [ sp:varName "productFlowInMonthMaterial"^^xsd:string
3935 ] ; 3949 ] ;
3936 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 3950 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialThatFlows> ;
3937 - sp:subject
3938 - [ sp:varName "productFlowInMonth"^^xsd:string
3939 - ]
3940 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductFlow> ;
3941 - sp:predicate rdf:type ;
3942 sp:subject 3951 sp:subject
3943 - [ sp:varName "productFlowInMonth"^^xsd:string 3952 + [ sp:varName "productionFlowMixedPart"^^xsd:string
3944 ] 3953 ]
3945 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ; 3954 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
3946 sp:predicate rdf:type ; 3955 sp:predicate rdf:type ;
3947 sp:subject 3956 sp:subject
3948 - [ sp:varName "productFlowInMonth"^^xsd:string 3957 + [ sp:varName "productFlowInMonthMaterial"^^xsd:string
3949 ] 3958 ]
3950 ] [ sp:object 3959 ] [ sp:object
3951 [ sp:varName "productFlowInMonthMaterial"^^xsd:string 3960 [ sp:varName "productFlowInMonthMaterial"^^xsd:string
3952 ] ; 3961 ] ;
3953 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialThatFlows> ; 3962 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
3954 sp:subject 3963 sp:subject
3955 - [ sp:varName "productFlowInMonth"^^xsd:string 3964 + [ sp:varName "quantityofmaterialinaspecifiedstate"^^xsd:string
3956 ] 3965 ]
3957 - ] [ sp:object 3966 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
3958 - [ sp:varName "productFlowWhole"^^xsd:string 3967 + sp:predicate rdf:type ;
3959 - ] ;
3960 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
3961 sp:subject 3968 sp:subject
3962 - [ sp:varName "productionFlowMixedPart"^^xsd:string 3969 + [ sp:varName "quantityofmaterialinaspecifiedstate"^^xsd:string
3963 ] 3970 ]
3964 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductFlow> ; 3971 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterialInASpecifiedState> ;
3965 sp:predicate rdf:type ; 3972 sp:predicate rdf:type ;
3966 sp:subject 3973 sp:subject
3967 - [ sp:varName "productFlowWhole"^^xsd:string 3974 + [ sp:varName "quantityofmaterialinaspecifiedstate"^^xsd:string
3968 ] 3975 ]
3969 ] [ rdf:type sp:Optional ; 3976 ] [ rdf:type sp:Optional ;
3970 sp:elements ([ sp:object 3977 sp:elements ([ sp:object
...@@ -4024,7 +4031,7 @@ mpr-tables:WellProductionFlows ...@@ -4024,7 +4031,7 @@ mpr-tables:WellProductionFlows
4024 ]) 4031 ])
4025 ] [ rdf:type sp:Optional ; 4032 ] [ rdf:type sp:Optional ;
4026 sp:elements ([ sp:object 4033 sp:elements ([ sp:object
4027 - [ sp:varName "productFlowInMonthMaterial"^^xsd:string 4034 + [ sp:varName "quantityofmaterialinaspecifiedstate"^^xsd:string
4028 ] ; 4035 ] ;
4029 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 4036 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
4030 sp:subject 4037 sp:subject
...@@ -4052,6 +4059,18 @@ mpr-tables:WellProductionFlows ...@@ -4052,6 +4059,18 @@ mpr-tables:WellProductionFlows
4052 [ sp:varName "volumeValueString"^^xsd:string 4059 [ sp:varName "volumeValueString"^^xsd:string
4053 ] 4060 ]
4054 ]) 4061 ])
4062 + ] [ sp:object
4063 + [ sp:varName "productFlowWhole"^^xsd:string
4064 + ] ;
4065 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
4066 + sp:subject
4067 + [ sp:varName "productionFlowMixedPart"^^xsd:string
4068 + ]
4069 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductFlow> ;
4070 + sp:predicate rdf:type ;
4071 + sp:subject
4072 + [ sp:varName "productFlowWhole"^^xsd:string
4073 + ]
4055 ] [ rdf:type sp:Optional ; 4074 ] [ rdf:type sp:Optional ;
4056 sp:elements ([ sp:object 4075 sp:elements ([ sp:object
4057 [ sp:varName "productionFlowPurposeType"^^xsd:string 4076 [ sp:varName "productionFlowPurposeType"^^xsd:string
...@@ -4142,7 +4161,7 @@ mpr-tables:WellProductionFlows ...@@ -4142,7 +4161,7 @@ mpr-tables:WellProductionFlows
4142 ] ; 4161 ] ;
4143 sp:predicate rdf:type ; 4162 sp:predicate rdf:type ;
4144 sp:subject 4163 sp:subject
4145 - [ sp:varName "productionFlowWhole"^^xsd:string 4164 + [ sp:varName "productionFlowMixedPart"^^xsd:string
4146 ] 4165 ]
4147 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionSubType> ; 4166 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionSubType> ;
4148 sp:predicate rdf:type ; 4167 sp:predicate rdf:type ;
...@@ -4159,7 +4178,7 @@ mpr-tables:WellProductionFlows ...@@ -4159,7 +4178,7 @@ mpr-tables:WellProductionFlows
4159 ]) 4178 ])
4160 ]) 4179 ])
4161 ] ; 4180 ] ;
4162 - rhspin:tableHeaders ("Wellbore"^^xsd:string "Status"^^xsd:string "Purpose"^^xsd:string "Material"^^xsd:string "Volume"^^xsd:string "Days"^^xsd:string "Flow type"^^xsd:string "Flow subtype"^^xsd:string "Gross/Net"^^xsd:string) . 4181 + rhspin:tableHeaders ("Wellbore"^^xsd:string "Status"^^xsd:string "Purpose"^^xsd:string "Material"^^xsd:string "Volume"^^xsd:string "Day"^^xsd:string "Flow type"^^xsd:string "Flow subtype"^^xsd:string "Gross/Net"^^xsd:string) .
4163 4182
4164 mpr-tables:WellTest 4183 mpr-tables:WellTest
4165 rdf:type rhspin:TableTemplate ; 4184 rdf:type rhspin:TableTemplate ;
......
...@@ -176,6 +176,9 @@ OPTIONAL { ...@@ -176,6 +176,9 @@ OPTIONAL {
176 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:GasSales" /> 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 +
180 +
181 +
179 182
180 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" /> 183 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
181 184
......
...@@ -3,15 +3,13 @@ let:report="{# SELECT ?report WHERE { ?report a ep-report:MonthlyProductionRepor ...@@ -3,15 +3,13 @@ let:report="{# SELECT ?report WHERE { ?report a ep-report:MonthlyProductionRepor
3 let:activity="{# SELECT ?activity WHERE {?activity a ep-fac:TemporalPartOfAProductionFacility . ?report ep-report:reportOn ?activity}}" 3 let:activity="{# SELECT ?activity WHERE {?activity a ep-fac:TemporalPartOfAProductionFacility . ?report ep-report:reportOn ?activity}}"
4 let:activityEnd="{# SELECT ?activityEnd WHERE {?activity a ep-fac:TemporalPartOfAProductionFacility . ?report ep-report:reportOn ?activity . ?activity ep-activity:finishedAt ?activityEnd}}" 4 let:activityEnd="{# SELECT ?activityEnd WHERE {?activity a ep-fac:TemporalPartOfAProductionFacility . ?report ep-report:reportOn ?activity . ?activity ep-activity:finishedAt ?activityEnd}}"
5 let:reportedFieldName="{# SELECT ?reportedFieldName 5 let:reportedFieldName="{# SELECT ?reportedFieldName
6 -WHERE { 6 +WHERE {
7 - ?report a ep-report:MonthlyProductionReportPartner . 7 + ?report rdf:type ep-report:MonthlyProductionReportPartner .
8 - ?productVolumeReport ep-core:partOf ?report . 8 + ?report ep-report:reportOn ?temporalpartofaproductionfacility .
9 - ?productVolumeReport a ep-report:ProductVolumeReport . 9 + ?temporalpartofaproductionfacility rdf:type ep-fac:TemporalPartOfAProductionFacility .
10 - ?productVolumeReport ep-report:reportOn ?productionFlowsInReportingPeriod . 10 + ?temporalpartofaproductionfacility ep-core:temporalPartOf ?productionfacility .
11 - ?productionFlowsInReportingPeriod a ep-flow:ProductionFlowNetwork . 11 + ?productionfacility rdf:type ep-fac:Field .
12 - ?stateOfField ep-flow:facilityContainsFlow ?productionFlowsInReportingPeriod . 12 + ?productionfacility npd:name ?reportedFieldName .
13 - ?stateOfField ep-core:temporalPartOf ?reportedField .
14 - ?reportedField npd:name ?reportedFieldName .
15 }}" 13 }}"
16 14
17 > 15 >
......