=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm 2011-09-14 06:36:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm 2011-09-29 05:04:07 +0000 @@ -1,67 +1,67 @@ - + - + - + #foreach( $patientIdentifier in $partner.identifiers ) #end - + - + #foreach( $attribute in $partner.attributes ) #if( $patientAttributeValueMap.get( $attribute.id ) != " " ) - #end #end - + - + #foreach( $program in $partner.programs ) === 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-09-27 04:19:31 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm 2011-09-29 05:04:07 +0000 @@ -3,63 +3,63 @@
- + $partner.getFullName()
- + $i18n.getString($partner.gender)
- + $format.formatDate( $partner.birthDate )
- + $partner.getAge()
 
- : $patientIdentifier.identifier
 
+ $patientAttributeValueMap.get( $attribute.id )
 
- + - - - - - - - + - + #foreach( $patientIdentifier in $patient.identifiers ) #end - + - + #foreach( $attribute in $patient.attributes ) #if( $patientAttributeValueMap.get( $attribute.id ) != " " ) - + - + #foreach( $program in $patient.programs )
+ $patient.id
+ $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
 
+ #if($attribute.valueType=="YES/NO") $i18n.getString( $patientAttributeValueMap.get( $attribute.id ) ) #else @@ -70,9 +70,9 @@ #end #end -