dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2205
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-09-23 14:39:06 +0700
message:
  Fix bug: No message appears when the “Save Calculated Data” Button is pushed. I think we need to add some message box here.
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js	2010-08-20 08:34:39 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js	2010-09-23 07:39:06 +0000
@@ -381,6 +381,8 @@
 
 function calculateAndSaveCDEs()
 {
+	lockScreen();
+	
     var request = new Request();
     request.setCallbackSuccess( dataValuesReceived );
     request.setResponseTypeXML( 'dataValues' );
@@ -399,4 +401,5 @@
 		value = value.firstChild.nodeValue;		
 		document.getElementById( 'value[' + dataElementId + '].value' ).value = value;
 	}
+	unLockScreen();
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js	2010-09-01 16:55:23 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js	2010-09-23 07:39:06 +0000
@@ -381,6 +381,8 @@
 
 function calculateAndSaveCDEs()
 {
+	lockScreen();
+
     var request = new Request();
     request.setCallbackSuccess( dataValuesReceived );
     request.setResponseTypeXML( 'dataValues' );
@@ -399,6 +401,7 @@
 		value = value.firstChild.nodeValue;		
 		document.getElementById( 'value[' + dataElementId + '].value' ).value = value;
 	}
+	unLockScreen();
 }
 
 // -----------------------------------------------------------------------------