NIHVIVO-2325 Display core:hasPreseneterRole date as non-interval
This commit is contained in:
parent
a097dc2784
commit
be6c3c5a30
2 changed files with 14 additions and 2 deletions
|
@ -11,10 +11,15 @@
|
|||
|
||||
SELECT DISTINCT <collated>?subclass</collated>
|
||||
?role
|
||||
?startDateOnly
|
||||
?roleLabel
|
||||
?activity ?activityName
|
||||
?dateTimeStart ?dateTimeEnd WHERE {
|
||||
|
||||
?subject ?property ?role
|
||||
|
||||
LET (?startDateOnly := (?property = core:hasPresenterRole) )
|
||||
|
||||
OPTIONAL { ?role core:roleIn ?activity .
|
||||
?activity rdfs:label ?activityName
|
||||
}
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
|
||||
next statement -->
|
||||
<#macro showRole statement>
|
||||
|
||||
<#local linkedIndividual>
|
||||
<#if statement.activity??>
|
||||
<a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a>
|
||||
|
@ -19,7 +18,15 @@
|
|||
<a href="${profileUrl(statement.role)}">missing activity</a>
|
||||
</#if>
|
||||
</#local>
|
||||
|
||||
<#local dateTime>
|
||||
<#if statement.startDateOnly == "true">
|
||||
<@dt.yearSpan statement.dateTimeStart! />
|
||||
<#else>
|
||||
<@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
|
||||
</#if>
|
||||
</#local>
|
||||
|
||||
${linkedIndividual} ${statement.roleLabel!} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
|
||||
${linkedIndividual} ${statement.roleLabel!} ${dateTime!}
|
||||
|
||||
</#macro>
|
Loading…
Add table
Add a link
Reference in a new issue