=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsService.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsService.java 2013-09-04 11:44:03 +0000 @@ -38,6 +38,8 @@ String ID = OutboundSmsService.class.getName(); List getAllOutboundSms(); + + List getAllOutboundSms( Integer min, Integer max ); int saveOutboundSms( OutboundSms sms ); @@ -47,5 +49,7 @@ List getOutboundSms( OutboundSmsStatus status ); + List getOutboundSms( OutboundSmsStatus status, Integer min, Integer max ); + OutboundSms getOutboundSms( int id ); } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsStore.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsStore.java 2013-09-04 11:44:03 +0000 @@ -35,11 +35,15 @@ int saveOutboundSms( OutboundSms sms ); List getAllOutboundSms(); + + List getAllOutboundSms( Integer min, Integer max ); OutboundSms getOutboundSmsbyId( int id ); List get( OutboundSmsStatus status ); + List get( OutboundSmsStatus status, Integer min, Integer max ); + void updateOutboundSms( OutboundSms sms ); void deleteOutboundSms( OutboundSms sms ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/hibernate/HibernateOutboundSmsStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/hibernate/HibernateOutboundSmsStore.java 2013-09-04 09:44:07 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/hibernate/HibernateOutboundSmsStore.java 2013-09-04 11:44:03 +0000 @@ -106,4 +106,39 @@ { delete( sms ); } + + @SuppressWarnings( "unchecked" ) + @Override + public List get( OutboundSmsStatus status, Integer min, Integer max ) + { + Session session = sessionFactory.getCurrentSession(); + + Criteria criteria = session.createCriteria( OutboundSms.class ).addOrder( Order.desc( "date" ) ); + + if ( status != null ) + { + criteria.add( Restrictions.eq( "status", status ) ); + } + + if ( min != null && max != null) + { + criteria.setFirstResult( min ).setMaxResults( max ); + } + return criteria.list(); + } + + @SuppressWarnings( "unchecked" ) + @Override + public List getAllOutboundSms( Integer min, Integer max ) + { + Session session = sessionFactory.getCurrentSession(); + + Criteria criteria = session.createCriteria( OutboundSms.class ).addOrder( Order.desc( "date" ) ); + + if ( min != null && max != null) + { + criteria.setFirstResult( min ).setMaxResults( max ); + } + return criteria.list(); + } } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java 2013-08-26 03:41:29 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java 2013-09-04 11:44:03 +0000 @@ -93,4 +93,16 @@ { return outboundSmsStore.getOutboundSmsbyId( id ); } + + @Override + public List getOutboundSms( OutboundSmsStatus status, Integer min, Integer max ) + { + return outboundSmsStore.get( status, min, max ); + } + + @Override + public List getAllOutboundSms( Integer min, Integer max ) + { + return outboundSmsStore.getAllOutboundSms( min, max ); + } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowSentSMSAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowSentSMSAction.java 2013-09-04 09:44:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowSentSMSAction.java 2013-09-04 11:44:03 +0000 @@ -129,22 +129,31 @@ throws Exception { listOutboundSMS = new ArrayList(); - + if ( filterStatusType != null && filterStatusType == 0 ) { - listOutboundSMS = outboundSmsService.getOutboundSms( OutboundSmsStatus.OUTBOUND ); + total = outboundSmsService.getOutboundSms( OutboundSmsStatus.OUTBOUND ).size(); + paging = createPaging( total ); + listOutboundSMS = outboundSmsService.getOutboundSms( OutboundSmsStatus.OUTBOUND, paging.getStartPos(), paging.getPageSize() ); } if ( filterStatusType != null && filterStatusType == 1 ) { - listOutboundSMS = outboundSmsService.getOutboundSms( OutboundSmsStatus.SENT ); + total = outboundSmsService.getOutboundSms( OutboundSmsStatus.SENT ).size(); + paging = createPaging( total ); + listOutboundSMS = outboundSmsService.getOutboundSms( OutboundSmsStatus.SENT, paging.getStartPos(), paging.getPageSize() ); } if ( filterStatusType != null && filterStatusType == 2 ) { - listOutboundSMS = outboundSmsService.getOutboundSms( OutboundSmsStatus.ERROR ); + total = outboundSmsService.getOutboundSms( OutboundSmsStatus.ERROR ).size(); + paging = createPaging( total ); + listOutboundSMS = outboundSmsService.getOutboundSms( OutboundSmsStatus.ERROR, paging.getStartPos(), paging.getPageSize() ); } if ( filterStatusType != null && filterStatusType == 3 || filterStatusType == null ) { - listOutboundSMS = outboundSmsService.getAllOutboundSms(); + filterStatusType = 3; + total = outboundSmsService.getAllOutboundSms().size(); + paging = createPaging( total ); + listOutboundSMS = outboundSmsService.getAllOutboundSms( paging.getStartPos(), paging.getPageSize() ); } recipientNames = new ArrayList(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/showSentSMSPage.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/showSentSMSPage.vm 2013-09-04 09:44:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/showSentSMSPage.vm 2013-09-04 11:44:03 +0000 @@ -80,6 +80,10 @@ + + $i18n.getString( "total_number_of_result" ): + $total +
@@ -107,6 +111,14 @@ #end + + +
$i18n.getString( 'remove' )
+

+
+ #parse( "/dhis-web-commons/paging/paging.vm" ) +
+
\ No newline at end of file