diff --git a/productMods/config/listViewConfig-hasEditReviewRole.xml b/productMods/config/listViewConfig-hasEditReviewRole.xml index 505d1e63..96770d26 100644 --- a/productMods/config/listViewConfig-hasEditReviewRole.xml +++ b/productMods/config/listViewConfig-hasEditReviewRole.xml @@ -3,9 +3,6 @@ - - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> @@ -36,9 +33,6 @@ OPTIONAL { ?activity rdfs:label ?activityLabel } } - OPTIONAL { ?role core:forInformationResource ?infoResource - LET (?infoResourceName := afn:localname(?infoResource)) - OPTIONAL { ?infoResource rdfs:label ?infoResourceLabel } # NB Currently we can only retrieve subclass for either the # infoResource or the activity, but not both. Later, we could have @@ -52,8 +46,7 @@ ) # Get subclass label for display in uncollated view - ?subclass rdfs:label ?subclassLabel - } + ?subclass rdfs:label ?subclassLabel OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . @@ -66,7 +59,7 @@ FILTER ( bound(?infoResource) ) - } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?infoResourceLabel ?infoResourceName + } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName @@ -77,13 +70,13 @@ CONSTRUCT { ?subject ?property ?role . - ?role core:forInformationResource ?infoResource . + ?role core:roleContributesTo ?infoResource . ?infoResource vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf ?superclass . ?subclass rdfs:label ?subclassLabel } WHERE { ?subject ?property ?role . - ?role core:forInformationResource ?infoResource . + ?role core:roleContributesTo ?infoResource . ?infoResource vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf ?superclass . ?subclass rdfs:label ?subclassLabel @@ -161,7 +154,7 @@ ?role ?roleProperty ?roleValue . } UNION { ?subject ?property ?role . - ?role core:forInformationResource ?infoResource . + ?role core:roleContributesTo ?infoResource . ?infoResource rdfs:label ?infoResourceLabel . } } diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl index b5587b8c..f8112949 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl @@ -15,15 +15,7 @@ next statement --> <#macro showRole statement property> <#local linkedIndividual> - <#if statement.infoResource??> - <#if statement.activity??> - ${statement.infoResourceLabel!statement.infoResourceName} ${statement.activityLabel!statement.activityName} - <#else> - ${statement.infoResourceLabel!statement.infoResourceName} - - <#elseif statement.activity??> - ${statement.activityLabel!statement.activityName} - + ${statement.activityLabel!statement.activityName} <#local dateTime>