dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2589
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2011-01-17 17:06:57 +0530
message:
  Minor Bug fiexd in detarget module
modified:
  local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementListFilterByGroupAction.java
  local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/detarget/i18n_module.properties
  local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/addDeTarget.vm
  local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/deTarget.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-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementListFilterByGroupAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementListFilterByGroupAction.java	2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementListFilterByGroupAction.java	2011-01-17 11:36:57 +0000
@@ -159,7 +159,7 @@
         if (  dataElementGroupId == null || dataElementGroupId.equalsIgnoreCase( "ALL" ) )
         {
             //System.out.println("\n\n +++ \n Inside dataElementGroupId null dataElementGroup Id is   : " + dataElementGroupId  );
-            dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
+            //dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
         }
         else
         {

=== modified file 'local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/detarget/i18n_module.properties'
--- local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/detarget/i18n_module.properties	2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/resources/org/hisp/dhis/detarget/i18n_module.properties	2011-01-17 11:36:57 +0000
@@ -61,7 +61,7 @@
 selected_dataElements = Selected DataElements
 group = Group
 define_detarget_associations = Define DataElement Target Associations
-select_deGroup_all = Select DataElementGroup / All
+select_deGroup_all = Select DataElementGroup
 detarget_data_entry = DataElement Target Data Entry
 sl_no = Sl. No.
 dataelement = DataElement

=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/addDeTarget.vm'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/addDeTarget.vm	2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/addDeTarget.vm	2011-01-17 11:36:57 +0000
@@ -63,7 +63,7 @@
         <td><!--<input type="text" id="availableDataElementFilter" onkeyup="filterValues( this.value )" style="min-width:25em">--></td>
         <td><!--<input type="text" id="availableDataElementFilter" onkeyup="filterAvailableDataElements()" style="min-width:25em">--></td>
         <td>##$i18n.getString( "name" )</td>
-        <td><!--<input type="text" id="deTargetMembersFilter" onkeyup="filterValues( this.value )" style="min-width:25em">--></td> 
+        
         <td><!--<input type="text" id="deTargetMembersFilter" onkeyup="filterDeTargetMembers()" style="min-width:25em">--></td>
       </tr>
       

=== modified file 'local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/deTarget.js'
--- local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/deTarget.js	2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/webapp/dhis-web-survey/javascript/deTarget.js	2011-01-17 11:36:57 +0000
@@ -152,7 +152,7 @@
 {
 	var filter = document.getElementById( 'deTargetMembersFilter' ).value;
     var list = document.getElementById( 'selectedList' );
-    
+    var deTargetMembers = document.getElementById( 'selectedList' ).value;
     list.options.length = 0;
     
     for ( var id in deTargetMembers )
@@ -172,6 +172,7 @@
 {
 	var filter = document.getElementById( 'availableDataElementFilter' ).value;
     var list = document.getElementById( 'availableList' );
+    var availableDataElements = document.getElementById( 'availableList' ).value;
     
     list.options.length = 0;
     
@@ -185,7 +186,7 @@
         }
     }
 }
-*/
+*//*
 function addDeTargetMembers()
 {
 	var list = document.getElementById( 'availableList' );
@@ -203,7 +204,7 @@
     
     filterDeTargetMembers();
     filterAvailableDataElements();
-}
+}*/
 /*
 function removeDeTargetMembers()
 {
@@ -227,11 +228,23 @@
 function filterByDataElementGroup( selectedDataElementGroup )
 {
   var selectedList = document.getElementById( 'selectedList' );
+  
+  var availableList = document.getElementById( 'availableList' );
 
  // var list = new Array();
   
   var params = 'dataElementGroupId=' + selectedDataElementGroup;
   
+  
+  if ( selectedDataElementGroup == "" || selectedDataElementGroup == "ALL" )
+  {
+	  alert( "Please Select DataElement Group" );
+	  clearList(availableList);
+	  return false;
+  }
+  
+  else
+  {
   for ( var i = 0; i < selectedList.options.length; ++i)
   {
   	//params += '&selectedIndicators=' + selectedList.options[i].value;
@@ -255,7 +268,7 @@
  // var params = "indicatorGroupId=" + selectedIndicatorGroup + "&selectedIndicators=" + list;
   request.sendAsPost( params );
   request.send( requestString ); 
-  
+  } 
  /* 
   
    $.post("filterAvailableIndicatorsByIndicatorGroup.action",
@@ -272,7 +285,7 @@
 
 function filterByDataElementGroupCompleted( xmlObject )
 {
- //var indicators = indicatorGroup.getElementsByTagName( 'indicators' )[0];
+  //var indicators = indicatorGroup.getElementsByTagName( 'indicators' )[0];
  // var indicatorList = indicators.getElementsByTagName( 'indicator' );
 
   var availableList = document.getElementById( 'availableList' );