← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #04813

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1604: Fixed bug <51004>

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 1604
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-03-10 13:35:04 +0700
message:
  Fixed bug <51004>
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm


--
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/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm	2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm	2010-03-10 06:35:04 +0000
@@ -30,7 +30,7 @@
 	</tr>
 	<tr>
 		<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" style="width:20em" maxlength="100" class="{validate:{required:true,minlength:2,maxlength:160}}"></td>
+		<td><input type="text" id="name" name="name" style="width:20em" maxlength="100" class="{validate:{required:true,minlength:2,maxlength:160}}"/></td>
 	</tr>
 	<tr>
 		<td colspan="2" height="15px"></td>
@@ -42,28 +42,31 @@
 		<th>$i18n.getString( "available_data_elements" )</th><td></td><th>$i18n.getString( "group_members" )</th>
 	</tr>
 	<tr>		
-		<td><input type="text" id="availableDataElementsFilter" onkeyup="filterAvailableDataElements()" style="width:25em"></td>
+		<td><input type="text" id="availableDataElementsFilter" onkeyup="filterList( this.value, 'availableDataElements' )" style="width:25em"/></td>
 		<td style="text-align:center">&lt; $i18n.getString( "filters" ) &gt;</td>
-		<td><input type="text" id="groupMembersFilter" onkeyup="filterGroupMembers()" style="width:25em"></td>
+		<td><input type="text" id="groupMembersFilter" onkeyup="filterList( this.value, 'groupMembers' )" style="width:25em"/></td>
 	</tr>
 	<tr>
 		<td>
-			<select id="availableDataElements" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="addGroupMembers()">
+			<select id="availableDataElements" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="moveSelectedById( 'availableDataElements', 'groupMembers' )">
 			</select>
 		</td>
 		
 		<td style="text-align:center">			
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="addGroupMembers()"><br>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="removeGroupMembers()">			
+			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" style="width:50px" onclick="moveSelectedById( 'availableDataElements', 'groupMembers' )"/><br/>
+			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" style="width:50px" onclick="moveSelectedById( 'groupMembers', 'availableDataElements' )"/><br/>
+			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="moveAllById( 'availableDataElements', 'groupMembers' )"/><br/>
+			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="moveAllById( 'groupMembers', 'availableDataElements' )"/>
+
 		</td>
 	
 		<td>
-			<select id="groupMembers" name="groupMembers" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="removeGroupMembers()" />
+			<select id="groupMembers" name="groupMembers" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="moveSelectedById( 'groupMembers', 'availableDataElements' )" />
 		</td>
 	</tr>
 </table>
 
-<p><input type="submit" value="$i18n.getString( "add" )" style="width:10em"><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataElementGroup.action'" style="width:10em"></p>
+<p><input type="submit" value="$i18n.getString( "add" )" style="width:10em"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataElementGroup.action'" style="width:10em"/></p>
 
 </form>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js	2010-02-04 08:29:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js	2010-03-10 06:35:04 +0000
@@ -127,78 +127,3 @@
     }
 }
 
-function filterGroupMembers()
-{
-    var filter = document.getElementById( 'groupMembersFilter' ).value;
-    var list = document.getElementById( 'groupMembers' );
-    
-    list.options.length = 0;
-    
-    for ( var id in groupMembers )
-    {
-        var value = groupMembers[id];
-        
-        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 )
-        {
-            list.add( new Option( value, id ), null );
-        }
-    }
-}
-
-function filterAvailableDataElements()
-{
-    var filter = document.getElementById( 'availableDataElementsFilter' ).value;
-    var list = document.getElementById( 'availableDataElements' );
-    
-    list.options.length = 0;
-    
-    for ( var id in availableDataElements )
-    {
-        var value = availableDataElements[id];
-        
-        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 )
-        {
-            list.add( new Option( value, id ), null );
-        }
-    }
-}
-
-function addGroupMembers()
-{
-    var list = document.getElementById( 'availableDataElements' );
-
-    while ( list.selectedIndex != -1 )
-    {
-        var id = list.options[list.selectedIndex].value;
-
-        list.options[list.selectedIndex].selected = false;
-
-        groupMembers[id] = availableDataElements[id];
-        
-        delete availableDataElements[id];        
-    }
-    
-    filterGroupMembers();
-    filterAvailableDataElements();
-}
-
-function removeGroupMembers()
-{
-    var list = document.getElementById( 'groupMembers' );
-
-    while ( list.selectedIndex != -1 )
-    {
-        var id = list.options[list.selectedIndex].value;
-
-        list.options[list.selectedIndex].selected = false;
-
-        //availableDataElements[id] = groupMembers[id];
-        
-        delete groupMembers[id];        
-    }
-    
-    filterGroupMembers();
-    filterAvailableDataElements();
-}
-
-

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2010-03-08 17:41:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2010-03-10 06:35:04 +0000
@@ -112,4 +112,7 @@
 selected_datasets                                           = Selected DataSets
 intro_assign_multidataset                                   = Assign Multi-DataSets to organisation unit. Multi-DataSet is a collection of data sets. This page allow you to assign one or many data set(s) to one or many organisation unit(s).
 orgunit_tree                                                = Organisation Unit Tree
-dataset_assignment_editor									= Dataset Assignment Editor
\ No newline at end of file
+dataset_assignment_editor									= Dataset Assignment Editor
+move_selected                                               = Move selected
+remove_selected                                             = Remove selected
+move_all                                                    = Move all

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-03-10 06:35:04 +0000
@@ -55,7 +55,7 @@
 selected_sections               = Danh s&#225;ch Section &#273;&#227; ch&#7885;n
 apply                           = C&#7853;p nh&#7853;t
 section_details                 = Chi ti&#7871;t Section
-edit_section                    = Edit Section
+edit_section                    = Ch\u1ec9nh s\u1eeda Section
 selected_section_elements       = Danh s&#225;ch Element &#273;&#227; ch&#7885;n
 available_section_elements      = Danh s&#225;ch Element ch&#432;a ch&#7885;n
 update_section                  = C&#7853;p nh&#7853;t section
@@ -65,4 +65,8 @@
 selected_datasets               = T\u1eadp h\u1ee3p d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
 filter                          = B\u1ed9 l\u1ecdc
 intro_assign_multidataset       = G\u00e1n \u0111a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u cho c\u00e1c \u0111\u01a1n v\u1ecb. \u0110a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u l\u00e0 g\u1ed3m nhi\u1ec1u t\u1eadp h\u1ee3p d\u1eef li\u1ec7u. Ch\u1ee9c n\u0103ng n\u00e0y cho ph\u00e9p g\u00e1n m\u1ed9t hay nhi\u1ec1u t\u1eadp h\u1ee3p d\u1eef li\u1ec7u cho m\u1ed9t hay nhi\u1ec1u \u0111\u01a1n v\u1ecb.   
-orgunit_tree                    = C\u00e2y \u0111\u01a1n v\u1ecb
\ No newline at end of file
+orgunit_tree                    = C\u00e2y \u0111\u01a1n v\u1ecb
+move_all                        = Chuy\u1ec3n to\u00e0n b\u1ed9
+remove_all                      = H\u1ee7y b\u1ecf to\u00e0n b\u1ed9
+move_selected                   = Di chuy\u1ec3n l\u1ef1a ch\u1ecdn
+remove_selected                 = H\u1ee7y b\u1ecf l\u1ef1a ch\u1ecdn
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2010-03-10 06:35:04 +0000
@@ -34,15 +34,15 @@
     <tbody>
       <tr>
         <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="name" name="name" onchange="nameChanged()" style="width:20em" maxlength="100" class="{validate:{required:true,minlength:2,maxlength:160}}"></td>
+        <td><input type="text" id="name" name="name" onchange="nameChanged()" style="width:20em" maxlength="100" class="{validate:{required:true,minlength:2,maxlength:160}}"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="shortName" name="shortName" maxlength="20" style="width:20em" maxlength="60" class="{validate:{required:true,minlength:2,maxlength:60}}"></td>
+        <td><input type="text" id="shortName" name="shortName" maxlength="20" style="width:20em" maxlength="60" class="{validate:{required:true,minlength:2,maxlength:60}}"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "code" )</label></td>
-        <td><input type="text" id="code" name="code" maxlength="20" style="width:20em"  maxlength="60" class="{validate:{maxlength:60}}"></td>
+        <td><input type="text" id="code" name="code" maxlength="20" style="width:20em"  maxlength="60" class="{validate:{maxlength:60}}"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "frequency" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
@@ -57,7 +57,7 @@
       <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
     </tbody>
   </table>
-
+	<br/>&nbsp;
   <table id="dataElementSelectionArea">
     <col> ## Available DataElements
     <col> ## Filter
@@ -70,7 +70,6 @@
       </tr>
     </thead>
     <tbody>
-    	
       <tr>        
         <td>
           <select id="dataElementGroupSelect" name="dataElementGroupSelect" style="min-width:25em"
@@ -81,38 +80,39 @@
             #end
           </select>
         </td>
-        <td>$i18n.getString( "group" )</td>
+        <td>[$i18n.getString( "group" )]</td>
         <td></td>        
       </tr>
       
       <tr>
-      	<td><input type="text" id="availableDataElementsFilter" onkeyup="filterAvailableDataElements()" style="min-width:25em"></td>
-      	<td>$i18n.getString( "name" )</td>
-      	<td><input type="text" id="dataSetMembersFilter" onkeyup="filterDataSetMembers()" style="min-width:25em"></td>
+      	<td><input type="text" id="availableDataElementsFilter" onkeyup="filterList( this.value, 'availableList' )" style="min-width:25em"></td>
+      	<td>[$i18n.getString( "name" )]</td>
+      	<td><input type="text" id="dataSetMembersFilter" onkeyup="filterList( this.value, 'selectedList' )" style="min-width:25em"></td>
       </tr>
       
       <tr>
         <td>
           <!-- List of all available DataElements -->
-          <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="addDataSetMembers()">            
+          <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="moveSelectedById( 'availableList', 'selectedList')">            
           </select>
         </td>
         <td>
-        	<input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" onclick="addDataSetMembers()">
-        	<br>
-            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" onclick="removeDataSetMembers()">          
-        </td>
+        	<input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="moveSelectedById( 'availableList', 'selectedList')"/><br/>
+            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="moveSelectedById( 'selectedList', 'availableList')"/><br/>
+			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="moveAllById( 'availableList', 'selectedList' )"/><br/>
+			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="moveAllById( 'selectedList', 'availableList' )"/>
+		</td>			
         <td>
           <!-- List of all selected DataElements -->
-          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="removeDataSetMembers()">
+          <select id="selectedList" name="selectedList" multiple="multiple" style="min-width:25em;height:20em" ondblclick="moveSelectedById( 'selectedList', 'availableList' )">
           </select>
         </td>
       </tr>
 
       <tr>
         <td colspan="3">
-          <input type="submit" value="$i18n.getString( "save" )" style="width:13em"><input type="button"
-            onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )" style="width:12em">
+          <input type="submit" value="$i18n.getString( "save" )" style="width:13em"/><input type="button"
+            onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )" style="width:12em"/>
         </td>
       </tr>
       
@@ -136,4 +136,4 @@
 
 	var previousName = '';
 
-</script>
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2010-03-09 10:53:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2010-03-10 06:35:04 +0000
@@ -198,78 +198,4 @@
     {
         list.add( new Option( availableDataElements[id], id ), null );
     }
-}
-
-function filterDataSetMembers()
-{
-	var filter = document.getElementById( 'dataSetMembersFilter' ).value;
-    var list = document.getElementById( 'selectedList' );
-    
-    list.options.length = 0;
-    
-    for ( var id in dataSetMembers )
-    {
-        var value = dataSetMembers[id];
-        
-        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 )
-        {
-            list.add( new Option( value, id ), null );
-        }
-    }
-}
-
-function filterAvailableDataElements()
-{
-	var filter = document.getElementById( 'availableDataElementsFilter' ).value;
-    var list = document.getElementById( 'availableList' );
-    
-    list.options.length = 0;
-    
-    for ( var id in availableDataElements )
-    {
-        var value = availableDataElements[id];
-        
-        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 )
-        {
-            list.add( new Option( value, id ), null );
-        }
-    }
-}
-
-function addDataSetMembers()
-{
-	var list = document.getElementById( 'availableList' );
-
-    while ( list.selectedIndex != -1 )
-    {
-		var selectedList = byId( 'selectedList' );
-        var id = list.options[list.selectedIndex].value;
-		
-		dataSetMembers[id] = availableDataElements[id];
-		
-		addOptionToList( selectedList, id, dataSetMembers[id] );
-		
-        list.remove( list.selectedIndex );
-        
-        delete availableDataElements[id];        
-    }
-}
-
-function removeDataSetMembers()
-{
-	var list = document.getElementById( 'selectedList' );
-
-    while ( list.selectedIndex != -1 )
-    {
-		var availableList = byId( 'availableList' );
-        var id = list.options[list.selectedIndex].value;
-
-        availableDataElements[id] = dataSetMembers[id];
-		
-		addOptionToList( availableList, id, availableDataElements[id] );
-		
-		list.remove( list.selectedIndex );
-        
-        delete dataSetMembers[id];        
-    }
-}
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js	2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js	2010-03-10 06:35:04 +0000
@@ -21,85 +21,3 @@
         list.add( new Option( availableDataSets[id], id ), null );
     }
 }
-
-function filterSelectedDataSets()
-{
-	var filter = document.getElementById( 'selectedDataSetsFilter' ).value;
-    var list = document.getElementById( 'selectedDataSets' );
-    
-    list.options.length = 0;
-    
-    for ( var id in selectedDataSets )
-    {
-        var value = selectedDataSets[id];
-        
-        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 )
-        {
-            list.add( new Option( value, id ), null );
-        }
-    }
-}
-
-function filterAvailableDataSets()
-{
-	var filter = document.getElementById( 'availableDataSetsFilter' ).value;
-    var list = document.getElementById( 'availableDataSets' );
-    
-    list.options.length = 0;
-    
-    for ( var id in availableDataSets )
-    {
-        var value = availableDataSets[id];
-        
-        if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 )
-        {
-            list.add( new Option( value, id ), null );
-        }
-    }
-}
-
-function addSelectedDataSets()
-{
-	var list = document.getElementById( 'availableDataSets' );
-
-    while ( list.selectedIndex != -1 )
-    {
-		var selectedList = byId( 'selectedDataSets' );
-        var id = list.options[list.selectedIndex].value;
-		
-		selectedDataSets[id] = availableDataSets[id];
-		
-		addOptionToList( selectedList, id, selectedDataSets[id] );
-		
-        list.remove( list.selectedIndex );
-        
-        delete availableDataSets[id];        
-    }
-    
-	//Not filter anymore
-    //filterDataSetMembers();
-    //filterAvailableDataElements();
-}
-
-function removeSelectedDataSets()
-{
-	var list = document.getElementById( 'selectedDataSets' );
-
-    while ( list.selectedIndex != -1 )
-    {
-		var availableList = byId( 'availableDataSets' );
-        var id = list.options[list.selectedIndex].value;
-
-        availableDataSets[id] = selectedDataSets[id];
-		
-		addOptionToList( availableList, id, availableDataSets[id] );
-		
-		list.remove( list.selectedIndex );
-        
-        delete selectedDataSets[id];        
-    }
-    
-	//Not filter anymore
-    //filterDataSetMembers();
-    //filterAvailableDataElements();
-}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-03-08 17:41:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-03-10 06:35:04 +0000
@@ -7,22 +7,25 @@
 		<th>$i18n.getString( "available_datasets" )</th><td></td><th>$i18n.getString( "selected_datasets" )</th>
 	</tr>
 	<tr>		
-		<td><input type="text" id="availableDataSetsFilter" onkeyup="filterAvailableDataSets()" style="width:25em" /></td>
+		<td><input type="text" id="availableDataSetsFilter" onkeyup="filterList( this.value, 'availableDataSets' )" style="width:25em" /></td>
 		<td style="text-align:center">&lt; $i18n.getString( "filters" ) &gt;</td>
-		<td><input type="text" id="selectedDataSetsFilter" onkeyup="filterSelectedDataSets()" style="width:25em" /></td>
+		<td><input type="text" id="selectedDataSetsFilter" onkeyup="filterList( this.value, 'selectedDataSets' )" style="width:25em" /></td>
 	</tr>
 	<tr>
 		<td>
-			<select id="availableDataSets" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="addSelectedDataSets()" />
+			<select id="availableDataSets" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="moveSelectedById( 'availableDataSets', 'selectedDataSets' )" />
 		</td>
 		
 		<td style="text-align:center">			
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="addSelectedDataSets()" /><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="removeSelectedDataSets()" />			
+			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" style="width:50px" onclick="moveSelectedById( 'availableDataSets', 'selectedDataSets' )" /><br/>
+			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" style="width:50px" onclick="moveSelectedById( 'selectedDataSets', 'availableDataSets' )" /><br/>
+			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="moveAllById( 'availableDataSets', 'selectedDataSets' )"/><br/>
+			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="moveAllById( 'selectedDataSets', 'availableDataSets' )"/>
+			
 		</td>
 	
 		<td>
-			<select id="selectedDataSets" name="selectedDataSets" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="removeSelectedDataSets()" />
+			<select id="selectedDataSets" name="selectedDataSets" size="2" multiple="multiple" style="min-width:25em; height:25em" ondblclick="moveSelectedById( 'selectedDataSets', 'availableDataSets' )" />
 		</td>
 	</tr>
 </table>
  Thread Previous • Date Previous • • Thread Next