=== 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-22 09:04:43 +0000 +++ 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 @@ -157,6 +157,13 @@ return values; } + private Integer currentPage; + + public void setCurrentPage( Integer currentPage ) + { + this.currentPage = currentPage; + } + private List searchingValues = new ArrayList(); public void setSearchingValues( List searchingValues ) @@ -322,20 +329,20 @@ // --------------------------------------------------------------------- // Get program-stage, start-date, end-date // --------------------------------------------------------------------- - - if( level==0 ) + + if ( level == 0 ) { level = organisationUnitService.getMaxOfOrganisationUnitLevels(); for ( Integer orgunitId : orgunitIds ) { int orgLevel = organisationUnitService.getLevelOfOrganisationUnit( orgunitId ); - if(level > orgLevel) + if ( level > orgLevel ) { level = orgLevel; } } } - + // --------------------------------------------------------------------- // Get program-stage, start-date, end-date // --------------------------------------------------------------------- @@ -347,7 +354,7 @@ Date startValue = format.parseDate( startDate ); Date endValue = format.parseDate( endDate ); List columns = getTableColumns(); - + // --------------------------------------------------------------------- // Generate tabular report // --------------------------------------------------------------------- @@ -364,7 +371,7 @@ // total = paging.getTotal(); //TODO grid = programStageInstanceService.getTabularReport( programStage, columns, organisationUnits, level, - startValue, endValue, !orderByOrgunitAsc, paging.getStartPos(), paging.getPageSize() ); + startValue, endValue, !orderByOrgunitAsc, getStartPos(), getEndPos() ); } else // Download as Excel @@ -375,7 +382,7 @@ } catch ( SQLGrammarException ex ) { - message = i18n.getString("failed_to_get_events"); + message = i18n.getString( "failed_to_get_events" ); } return type == null ? SUCCESS : type; @@ -391,6 +398,28 @@ return (totalRecord % pageSize == 0) ? (totalRecord / pageSize) : (totalRecord / pageSize + 1); } + public int getStartPos() + { + if ( currentPage == null ) + { + return paging.getStartPos(); + } + int startPos = currentPage <= 0 ? 0 : (currentPage - 1) * paging.getPageSize(); + 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(); @@ -437,7 +466,7 @@ { int objectId = Integer.parseInt( values[1] ); DataElement dataElement = dataElementService.getDataElement( objectId ); - if(dataElement.getType().equals( DataElement.VALUE_TYPE_INT )) + if ( dataElement.getType().equals( DataElement.VALUE_TYPE_INT ) ) { column.setPrefix( PREFIX_NUMBER_DATA_ELEMENT ); } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-10-23 08:11:54 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-10-23 13:15:16 +0000 @@ -89,7 +89,7 @@