dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11807
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-27 13:52:06 +0700
message:
  Display message to inform to users sending-sms status.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SendSmsToListAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SendSmsToListAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SendSmsToListAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SendSmsToListAction.java	2013-08-27 06:52:06 +0000
@@ -170,7 +170,6 @@
         {
             orgunits.add( organisationUnit );
         }
-
         else
         {
             organisationUnit = null;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-08-12 06:23:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-08-27 06:52:06 +0000
@@ -1817,6 +1817,7 @@
 			title:i18n_send_message,
 			maximize:true, 
 			closable:true,
+			closable:true,
 			modal:true,
 			overlay:{background:'#000000', opacity:0.1},
 			width:400,
@@ -1850,14 +1851,17 @@
 					+ "<td>" + field.value + "</td>"+
 					+ "<td>" + field.value + "</td></tr>");
 				field.style.backgroundColor = SUCCESS_COLOR;
-				
+				hideById('smsError');
+				setInnerHTML('smsSuccess', json.message);
+			
 				jQuery('#enrollmentDate').width('325');
 				jQuery('#dateOfIncident').width('325');
 				jQuery('#removeProgram').remove();
 			}
 			else {
-				showSuccessMessage( json.message );
 				field.style.backgroundColor = ERROR_COLOR;
+				hideById('smsSuccess');
+				setInnerHTML('smsError', json.message);
 			}
 			
 			if( jQuery("#messageTB tr.hidden").length > 0 ){

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2013-08-07 08:46:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2013-08-27 06:52:06 +0000
@@ -172,7 +172,8 @@
 				<td>
 					<input type="text" id="smsMessage" name="smsMessage" class="{validate:{required:true,maxlength:160}}" onkeypress="keypressOnMessage(event, this,'$programStageInstance.id');" style='height:50px;'></input>
 				</td>
-				<td id="smsError" style="color:red;"></td>
+				<td id="smsSuccess" style="color:green;"></td>
+				<td id="smsError" style="color:green;"></td>
 			</tr>
 			<tr>
 				<td></td>