=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java	2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java	2012-03-16 07:50:14 +0000
@@ -59,6 +59,8 @@
     Collection<CaseAggregationCondition> getCaseAggregationCondition( DataElement dataElement );
     
     CaseAggregationCondition getCaseAggregationCondition( DataElement dataElement, DataElementCategoryOptionCombo optionCombo );
+    
+    Collection<CaseAggregationCondition> getCaseAggregationCondition( Collection<DataElement> dataElements );
 
     
     Double parseConditition( CaseAggregationCondition aggregationCondition, OrganisationUnit orgunit, Period period );

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java	2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java	2012-03-16 07:50:14 +0000
@@ -48,5 +48,7 @@
 
     CaseAggregationCondition get( DataElement dataElement, DataElementCategoryOptionCombo optionCombo );
     
+    Collection<CaseAggregationCondition> get( Collection<DataElement> dataElements );
+    
     List<Integer> executeSQL( String sql );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2012-03-06 08:58:47 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2012-03-16 07:50:14 +0000
@@ -489,6 +489,11 @@
         return patientAttributes;
     }
 
+    public Collection<CaseAggregationCondition> getCaseAggregationCondition( Collection<DataElement> dataElements )
+    {
+        return aggregationConditionStore.get( dataElements );
+    }
+
     // -------------------------------------------------------------------------
     // Support Methods
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java	2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java	2012-03-16 07:50:14 +0000
@@ -119,4 +119,11 @@
             Restrictions.eq( "optionCombo", optionCombo ))
             .uniqueResult();
     }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Collection<CaseAggregationCondition> get( Collection<DataElement> dataElements )
+    {
+        return getCriteria( Restrictions.in( "aggregationDataElement", dataElements ) ).list();
+    }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java	2012-03-16 07:50:14 +0000
@@ -31,6 +31,8 @@
 
 import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
 import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
 
 import com.opensymphony.xwork2.Action;
 
@@ -48,24 +50,46 @@
 
     private CaseAggregationConditionService aggregationConditionService;
 
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
+    public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
+    {
+        this.aggregationConditionService = aggregationConditionService;
+    }
+
+    public DataSetService dataSetService;
+
+    public void setDataSetService( DataSetService dataSetService )
+    {
+        this.dataSetService = dataSetService;
+    }
+
+    // -------------------------------------------------------------------------
+    // Getters && Setters
+    // -------------------------------------------------------------------------
+    
+    private Integer dataSetId;
+
+    public void setDataSetId( Integer dataSetId )
+    {
+        this.dataSetId = dataSetId;
+    }
+
+    public Integer getDataSetId()
+    {
+        return dataSetId;
+    }
 
     private Collection<CaseAggregationCondition> aggregationConditions;
 
-    // -------------------------------------------------------------------------
-    // Getters && Setters
-    // -------------------------------------------------------------------------
-
     public Collection<CaseAggregationCondition> getAggregationConditions()
     {
         return aggregationConditions;
     }
 
-    public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
+    private Collection<DataSet> dataSets;
+
+    public Collection<DataSet> getDataSets()
     {
-        this.aggregationConditionService = aggregationConditionService;
+        return dataSets;
     }
 
     // -------------------------------------------------------------------------
@@ -76,7 +100,18 @@
     public String execute()
         throws Exception
     {
-        aggregationConditions = aggregationConditionService.getAllCaseAggregationCondition();
+        dataSets = dataSetService.getAllDataSets();
+
+        if ( dataSetId == null )
+        {
+            aggregationConditions = aggregationConditionService.getAllCaseAggregationCondition();
+
+            return SUCCESS;
+        }
+
+        DataSet dataSet = dataSetService.getDataSet( dataSetId );
+
+        aggregationConditions = aggregationConditionService.getCaseAggregationCondition( dataSet.getDataElements() );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java	2012-03-16 02:00:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java	2012-03-16 07:50:14 +0000
@@ -67,7 +67,9 @@
     // -------------------------------------------------------------------------
     
     private Integer id;
-	
+
+    private Integer dataSetId;
+
     private List<PatientAttribute> patientAttributes;
 
     private List<DataSet> dataSets;
@@ -100,6 +102,16 @@
         this.id = id;
     }
 
+    public void setDataSetId( Integer dataSetId )
+    {
+        this.dataSetId = dataSetId;
+    }
+    
+    public Integer getDataSetId()
+    {
+        return dataSetId;
+    }
+
     public List<Program> getPrograms()
     {
         return programs;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java	2012-03-16 02:00:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java	2012-03-16 07:50:14 +0000
@@ -71,6 +71,8 @@
 
     private Integer id;
 
+    private Integer dataSetId;
+
     private CaseAggregationCondition caseAggregation;
 
     private String description;
@@ -110,6 +112,16 @@
         this.id = id;
     }
 
+    public void setDataSetId( Integer dataSetId )
+    {
+        this.dataSetId = dataSetId;
+    }
+
+    public Integer getDataSetId()
+    {
+        return dataSetId;
+    }
+
     public String getDescription()
     {
         return description;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2012-03-13 08:24:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2012-03-16 07:50:14 +0000
@@ -602,6 +602,9 @@
 		<property name="aggregationConditionService">
 			<ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
 		</property>
+		<property name="dataSetService">
+			<ref bean="org.hisp.dhis.dataset.DataSetService" />
+		</property>
 	</bean>
 
 	<bean

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-03-08 06:39:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-03-16 07:50:14 +0000
@@ -251,4 +251,5 @@
 display_provided_other_facility_column=Display provided other facility column
 aggregation_query_builder=Aggregation Query Builder
 patient_org_unit_registration=Beneficiary Org Unit Registration
-dataset= Dataset
\ No newline at end of file
+dataset= Dataset
+filter_by_data_set = Filter by dataset
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-03-15 09:25:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-03-16 07:50:14 +0000
@@ -659,6 +659,7 @@
 			<param name="page">/dhis-web-maintenance-patient/caseAggregation.vm</param>
 			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/caseaggregation.js</param>
+			<param name="stylesheets">style/basic.css</param>
 		</action>
 
 		<action name="showAddCaseAggregationForm"
@@ -759,6 +760,12 @@
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 
+		<action name="getCaseAggConditionByDataset"
+			class="org.hisp.dhis.patient.action.caseaggregation.GetAllCaseAggregationConditionAction">
+			<result name="success" type="velocity">/content.vm</result>
+			<param name="page">/dhis-web-maintenance-patient/caseAggregationList.vm</param>
+		</action>
+		
 		<!-- Validation - PatientValidationCriteria -->
 
 		<action name="validationCriteria"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-03-13 08:24:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-03-16 07:50:14 +0000
@@ -32,7 +32,7 @@
 			<select id="dataSets" name="dataSets" style="width:30.5em" onchange="getDataElementsByDataset();">
 				<option value="">[$i18n.getString('please_select')]</option>
 				#foreach( $dataSet in $dataSets)
-					<option value="$dataSet.id" >$dataSet.name</option>
+					<option value="$dataSet.id" #if( $dataSetId=="$dataSet.id") selected #end>$dataSet.name</option>
 				#end
 			</select>
 		</td>				
@@ -278,7 +278,7 @@
 		<td>
 			<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
 			<input type="button" value="$i18n.getString( 'test_condition' )" style="width:10em" onclick='testCaseAggregationCondition();'/>
-			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action'" style="width:10em"/>
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action?dataSetId=$dataSetId'" style="width:10em"/>
 		</td>
 	</tr>
 </table>
@@ -290,4 +290,7 @@
 	var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
 	var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
 	jQuery("#tabs").tabs();
+	#if( $dataSetId )
+		getDataElementsByDataset();
+	#end
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2012-01-11 07:42:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2012-03-16 07:50:14 +0000
@@ -3,53 +3,50 @@
 <table class="mainPageTable">
   <tr>
     <td style="vertical-align:top">
+		<table width="100%">
+          
+		  <tr>
+			<td>$i18n.getString( "filter_by_data_set" )</td>
+			<td>
+				<select id='dataSetId' name='dataSetId' onchange='getCaseAggConditionByDataset();'>
+					<option value=''>[$i18n.getString( "all" )]</option>
+					#foreach( $dataSet in $dataSets )
+					<option value='$dataSet.id' #if( $dataSetId=="$dataSet.id") selected #end >$dataSet.name</option>
+					#end
+				</select>
+			</td>
+		</tr>
+		<tr>
+		  	<td>$i18n.getString( "filter_by_name" )</td>
+			<td>
+				<input type="text" onkeyup="filterValues( this.value , 1)" />
+			</td>
+			<td colspan="3" style="text-align:right">
+				<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddCaseAggregationForm.action?dataSetId=$dataSetId'" >
+			</td>
+		</tr>
+		</table>
+			
+		<table class="listTable">
+			<col>
+			<col width="100">   
 		
-      <table class="listTable">
-          <col>          
-          <col width="20">
-          <col width="20">
-          <col width="20">          		  
-		  <tr>
-		  	<td>
-				$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/>
-			</td>
-			<td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddCaseAggregationForm.action'" style="width:70px"></td>
-		  </tr>
-          <tr>
-            <th>$i18n.getString( "name" )</th>
-            <th colspan="3">$i18n.getString( "operations" )</th>
-          </tr>
-
-          <tbody id="list">
-            #foreach( $aggregationCondition in $aggregationConditions )
-              <tr id="tr${aggregationCondition.id}">
-              
-                <td>$encoder.htmlEncode( $aggregationCondition.description )</td>                
-                
-                <td style="text-align:center">
-                  <a href="showUpdateCaseAggregationForm.action?id=$aggregationCondition.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
-                </td>                
-				
-                <td style="text-align:center">
-                  <a href="javascript:removeCaseAggregation( '$aggregationCondition.id', '$encoder.jsEncode( $aggregationCondition.description )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
-                </td>            
-                
-                <td style="text-align:center">
-                  <a href="javascript:showCaseAggregationDetails( $aggregationCondition.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
-                </td>
-                
-              </tr>
-			#end
-
-          </tbody>
+			<tr>
+				<th>$i18n.getString( "name" )</th>
+				<th>$i18n.getString( "operations" )</th>
+			</tr>
+
+			<tbody id="list">
+				#parse( "/dhis-web-maintenance-patient/caseAggregationList.vm" )
+			</tbody>
 
         </table>
     </td>
 		<td style="width:20em; padding-left:2em; vertical-align:top">
 
-			<div id="detailsArea" style="display:none">
+			<div id="detailsArea" class="hidden">
 				<div style="float:right">
-					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
                 <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
                 <p><label class="bold">$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2012-03-13 09:47:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2012-03-16 07:50:14 +0000
@@ -276,3 +276,19 @@
 	}
 }
 
+function getCaseAggConditionByDataset()
+{
+	$.get( 'getCaseAggConditionByDataset.action',
+		{
+			dataSetId: getFieldValue( 'dataSetId' )
+		}
+		, function( html ) 
+		{
+			setInnerHTML('list', html );
+		} );
+}
+
+function addCaseAggConditionForm()
+{
+	
+}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-03-13 08:24:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-03-16 07:50:14 +0000
@@ -1,12 +1,25 @@
 <script>
 	jQuery(document).ready(	function(){
+	
 		validation( 'updateCaseAggregationForm', function(form){
 			form.submit();
 		}); 
 		
 		checkValueIsExist( "aggregationDataElementId", "validateCaseAggregation.action", {id:getFieldValue('id')});
+		
+		byId('description').focus();
+		var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
+		var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
+		jQuery("#tabs").tabs();
+		
 	});	
 	
+	#if( $dataSetId )
+		getDataElementsByDataset();
+		var selectedValue = "$caseAggregation.aggregationDataElement.id" + "." + "$caseAggregation.optionCombo.id";
+		jQuery("#aggregationDataElementId").val( selectedValue );
+		var avasdjl;
+	#end	
 </script>
 														
 <h3>$i18n.getString( "edit_case_aggregation_condition" )</h3>
@@ -34,7 +47,7 @@
 			<select id="dataSets" name="dataSets" style="width:30.5em" onchange="getDataElementsByDataset();">
 				<option value="">[$i18n.getString('please_select')]</option>
 				#foreach( $dataSet in $dataSets)
-					<option value="$dataSet.id" >$dataSet.name</option>
+					<option value="$dataSet.id" #if( $dataSetId=="$dataSet.id") selected #end >$dataSet.name</option>
 				#end
 			</select>
 		</td>				
@@ -281,16 +294,9 @@
 		<td>
 			<input type="submit" value="$i18n.getString( 'update' )" style="width:10em">
 			<input type="button" value="$i18n.getString( 'test_condition' )" style="width:10em" onclick='testCaseAggregationCondition();'/>
-			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action'" style="width:10em">
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action?dataSetId=$dataSetId'" style="width:10em">
 		</td>
 	<tr>
 </table>
 
 </form>
-
-<script>
-	byId('description').focus();
-	var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
-	var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
-	jQuery("#tabs").tabs();
-</script>