=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriod.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriod.vm 2010-01-25 09:23:35 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriod.vm 2010-01-26 15:28:59 +0000 @@ -2,6 +2,7 @@ { "id": $!{period.id}, "startDate": "$!format.formatDate( ${period.startDate} )", - "endDate": "$!format.formatDate( ${period.endDate} )" + "endDate": "$!format.formatDate( ${period.endDate} )", + "name": "$!format.formatPeriod( ${period} )" } } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriods.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriods.vm 2010-01-25 09:23:35 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriods.vm 2010-01-26 15:28:59 +0000 @@ -4,7 +4,8 @@ { "id": $!{period.id}, "startDate": "$!format.formatDate( ${period.startDate} )", - "endDate": "$!format.formatDate( ${period.endDate} )" + "endDate": "$!format.formatDate( ${period.endDate} )", + "name": "$!format.formatPeriod( ${period} )" }#if( $velocityCount < $size ),#end #end ] } === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriod.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriod.vm 2010-01-25 09:23:35 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriod.vm 2010-01-26 15:28:59 +0000 @@ -3,4 +3,5 @@ $period.id $!format.formatDate( $period.startDate ) $!format.formatDate( $period.endDate ) + $!format.formatPeriod( $period ) \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriods.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriods.vm 2010-01-25 09:23:35 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriods.vm 2010-01-26 15:28:59 +0000 @@ -5,6 +5,7 @@ $period.id $!format.formatDate( $period.startDate ) $!format.formatDate( $period.endDate ) + $!format.formatPeriod( $period ) #end \ No newline at end of file