From b99b6562362a8eea7df21ef6df1a23e5025c8402 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 4 Feb 2011 14:52:06 +0000 Subject: [PATCH] NIHVIVO-1724 Display core:hrJobTitle if there is no rdfs:label on the position --- productMods/config/listViewConfig-personInPosition.xml | 6 +++++- .../partials/individual/propStatement-personInPosition.ftl | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml index 7be5edd3..bbe9d95d 100644 --- a/productMods/config/listViewConfig-personInPosition.xml +++ b/productMods/config/listViewConfig-personInPosition.xml @@ -11,6 +11,7 @@ SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName) ?positionTitle + ?hrJobTitle ?org ?orgName ?dateTimeStart ?dateTimeEnd WHERE { ?subject ?property ?position @@ -18,6 +19,7 @@ ?org rdfs:label ?orgName } OPTIONAL { ?position rdfs:label ?positionTitle } + OPTIONAL { ?position core:hrJobTitle ?hrJobTitle } OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart @@ -36,7 +38,8 @@ SELECT DISTINCT ?subclass ?position (afn:localname(?position) AS ?positionName) - ?positionTitle + ?positionTitle + ?hrJobTitle ?org ?orgName ?dateTimeStart ?dateTimeEnd WHERE { ?subject ?property ?position @@ -44,6 +47,7 @@ ?org rdfs:label ?orgName } OPTIONAL { ?position rdfs:label ?positionTitle } + OPTIONAL { ?position core:hrJobTitle ?hrJobTitle } OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl index 1a7cf68c..2f9d6ef4 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl @@ -20,6 +20,6 @@ - <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> + <@s.join [ linkedIndividual, statement.positionTitle!statement.hrJobTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> \ No newline at end of file