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

NIHVIVO-1336 Modifications to educational training query and template due to core:EducationalTraining being associated with a core:DateTimeInterval rather than a core:DateTimeValue

Browse source
This commit is contained in:
rjy7 2011-01-06 17:02:01 +00:00
parent 88697e61db
commit 9f62e70e81
2 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
productMods/config/listViewConfig-educationalTraining.xml
View file

@ -10,7 +10,7 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
SELECT DISTINCT ?edTraining (afn:localname(?edTraining) AS ?edTrainingName) ?org ?orgName SELECT DISTINCT ?edTraining (afn:localname(?edTraining) AS ?edTrainingName) ?org ?orgName
?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTime ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTimeStart ?dateTimeEnd
WHERE { WHERE {
GRAPH ?g1 { ?subject ?property ?edTraining } GRAPH ?g1 { ?subject ?property ?edTraining }
OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org . OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org .
@ -23,10 +23,15 @@
OPTIONAL { GRAPH ?g6 { ?edTraining core:majorField ?majorField } } OPTIONAL { GRAPH ?g6 { ?edTraining core:majorField ?majorField } }
OPTIONAL { GRAPH ?g7 { ?edTraining core:departmentOrSchool ?deptOrSchool } } OPTIONAL { GRAPH ?g7 { ?edTraining core:departmentOrSchool ?deptOrSchool } }
OPTIONAL { GRAPH ?g8 { ?edTraining core:supplementalInformation ?info } } OPTIONAL { GRAPH ?g8 { ?edTraining core:supplementalInformation ?info } }
OPTIONAL { GRAPH ?g9 { ?edTraining core:dateTimeInterval ?dateTimeInterval . OPTIONAL { GRAPH ?g9 { ?edTraining core:dateTimeInterval ?dateTimeInterval }
?dateTimeInterval core:dateTime ?dateTime } OPTIONAL { GRAPH ?g10 { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart }
}
OPTIONAL { GRAPH ?g11 { ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd }
}
} }
} ORDER BY DESC(?dateTime) } ORDER BY DESC(?dateTimeEnd) DESC(?dateTimeStart)
</query> </query>
<template>propStatement-educationalTraining.ftl</template> <template>propStatement-educationalTraining.ftl</template>

26
productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
View file

@ -26,10 +26,28 @@
</#if> </#if>
</#local> </#local>
<#if statement.dateTime??> <#local dateTimeInterval>
<#local year = dt.xsdDateTimeToYear(statement.dateTime)> <#if statement.dateTimeStart??>
</#if> <#local startYear = dt.xsdDateTimeToYear(statement.dateTimeStart)>
</#if>
<#if statement.dateTimeEnd??>
<#local endYear = dt.xsdDateTimeToYear(statement.dateTimeEnd)>
</#if>
<#if startYear?? && endYear??>
${startYear} - ${endYear}
<#elseif startYear??>
${startYear} -
<#elseif endYear ??>
${endYear} <#-- no hyphen, so doesn't display as a range with missing start date -->
</#if>
</#local>
<@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info!, year! ] /> <#local date>
<#if dateTimeInterval?has_content>
<span class="listDateTime">${dateTimeInterval}</span>
</#if>
</#local>
<@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info! ] /> ${date}
</#macro> </#macro>