=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-03-04 09:38:55 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-03-04 10:00:47 +0000 @@ -375,6 +375,10 @@ // Header grid.addHeader( new GridHeader( i18n.getString( "full_name" ), false, false ) ); + grid.addHeader( new GridHeader( i18n.getString( "gender" ), false, false ) ); + grid.addHeader( new GridHeader( i18n.getString( "date_of_birth" ), false, false ) ); + grid.addHeader( new GridHeader( i18n.getString( "age" ), false, false ) ); + grid.addHeader( new GridHeader( i18n.getString( "phone_number" ), false, false ) ); grid.addHeader( new GridHeader( i18n.getString( "date_scheduled" ), false, false ) ); String programStage = ""; @@ -386,10 +390,19 @@ grid.addRow(); grid.addValue( eventName ); grid.addValue( "" ); + grid.addValue( "" ); + grid.addValue( "" ); + grid.addValue( "" ); + grid.addValue( "" ); programStage = eventName; } grid.addRow(); - grid.addValue( stageInstance.getProgramInstance().getPatient().getFullName() ); + Patient patient = stageInstance.getProgramInstance().getPatient(); + grid.addValue( patient.getFullName() ); + grid.addValue( patient.getGender() ); + grid.addValue( DateUtils.getMediumDateString( patient.getBirthDate() ) ); + grid.addValue( patient.getAge() ); + grid.addValue( patient.getPhoneNumber() ); grid.addValue( DateUtils.getMediumDateString( stageInstance.getDueDate() ) ); } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-03-04 09:38:55 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-03-04 10:00:47 +0000 @@ -17,11 +17,16 @@ #set( $programStage = '' ) #foreach( $programStageInstance in $programStageInstances ) #set( $eventName = $programStageInstance.programStage.displayName ) + #set( $patient = $programStageInstance.programInstance.patient) #if( $eventName != $programStage)