NIHVIVO-1341 Change names of custom list view config files, xml elements, templates.
This commit is contained in:
parent
92040a8eb2
commit
23302816ac
3 changed files with 14 additions and 7 deletions
|
@ -16,7 +16,7 @@
|
|||
xmlns:vitro="&vitro;">
|
||||
|
||||
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#educationalTraining">
|
||||
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">objectPropertyList-educationalTraining.xml</display:listViewConfigFile>
|
||||
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-educationalTraining.xml</display:listViewConfigFile>
|
||||
</rdf:Description>
|
||||
</rdf:RDF>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
|
||||
SELECT DISTINCT ?edTraining ?org ?orgName ?degree ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTime WHERE {
|
||||
SELECT DISTINCT ?edTraining ?org ?orgName ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTime WHERE {
|
||||
?subject ?property ?edTraining .
|
||||
?edTraining core:trainingAtOrganization ?org .
|
||||
?org rdfs:label ?orgName .
|
||||
|
@ -15,8 +15,9 @@
|
|||
OPTIONAL { ?edTraining core:majorField ?majorField . }
|
||||
OPTIONAL { ?edTraining core:departmentOrSchool ?deptOrSchool . }
|
||||
OPTIONAL { ?edTraining core:supplementalInformation ?info . }
|
||||
OPTIONAL { ?edTraining core:dateTimeInterval ?interval . }
|
||||
OPTIONAL { ?interval core:hasDateTimeValue ?dateTime . }
|
||||
OPTIONAL { ?edTraining core:dateTimeInterval ?interval .
|
||||
?interval core:start ?dateTimeValue .
|
||||
?dateTimeValue core:dateTime ?dateTime . }
|
||||
} ORDER BY DESC(?dateTime)
|
||||
</query>
|
||||
|
||||
|
|
|
@ -5,11 +5,17 @@
|
|||
<#import "lib-sequence.ftl" as s>
|
||||
|
||||
<#assign degree>
|
||||
<#if statement.degree??>
|
||||
<#if statement.degreeName??>
|
||||
<@s.join [ statement.degreeAbbr!statement.degreeName, statement.majorField! ], " in " />
|
||||
</#if>
|
||||
</#assign>
|
||||
|
||||
<#assign org><a href="${url(statement.org)}">${statement.orgName}</a></#assign>
|
||||
|
||||
<@s.join [ degree, org, statement.deptOrSchool!, statement.info!, statement.datetime! ] />
|
||||
<#--
|
||||
<#if statement.dateTime??>
|
||||
<#assign dateTime = statement.dateTime?string("yyyy")>
|
||||
</#if>
|
||||
-->
|
||||
|
||||
<@s.join [ degree, org, statement.deptOrSchool!, statement.info!, dateTime! ] />
|
||||
|
|
Loading…
Add table
Reference in a new issue