litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging r4254 to the trunk

Browse source
This commit is contained in:
tworrall 2012-08-08 20:46:30 +00:00
parent cefee06309
commit 9bd545bfbb
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
productMods/config/listViewConfig-hasRole.xml
View file

@ -17,8 +17,9 @@
?roleLabel ?roleLabel
?activity ?activityName ?activity ?activityName
?activityLabel ?activityLabel
?dateTimeStart ?dateTimeEnd WHERE { ?dateTimeStart ?dateTimeEnd
?hideThis
WHERE {
?subject ?property ?role ?subject ?property ?role
OPTIONAL { ?role core:roleRealizedIn ?activity OPTIONAL { ?role core:roleRealizedIn ?activity
@ -40,6 +41,7 @@
} }
OPTIONAL { ?role rdfs:label ?roleLabel } OPTIONAL { ?role rdfs:label ?roleLabel }
OPTIONAL { ?role core:hideFromDisplay ?hideThis }
OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
@ -48,7 +50,7 @@
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd
} }
} }
NOT EXISTS { ?role core:hideFromDisplay ?hideThis } # NOT EXISTS { ?role core:hideFromDisplay ?hideThis }
<critical-data-required> <critical-data-required>
FILTER ( bound(?activity) ) FILTER ( bound(?activity) )
</critical-data-required> </critical-data-required>

14
productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
View file

@ -13,6 +13,16 @@
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement --> next statement -->
<#macro showRole statement> <#macro showRole statement>
<#if statement.hideThis?has_content>
<span class="hideThis">&nbsp;</span>
<script type="text/javascript" >
$('span.hideThis').parent().parent().addClass("hideThis");
if ( $('h3#hasResearcherRole').attr('class').length == 0 ) {
$('h3#hasResearcherRole').addClass('hiddenGrants');
}
$('span.hideThis').parent().remove();
</script>
<#else>
<#local linkedIndividual> <#local linkedIndividual>
<#if statement.activity??> <#if statement.activity??>
<a href="${profileUrl(statement.uri("activity"))}" title="activity name">${statement.activityLabel!statement.activityName}</a> <a href="${profileUrl(statement.uri("activity"))}" title="activity name">${statement.activityLabel!statement.activityName}</a>
@ -26,6 +36,6 @@
<@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#local> </#local>
${linkedIndividual} ${statement.roleLabel!} ${dateTime!} ${linkedIndividual} ${statement.roleLabel!} ${dateTime!}
</#if>
</#macro> </#macro>