dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16083
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-07-11 12:37:24 +0700
message:
  Hide waiting-div after showing the validation-result in case-entry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.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/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2014-07-08 06:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2014-07-11 05:37:24 +0000
@@ -508,15 +508,16 @@
 		});
 
 		$("#loading-bar").siblings(".ui-dialog-titlebar").hide();
-
+		
 		$.get( 'validateProgram.action', 
 			{
 				programStageInstanceId: jQuery('.stage-object-selected').attr('id').split('_')[1]
 			}).done(function(html){
             $("#loading-bar").dialog("close");
             $('#validateProgramDiv').html(html);
+ 
             if( getFieldValue('violateValidation') == 'true' ) {
-                $('#validateProgramDiv').dialog({
+				$('#validateProgramDiv').dialog({
                     title: i18n_violate_validation,
                     maximize: true,
                     closable: true,
@@ -537,7 +538,8 @@
         });
     }
     else {
-        runCompleteEvent(isCreateEvent);
+		$("#loading-bar").dialog("close");
+		runCompleteEvent(isCreateEvent);
     }
 }