=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java	2010-03-05 13:21:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java	2010-04-12 08:26:53 +0000
@@ -986,9 +986,9 @@
                 // -------------------------------------------------------------
                 if( patientDataValue != null )
                 {
-                    System.out.println("optioncomboId: "+patientDataValue.getOptionCombo().getId() + " ===name: "+ patientDataValue.getOptionCombo().getName());
+//                    System.out.println("optioncomboId: "+patientDataValue.getOptionCombo().getId() + " ===name: "+ patientDataValue.getOptionCombo().getName());
                     appendCode = appendCode.replace( "id=\"combo["+patientDataValue.getOptionCombo().getId()+"].combo\"", "id=\"combo["+patientDataValue.getOptionCombo().getId()+"].combo\" selected=\"selected\"");
-                    System.out.println("appendCode: "+appendCode);
+//                    System.out.println("appendCode: "+appendCode);
                 }
 
                 appendCode += "</select>";

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2010-04-12 08:26:53 +0000
@@ -284,4 +284,44 @@
       ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>                 
   </bean>
   
+  <!-- Case Aggregation -->
+  <bean id="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationFormAction"
+    class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationFormAction" 
+    scope="prototype">     
+    <property name="dataSetService"
+      ref="org.hisp.dhis.dataset.DataSetService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.caseentry.action.caseaggregation.GetOrgUnitsAction"
+	class="org.hisp.dhis.caseentry.action.caseaggregation.GetOrgUnitsAction"
+	scope="prototype">
+	  <property name="organisationUnitService"
+		ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+  </bean>
+  
+  <bean id="org.hisp.dhis.caseentry.action.caseaggregation.GetDataSetPeriodsAction"
+	class="org.hisp.dhis.caseentry.action.caseaggregation.GetDataSetPeriodsAction"
+	scope="prototype">
+	  <property name="periodService"
+		ref="org.hisp.dhis.period.PeriodService"/>
+	  <property name="dataSetService"
+		ref="org.hisp.dhis.dataset.DataSetService"/>
+  </bean>
+
+  <bean id="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationResultAction"
+    class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationResultAction" 
+    scope="prototype">     
+    <property name="organisationUnitService" 
+      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+    <property name="periodService" 
+      ref="org.hisp.dhis.period.PeriodService"/>
+    <property name="dataSetService" 
+      ref="org.hisp.dhis.dataset.DataSetService"/>
+    <property name="caseAggregationService" 
+      ref="org.hisp.dhis.caseaggregation.CaseAggregationMappingService"/>
+    <property name="dataValueService" 
+      ref="org.hisp.dhis.datavalue.DataValueService"/>
+    <property name="currentUserService" 
+      ref="org.hisp.dhis.user.CurrentUserService"/>
+  </bean>
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2010-04-12 08:26:53 +0000
@@ -168,6 +168,32 @@
       <result name="success" type="velocity">/popup.vm</result>      
       <param name="page">/dhis-web-caseentry/records.vm</param>                  
     </action>
+    
+	 <!-- Case Aggregation -->
+
+    <action name="caseAggregationForm" class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationFormAction">
+      <interceptor-ref name="organisationUnitTreeStack"/>            
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/caseAggregationForm.vm</param>
+      <param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>    
+      <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/caseagg.js,javascript/date.js</param>      
+    </action>
+    
+	<action name="getOrgUnitDetails" class="org.hisp.dhis.caseentry.action.caseaggregation.GetOrgUnitsAction">
+		<result name="success" type="velocity">/dhis-web-caseentry/responseOrgUnit.vm</result>			
+		<param name="onExceptionReturn">plainTextError</param>
+	</action>
+	
+	<action name="getDataSetPeriods" class="org.hisp.dhis.caseentry.action.caseaggregation.GetDataSetPeriodsAction">
+		<result name="success" type="velocity">/dhis-web-caseentry/dSetResponsePeriod.vm</result>
+		<param name="onExceptionReturn">plainTextError</param>
+	</action>
+
+    <action name="caseAggregationResult" class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationResultAction">                 
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/caseAggregationResult.vm</param>
+      <param name="menu">/dhis-web-caseentry/menu.vm</param>      
+    </action>
 		  
   </package>
 </struts>