=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView.js 2014-08-28 09:15:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView.js 2015-03-10 07:43:30 +0000
@@ -26,9 +26,16 @@
if ( text.toLowerCase().indexOf( filter_1.toLowerCase() ) != -1 )
{
- list_1.append( '' );
- list_2.append( '' );
- }
+ if( !checkSelectedDataElement( id ) )
+ {
+ list_1.append( '' );
+ }
+ }
+
+ if ( text.toLowerCase().indexOf( filter_2.toLowerCase() ) != -1 )
+ {
+ list_2.append( '' );
+ }
}
sortList( 'availableDataElements', 'ASC' );
@@ -37,6 +44,30 @@
list_2.find( ":first" ).attr( "selected", "selected" );
}
+function checkSelectedDataElement( deId )
+{
+ var list_selected = jQuery( "#selectedDataElements_storage" ).children();
+ var selectedDataElements = jQuery( "#view_1 #selectedDataElements" ).children();
+
+ $.each( selectedDataElements, function( i_de, item_de )
+ {
+ list_selected.push( item_de );
+ });
+
+ var returnStatus = false;
+
+ jQuery.each( list_selected, function( i, item )
+ {
+ if ( item.value == deId )
+ {
+ returnStatus = true;
+ return false; // same as break;
+ }
+ } );
+
+ return returnStatus;
+}
+
function loadAvailableGroups()
{
var filter_1 = jQuery( '#view_1 #dataElementGroupsFilter' ).val();