=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/RemoveRepresentativeAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/RemoveRepresentativeAction.java 2011-09-14 06:36:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/RemoveRepresentativeAction.java 2012-10-03 08:00:10 +0000 @@ -68,8 +68,8 @@ throws Exception { Patient patient = patientService.getPatient( patientId ); - patient.setRepresentative( null ); + patient.setUnderAge( false ); patientService.updatePatient( patient ); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveRepresentativeAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveRepresentativeAction.java 2011-09-14 06:36:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveRepresentativeAction.java 2012-10-03 08:00:10 +0000 @@ -99,8 +99,8 @@ Patient representative = patientService.getPatient( representativeId ); patient = patientService.getPatient( patientId ); - patient.setRepresentative( representative ); + patient.setUnderAge( true ); if ( copyAttribute ) { === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-10-03 07:06:54 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-10-03 08:00:10 +0000 @@ -87,7 +87,6 @@ please_specify_an_orgunit=Please specify an organisation unit please_select_to_date_greater_or_equals_to_from_date=Please select to-date later or equal to from-date violate_validation=Violating validation -common_info=Common information dob_type=DOB type intro_multiple_individual_records=Enter data for multiple program stages and persons for a program. The entry screen gives an overview of the stage status. in=In === 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 2012-06-15 07:11:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm 2012-10-03 08:00:10 +0000 @@ -1,32 +1,29 @@
- | ||
- - $partner.getFullName() - | -||
- - $i18n.getString($partner.gender) - | -||
- - $format.formatDate( $partner.birthDate ) - | -||
- - $partner.getAge() - | ++ | |
$i18n.getString( "full_name" ) | +: $partner.getFullName() | +|
$i18n.getString( "gender" ) | +: $i18n.getString($partner.gender) | +|
$i18n.getString( "date_of_birth" ) | +: $format.formatDate( $partner.birthDate ) | +|
$i18n.getString( "age" ) | +: $partner.getAge() | +|
$i18n.getString( "phone_number" ) | +: $!patient.phoneNumber | |
- - : $patientIdentifier.identifier | +: $patientIdentifier.identifier | |
- | ||
- $patientAttributeValueMap.get( $attribute.id ) - | +||
$attribute.name | +: $patientAttributeValueMap.get( $attribute.id ) | +|
- | ||
$program.name | -: + #foreach( $program in $partner.programs ) + $program.name + #end + | + +|