NIHVIVO-1610 Extracted datetime code in propStatement templates into a macro.

productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl

@@ -26,28 +26,6 @@
         </#if>
     </#local>
 
-    <#local dateTimeInterval>
+    <@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
-        <#if statement.dateTimeStart??>
-            <#local startYear = dt.xsdDateTimeToYear(statement.dateTimeStart)>
-        </#if>
-        <#if statement.dateTimeEnd??>
-            <#local endYear = dt.xsdDateTimeToYear(statement.dateTimeEnd)>
-        </#if>
-        <#if startYear?? && endYear??>
-            ${startYear} - ${endYear}
-        <#elseif startYear??>
-            ${startYear} -
-        <#elseif endYear ??>
-            ${endYear} <#-- no hyphen, so doesn't display as a range with missing start date -->
-        </#if>
-    </#local>
-    
-    <#local date>
-        <#if dateTimeInterval?has_content>
-            <span class="listDateTime">${dateTimeInterval}</span>
-        </#if>
-    </#local>
-    
-    <@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info! ] /> ${date}
 
 </#macro>

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

@@ -20,28 +20,6 @@
         </#if>
     </#local>
 
-    <#local dateTimeInterval>
+    ${linkedIndividual} ${statement.specificRole} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
-        <#if statement.dateTimeStart??>
-            <#local startYear = dt.xsdDateTimeToYear(statement.dateTimeStart)>
-        </#if>
-        <#if statement.dateTimeEnd??>
-            <#local endYear = dt.xsdDateTimeToYear(statement.dateTimeEnd)>
-        </#if>
-        <#if startYear?? && endYear??>
-            ${startYear} - ${endYear}
-        <#elseif startYear??>
-            ${startYear} -
-        <#elseif endYear ??>
-            - ${endYear}
-        </#if>
-    </#local>
-    
-    <#local dateInRole>
-        <#if dateTimeInterval?has_content>
-            <span class="listDateTime">${dateTimeInterval}</span>
-        </#if>
-    </#local>
-    
-    ${linkedIndividual} ${statement.specificRole} ${dateInRole!}
 
 </#macro>

productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl

@@ -20,28 +20,6 @@
         </#if>
     </#local>
 
-    <#local dateTimeInterval>
+    <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
-        <#if statement.dateTimeStart??>
-            <#local startYear = dt.xsdDateTimeToYear(statement.dateTimeStart)>
-        </#if>
-        <#if statement.dateTimeEnd??>
-            <#local endYear = dt.xsdDateTimeToYear(statement.dateTimeEnd)>
-        </#if>
-        <#if startYear?? && endYear??>
-            ${startYear} - ${endYear}
-        <#elseif startYear??>
-            ${startYear} -
-        <#elseif endYear ??>
-            - ${endYear}
-        </#if>
-    </#local>
-    
-    <#local dateInPosition>
-        <#if dateTimeInterval?has_content>
-            <span class="listDateTime">${dateTimeInterval}</span>
-        </#if>
-    </#local>
-    
-    <@s.join [ linkedIndividual, statement.positionTitle! ] /> ${dateInPosition!}
 
 </#macro>

productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl

@@ -20,28 +20,6 @@
         </#if>
     </#local>
     
-    <#local dateTimeInterval>
+    <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
-        <#if statement.dateTimeStart??>
-            <#local startYear = dt.xsdDateTimeToYear(statement.dateTimeStart)>
-        </#if>
-        <#if statement.dateTimeEnd??>
-            <#local endYear = dt.xsdDateTimeToYear(statement.dateTimeEnd)>
-        </#if>
-        <#if startYear?? && endYear??>
-            ${startYear} - ${endYear}
-        <#elseif startYear??>
-            ${startYear} -
-        <#elseif endYear ??>
-            - ${endYear}
-        </#if>
-    </#local>
-    
-    <#local dateInPosition>
-        <#if dateTimeInterval?has_content>
-            <span class="listDateTime">${dateTimeInterval}</span>
-        </#if>
-    </#local>
-    
-    <@s.join [ linkedIndividual, statement.positionTitle! ] /> ${dateInPosition!}
 
 </#macro>

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

@@ -20,28 +20,6 @@
         </#if>
     </#local>
 
-    <#local dateTimeInterval>
+    ${linkedIndividual} ${statement.specificRole} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
-        <#if statement.dateTimeStart??>
-            <#local startYear = dt.xsdDateTimeToYear(statement.dateTimeStart)>
-        </#if>
-        <#if statement.dateTimeEnd??>
-            <#local endYear = dt.xsdDateTimeToYear(statement.dateTimeEnd)>
-        </#if>
-        <#if startYear?? && endYear??>
-            ${startYear} - ${endYear}
-        <#elseif startYear??>
-            ${startYear} -
-        <#elseif endYear ??>
-            - ${endYear}
-        </#if>
-    </#local>
-    
-    <#local dateInRole>
-        <#if dateTimeInterval?has_content>
-            <span class="listDateTime">${dateTimeInterval}</span>
-        </#if>
-    </#local>
-    
-    ${linkedIndividual} ${statement.specificRole} ${dateInRole!}
 
 </#macro>