=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-10-23 13:15:16 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-10-23 15:14:18 +0000 @@ -157,13 +157,6 @@ return values; } - private Integer currentPage; - - public void setCurrentPage( Integer currentPage ) - { - this.currentPage = currentPage; - } - private List searchingValues = new ArrayList(); public void setSearchingValues( List searchingValues ) @@ -371,7 +364,7 @@ // total = paging.getTotal(); //TODO grid = programStageInstanceService.getTabularReport( programStage, columns, organisationUnits, level, - startValue, endValue, !orderByOrgunitAsc, getStartPos(), getEndPos() ); + startValue, endValue, !orderByOrgunitAsc, getStartPos(), paging.getPageSize() ); } else // Download as Excel @@ -408,18 +401,7 @@ startPos = (startPos > total) ? total : startPos; return startPos; } - - public int getEndPos() - { - if ( currentPage == null ) - { - return paging.getEndPos(); - } - int endPos = getStartPos() + paging.getPageSize(); - endPos = (endPos > total) ? total : endPos; - return endPos; - } - + private List getTableColumns() { List columns = new ArrayList();