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

NIHVIVO-1339 In relatedRole view, display role type label if role has no label (for investigator roles and children).

Browse source 
NIHVIVO-1334 Remove terms from SELECT clause that don't get displayed (e.g., dateTimeInterval) but are used to get other terms.
This commit is contained in:
rjy7 2011-01-07 20:34:30 +00:00
parent 3aaed96705
commit 7edc978038
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,6 @@
</#if>
</#local>
${linkedIndividual} ${statement.specificRole!} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
${linkedIndividual} ${statement.roleLabel!} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>

4
productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
View file

@ -20,6 +20,8 @@
</#if>
</#local>
${linkedIndividual} ${statement.specificRole!} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
<#-- Generally roles are assigned a label when entered through a custom form. Investigator and its subclasses do not,
so use the type label instead. -->
${linkedIndividual} ${statement.roleLabel!statement.roleTypeLabel!} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>