=== modified file 'local/in/dhis-in-api/pom.xml'
--- local/in/dhis-in-api/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-api/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-api</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-configuration</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-dataentrystatus</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-dbmanager</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-linelisting</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-reports</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-survey</artifactId>

=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-in-services/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-services</artifactId>

=== modified file 'local/in/dhis-mobile/dhis-service-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-service-mobile/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-services</artifactId>
-        <version>2.6</version>
+        <version>2.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>dhis-service-mobile</artifactId>

=== modified file 'local/in/dhis-mobile/dhis-web-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-web-mobile/pom.xml	2011-12-26 07:49:43 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>dhis-web-mobile</artifactId>

=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-web-dashboard/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-   <version>2.6</version>
+	<version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-dashboard</artifactId>

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsAction.java	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsAction.java	2012-01-10 10:35:10 +0000
@@ -149,8 +149,9 @@
     {
         optionComboIds = new ArrayList<String>();
         optionComboNames = new ArrayList<String>();
-
-        if ( id == null || id == ALL )
+        
+        System.out.println(" id = " +id );
+        if ( id == null || id == 0 )
         {
             dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
             System.out.println("id = "+id + " dataElements size = "+dataElements.size());

=== modified file 'local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties'
--- local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties	2011-12-03 07:44:11 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties	2012-01-10 10:35:10 +0000
@@ -157,4 +157,5 @@
 dataset_not_selected = Select Available data sets
 bulk_sms = Bulk SMS
 due_dates = Due Dates
-ds_sms = DS SMS
\ No newline at end of file
+ds_sms = DS SMS
+filter = Filter
\ No newline at end of file

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm	2012-01-10 10:35:10 +0000
@@ -105,11 +105,23 @@
 		</td>
     </tr>
     <tr>
-      <td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
+    </tr>    
+    
+    <tr>
+      <td class="NormalB">$i18n.getString( "filter" ):&nbsp;<input type="text" id="availableDataElementsFilter" onkeyup="filterAvailableDataElements()" style="min-width:24em"></td>
       <td class="NormalB">&nbsp;</td>
       <td class="NormalB">&nbsp;</td>
     </tr>
     <tr>
+		<td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
+    </tr>    
+    
+    <tr>
 		<td class="NormalB">$i18n.getString( "ga_available_delist" )<br>
 			<select multiple size="7" id="availableDataElements" name="availableDataElements"  style="width:325px; height:100px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
 				#foreach ( $element in $dataElements )
@@ -214,4 +226,13 @@
 
 <script>
 	getPeriods();
+</script>
+
+<script type="text/javascript">
+
+	var availableDataElements = new Object();	
+    #foreach ( $availableDataElement in $dataElements )
+    	availableDataElements['$availableDataElement.id'] = '$encoder.jsEscape( $availableDataElement.name, "'" )';
+    #end
+	
 </script>
\ No newline at end of file

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm	2012-01-10 10:35:10 +0000
@@ -99,8 +99,18 @@
 		<td class="NormalB">&nbsp;</td>
 		<td class="NormalB">&nbsp;</td>
 		<td class="NormalB">&nbsp;</td>
+    </tr>    
+    <tr>
+		<td class="NormalB">$i18n.getString( "filter" ):&nbsp;<input type="text" id="availableIndicatorsFilter" onkeyup="filterAvailableIndicators()" style="min-width:24em"></td>
+		<td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
     </tr>
     <tr>
+		<td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
+		<td class="NormalB">&nbsp;</td>
+    </tr>        
+    <tr>
 		<td class="NormalB">$i18n.getString( "ga_available_indicatorList" )<br>
 			<select multiple size="7" id="availableIndicators" name="availableIndicators"  style="width:325px; height:100px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
 				#foreach ( $element in $indicators )
@@ -205,4 +215,16 @@
 
 <script>
 	getPeriods();
-</script>
\ No newline at end of file
+</script>
+
+<script type="text/javascript">
+
+	var availableIndicators = new Object();	
+    #foreach ( $availableIndicator in $indicators )
+    	availableIndicators['$availableIndicator.id'] = '$encoder.jsEscape( $availableIndicator.name, "'" )';
+    #end
+
+</script>
+
+
+

=== 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	2011-11-03 06:07:39 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js	2012-01-10 10:35:10 +0000
@@ -228,9 +228,32 @@
     
     var deSelectionList = document.getElementById("deSelection");    
     var deOptionValue = deSelectionList.options[ deSelectionList.selectedIndex ].value;
+    /*
+    if ( dataSetSectionId == 0 )
+    {
+    	alert( dataSetSectionId );
+    	document.getElementById( "availableDataElementsFilter" ).value = "";
+    	document.getElementById( "availableDataElementsFilter" ).disabled = false;
+    	return false;
+    }
+	*/
     if ( dataSetSectionId != null )
     {
-		$.post("getDataElements.action",
+    	document.getElementById( "availableDataElementsFilter" ).value = "";
+    	document.getElementById( "availableDataElementsFilter" ).disabled = true;
+    	
+        if ( dataSetSectionId == 0 )
+        {
+        	document.getElementById( "availableDataElementsFilter" ).value = "";
+        	document.getElementById( "availableDataElementsFilter" ).disabled = false;
+        }
+        else
+        {
+        	document.getElementById( "availableDataElementsFilter" ).value = "";
+        	document.getElementById( "availableDataElementsFilter" ).disabled = true;
+        }
+    	
+    	$.post("getDataElements.action",
 		{
 			//id:dataElementGroupId,
 			id:dataSetSectionId,
@@ -350,10 +373,36 @@
 {
     var indicatorGroupList = document.getElementById( "indicatorGroupId" );
     var indicatorGroupId = indicatorGroupList.options[ indicatorGroupList.selectedIndex ].value;
-	
+    
+    /*
+    if ( indicatorGroupId == "$ALL" )
+    {
+    	alert( indicatorGroupId );
+    	document.getElementById( "availableIndicatorsFilter" ).value = "";
+    	document.getElementById( "availableIndicatorsFilter" ).disabled = false;
+    	return false;
+    }
+    */
+    
     if ( indicatorGroupId != null )
     {
-		$.post("getIndicators.action",
+    	
+        if ( indicatorGroupId != "$ALL" )
+        {
+        	//alert( indicatorGroupId );
+        	document.getElementById( "availableIndicatorsFilter" ).value = "";
+        	document.getElementById( "availableIndicatorsFilter" ).disabled = true;
+        	//return false;
+        }
+        else
+        {
+        	document.getElementById( "availableIndicatorsFilter" ).value = "";
+        	document.getElementById( "availableIndicatorsFilter" ).disabled = false;
+        }
+    	//document.getElementById( "availableIndicatorsFilter" ).value = "";
+    	//document.getElementById( "availableIndicatorsFilter" ).disabled = false;
+        
+    	$.post("getIndicators.action",
 			{
 				id:indicatorGroupId
 			},

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js	2011-12-26 07:49:43 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js	2012-01-10 10:35:10 +0000
@@ -595,3 +595,71 @@
   	return true;
 } 
 // formValidations Function Indicators End
+
+ 
+//filter available indicators list
+function filterAvailableIndicators()
+{
+	var filter = document.getElementById( 'availableIndicatorsFilter' ).value;
+    var list = document.getElementById( 'availableIndicators' );
+    
+    list.options.length = 0;
+    
+    var selIndListId = document.getElementById( 'selectedIndicators' );
+    var selIndLength = selIndListId.options.length;
+    
+    for ( var id in availableIndicators )
+    {
+    	//alert( "id : " + id );
+        var value = availableIndicators[id];
+        
+        var flag = 1;
+        for( var i =0 ; i<selIndLength; i++ )
+        {
+        	//alert( selIndListId.options[i].text );
+        	//alert( selIndListId.options[i].value );
+        	if( id == selIndListId.options[i].value )
+        		{
+        		flag =2;
+        		//alert("aaaa");
+        		break;
+        		}
+        }
+        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 && (flag == 1) )
+        {
+            list.add( new Option( value, id ), null );
+        }
+        //alert( flag );
+    }
+}
+//filter available data elements list
+function filterAvailableDataElements()
+{
+	var filter = document.getElementById( 'availableDataElementsFilter' ).value;
+    var list = document.getElementById( 'availableDataElements' );
+    
+    list.options.length = 0;
+    
+    var selDeListId = document.getElementById( 'selectedDataElements' );
+    var selDeLength = selDeListId.options.length;
+    
+    for ( var id in availableDataElements )
+    {
+        var value = availableDataElements[id];
+        
+        var flag = 1;
+        for( var i =0 ; i<selDeLength; i++ )
+        {
+        	if( id == selDeListId.options[i].value )
+        		{
+        		flag =2;
+        		//alert("aaaa");
+        		break;
+        		}
+        }
+        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 && (flag == 1) )
+        {
+            list.add( new Option( value, id ), null );
+        }
+    }
+}

=== modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-dataentry-national</artifactId>

=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-web-excelimport/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-excelimport</artifactId>

=== modified file 'local/in/dhis-web-linelisting-in/pom.xml'
--- local/in/dhis-web-linelisting-in/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-web-linelisting-in/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-linelisting-in</artifactId>

=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-maintenance-in</artifactId>

=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-web-reports-national/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-reports-national</artifactId>

=== modified file 'local/in/dhis-web-survey/pom.xml'
--- local/in/dhis-web-survey/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-web-survey/pom.xml	2012-01-10 10:35:10 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.6</version>
+    <version>2.7-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-survey</artifactId>

=== modified file 'local/in/pom.xml'
--- local/in/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/pom.xml	2012-01-10 10:35:10 +0000
@@ -5,7 +5,7 @@
   
   <groupId>org.hisp.dhis</groupId>
   <artifactId>dhis-local</artifactId>
-  <version>2.6</version>
+  <version>2.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Local India Modules</name>