diff --git a/languages/example/rdf/display/everytime/PropertyConfig_es.n3 b/languages/example/rdf/display/everytime/PropertyConfig_es.n3 index 4beaf49e..0aa366f3 100644 --- a/languages/example/rdf/display/everytime/PropertyConfig_es.n3 +++ b/languages/example/rdf/display/everytime/PropertyConfig_es.n3 @@ -42,3 +42,5 @@ "jefe de"@es . "miembro de"@es . "tel\u00E9fono"@es . + "tiene sub-organización"@es . + "organización dentro de"@es . \ No newline at end of file diff --git a/languages/example/themes/wilma/i18n/all_es.properties b/languages/example/themes/wilma/i18n/all_es.properties index 35ac2536..0b02b0cc 100644 --- a/languages/example/themes/wilma/i18n/all_es.properties +++ b/languages/example/themes/wilma/i18n/all_es.properties @@ -120,6 +120,7 @@ missing_info_resource = falta de recursos de información award_receipt_name = Nombre del premio recibido award_name = Nombre del premio conferred_by = conferida por +conferred_on = conferida a selected_award = Premio Seleccionado incomplete_date_time_interval = intervalo de la fecha / hora incompleta diff --git a/productMods/config/listViewConfig-awardOrHonorGiven.xml b/productMods/config/listViewConfig-awardOrHonorGiven.xml new file mode 100644 index 00000000..6b7ead3e --- /dev/null +++ b/productMods/config/listViewConfig-awardOrHonorGiven.xml @@ -0,0 +1,136 @@ + + + + + + + + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX owl: <http://www.w3.org/2002/07/owl#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + + SELECT DISTINCT ?awardReceipt + ?receiptLabel + ?award + ?awardLabel + ?givenTo + ?givenToLabel + ?dateTimeStart + ?dateTimeEnd + ?dateTime + + WHERE { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } + OPTIONAL { ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel + } + OPTIONAL { ?awardReceipt core:relates ?givenTo . + ?givenTo rdfs:label ?givenToLabel + } + OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } + } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) + + + + PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + + CONSTRUCT { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel . + ?awardReceipt core:relates ?givenTo . + ?givenTo rdfs:label ?givenToLabel . + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } WHERE { + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + ?awardReceipt core:relates ?givenTo . + ?givenTo a foaf:Person . + ?givenTo rdfs:label ?givenToLabel + } UNION { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } + } + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + CONSTRUCT { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } WHERE { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + CONSTRUCT { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } WHERE { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + + + diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl new file mode 100644 index 00000000..16d9b85b --- /dev/null +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonorGiven.ftl @@ -0,0 +1,40 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.3 file for details. + + This template must be self-contained and not rely on other variables set for the individual page, because it + is also used to generate the property statement during a deletion. + --> +<#import "lib-sequence.ftl" as s> +<#import "lib-datetime.ftl" as dt> +<@showAward statement /> + +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> +<#macro showAward statement> + + <#local linkedIndividual> + <#if statement.award??> + ${statement.awardLabel!} + <#else> + ${statement.receiptLabel!} + + + + <#local dateTimeVal> + <#if statement.dateTime??> + <@dt.yearSpan statement.dateTime! /> + <#else> + <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> + + + + <#local conferredOn> + <#if statement.givenTo?has_content && statement.givenToLabel?has_content> + ${i18n().conferred_on} ${statement.givenToLabel} + + + + <@s.join [ linkedIndividual, conferredOn!, dateTimeVal! ] /> + + diff --git a/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl b/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl index e44041ea..f7b7cef9 100644 --- a/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl +++ b/productMods/templates/freemarker/edit/forms/subjectHasMailingAddress.ftl @@ -76,7 +76,7 @@

- +

diff --git a/productMods/templates/freemarker/lib/lib-vivo-properties.ftl b/productMods/templates/freemarker/lib/lib-vivo-properties.ftl index d74c79be..eb4e630a 100644 --- a/productMods/templates/freemarker/lib/lib-vivo-properties.ftl +++ b/productMods/templates/freemarker/lib/lib-vivo-properties.ftl @@ -25,7 +25,7 @@ <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->