From 61d77d16c74d59c046549fce69a8d64b22c23704 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 26 Jun 2012 17:44:06 +0000
Subject: [PATCH] NIHVIVO-3815, 3816, 3822 modified default type value in
 educational training ftl, fixed placeholder text issue with presentations,
 now display end date in list view when no start date with grants

---
 .../partials/individual/propStatement-hasInvestigatorRole.ftl   | 2 +-
 .../freemarker/edit/forms/addPresenterRoleToPerson.ftl          | 2 +-
 .../freemarker/edit/forms/personHasEducationalTraining.ftl      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
index 12e3b40b..f1309a32 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
@@ -31,7 +31,7 @@
     </#local>
         
     <#local dateTime>
-        <#if statement.dateTimeStartRole?has_content >
+        <#if statement.dateTimeStartRole?has_content || statement.dateTimeEndRole?has_content>
             <@dt.yearIntervalSpan "${statement.dateTimeStartRole!}" "${statement.dateTimeEndRole!}" />
         <#else>
             <@dt.yearIntervalSpan "${statement.dateTimeStartGrant!}" "${statement.dateTimeEndGrant!}" />
diff --git a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
index 38bdf370..bd8c8519 100644
--- a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
@@ -143,7 +143,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
       <input class="acUriReceiver" type="hidden" id="conferenceUri" name="existingConference" value="${conferenceValue}" ${flagClearLabelForExisting}="true" />
   </div>
     <p>
-        <h4>Years of Participation in ###</h4>
+        <h4 class="label">Years of Participation in ###</h4>
     </p>
     <#--Need to draw edit elements for dates here-->
     <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
diff --git a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
index ba81878a..46c4cc48 100644
--- a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
@@ -167,7 +167,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <select name="trainingType" style="margin-top:-2px" >
         <option value="" <#if trainingTypeValue == "">selected</#if>>Select one</option>                
         <#list trainingTypeOpts?keys as key>             
-            <option value="${key}"  <#if trainingTypeValue == key>selected</#if>>${trainingTypeOpts[key]}</option>         
+            <option value="${key}"  <#if trainingTypeValue == key>selected</#if>><#if trainingTypeOpts[key] == "Other">Academic Studies or Other Training<#else>${trainingTypeOpts[key]}</#if></option>         
         </#list>
     </select>
     <p>