MonkeyChap

Merge branch 'IanProdFri10'

1 -# Saved by TopBraid on Fri Oct 14 00:15:06 BST 2011 1 +# Saved by TopBraid on Fri Oct 14 18:36:52 BST 2011
2 # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-report 2 # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-report
3 # imports: http://www.reportinghub.no/ep/schema/1.0/report 3 # imports: http://www.reportinghub.no/ep/schema/1.0/report
4 # imports: http://www.reportinghub.no/np/schema/1.0/npd 4 # imports: http://www.reportinghub.no/np/schema/1.0/npd
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 11
12 <http://www.reportinghub.no/ep/schema/1.0/production-report> 12 <http://www.reportinghub.no/ep/schema/1.0/production-report>
13 rdf:type owl:Ontology ; 13 rdf:type owl:Ontology ;
14 - owl:imports <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/np/schema/1.0/npd> ; 14 + owl:imports <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/ep/schema/1.0/report> ;
15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
16 16
17 ep-prodreport:DailyProductionReport 17 ep-prodreport:DailyProductionReport
...@@ -34,8 +34,8 @@ ep-prodreport:ReportAliasIdentifier ...@@ -34,8 +34,8 @@ ep-prodreport:ReportAliasIdentifier
34 rdfs:subClassOf owl:Thing ; 34 rdfs:subClassOf owl:Thing ;
35 rdfs:subClassOf 35 rdfs:subClassOf
36 [ rdf:type owl:Restriction ; 36 [ rdf:type owl:Restriction ;
37 - owl:cardinality "1"^^xsd:nonNegativeInteger ; 37 + owl:minCardinality "1"^^xsd:nonNegativeInteger ;
38 - owl:onProperty ep-prodreport:isAliasFor 38 + owl:onProperty ep-prodreport:aliasName
39 ] ; 39 ] ;
40 rdfs:subClassOf 40 rdfs:subClassOf
41 [ rdf:type owl:Restriction ; 41 [ rdf:type owl:Restriction ;
...@@ -44,8 +44,8 @@ ep-prodreport:ReportAliasIdentifier ...@@ -44,8 +44,8 @@ ep-prodreport:ReportAliasIdentifier
44 ] ; 44 ] ;
45 rdfs:subClassOf 45 rdfs:subClassOf
46 [ rdf:type owl:Restriction ; 46 [ rdf:type owl:Restriction ;
47 - owl:minCardinality "1"^^xsd:nonNegativeInteger ; 47 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
48 - owl:onProperty ep-prodreport:aliasName 48 + owl:onProperty ep-prodreport:isAliasFor
49 ] . 49 ] .
50 50
51 ep-prodreport:aliasName 51 ep-prodreport:aliasName
...@@ -56,6 +56,11 @@ ep-prodreport:aliasOwner ...@@ -56,6 +56,11 @@ ep-prodreport:aliasOwner
56 rdf:type owl:ObjectProperty ; 56 rdf:type owl:ObjectProperty ;
57 rdfs:range <http://www.reportinghub.no/np/schema/npd#Individual> . 57 rdfs:range <http://www.reportinghub.no/np/schema/npd#Individual> .
58 58
59 +ep-prodreport:dateCoveredByReport
60 + rdf:type owl:DatatypeProperty ;
61 + rdfs:domain ep-prodreport:DailyProductionReport ;
62 + rdfs:range xsd:date .
63 +
59 ep-prodreport:disclaimer 64 ep-prodreport:disclaimer
60 rdf:type rdf:Property ; 65 rdf:type rdf:Property ;
61 rdfs:domain <http://www.reportinghub.no/ep/schema/report#Report> ; 66 rdfs:domain <http://www.reportinghub.no/ep/schema/report#Report> ;
......
1 -# Saved by TopBraid on Fri Oct 14 17:19:24 BST 2011 1 +# Saved by TopBraid on Fri Oct 14 18:47:01 BST 2011
2 # baseURI: null 2 # baseURI: null
3 3
4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . 4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
......
1 <ui:group 1 <ui:group
2 let:report="{# SELECT ?report WHERE {?report a ep-prodreport:DailyProductionReport }}" 2 let:report="{# SELECT ?report WHERE {?report a ep-prodreport:DailyProductionReport }}"
3 let:mainAct="{# SELECT ?mainAct WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct}}" 3 let:mainAct="{# SELECT ?mainAct WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct}}"
4 - let:mainAct="{# SELECT ?mainAct WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct}}" 4 + let:mainFac="{# SELECT ?mainFac WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainAct ep-prodact:involvement ?epMainFacTempPart . ?mainFac ep-core:hasTemporalPart ?epMainFacTempPart}}"
5 - let:opCo="{# SELECT ?opCo WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainAct ep-prodact:involvement ?opCo}}" 5 + let:opCo="{# SELECT ?opCo WHERE {?report a ep-prodreport:DailyProductionReport . ?report ep-report:reportOn ?mainAct . ?mainFac ep-fac:facilityOperator ?opCo}}"
6 > 6 >
7 - <h1>Daily Production Report: {# SELECT ?mfName WHERE {?mainFac rdfs:label ?mfName}}</h1> 7 + <center>
8 - <h2>Operating Company: {# SELECT ?ocName WHERE {?opCo rdfs:label ?ocName}}</h2> 8 + <h1>{# SELECT ?mfName WHERE {?mainFac rdfs:label ?mfName}}</h1>
9 - 9 + <h2>{# SELECT ?ocName WHERE {?opCo rdfs:label ?ocName}}</h2>
10 + <h2>{# SELECT ?docName WHERE {?report rdfs:label ?docName}}</h2>
11 + <h2>Report date: {# SELECT ?docDate WHERE {?report ep-prodreport:dateCoveredByReport ?docDate}}</h2>
12 + <h2>Issue date: {# SELECT ?createDate WHERE {?report ep-report:createdAt ?createDate}}</h2>
13 + </center>
10 <hr /> 14 <hr />
11 15
12 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInformation" /> 16 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInformation" />
......