dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21507
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10190: (mobile) Fixed GUI.
------------------------------------------------------------
revno: 10190
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-14 10:32:14 +0700
message:
(mobile) Fixed GUI.
added:
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/images/question.png
modified:
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.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-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java 2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java 2013-03-14 03:32:14 +0000
@@ -201,14 +201,14 @@
if ( group == null )
{
- message = "selected_user_group_is_unavailable";
+ message = i18n.getString( "selected_user_group_is_unavailable" );
return ERROR;
}
if ( group.getMembers() == null || group.getMembers().isEmpty() )
{
- message = "selected_user_group_has_no_member";
+ message = i18n.getString( "selected_user_group_has_no_member" );
return ERROR;
}
@@ -231,7 +231,7 @@
if ( users.isEmpty() )
{
- message = "there_is_no_user_assigned_to_selected_units";
+ message = i18n.getString( "there_is_no_user_assigned_to_selected_units" );
return ERROR;
}
@@ -251,7 +251,7 @@
if ( recipients.isEmpty() )
{
- message = "selected_units_have_no_phone_number";
+ message = i18n.getString( "selected_units_have_no_phone_number" );
return ERROR;
}
@@ -295,7 +295,7 @@
if ( phones.isEmpty() )
{
- message = "selected_persons_have_no_phone_number";
+ message = i18n.getString( "selected_persons_have_no_phone_number" );
return ERROR;
}
=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties 2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties 2013-03-14 03:32:14 +0000
@@ -102,6 +102,9 @@
search_result_matching_the_search_criteria=Result matches the search criteria
search_patients_by_attributes=Search persons by attributes
user_group=User Group
+no_message=Please type your message before sending
+do_not_send_patient_confidential_messages_using_sms=Do not send patient confidential messages using sms
+please_select_a_gateway_type_to_send_sms=Please select a default gateway (Maintenance -> ) to send sms
there_is_no_user_assigned_to_selected_units=There is no user assigned to selected units
selected_units_have_no_phone_number=The selected units have no phone number
selected_persons_have_no_phone_number=The selected persons have no phone number
=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties 2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties 2013-03-14 03:32:14 +0000
@@ -69,6 +69,9 @@
please_select=H\u00e3y ch\u1ecdn
user_group=Nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
send_sms_to_target=G\u1eedi SMS t\u1edbi
+no_message=Vui l\u00f2ng nh\u1eadp n\u1ed9i dung tin nh\u1eafn tr\u01b0\u1edbc khi g\u1eedi \u0111i
+do_not_send_patient_confidential_messages_using_sms=Kh\u00f4ng \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng t\u00ednh n\u0103ng n\u00e0y \u0111\u1ec3 g\u1eedi SMS t\u1edbi c\u00e1 nh\u00e2n v\u00ec m\u1ee5c \u0111\u00edch ri\u00eang t\u01b0
+please_select_a_gateway_type_to_send_sms=H\u00e3y ch\u1ecdn m\u1ed9t gateway m\u1eb7c \u0111\u1ecbnh (B\u1ea3o tr\u00ec -> C\u1ea5u h\u00ecnh di \u0111\u1ed9ng) \u0111\u1ec3 cho ph\u00e9p g\u1eedi SMS
please_select_a_program=H\u00e3y ch\u1ecdn m\u1ed9t ch\u01b0\u01a1ng tr\u00ecnh
please_select_user_group=H\u00e3y ch\u1ecdn nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
there_is_no_program=Kh\u00f4ng c\u00f3 ch\u01b0\u01a1ng tr\u00ecnh n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn. Tin nh\u1eafn s\u1ebd kh\u00f4ng \u0111\u01b0\u1ee3c g\u1eedi \u0111i
=== added file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/images/question.png'
Binary files dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/images/question.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/images/question.png 2013-03-14 03:32:14 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm 2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm 2013-03-14 03:32:14 +0000
@@ -53,7 +53,6 @@
<col/>
<col/>
<col/>
- <col/>
#if($mapPatientOrgunit.size()!=0)
<col/>
#end
@@ -76,7 +75,8 @@
#end
<th>$i18n.getString( "gender" )</th>
<th>$i18n.getString( "date_of_birth" )</th>
- <th class="{sorter: false}">$i18n.getString( "age" )</th><th class="{sorter: false}">$i18n.getString( "phone_number" )</th>
+ <th class="{sorter: false}">$i18n.getString( "age" )</th>
+
#if($mapPatientOrgunit.size()!=0)
<th>$i18n.getString( "hierachy_orgunit" )</th>
#end
@@ -134,7 +134,7 @@
<a href="javascript:addPhoneToList( 'recipients', '$patient.id', '$patient.getFullName()', '$!patient.phoneNumber' )" title='$i18n.getString( "add_phone_to_list" )'>
<img src="../images/move_down.png" alt='$i18n.getString( "add_phone_to_list" )' /></a>
#else
- <img src="images/question.png" title='$i18n.getString( "no_phone" )' />
+ <img src="../dhis-web-sms/images/question.png" title='$i18n.getString( "no_phone" )' />
#end
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm 2013-03-12 18:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm 2013-03-14 03:32:14 +0000
@@ -65,7 +65,7 @@
</td>
</tr>
- <tr><th colspan="2">$i18n.getString( "message" )</th></tr>
+ <tr><th colspan="2">$i18n.getString( "message" ) ($i18n.getString( "do_not_send_patient_confidential_messages_using_sms" ))</th></tr>
<tr><td colspan="2"><textarea id="smsMessage" name="smsMessage" cols="95" rows="5" class="{validate:{required:true}}"></textarea></td></tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 2013-03-12 18:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 2013-03-14 03:32:14 +0000
@@ -70,7 +70,7 @@
<tr id="orgunitType" style="display:none"><td colspan="2"><br/>#organisationUnitSelectionTree( true, true, false )</td></tr>
- <tr><th colspan="2">$i18n.getString( "message" )</th></tr>
+ <tr><th colspan="2">$i18n.getString( "message" ) ($i18n.getString( "do_not_send_patient_confidential_messages_using_sms" ))</th></tr>
<tr><td colspan="2"><textarea id="smsMessage" name="smsMessage" cols="86" rows="5" class="{validate:{required:true}}"></textarea></td></tr>
<tr>
<td><input type="submit" name="send" value="$i18n.getString( 'send_sms' )"/>
