=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientLocationAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientLocationAction.java 2012-08-12 06:10:50 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientLocationAction.java 2013-06-11 05:55:48 +0000 @@ -29,6 +29,7 @@ import org.hisp.dhis.oust.manager.SelectionTreeManager; import org.hisp.dhis.patient.Patient; +import org.hisp.dhis.patient.PatientIdentifier; import org.hisp.dhis.patient.PatientService; import com.opensymphony.xwork2.Action; @@ -75,6 +76,20 @@ return patientId; } + private String systemIdentifier; + + public String getSystemIdentifier() + { + return systemIdentifier; + } + + private Patient patient; + + public Patient getPatient() + { + return patient; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -82,8 +97,17 @@ public String execute() throws Exception { - Patient patient = patientService.getPatient( patientId ); + patient = patientService.getPatient( patientId ); + for( PatientIdentifier identifier : patient.getIdentifiers() ) + { + if( identifier.getIdentifierType()== null) + { + systemIdentifier = identifier.getIdentifier(); + break; + } + } + selectionTreeManager.setSelectedOrganisationUnit( patient.getOrganisationUnit() ); return SUCCESS; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java 2013-06-10 09:32:43 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java 2013-06-11 05:55:48 +0000 @@ -32,7 +32,6 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-05-29 09:41:18 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-06-11 05:55:48 +0000 @@ -32,7 +32,12 @@ #if( $!patient.gender )
+ $patient.getFullName()+ |
+ ||
+ | $i18n.getString('gender'): | ++ #if($patient.gender=='F') + + #else + + #end + | +
+ | $i18n.getString('dob_type'): | +$!format.formatDate($!patient.birthDate) | +
+ | $i18n.getString('age'): | +$!patient.getAge() | +