Added log:reportingPeriodStart, renamed log:wellBoreName to

log:ndpEntityName, adjusted UI of log viewer

Added log:reportingPeriodStart, renamed log:wellBoreName to
log:ndpEntityName, adjusted UI of log viewer
Holger Knublauch
Commit 52bf1d472e3e13fdcf22883b0b152168c786520d 52bf1d47 1 parent 585bc601
Showing 4 changed files with 58 additions and 23 deletions
www.reportinghub.no/spin/SPIN-RH-v1.0.spin.ttl
www.reportinghub.no/system/schema/SCHEMA-logging.ttl
www.reportinghub.no/system/schema/SCHEMA-reporting.ttl
www.reportinghub.no/system/swp/SWP-logging.ui.ttl
--- a/www.reportinghub.no/spin/SPIN-RH-v1.0.spin.ttl
View file @52bf1d4
+++ b/www.reportinghub.no/spin/SPIN-RH-v1.0.spin.ttl
View file @52bf1d4
@@ -1470,6 +1470,34 @@ rhspin:fieldById
                 spl:valueType xsd:string
               ] .
+rhspin:fieldByOwner
+      rdf:type spin:Function ;
+      rdfs:label "field by owner"^^xsd:string ;
+      rdfs:subClassOf spin:Functions ;
+      spin:body
+              [ rdf:type sp:Select ;
+                sp:resultVariables ([ sp:varName "field"^^xsd:string
+                          ]) ;
+                sp:where ([ rdf:type sp:NamedGraph ;
+                            sp:elements ([ sp:object
+                                                [ sp:varName "owner"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#fieldOwner> ;
+                                        sp:subject
+                                                [ sp:varName "field"^^xsd:string
+                                                ]
+                                      ]) ;
+                            sp:graphNameNode npdata:npd
+                          ])
+              ] ;
+      spin:constraint
+              [ rdf:type spl:Argument ;
+                rdfs:comment "The licence or BAA to get the field name of."^^xsd:string ;
+                spl:predicate arg:owner ;
+                spl:valueType <http://www.reportinghub.no/np/schema/npd#Owner>
+              ] ;
+      spin:returnType <http://www.reportinghub.no/ep/schema/facility#Field> .
+
 rhspin:fieldNameByOwner
       rdf:type spin:Function ;
       rdfs:label "field name by owner"^^xsd:string ;
@@ -2627,13 +2655,13 @@ rhspin:wellByName
               ] ;
       spin:returnType <http://www.reportinghub.no/ep/schema/well#Well> .
-_:b9  sp:varName "company"^^xsd:string .
-
 _:b11
       sp:varName "company"^^xsd:string .
 _:b7  sp:varName "company"^^xsd:string .
+_:b9  sp:varName "company"^^xsd:string .
+
 _:b10
       sp:varName "companyName"^^xsd:string .
@@ -2686,10 +2714,10 @@ _:b6  sp:varName "well"^^xsd:string .
 _:b12
       sp:varName "wellBore"^^xsd:string .
-_:b4  sp:varName "wellBore"^^xsd:string .
-
 _:b8  sp:varName "wellBore"^^xsd:string .
+_:b4  sp:varName "wellBore"^^xsd:string .
+
 _:b3  sp:varName "wellBoreId"^^xsd:string .
 _:b2  sp:varName "wellBoreName"^^xsd:string .
--- a/www.reportinghub.no/system/schema/SCHEMA-logging.ttl
View file @52bf1d4
+++ b/www.reportinghub.no/system/schema/SCHEMA-logging.ttl
View file @52bf1d4
@@ -129,6 +129,13 @@ log:initiatedBy
       rdfs:label "user"^^xsd:string ;
       rdfs:range xsd:string .
+log:npdEntityName
+      rdf:type owl:DatatypeProperty ;
+      rdfs:comment "Points to a well bore or field name that had the report uploaded."^^xsd:string ;
+      rdfs:domain log:ReportUploadEvent ;
+      rdfs:label "NPD entity name"^^xsd:string ;
+      rdfs:range xsd:string .
+
 log:onBehalfOf
       rdf:type owl:DatatypeProperty ;
       rdfs:comment "The name of the company that the user has been logged in for."^^xsd:string ;
@@ -158,6 +165,13 @@ log:reportType
       rdfs:label "report type"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/system/schema/reporting#ReportClass> .
+log:reportingPeriodStart
+      rdf:type owl:DatatypeProperty ;
+      rdfs:comment "The start date of the reporting period in the report."^^xsd:string ;
+      rdfs:domain log:ReportUploadEvent ;
+      rdfs:label "reporting period start"^^xsd:string ;
+      rdfs:range xsd:date .
+
 log:url
       rdf:type owl:DatatypeProperty ;
       rdfs:comment "The URL of a query request."^^xsd:string ;
@@ -165,13 +179,6 @@ log:url
       rdfs:label "url"^^xsd:string ;
       rdfs:range xsd:string .
-log:wellBoreName
-      rdf:type owl:DatatypeProperty ;
-      rdfs:comment "Points to one or more well bore names that had reports uploaded."^^xsd:string ;
-      rdfs:domain log:ReportUploadEvent ;
-      rdfs:label "well bore name"^^xsd:string ;
-      rdfs:range xsd:string .
-
 log:xml
       rdf:type owl:DatatypeProperty ;
       rdfs:comment "The complete source of the submitted XML document."^^xsd:string ;
--- a/www.reportinghub.no/system/schema/SCHEMA-reporting.ttl
View file @52bf1d4
+++ b/www.reportinghub.no/system/schema/SCHEMA-reporting.ttl
View file @52bf1d4
@@ -69,7 +69,7 @@ report:AbstractReport
 report:DDR
       rdf:type report:ReportClass ;
       rdfs:comment "The metadata about a Daily Drilling Report."^^xsd:string ;
-      rdfs:label "DDR"^^xsd:string ;
+      rdfs:label "DDR 1.1"^^xsd:string ;
       rdfs:subClassOf report:AbstractDR ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
@@ -85,7 +85,7 @@ report:DDR
 report:DPR
       rdf:type report:ReportClass ;
       rdfs:comment "The metadata about a Daily Production Report."^^xsd:string ;
-      rdfs:label "DPR"^^xsd:string ;
+      rdfs:label "DPR 1.0"^^xsd:string ;
       rdfs:subClassOf report:AbstractDR ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
@@ -93,6 +93,11 @@ report:DPR
                 owl:onProperty report:owner
               ] .
+report:DPR2
+      rdf:type report:ReportClass ;
+      rdfs:label "DPR 2.0"^^xsd:string ;
+      rdfs:subClassOf report:AbstractDR .
+
 report:Format
       rdf:type owl:Class ;
       rdfs:label "Format"^^xsd:string ;
@@ -102,19 +107,14 @@ report:HTMLFormat
       rdf:type report:Format ;
       rdfs:label "HTMLFormat"^^xsd:string .
-report:MPRD
-      rdf:type report:ReportClass ;
-      rdfs:label "MPRD"^^xsd:string ;
-      rdfs:subClassOf report:AbstractMPR .
-
 report:MPRG
       rdf:type report:ReportClass ;
-      rdfs:label "MPR Gov"^^xsd:string ;
+      rdfs:label "MPR Gov 1.0"^^xsd:string ;
       rdfs:subClassOf report:AbstractMPR .
 report:MPRP
       rdf:type report:ReportClass ;
-      rdfs:label "MPRP"^^xsd:string ;
+      rdfs:label "MPR Partner 1.0"^^xsd:string ;
       rdfs:subClassOf report:AbstractMPR .
 report:NPTR
--- a/www.reportinghub.no/system/swp/SWP-logging.ui.ttl
View file @52bf1d4
+++ b/www.reportinghub.no/system/swp/SWP-logging.ui.ttl
View file @52bf1d4
@@ -252,7 +252,7 @@ log:ReportEvent
               ] .
 log:ReportUploadEvent
-      swa:keyProperties (<http://purl.org/dc/terms/created> rdf:type log:reportType log:wellBoreName log:initiatedBy log:onBehalfOf log:outcome rdfs:comment) ;
+      swa:keyProperties (<http://purl.org/dc/terms/created> rdf:type log:reportType log:npdEntityName log:reportingPeriodStart log:initiatedBy log:onBehalfOf log:outcome rdfs:comment) ;
       ui:instanceView
               [ rdf:type ui:group ;
                 default:subject spin:_this ;
@@ -273,8 +273,8 @@ log:ReportUploadEvent
                                   ] ;
                           ui:child
                                   [ rdf:type swa:Object ;
-                                    arg:label "Well bore name"^^xsd:string ;
+                                    arg:label "NPD entity name"^^xsd:string ;
-                                    arg:predicate log:wellBoreName ;
+                                    arg:predicate log:npdEntityName ;
                                     ui:childIndex 1
                                   ] ;
                           ui:childIndex 1