=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java 2013-08-30 03:00:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java 2013-08-30 07:09:29 +0000 @@ -115,6 +115,13 @@ this.keyword = keyword; } + private Integer total; + + public Integer getTotal() + { + return total; + } + // ------------------------------------------------------------------------- // Action Implementation // ------------------------------------------------------------------------- @@ -151,11 +158,13 @@ { keyword = ""; } - - this.paging = createPaging( incomingSmsService.getSmsByStatus( null, keyword.trim() ).size() ); if ( smsStatus == null || smsStatus.trim().equals( "" ) ) { + total = incomingSmsService.getSmsByStatus( null, keyword.trim() ).size(); + + this.paging = createPaging( total ); + listIncomingSms = new ArrayList( incomingSmsService.getSmsByStatus( null, keyword, this.paging.getStartPos(), this.paging.getPageSize() ) ); } @@ -167,13 +176,17 @@ { if ( statusArray[i].toString().equalsIgnoreCase( smsStatus ) ) { + total = incomingSmsService.getSmsByStatus( statusArray[i], keyword ).size(); + + this.paging = createPaging( total ); + listIncomingSms = new ArrayList( incomingSmsService.getSmsByStatus( statusArray[i], - keyword.trim() ) ); + keyword.trim(), this.paging.getStartPos(), this.paging.getPageSize() ) ); + break; } } } - return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties 2013-08-28 07:52:09 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties 2013-08-30 07:09:29 +0000 @@ -125,4 +125,5 @@ j2me_parser=J2ME Parser mobile_phones_pattern=Mobile Phones Pattern phone_number = Phone Number -filter_by_phone_number = Filter by Phone Number \ No newline at end of file +filter_by_phone_number = Filter by Phone Number +total_number_of_result = Total Number of Result \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm 2013-08-30 03:00:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm 2013-08-30 07:09:29 +0000 @@ -158,23 +158,6 @@

$i18n.getString( "show_receive_sms_form" )

- + + + +
$i18n.getString('filter_by_status'): @@ -193,8 +176,13 @@
$i18n.getString( "total_number_of_result" ):$total

+