dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11840
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-08-30 14:09:29 +0700
message:
  fix bugs
modified:
  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/resources/org/hisp/dhis/mobile/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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<IncomingSms>( 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<IncomingSms>( 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 @@
 <h3>$i18n.getString( "show_receive_sms_form" )</h3>
 <form id="receiveSmsPage" name="receiveSmsPage" action="showReceivingPage.action" method="get" >
 	<table border="0px" style="width:100%">
-		<!--<div style="text-align:right; width:840px">	
-			<div style="float: left">
-				<select style="width: 150px" name="smsStatus" onchange="javascript:document.forms['receiveSmsPage'].submit();">
-					<option value="">$i18n.getString( "all" )</option>
-					<option value="INCOMING" #if($smsStatus == 'INCOMING') selected='selected' #end>$i18n.getString( "incoming" )</option>
-					<option value="PROCESSED" #if($smsStatus == 'PROCESSED') selected='selected' #end>$i18n.getString( "processed" )</option>
-					<option value="FAILED" #if($smsStatus == 'FAILED') selected='selected' #end>$i18n.getString( "failed" )</option>
-					<option value="UNHANDLED" #if($smsStatus == 'UNHANDLED') selected='selected' #end>$i18n.getString( "unhandled" )</option>
-				</select>
-				<input type="text" name="keyword" #if($keyword) value="$keyword" #else value="" #end style="width: 150px"/>
-				<input type="submit" name="filter" value="Filter"/>
-				<input type="reset" name="clear" value="Clear"/>
-			</div>
-			<div style="float: right">
-				<input type="button" name="btnDelete" value="$i18n.getString( 'delete_checked_option' )" onclick="deleteChecked()"/>
-			</div>	
-		</div>-->
 		<tr>
 			<td style="width:130px">$i18n.getString('filter_by_status'):</td>
 			<td style="width:150px" colspan="3">
@@ -193,8 +176,13 @@
 			<td style="width:50px"><input type="submit" name="filter" value="Filter"/></td>
 			<td style="text-align:right"><input type="button" name="btnDelete" value="$i18n.getString( 'delete_checked_option' )" onclick="deleteChecked()"/></td>
 		</tr>
+		<tr>
+			<td style="width:130px">$i18n.getString( "total_number_of_result" ):</td>
+			<td style="text-align:left" colspan="3">$total</td>
+		</tr>
 	</table>
 	<br/>
+	
 	<table id="detailsSmsList" class="listTable" style="width:100%" border="0px">
 		<!--<col width="40px"/>-->
 		<thead>