diff --git a/productMods/WEB-INF/ontologies/app/listViewConfig.owl b/productMods/WEB-INF/ontologies/app/listViewConfig.owl index cfba17e8..9a8a773c 100644 --- a/productMods/WEB-INF/ontologies/app/listViewConfig.owl +++ b/productMods/WEB-INF/ontologies/app/listViewConfig.owl @@ -16,7 +16,7 @@ xmlns:vitro="&vitro;"> - objectPropertyList-educationalTraining.xml + listViewConfig-educationalTraining.xml diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index bc9234d9..be1615e6 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -5,9 +5,9 @@ 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 . + ?edTraining core:trainingAtOrganization ?org . ?org rdfs:label ?orgName . OPTIONAL { ?edTraining core:degreeEarned ?degree . } OPTIONAL { ?degree rdfs:label ?degreeName . } @@ -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) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index b26cbe22..abed7254 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl @@ -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 " /> <#assign org>${statement.orgName} -<@s.join [ degree, org, statement.deptOrSchool!, statement.info!, statement.datetime! ] /> +<#-- +<#if statement.dateTime??> + <#assign dateTime = statement.dateTime?string("yyyy")> + +--> + +<@s.join [ degree, org, statement.deptOrSchool!, statement.info!, dateTime! ] />