← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2274: Bug Fixed in Data Elements and Indicators

 

------------------------------------------------------------
revno: 2274
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-09-29 17:21:04 +0530
message:
  Bug Fixed in Data Elements and Indicators
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js	2010-09-29 06:22:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js	2010-09-29 11:51:04 +0000
@@ -97,7 +97,8 @@
 	
 	refreshListById( 'availableDataElements' );
 	visableAvailableDataElements();
-	disable('availableDataElements');
+	//disable('availableDataElements');
+	enable('availableDataElements');
 	$( '#groupNameView' ).html( name );
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js	2010-09-24 21:51:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js	2010-09-29 11:51:04 +0000
@@ -252,7 +252,11 @@
 {
 	try
 	{
-	    var id = $("#indicatorGroups").value;
+//	    var id = $("#indicatorGroups").value;alert(id);
+	    
+	    var indicatorGroupsSelect = byId( 'indicatorGroups' );
+	    var id = indicatorGroupsSelect.options[ indicatorGroupsSelect.selectedIndex ].value;
+	    
 	    var request = new Request();
 	    var requestString = 'updateIndicatorGroupEditor.action';
 	    var params = "id=" + id;
@@ -275,10 +279,14 @@
 	}
 }
 
-function updateIndicatorGroupMembersReceived( xmlObject ){       
-    
-	var name = xmlObject.getElementsByTagName( "name" )[0].firstChild.nodeValue;
-    setHeaderDelayMessage(i18n_update_success + " : " + name);
+function updateIndicatorGroupMembersReceived( xmlObject )
+{       
+    
+//	var name = xmlObject.getElementsByTagName( "name" )[0].firstChild.nodeValue;
+//    setHeaderDelayMessage(i18n_update_success + " : " + name);
+    
+    var indicatorGroupsSelect = byId( 'indicatorGroups' );
+    setHeaderDelayMessage( i18n_update_success + " : " + indicatorGroupsSelect.options[ indicatorGroupsSelect.selectedIndex ].text );
 }
 
 /*==============================================================================