------------------------------------------------------------ revno: 17242 committer: Tran Chau<tran.hispviet...@gmail.com> branch nick: dhis2 timestamp: Thu 2014-10-23 20:37:24 +0700 message: Minor fix in mobile maintenance module. modified: 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/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-12-20 08:11:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm 2014-10-23 13:37:24 +0000 @@ -200,10 +200,6 @@ } } - - - - </script> <input id="pollingInterval" name="pollingInterval" type="hidden" value="$pollingInterval"/> @@ -258,7 +254,10 @@ <tr id="tr${incomingSms.id}" height="40"> <td style="text-align:center"><input type="checkbox" name="mycheck" value="$incomingSms.id"/></td> - <td style="text-align:center">$velocityCount</td> + <td style="text-align:center"> + #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount ) + $nr + </td> <td> <a id="$velocityCount" style="display: block" href="#" onclick="makeVisible( $incomingSms.id, $velocityCount )">$incomingSms.text</a> === 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 11:44:03 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/showSentSMSPage.vm 2014-10-23 13:37:24 +0000 @@ -102,7 +102,10 @@ #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 style="text-align:center"> + #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount ) + $nr + </td> <td>$outboundSms.message</td> <td>$outboundSms.recipients</td> <td>$recipientNames.get($velocityCount)</td>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp