=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2011-12-15 18:39:36 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2011-12-15 19:02:36 +0000 @@ -229,9 +229,8 @@ public JFreeChart getJFreePeriodChart( Indicator indicator, OrganisationUnit unit, boolean title, I18nFormat format ) { - RelativePeriods relatives = new RelativePeriods(); - relatives.setLast12Months( true ); - List periods = periodService.reloadPeriods( relatives.getRelativePeriods( format, true ) ); + List periods = periodService.reloadPeriods( + new RelativePeriods().setLast12Months( true ).getRelativePeriods( format, true ) ); Chart chart = new Chart(); === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java 2011-12-15 16:24:21 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java 2011-12-15 19:02:36 +0000 @@ -31,6 +31,7 @@ import org.hisp.dhis.api.utils.WebLinkPopulator; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.organisationunit.OrganisationUnitService; +import org.hisp.dhis.period.Cal; import org.hisp.dhis.report.Report; import org.hisp.dhis.report.ReportService; import org.hisp.dhis.report.Reports; @@ -48,6 +49,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; @Controller @@ -144,7 +146,7 @@ organisationUnitUid = organisationUnitService.getRootOrganisationUnits().iterator().next().getUid(); } - Date date = period != null ? DateUtils.getMediumDate( period ) : new Date(); + Date date = period != null ? DateUtils.getMediumDate( period ) : new Cal().now().subtract( Calendar.MONTH, 1 ).time(); reportService.renderReport( response.getOutputStream(), uid, date, organisationUnitUid, type, i18nManager.getI18nFormat() ); === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java 2011-12-15 16:24:21 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java 2011-12-15 19:02:36 +0000 @@ -32,6 +32,7 @@ import org.hisp.dhis.common.Grid; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.organisationunit.OrganisationUnitService; +import org.hisp.dhis.period.Cal; import org.hisp.dhis.reporttable.ReportTable; import org.hisp.dhis.reporttable.ReportTableService; import org.hisp.dhis.reporttable.ReportTables; @@ -49,6 +50,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.InputStream; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import static org.hisp.dhis.system.util.CodecUtils.filenameEncode; @@ -126,7 +128,7 @@ organisationUnitUid = organisationUnitService.getRootOrganisationUnits().iterator().next().getUid(); } - Date date = period != null ? DateUtils.getMediumDate( period ) : new Date(); + Date date = period != null ? DateUtils.getMediumDate( period ) : new Cal().now().subtract( Calendar.MONTH, 1 ).time(); Grid grid = reportTableService.getReportTableGrid( uid, i18nManager.getI18nFormat(), date, organisationUnitUid ); @@ -148,7 +150,7 @@ organisationUnitUid = organisationUnitService.getRootOrganisationUnits().iterator().next().getUid(); } - Date date = period != null ? DateUtils.getMediumDate( period ) : new Date(); + Date date = period != null ? DateUtils.getMediumDate( period ) : new Cal().now().subtract( Calendar.MONTH, 1 ).time(); Grid grid = reportTableService.getReportTableGrid( uid, i18nManager.getI18nFormat(), date, organisationUnitUid ); @@ -171,7 +173,7 @@ organisationUnitUid = organisationUnitService.getRootOrganisationUnits().iterator().next().getUid(); } - Date date = period != null ? DateUtils.getMediumDate( period ) : new Date(); + Date date = period != null ? DateUtils.getMediumDate( period ) : new Cal().now().subtract( Calendar.MONTH, 1 ).time(); Grid grid = reportTableService.getReportTableGrid( uid, i18nManager.getI18nFormat(), date, organisationUnitUid ); @@ -194,7 +196,7 @@ organisationUnitUid = organisationUnitService.getRootOrganisationUnits().iterator().next().getUid(); } - Date date = period != null ? DateUtils.getMediumDate( period ) : new Date(); + Date date = period != null ? DateUtils.getMediumDate( period ) : new Cal().now().subtract( Calendar.MONTH, 1 ).time(); Grid grid = reportTableService.getReportTableGrid( uid, i18nManager.getI18nFormat(), date, organisationUnitUid );