Fixed an inventory bug

David Leal
Commit 5428ab5f5d783d5af905359bac09e815c8bf69f6 5428ab5f 1 parent 1dbebefc
Showing 2 changed files with 53 additions and 47 deletions
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-REPORT-v1.0.ttl
www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0.ttl
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-REPORT-v1.0.ttl
View file @5428ab5
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-REPORT-v1.0.ttl
View file @5428ab5
@@ -14,7 +14,7 @@
 <http://www.reportinghub.no/ep/schema/1.0/report>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/np/schema/1.0/npd> ;
+      owl:imports <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType>
@@ -48,13 +48,13 @@ ep-report:DrillingReport
       rdfs:subClassOf ep-report:Report .
 ep-report:FinalDailyDrillingReport
-      rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ;
+      rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
       rdfs:comment "daily drilling report that contains the final definitive status for the well. This report is normally issued some period of time (e.g., 6 months) after the completion of drilling. (source: DDR-XSD)"^^xsd:string ;
       rdfs:label "final daily drilling report"^^xsd:string ;
       rdfs:subClassOf ep-report:DailyDrillingReport .
 ep-report:FinalVersionOfAReport
-      rdf:type ep-report:ReportVersionStatus , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportVersionStatus ;
       rdfs:comment "report that is a final version"^^xsd:string ;
       rdfs:label "final version of a report"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -90,8 +90,13 @@ ep-report:NonProductivetimeReport
       rdfs:subClassOf ep-report:Report ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-report:DailyDrillingReport ;
+                owl:onProperty ep-report:reportOn
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
                 owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty ep-report:createdAt
+                owl:onProperty ep-report:reportOn
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
@@ -101,28 +106,23 @@ ep-report:NonProductivetimeReport
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
                 owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty ep-report:reportOn
+                owl:onProperty ep-report:createdAt
-              ] ;
-      rdfs:subClassOf
-              [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ep-report:DailyDrillingReport ;
-                owl:onProperty ep-report:reportOn
               ] .
 ep-report:NormalDailyDrillingReport
-      rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ;
+      rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
       rdfs:comment "daily drilling report that has been approved by the drilling operator (source: DDR-XSD)"^^xsd:string ;
       rdfs:label "normal daily drilling report"^^xsd:string ;
-      rdfs:subClassOf ep-report:DailyDrillingReport , ep-report:FinalVersionOfAReport .
+      rdfs:subClassOf ep-report:FinalVersionOfAReport , ep-report:DailyDrillingReport .
 ep-report:PreliminaryDailyDrillingReport
-      rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ;
+      rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
       rdfs:comment "daily drilling report that is a preliminary report that has not yet been approved by the drilling operator. This report is normally issued at the beginning of the work day (e.g., 6:00 am) before. (source: DDR-XSD)"^^xsd:string ;
       rdfs:label "preliminary daily drilling report"^^xsd:string ;
-      rdfs:subClassOf ep-report:DailyDrillingReport , ep-report:PreliminaryVersionOfAReport .
+      rdfs:subClassOf ep-report:PreliminaryVersionOfAReport , ep-report:DailyDrillingReport .
 ep-report:PreliminaryVersionOfAReport
-      rdf:type ep-report:ReportVersionStatus , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportVersionStatus ;
       rdfs:comment "report that is a preliminary version"^^xsd:string ;
       rdfs:label "preliminary version of a report"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -133,6 +133,12 @@ ep-report:ProductVolumeFlowReport
       rdfs:label "product volume flow report"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
+ep-report:ProductVolumeInventoryReport
+      rdf:type owl:Class ;
+      rdfs:comment "report that is part of a product volume report and that is about a single inventory"^^xsd:string ;
+      rdfs:label "product volume inventory report"^^xsd:string ;
+      rdfs:subClassOf ep-report:Report .
+
 ep-report:ProductVolumeReport
       rdf:type owl:Class ;
       rdfs:comment "report that is part of a production report and that is about product volumes"^^xsd:string ;
@@ -170,55 +176,55 @@ ep-report:Report
       rdfs:subClassOf owl:Thing .
 ep-report:ReportAt06-00
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report for instant that is for 6 am during the report period. This can be ambiguous if the report period begins and ends at 6 am, so use report start/end instead. This cannot be used for a reporting period that is greater than 24 hours. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report at 06:00"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtBeginningOfReportingPeriod
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report for instant that is a part of another report, and that is for the beginning of the period of the report it is part of (source: MPR-XSD)."^^xsd:string ;
       rdfs:label "report at beginning of reporting period"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtEndOfReportingPeriod
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report for instant that is a part of another report, and that is for the end of the period of the report it is part of (source: MPR-XSD)."^^xsd:string ;
       rdfs:label "report at end of reporting period"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtMidnight
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report for instant that is for midnight during the report period. This can be ambiguous if the report period begins and ends at midnight, so use report start/end instead. This cannot be used for a reporting period that is greater than 24 hours. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report at midnight"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtNoon
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report for instant that is for noon during the report period. This can be ambiguous if the report period begins and ends at noon, so use report start/end instead. This cannot be used for a reporting period that is greater than 24 hours. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report at  noon"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportForAllToDate
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within all time up to the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for all to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForDailyMonthToDate
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about the average for each day within the period from the beginning of a month to the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for daily month to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForDailyYearToDate
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about the average for each day within the period from the beginning of a year to the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for daily year to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForGasYearToDate
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM October 1st ending at 06:00 AM on a given date (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for gas year to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -230,67 +236,67 @@ ep-report:ReportForInstant
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForMonthToDate
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report on activities within a period from the beginning of a calendar month up to the end of a reporting period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for month to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneDay
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within one day, or within the 24 hour period ending at the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one day"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneGasDay
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM and ending 06:00 AM next day (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one gas day"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneGasMonth
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM on the the first day of a month and ending at 06:00 AM on the first day of next month (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one gas month"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneGasYear
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM October 1st and ending at same date and time the following year (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one gas year"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneMonth
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within one calendar month (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one month"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneWeek
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within one calendar week, or 7 consequtive 24 hour periods ending at the end of the report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one week"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneYear
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within one Gregorian year (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one year"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForPreviousPeriod
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is a part of another report and that is about activities within the period immediately prior to that of the report it is a part of. For example, if the report period represents a day then the previous period represents the previous day (source: MPR-XSD)."^^xsd:string ;
       rdfs:label "report for previous period"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForReportingPeriod
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within the whole of a reporting period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for reporting period"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForYearToDate
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within the period from the beginning of a year up to the end of a reporting period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for year to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -314,22 +320,22 @@ ep-report:WeeklyDrillingReport
       rdfs:subClassOf ep-report:DrillingReport ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ep-report:DailyDrillingReport ;
+                owl:cardinality "7"^^xsd:nonNegativeInteger ;
                 owl:onProperty ep-report:reportOn
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:cardinality "1"^^xsd:nonNegativeInteger ;
+                owl:allValuesFrom xsd:dateTime ;
                 owl:onProperty ep-report:createdAt
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom xsd:dateTime ;
+                owl:cardinality "1"^^xsd:nonNegativeInteger ;
                 owl:onProperty ep-report:createdAt
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:cardinality "7"^^xsd:nonNegativeInteger ;
+                owl:allValuesFrom ep-report:DailyDrillingReport ;
                 owl:onProperty ep-report:reportOn
               ] .
@@ -347,13 +353,13 @@ ep-report:approvedReport
       rdfs:range ep-report:Report .
 ep-report:createdAt
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "point in time that a report was created at"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "created at"^^xsd:string .
 ep-report:dailyDrillingReportNumber
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "identifier of a daily drilling report"^^xsd:string ;
       rdfs:domain ep-report:DailyDrillingReport ;
       rdfs:label "daily drilling report number"^^xsd:string .
@@ -386,13 +392,13 @@ ep-report:existsUpToTheEndOfThePeriodReportedOnBy
       rdfs:range ep-report:Report .
 ep-report:hasContent
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "text that is the content of a report"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "has content"^^xsd:string .
 ep-report:issuedAt
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "point in time that a report was issued at"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "issued at"^^xsd:string .
@@ -405,7 +411,7 @@ ep-report:issuedReport
       rdfs:range ep-report:Report .
 ep-report:nameAsDatumObject
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "name by which a physical object is refered to as a datum object"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/core#PhysicalObject> ;
       rdfs:label "name as datum object"^^xsd:string .
@@ -418,7 +424,7 @@ ep-report:reportOn
       rdfs:range <http://www.reportinghub.no/ep/schema/core#PhysicalThing> .
 ep-report:reportVersion
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "version identifier for a report"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "report version"^^xsd:string .
@@ -431,13 +437,13 @@ ep-report:title
       rdfs:range xsd:string .
 ep-report:validFrom
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "point in time that a report is valid from"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "valid from"^^xsd:string .
 ep-report:validTo
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
       rdfs:comment "point in time that a report if valid until"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "valid to"^^xsd:string .
--- a/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0.ttl
View file @5428ab5
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0.ttl
View file @5428ab5