dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11823: improve UI of view received and sent SMS page

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 28 Aug 2013 07:58:57 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 11823
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-08-28 14:52:09 +0700
message:
  improve UI of view received and sent SMS page
modified:
  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
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/showSentSMSPage.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/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-08 06:59:54 +0000
+++ 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
@@ -32,7 +32,7 @@
 gateways=Gateways
 operation=Operation
 gateway_type=Gateway Type
-list_sent_SMS=List Of Sent SMS
+list_sent_SMS=List of Sent SMS
 sent=Sent
 all=All
 filter_by_status=Filter by Status
@@ -123,4 +123,6 @@
 validation_error_space=*White space not allowed
 key_value_parser=Key Value Parser
 j2me_parser=J2ME Parser
-mobile_phones_pattern=Mobile Phones Pattern
\ No newline at end of file
+mobile_phones_pattern=Mobile Phones Pattern
+phone_number = Phone Number
+filter_by_phone_number = Filter by Phone Number
\ 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-07-12 06:39:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm	2013-08-28 07:52:09 +0000
@@ -157,33 +157,46 @@
 <input id="pollingInterval" name="pollingInterval" type="hidden" value="$pollingInterval"/>
 <h3>$i18n.getString( "show_receive_sms_form" )</h3>
 <form id="receiveSmsPage" name="receiveSmsPage" action="showReceivingPage.action" method="get" >
-	<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>
+	<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">
+				<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>
+			</td>
+		</tr>
+		<tr>
+			<td style="width:135px">$i18n.getString('filter_by_phone_number'):</td>
+			<td style="width:150px"><input type="text" name="keyword" #if($keyword) value="$keyword" #else value="" #end style="width: 150px; height: 10px"/></td>
+			<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>
+	</table>
 	<br/>
-	<table id="detailsSmsList" class="listTable" style="width:100%">
-		<col width="40px"/>
-		<col width="40px"/>
-		<col width="200px"/>
-		<col width="100px"/>
-		<col width="60px"/>
-		<col width="120px"/>
-		<col width="70px"/>
-		<col width="40px"/>
+	<table id="detailsSmsList" class="listTable" style="width:100%" border="0px">
+		<!--<col width="40px"/>-->
 		<thead>
 			<th style="text-align:center"><a href="#" onclick="checkAll()" title="$i18n.getString( 'check_all' )"><img src="../images/check.png"/></a></th>
 			<th style="text-align:center">$i18n.getString( "no." )</th>

=== 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-08-05 03:16:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/showSentSMSPage.vm	2013-08-28 07:52:09 +0000
@@ -65,54 +65,47 @@
 </script>
 <h3>$i18n.getString( 'list_sent_SMS' )</h3>
 <form id="sentSMSPage" name="sentSMSPage" action="showSentPage.action" method="post"> 
-<table border="0px" style="width:100%">
-	<tr>
-		<td style="width:90px">$i18n.getString('filter_by_status'):</td>
-		<td>
-			<select id="statusType" onchange="filterByStatus(this.value)">
-				<option value="0" #if ( $!filterStatusType == 0 ) selected='selected' #end>$i18n.getString('outbound')</option>
-				<option value="1" #if ( $!filterStatusType == 1 ) selected='selected' #end>$i18n.getString('sent')</option>
-				<option value="2" #if ( $!filterStatusType == 2 ) selected='selected' #end>$i18n.getString('all')</option>
-			</select>
-		</td>
-		<td style="text-align:right">
-			<input type="button" name="btnDelete" value="$i18n.getString( 'delete_checked_option' )" onclick="deleteChecked()"/>
-		</td>
-	</tr>
-<table>
-<table id="detailsSentSMSList" class="listTable" style="width:100%">
-		<col width="40px"/>
-		<col width="40px"/>
-		<col width="200px"/>
-		<col width="100px"/>
-		<col width="100px"/>
-		<col width="60px"/>
-		<col width="130px"/>
-		<col width="50px"/>
-	<thead>
-		<th style="text-align:center"><a href="#" onclick="checkAll()" title="$i18n.getString( 'check_all' )"><img src="../images/check.png"/></a></th>			
-		<th style="text-align:center">$i18n.getString( "no." )</th>
-		<th>$i18n.getString( "message" )</th>
-		<th>$i18n.getString( "phoneNumber" )</th>
-		<th>$i18n.getString( "receipient" )</th>
-		<th>$i18n.getString( "status" )</th>
-		<th>$i18n.getString( "date" )</th>
-		<!--<th style="text-align:center">$i18n.getString( "delete" )</th>-->
-	</thead>
-	<tbody id="sentSMS">
-		#foreach( $outboundSms in $listOutboundSMS)
-		#set($numb=$velocityCount-1)
-		<tr id="tr${outboundSms.id}" height="40">
-			<td style="text-align:center"><input type="checkbox" name="mycheck" value="$outboundSms.id"/></td>
-			<td style="text-align:center">$velocityCount</td>
-			<td>$outboundSms.message</td>
-			<td>$outboundSms.recipients</td>
-			<td>$recipientNames.get($velocityCount)</td>
-			<td>$outboundSms.status</td>
-			<td>$outboundSms.date.toLocaleString()</td>
-			<!--<td style="text-align:center"><a href="javascript:removeSingleItem( '$outboundSms.id', '$outboundSms.message' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></td>-->
+	<table border="0px" style="width:100%">
+		<tr>
+			<td style="width:90px">$i18n.getString('filter_by_status'):</td>
+			<td>
+				<select id="statusType" onchange="filterByStatus(this.value)">
+					<option value="0" #if ( $!filterStatusType == 0 ) selected='selected' #end>$i18n.getString('outbound')</option>
+					<option value="1" #if ( $!filterStatusType == 1 ) selected='selected' #end>$i18n.getString('sent')</option>
+					<option value="2" #if ( $!filterStatusType == 2 ) selected='selected' #end>$i18n.getString('all')</option>
+				</select>
+			</td>
+			<td style="text-align:right">
+				<input type="button" name="btnDelete" value="$i18n.getString( 'delete_checked_option' )" onclick="deleteChecked()"/>
+			</td>
 		</tr>
-		#end
-	</tbody>
-</table>
+	</table>
+	<br/>
+	<table id="detailsSentSMSList" class="listTable" style="width:100%" border="0px">
+		<thead>
+			<th style="text-align:center"><a href="#" onclick="checkAll()" title="$i18n.getString( 'check_all' )"><img src="../images/check.png"/></a></th>			
+			<th style="text-align:center">$i18n.getString( "no." )</th>
+			<th>$i18n.getString( "message" )</th>
+			<th>$i18n.getString( "phone_number" )</th>
+			<th>$i18n.getString( "receipient" )</th>
+			<th>$i18n.getString( "status" )</th>
+			<th>$i18n.getString( "date" )</th>
+			<th style="text-align:center">$i18n.getString( "delete" )</th>
+		</thead>
+		<tbody id="sentSMS">
+			#foreach( $outboundSms in $listOutboundSMS)
+			#set($numb=$velocityCount-1)
+			<tr id="tr${outboundSms.id}" height="40">
+				<td style="text-align:center"><input type="checkbox" name="mycheck" value="$outboundSms.id"/></td>
+				<td style="text-align:center">$velocityCount</td>
+				<td>$outboundSms.message</td>
+				<td>$outboundSms.recipients</td>
+				<td>$recipientNames.get($velocityCount)</td>
+				<td>$outboundSms.status</td>
+				<td>$outboundSms.date.toLocaleString()</td>
+				<td style="text-align:center"><a href="javascript:removeSingleItem( '$outboundSms.id', '$outboundSms.message' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></td>
+			</tr>
+			#end
+		</tbody>
+	</table>
 </form>
\ No newline at end of file