← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6009: Remove request object from local/in/data analyser

 

------------------------------------------------------------
revno: 6009
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 12:30:23 +0530
message:
  Remove request object from local/in/data analyser
modified:
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.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 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js	2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js	2012-02-17 07:00:23 +0000
@@ -276,6 +276,7 @@
         	document.getElementById( "availableDataElementsFilter" ).disabled = true;
         }
     	
+        lockScreen();
     	$.post("getDataElements.action",
 		{
 			//id:dataElementGroupId,
@@ -358,7 +359,7 @@
             availableDataElements.add(option, null);
         }
     }
-    
+    unLockScreen(); 
 // If the list of available dataelements is empty, an empty placeholder will be added
 //addOptionPlaceHolder( availableDataElements );
 }// getDataElementsReceived end

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js	2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js	2012-02-17 07:00:23 +0000
@@ -38,7 +38,9 @@
 	clearList(availableDataElements);
 	clearList(selectedDataElements);
 	
+	lockScreen();
 	getDataElements();
+	unLockScreen();
 }
 
 // Category ListBox Change function

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js	2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js	2012-02-17 07:00:23 +0000
@@ -266,7 +266,7 @@
         	document.getElementById( "availableDataElementsFilter" ).value = "";
         	document.getElementById( "availableDataElementsFilter" ).disabled = true;
         }    	
-    	
+        lockScreen();
     	$.post("getDataElementsForTA.action",
 		{
 			id:dataSetSectionId,
@@ -301,7 +301,7 @@
             availableDataElements.add(option, null);
         }
     }
-    
+    unLockScreen();
 }
 // getDataElementsReceived end
 
@@ -480,13 +480,6 @@
 	}
 	
 }
-
-
-
-
-
-
-
 //getting weekly Period
 function getWeeklyPeriod()
 {