=== 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-01 07:16:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-03-01 08:09:34 +0000
@@ -718,7 +718,7 @@
 		<action name="getPSDataElements"
 			class="org.hisp.dhis.patient.action.caseaggregation.GetPSDataElementsAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responsePSDataElements.vm
+				/dhis-web-maintenance-patient/responsePSDataElement.vm
 			</result>
 		</action>
 		

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseCaseAggOptionCapture.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseCaseAggOptionCapture.vm	2010-08-05 12:25:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseCaseAggOptionCapture.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataelements>
-	#foreach( $optionCombo in $optionCombos )
-    	<dataelement status="success">							
-      		<id>$optionCombo.id</id>
-      		<name>$optionCombo.name</name>
-    	</dataelement>
-	#end	
-</dataelements>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseExpression.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseExpression.vm	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseExpression.vm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<expression>$encoder.xmlEncode( $expression )</expression>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseGetDataElements.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseGetDataElements.vm	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseGetDataElements.vm	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<programStageDataElement>
-<dataElements>
-   #foreach( $dataElement in $listDataElement )
-      <dataElement id="$dataElement.id" type="$dataElement.type" shortName="$dataElement.shortName">$encoder.xmlEncode( $dataElement.name )</dataElement>
-    #end
-</dataElements>
-</programStageDataElement>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseMemberList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseMemberList.vm	2009-10-11 17:27:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseMemberList.vm	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<members>
-#foreach ( $member in $members )
-	<member>		
-		<fullName>$encoder.xmlEncode( $member.firstName ) $encoder.xmlEncode( $member.middleName ) $encoder.xmlEncode( $member.lastName )</fullName>	
-	</member>
-#end
-</members>

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseOptionCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseOptionCombo.vm	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseOptionCombo.vm	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-#set($count = 0)
-<optionCombo>
-  <categoryOptions>
-    #foreach( $optionComboId in $optionComboIds )
-      #set($optionComboName = $optionComboNames.get($count))	
-      <categoryOption id="$optionComboId">$encoder.xmlEncode( $optionComboName )</categoryOption>
-      #set($count = $count + 1)
-    #end
-  </categoryOptions>
-</optionCombo>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePSDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePSDataElement.vm	2012-03-01 07:16:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePSDataElement.vm	2012-03-01 08:09:34 +0000
@@ -4,7 +4,7 @@
 		<dataelement>
 			<id>[DE:$psId.$dataElement.id]</id>
 			<name>$encoder.xmlEncode( $dataElement.name )</name>
-			<optionset>$encoder.xmlEncode( $dataElement.optionSet.options )</optionset>
+			<optionset>$!dataElement.optionSet.options</optionset>
 		</dataelement>	
 	#end
 </dataelements>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSelProgramStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSelProgramStageList.vm	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSelProgramStageList.vm	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<programStage>
-  <dataElements>
-	    #foreach( $programStage in $listProgramStage )
-	      <dataElement id="$programStage.id">$encoder.xmlEncode( $programStage.name )</dataElement>
-	    #end
-  </dataElements>
-</programStage>
\ No newline at end of file