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

Merge pull request #28 from gneissone/no-old-positions

Browse source 
hide past positions in 'research area of' list view
This commit is contained in:
grahamtriggs 2016-01-07 14:00:58 +00:00
commit f1db2aa8aa
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml
View file

@ -22,6 +22,7 @@
?org
?orgLabel
?title
?dateTimeEnd
WHERE {
?subject ?property ?person .
OPTIONAL { ?person core:relatedBy ?position .
@ -42,8 +43,13 @@
?org a foaf:Organization .
?org rdfs:label ?orgLabel
}
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd .
FILTER ( ?dateTimeEnd < now() )
}
}
ORDER BY (fn:lower-case(?personName))
ORDER BY (fn:lower-case(?personName)) (bound(?dateTimeEnd)) desc(?dateTimeEnd)
</query-select>
<query-construct>
@ -59,6 +65,9 @@
?position core:relates ?org .
?org a foaf:Organization .
?org rdfs:label ?orgName .
?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?endDate .
?endDate core:dateTime ?endDateValue .
} WHERE {
{
?subject ?property ?person
@ -84,6 +93,13 @@
?position core:relates ?org .
?org a foaf:Organization .
?org rdfs:label ?orgName
} UNION {
?subject ?property ?person .
?person core:relatedBy ?position .
?position a core:Position .
?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?endDate .
?endDate core:dateTime ?endDateValue
}
}
</query-construct>

20
webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
View file

@ -14,15 +14,17 @@
<#local linkedIndividual>
<a href="${profileUrl(statement.uri("person"))}" title="${i18n().person_name}">${statement.personName!}</a>
</#local>
<#if statement.title?has_content >
<#local posnTitle = statement.title>
<#elseif statement.posnLabel?has_content>
<#local posnTitle = statement.posnLabel>
</#if>
<#if statement.org??>
<#local orgString>
<a href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}">${statement.orgLabel!""}</a>
</#local>
<#if !(statement.dateTimeEnd?has_content)>
<#if statement.title?has_content >
<#local posnTitle = statement.title>
<#elseif statement.posnLabel?has_content>
<#local posnTitle = statement.posnLabel>
</#if>
<#if statement.org??>
<#local orgString>
<a href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}">${statement.orgLabel!""}</a>
</#local>
</#if>
</#if>
<@s.join [ linkedIndividual, posnTitle!, orgString! ] />