litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1724 Display core:hrJobTitle if there is no rdfs:label on the position

Browse source
This commit is contained in:
rjy7 2011-02-04 14:52:06 +00:00
parent 86c27039b0
commit b99b656236
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
productMods/config/listViewConfig-personInPosition.xml
View file

@ -11,6 +11,7 @@
SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName) SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName)
?positionTitle ?positionTitle
?hrJobTitle
?org ?orgName ?org ?orgName
?dateTimeStart ?dateTimeEnd WHERE { ?dateTimeStart ?dateTimeEnd WHERE {
?subject ?property ?position ?subject ?property ?position
@ -18,6 +19,7 @@
?org rdfs:label ?orgName ?org rdfs:label ?orgName
} }
OPTIONAL { ?position rdfs:label ?positionTitle } OPTIONAL { ?position rdfs:label ?positionTitle }
OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
@ -37,6 +39,7 @@
SELECT DISTINCT ?subclass SELECT DISTINCT ?subclass
?position (afn:localname(?position) AS ?positionName) ?position (afn:localname(?position) AS ?positionName)
?positionTitle ?positionTitle
?hrJobTitle
?org ?orgName ?org ?orgName
?dateTimeStart ?dateTimeEnd WHERE { ?dateTimeStart ?dateTimeEnd WHERE {
?subject ?property ?position ?subject ?property ?position
@ -44,6 +47,7 @@
?org rdfs:label ?orgName ?org rdfs:label ?orgName
} }
OPTIONAL { ?position rdfs:label ?positionTitle } OPTIONAL { ?position rdfs:label ?positionTitle }
OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart

2
productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
View file

@ -20,6 +20,6 @@
</#if> </#if>
</#local> </#local>
<@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> <@s.join [ linkedIndividual, statement.positionTitle!statement.hrJobTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro> </#macro>