=== 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	2011-03-24 06:04:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2011-05-06 08:09:10 +0000
@@ -40,8 +40,6 @@
         option.title = name;
         
         de.add(option, null);  
-        
-      
     }	    
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm	2010-11-25 22:22:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm	2011-05-06 08:09:10 +0000
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataelements>
-
-	#set( $count = 0 )
-	#foreach( $ocName in $optionComboNames )							
-		<dataelement>							
+	#foreach( $ocName in $optionComboNames )
+	#set( $count = $velocityCount - 1 )
+		<dataelement>
   			<id>$optionComboIds.get($count)</id>
   			<name>$encoder.xmlEncode( $ocName )</name>
   			<type>$encoder.xmlEncode( $optionComboType.get($count) )</type>
-		</dataelement>			
-		#set( $count = $count + 1 )		
+		</dataelement>	
 	#end
-
 </dataelements>
\ No newline at end of file