NIHVIVO-1591 Apply datetime functions and macros in lib-datetime.ftl to propStatement views

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

@@ -7,7 +7,7 @@
 
 <@showAuthorship statement />
 
-<#-- Use a macro to keep variable assignments local; otherwise the values are in effect for the
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAuthorship statement>
 
@@ -20,10 +20,6 @@
         </#if>
     </#local>
 
-    <#if statement.dateTime??>
+    ${linkedIndividual} <@dt.yearSpan "${statement.dateTime!}" />
-        <#local year = dt.xsdDateTimeToYear(statement.dateTime)>
-    </#if>
-    
-    <@s.join [ linkedIndividual, year! ] />
 
 </#macro>

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

@@ -4,5 +4,5 @@
 
 <#import "lib-datetime.ftl" as dt>
 
-<@dt.dateTimeIntervalLong "${statement.dateTimeStart!}" "${statement.precisionStart!}" 
+${dt.dateTimeIntervalLong("${statement.dateTimeStart!}", "${statement.precisionStart!}", 
-                          "${statement.dateTimeEnd!}" "${statement.precisionEnd!}" />
+                          "${statement.dateTimeEnd!}", "${statement.precisionEnd!}")}

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

@@ -7,8 +7,8 @@
 
 <@showEducationalTraining statement />
 
-<#-- Use a macro to keep variable assignments local; otherwise the values get passed to the next
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
-     statement -->
+     next statement -->
 <#macro showEducationalTraining statement>
 
     <#local degree>
@@ -26,6 +26,6 @@
         </#if>
     </#local>
 
-    <@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
+    <@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
 
 </#macro>

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

@@ -7,8 +7,8 @@
 
 <@showRole statement />
 
-<#-- Use a macro to keep variable assignments local; otherwise the values get passed to the next
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
-     statement -->
+     next statement -->
 <#macro showRole statement>
     
     <#local linkedIndividual>
@@ -20,6 +20,6 @@
         </#if>
     </#local>
 
-    ${linkedIndividual} ${statement.roleLabel!} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
+    ${linkedIndividual} ${statement.roleLabel!} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
 
 </#macro>

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

@@ -6,7 +6,7 @@
 
 <@showAuthorship statement />
 
-<#-- Use a macro to keep variable assignments local; otherwise the values are in effect for the
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showAuthorship statement>
 

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

@@ -7,8 +7,8 @@
 
 <@showPosition statement />
 
-<#-- Use a macro to keep variable assignments local; otherwise the values get passed to the next
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
-     statement -->
+     next statement -->
 <#macro showPosition statement>
     
     <#local linkedIndividual>
@@ -20,6 +20,6 @@
         </#if>
     </#local>
 
-    <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
+    <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
 
 </#macro>

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

@@ -7,8 +7,8 @@
 
 <@showPosition statement />
 
-<#-- Use a macro to keep variable assignments local; otherwise the values get passed to the next
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
-     statement -->
+     next statement -->
 <#macro showPosition statement>
     
     <#local linkedIndividual>
@@ -20,6 +20,6 @@
         </#if>
     </#local>
     
-    <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
+    <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
 
 </#macro>

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

@@ -7,8 +7,8 @@
 
 <@showRole statement />
 
-<#-- Use a macro to keep variable assignments local; otherwise the values get passed to the next
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
-     statement -->
+     next statement -->
 <#macro showRole statement>
     
     <#local linkedIndividual>
@@ -22,6 +22,6 @@
 
     <#-- 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!}" />
+    ${linkedIndividual} ${statement.roleLabel!statement.roleTypeLabel!} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
 
 </#macro>