← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11960: Close Send message popup when to click Send button in Re-schedule and Set status tab.

 

------------------------------------------------------------
revno: 11960
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-09-07 19:37:59 +0700
message:
  Close Send  message popup when to click Send button in Re-schedule and Set status tab.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js


--
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/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-09-07 12:32:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-09-07 12:37:59 +0000
@@ -1905,6 +1905,7 @@
 		}, function ( json )
 		{
 			if ( json.response == "success" ) {
+				jQuery('#smsDiv').dialog('close');
 				var date = new Date();
 				var currentTime = date.getHours() + ":" + date.getMinutes();
 				jQuery('[name=commentTB]').prepend("<tr><td>" + getFieldValue('currentDate') + " " + currentTime + "</td>"
@@ -1920,11 +1921,13 @@
 				jQuery('#enrollmentDate').width('325');
 				jQuery('#dateOfIncident').width('325');
 				jQuery('#removeProgram').remove();
+				showSuccessMessage(json.message);
 			}
 			else {
 				field.style.backgroundColor = ERROR_COLOR;
 				hideById('smsSuccess');
 				setInnerHTML('smsError', json.message);
+				showErrorMessage(json.message);
 			}
 			
 			if( jQuery("#messageTB tr.hidden").length > 0 ){