diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index b0e5a6a6..c965a5ab 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl +++ b/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> @@ -19,11 +19,7 @@ ${statement.authorshipName} (no linked information resource) - - <#if statement.dateTime??> - <#local year = dt.xsdDateTimeToYear(statement.dateTime)> - - - <@s.join [ linkedIndividual, year! ] /> + + ${linkedIndividual} <@dt.yearSpan "${statement.dateTime!}" /> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl index 12c591e4..92ec115d 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl +++ b/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!}" - "${statement.dateTimeEnd!}" "${statement.precisionEnd!}" /> +${dt.dateTimeIntervalLong("${statement.dateTimeStart!}", "${statement.precisionStart!}", + "${statement.dateTimeEnd!}", "${statement.precisionEnd!}")} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index 64026c4a..27aafd78 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl +++ b/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 - statement --> +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> <#macro showEducationalTraining statement> <#local degree> @@ -26,6 +26,6 @@ - <@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/> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl index 2484e302..d73e48c0 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl +++ b/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 - statement --> +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> <#macro showRole statement> <#local linkedIndividual> @@ -20,6 +20,6 @@ - ${linkedIndividual} ${statement.roleLabel!} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> + ${linkedIndividual} ${statement.roleLabel!} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl index cd743fcd..9097ebb5 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl +++ b/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> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl index fcac5b55..26a9a909 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl +++ b/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 - statement --> +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> <#macro showPosition statement> <#local linkedIndividual> @@ -20,6 +20,6 @@ - <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> + <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl index b46c8414..1a7cf68c 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl +++ b/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 - statement --> +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> <#macro showPosition statement> <#local linkedIndividual> @@ -20,6 +20,6 @@ - <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> + <@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl index 0b8c4c89..e039845b 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl +++ b/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 - statement --> +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + 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!}" /> \ No newline at end of file