=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/periodtype.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/periodtype.js 2012-07-17 10:05:44 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/periodtype.js 2012-10-09 11:49:55 +0000 @@ -290,7 +290,8 @@ date.setDate( date.getDate() + 1 ); period['startDate'] = format_yyyymmdd( date ); period['name'] = monthNames[9] + ' ' + date.getFullYear() + ' - ' + monthNames[8] + ' ' + ( date.getFullYear() + 1 ); - period['id'] = 'FinancialOct_' + period['startDate']; + period['iso'] = date.getFullYear() + 'Oct'; + period['id'] = period['iso']; periods.push( period ); date.setDate( date.getDate() - 1 ); } @@ -315,7 +316,8 @@ date.setDate( date.getDate() + 1 ); period['startDate'] = format_yyyymmdd( date ); period['name'] = monthNames[6] + ' ' + date.getFullYear() + ' - ' + monthNames[5] + ' ' + ( date.getFullYear() + 1 ); - period['id'] = 'FinancialJuly_' + period['startDate']; + period['iso'] = date.getFullYear() + 'July'; + period['id'] = period['iso']; periods.push( period ); date.setDate( date.getDate() - 1 ); } @@ -340,7 +342,8 @@ date.setDate( date.getDate() + 1 ); period['startDate'] = format_yyyymmdd( date ); period['name'] = monthNames[3] + ' ' + date.getFullYear() + ' - ' + monthNames[2] + ' ' + ( date.getFullYear() + 1 ); - period['id'] = 'FinancialApril_' + period['startDate']; + period['iso'] = date.getFullYear() + 'April'; + period['id'] = period['iso']; periods.push( period ); date.setDate( date.getDate() - 1 ); }