=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java 2010-02-22 09:19:15 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java 2011-12-21 10:15:27 +0000 @@ -52,4 +52,5 @@ Collection get( ProgramStage programStage ); Collection getListDataElement( ProgramStage programStage ); + } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm 2011-12-21 09:21:08 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm 2011-12-21 10:15:27 +0000 @@ -1,26 +1,38 @@ - + - + + + + @@ -34,9 +46,11 @@ + #end @@ -49,6 +63,8 @@ #if( $patientAttributeValueMap.get( $attribute.id ) != " " ) + - - #foreach( $program in $patient.programs ) - - - - #end - + +
+ + + $patient.getFullName()
+ + + $i18n.getString($patient.gender)
+ $!patient.dobType
+ $format.formatDate( $!patient.birthDate )
+ #if($!patient.bloodGroup && !$patient.bloodGroup.equals("")) $patient.bloodGroup #else $i18n.getString('none') #end
- : $patientIdentifier.identifier + + $patientIdentifier.identifier
+ #if($attribute.valueType=="YES/NO") $i18n.getString( $patientAttributeValueMap.get( $attribute.id ) ) #else @@ -62,11 +78,10 @@
 
$program.name
+ #foreach( $program in $patient.programs ) + $program.name
+ #end +
\ No newline at end of file