dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7117
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-31 17:11:37 +0700
message:
  (mobile) Fixed SMS Configuration GUI.
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/resources/org/hisp/dhis/mobile/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.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	2012-05-31 09:58:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties	2012-05-31 10:11:37 +0000
@@ -76,7 +76,7 @@
 raw_phone_number=Raw phone numbers
 assigned_user_number=User assigned to organisation unit 
 selected_unit_number=Selected organisation unit
-patient_number=Person/Patient
+patient_number=Person/Patient number
 programs=Programs
 organisation_unit_level=Organisation unit level
 chidren_only=Children only
@@ -96,5 +96,11 @@
 search_by_name_identifier=Search by name or identifier
 search_by_program=Search by program
 please_select_village=Please select village
+specify_search_criteria=Please specify search criteria
+list_all_patients=List all beneficiaries
+search=Search
+search_by_selected_unit=Search by selected unit
+please_select_village=Please select village
 please_select=Please Select
-activity_grouping_attribute=Activity Grouping Attribute
\ No newline at end of file
+activity_grouping_attribute=Activity Grouping Attribute
+sms_configuration_not_initialized=SMS Service is not initialized.\nPlease fill in two fields as below then click "Save Settings".
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_vi_VN.properties	2012-05-09 02:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_vi_VN.properties	2012-05-31 10:11:37 +0000
@@ -46,3 +46,30 @@
 raw_phone_number=S\u1ed1 nh\u1eadp tay
 assigned_user_number=Ng\u01b0\u1eddi d\u00f9ng \u0111\u01b0\u1ee3c g\u00e1n v\u00e0o \u0111\u01a1n v\u1ecb ch\u1ecdn 
 selected_unit_number=\u0110\u01a1n v\u1ecb \u0111\u01b0\u1ee3c ch\u1ecdn
+patient_number=S\u1ed1 \u0111i\u1ec7n tho\u1ea1i c\u1ee7a b\u1ec7nh nh\u00e2n
+programs=C\u00e1c ch\u01b0\u01a1ng tr\u00ecnh
+organisation_unit_level=C\u1ea5p \u0111\u01a1n v\u1ecb
+chidren_only=Ch\u1ec9 ch\u1ecdn \u0111\u01a1n v\u1ecb con
+please_select_a_program=H\u00e3y ch\u1ecdn m\u1ed9t ch\u01b0\u01a1ng tr\u00ecnh
+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
+please_select_a_gateway_type_to_send_sms=H\u00e3y ch\u1ecdn lo\u1ea1i gateway \u0111\u1ec3 g\u1eedi tin nh\u1eafn
+service_stopped_cannot_send_sms=D\u1ecbch v\u1ee5 g\u1eedi tin tr\u00ean m\u00e1y ch\u1ee7 t\u1ea1m d\u1eebng. Tin nh\u1eafn kh\u00f4ng th\u1ec3 g\u1eedi \u0111i
+please_verify_phone=H\u00e3y nh\u1eadp m\u1ed9t hay nhi\u1ec1u s\u1ed1 di \u0111\u1ed9ng c\u1ea7n g\u1eedi. D\u00f9ng d\u1ea5u ch\u1ea5m ph\u1ea3y (;) \u0111\u1ec3 ng\u0103n c\u00e1ch.
+please_select_orgunit=H\u00e3y ch\u1ecdn \u00edt nh\u1ea5t m\u1ed9t \u0111\u01a1n v\u1ecb.
+no_recipient=Kh\u00f4ng c\u00f3 ng\u01b0\u1eddi nh\u1eadn. Tin nh\u1eafn kh\u00f4ng th\u1ec3 g\u1eedi \u0111i.\nCh\u00fa \u00fd: B\u1ea1n ph\u1ea3i \u0111\u1ea3m b\u1ea3o ch\u1ee9c n\u0103ng "Tin nh\u1eafn Th\u00f4ng b\u00e1o" \u0111\u00e3 \u0111\u01b0\u1ee3c k\u00edch ho\u1ea1t.
+unable_load_gateway=Kh\u00f4ng th\u1ec3 t\u1ea3i d\u1eef li\u1ec7u c\u1ee7a gateway
+unable_start_smslib_service=Kh\u00f4ng th\u1ec3 kh\u1edfi \u0111\u1ed9ng D\u1ecbch v\u1ee5 g\u1eedi tin
+unable_stop_smslib_service=Kh\u00f4ng th\u1ec3 d\u1eebng D\u1ecbch v\u1ee5 g\u1eedi tin
+sms_unable_or_there_is_no_gateway_service_not_started=D\u1ecbch v\u1ee5 g\u1eedi tin ch\u01b0a \u0111\u01b0\u1ee3c kh\u1edfi t\u1ea1o ho\u1eb7c kh\u00f4ng c\u00f3 gateway n\u00e0o \u0111\u01b0\u1ee3c t\u1ea1o.\nD\u1ecbch v\u1ee5 g\u1eedi tin s\u1ebd kh\u00f4ng th\u1ec3 k\u00edch ho\u1ea1t.
+unable_load_configuration_cause_of_there_is_no_gateway=Kh\u00f4ng th\u1ec3 t\u1ea3i c\u1ea5u h\u00ecnh v\u00ec kh\u00f4ng c\u00f3 gateway n\u00e0o \u0111\u01b0\u1ee3c t\u1ea1o.
+registering_unit=\u0110\u01a1n v\u1ecb \u0111\u0103ng k\u00fd
+search_by_name_identifier=T\u00ecm theo t\u00ean ho\u1eb7c m\u00e3
+search_by_program=T\u00ecm theo ch\u01b0\u01a1ng tr\u00ecnh
+please_select_village=H\u00e3y ch\u1ecdn \u0111\u01a1n v\u1ecb
+specify_search_criteria=H\u00e3y ch\u1ecdn \u0111i\u1ec1u ki\u1ec7n t\u00ecm ki\u1ebfm
+list_all_patients=Li\u1ec7t k\u00ea to\u00e0n b\u1ed9 B\u1ec7nh nh\u00e2n
+search=T\u00ecm ki\u1ebfm
+search_by_selected_unit=T\u00ecm theo \u0111\u01a1n v\u1ecb
+please_select=H\u00e3y ch\u1ecdn
+activity_grouping_attribute=Activity Grouping Attribute
+sms_configuration_not_initialized=D\u1ecbch v\u1ee5 tin nh\u1eafn ch\u01b0a \u0111\u01b0\u1ee3c kh\u1edfi t\u1ea1o.\nH\u00e3y cung c\u1ea5p hai th\u00f4ng s\u1ed1 b\u00ean d\u01b0\u1edbi v\u00e0o l\u01b0u l\u1ea1i.
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2012-05-31 09:58:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2012-05-31 10:11:37 +0000
@@ -63,11 +63,6 @@
       <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js</param>
 	  <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-  
-	<action name="loadProgramsByUnit" class="org.hisp.dhis.mobile.action.LoadProgramsByUnitAction">
-      <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonPrograms.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
 
     <action name="sendSMS" class="org.hisp.dhis.mobile.action.ProcessingSendSMSAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm	2012-04-04 04:27:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm	2012-05-31 10:11:37 +0000
@@ -1,12 +1,22 @@
 <style>
-	.overlaps {
-    background-color: #BAFFBC;
-    border: 1px solid #12CD17;
-    display: none;
-    margin: 1em;
-    padding: 1em;
-    width: 500px;
-}
+	.generalOverlaps
+	{
+		border: 1px solid #12CD17;
+		display: none;
+		margin: 1em;
+		padding: 1em;
+		width: 500px;
+	}
+	
+	.overlaps
+	{
+		background-color: #BAFFBC;
+	}
+	
+	.overlapsWarning
+	{
+		background-color: #F08080;
+	}
 </style>
 
 <script type="text/javascript">
@@ -49,9 +59,15 @@
     <tbody>
 		<tr>
 			<td colspan="2">
-				<div class="overlaps" id="noOverlapsDiv" style="display: block;">
+				#if( $!smsConfig )
+				<div class="generalOverlaps overlaps" id="noOverlapsDiv" style="display: block;">
 					$i18n.getString( $!encoder.htmlEncode( $!smsServiceStatus ) )
 				</div>
+				#else
+				<div class="generalOverlaps overlapsWarning" id="noOverlapsDiv" style="display: block;">
+					$i18n.getString( "sms_configuration_not_initialized" )
+				</div>
+				#end
 			</td>
 		</tr>
 		<tr>
@@ -70,16 +86,18 @@
 
 	<tbody>
 		<tr>
-			<td>$i18n.getString("polling_interval_in_seconds"):</td>
+			<td><label for="pollingInterval">$i18n.getString( "polling_interval_in_seconds" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td><input type="text" id="pollingInterval" name="pollingInterval" style="width:20em" value="$!smsConfig.pollingInterval"/></td>
 		</tr>
 		<tr>
-			<td>$i18n.getString("server_phone_number"):</td>
+			<td><label for="serverPhoneNumber">$i18n.getString( "server_phone_number" )</label></td>
 			<td><input type="text" id="serverPhoneNumber" name="serverPhoneNumber" style="width:20em" value="$!smsConfig.longNumber"/>
 			<input type="submit" value="$i18n.getString( 'save_settings' )" style="width:13em"/></td>
 		</tr>
 		<tr>
-			<td align="right" colspan="2"><input type="button" value="$i18n.getString( 'add_update_gw' )" style="width:13em#if( !$smsServiceStatus );display:none#end" onclick="window.location.href='showUpdateGateWayConfigForm.action'"/></td>
+			<td align="right" colspan="2">
+				<input type="button" value="$i18n.getString( 'add_update_gw' )" style="width:13em" #if( !$smsConfig )disabled="true"#end onclick="window.location.href='showUpdateGateWayConfigForm.action'"/>
+			</td>
 		</tr>
 		<tr>
 			<td colspan="2">
@@ -97,7 +115,6 @@
 							#set( $gw = $!gatewayConfigMap1.get( $key ) )
 							<td>$!encoder.htmlEncode( $gw.name )</td>
 							<td style="text-align:right">
-							  <!--a title="$i18n.getString( 'edit' )" href="editGateWayConfig.action?gateWayID="><img alt="$i18n.getString( 'edit' )" src="../images/edit.png"/></a-->
 							  <a href="javascript:removeGateway( $key, '$!encoder.jsEncode( $gw.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
 							</td>
 						</tr>