=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2013-01-28 05:28:45 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2013-06-12 04:19:18 +0000 @@ -39,7 +39,11 @@
- $patient.getFullName()- |
+ + | $i18n.getString('full_name'): | +$patient.getFullName() | ||
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-06-06 04:44:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-06-12 04:19:18 +0000 @@ -20,6 +20,15 @@ | $encoder.htmlEncode($programStageInstance.programInstance.patient.getFullName()) ( $programStageInstance.programInstance.patient.gender ) | ||||
$i18n.getString("gender") | +#if($patient.gender=='F') + + #else + + #end + | +||||
$i18n.getString( "date_of_birth" ): | $format.formatDate( $programStageInstance.programInstance.patient.birthDate ) ( $programStageInstance.programInstance.patient.getAge() ) | ||||
$i18n.getString( "gender" ): | -$i18n.getString( $patient.gender ) | +#if($patient.gender=='F') + + #else + + #end + | |||
$i18n.getString( "date_of_birth" ): | === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2013-03-07 16:01:54 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm 2013-06-12 04:19:18 +0000 @@ -19,7 +19,12 @@|||||
$i18n.getString( "gender" ): | -$i18n.getString( $patient.gender ) | + | #if($patient.gender=='F') + + #else + + #end + | ||
$i18n.getString( "date_of_birth" ): | === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2013-05-29 14:28:47 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2013-06-12 04:19:18 +0000 @@ -11,7 +11,13 @@ $i18n.getString( "full_name" ):- $encoder.htmlEncode( $patient.getFullName() ) ( $i18n.getString( "$patient.gender" ) ) + $encoder.htmlEncode( $patient.getFullName() ) + ( #if($patient.gender=='F') + + #else + + #end + ) | $i18n.getString('program'): | $program.displayName |