diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml index e75ebcfd..94ab38bc 100644 --- a/productMods/config/listViewConfig-hasRole.xml +++ b/productMods/config/listViewConfig-hasRole.xml @@ -17,8 +17,9 @@ ?roleLabel ?activity ?activityName ?activityLabel - ?dateTimeStart ?dateTimeEnd WHERE { - + ?dateTimeStart ?dateTimeEnd + ?hideThis + WHERE { ?subject ?property ?role OPTIONAL { ?role core:roleRealizedIn ?activity @@ -40,6 +41,7 @@ } OPTIONAL { ?role rdfs:label ?roleLabel } + OPTIONAL { ?role core:hideFromDisplay ?hideThis } OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart @@ -48,7 +50,7 @@ ?dateTimeEndValue core:dateTime ?dateTimeEnd } } - NOT EXISTS { ?role core:hideFromDisplay ?hideThis } + # NOT EXISTS { ?role core:hideFromDisplay ?hideThis } FILTER ( bound(?activity) ) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl index 0e83d573..6c3634c0 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl @@ -13,6 +13,16 @@ <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the next statement --> <#macro showRole statement> +<#if statement.hideThis?has_content> +   + +<#else> <#local linkedIndividual> <#if statement.activity??> ${statement.activityLabel!statement.activityName} @@ -26,6 +36,6 @@ <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> - ${linkedIndividual} ${statement.roleLabel!} ${dateTime!} - + ${linkedIndividual} ${statement.roleLabel!} ${dateTime!} + \ No newline at end of file