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

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

Browse source
This commit is contained in:
rjy7 2011-01-06 21:19:44 +00:00
parent 77c1b1235c
commit 5474fe2bb7
5 changed files with 9 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,29 +25,7 @@
<a href="${profileUrl(statement.edTraining)}">${statement.edTrainingName}</a> (no linked organization)
</#if>
</#local>
<#local dateTimeInterval>
<#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}
<@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
</#macro>

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

@ -19,29 +19,7 @@
<a href="${profileUrl(statement.role)}">${statement.roleName}</a> (no linked activity)
</#if>
</#local>
<#local dateTimeInterval>
<#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!}
${linkedIndividual} ${statement.specificRole} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>

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

@ -19,29 +19,7 @@
<a href="${profileUrl(statement.position)}">${statement.positionName}</a> (no linked person)
</#if>
</#local>
<#local dateTimeInterval>
<#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!}
<@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>

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

@ -20,28 +20,6 @@
</#if>
</#local>
<#local dateTimeInterval>
<#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!}
<@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>

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

@ -19,29 +19,7 @@
<a href="${profileUrl(statement.role)}">${statement.roleName}</a> (no linked individual in this role)
</#if>
</#local>
<#local dateTimeInterval>
<#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!}
${linkedIndividual} ${statement.specificRole} <@dt.yearInterval "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>