Bob DuCharme

Added mole ratio figures to Fluid Sample Analysis Results section of report.

......@@ -252,6 +252,7 @@ dpr-tables:FluidSampleAnalysisResults
rdfs:subClassOf rhspin:DPRTableTemplates ;
spin:body
[ rdf:type sp:Select ;
sp:distinct "true"^^xsd:boolean ;
sp:orderBy ([ sp:varName "sampledFluidName"^^xsd:string
]) ;
sp:resultVariables ([ sp:varName "sampledFluidName"^^xsd:string
......@@ -347,6 +348,63 @@ dpr-tables:FluidSampleAnalysisResults
sp:subject
[ sp:varName "componentType"^^xsd:string
]
] [ sp:object
[ sp:varName "firstOfPair"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "component"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#MolePair> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "molePair"^^xsd:string
]
] [ sp:object
[ sp:varName "firstOfPair"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#firstOfPair> ;
sp:subject
[ sp:varName "molePair"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mole> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "firstOfPair"^^xsd:string
]
] [ sp:object
[ sp:varName "secondOfPair"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#secondOfPair> ;
sp:subject
[ sp:varName "molePair"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mole> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "secondOfPair"^^xsd:string
]
] [ sp:object
[ sp:varName "ratio"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#divide> ;
sp:subject
[ sp:varName "molePair"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Ratio> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "ratio"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "ratio"^^xsd:string
]
] ;
sp:variable
[ sp:varName "moleRatioPercent"^^xsd:string
]
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "component"^^xsd:string
......@@ -373,24 +431,6 @@ dpr-tables:FluidSampleAnalysisResults
[ sp:varName "massRatioPercent"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "moleRatio"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/material#moleRatio> ;
sp:subject
[ sp:varName "materialPair"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "moleRatio"^^xsd:string
]
] ;
sp:variable
[ sp:varName "moleRatioPercent"^^xsd:string
]
])
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
......