=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Patient.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Patient.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Patient.java 2014-05-09 09:08:45 +0000 @@ -49,6 +49,8 @@ private int id; private String organisationUnitName; + + private String trackedEntityName; private List attributes = new ArrayList(); @@ -113,6 +115,16 @@ this.organisationUnitName = organisationUnitName; } + public String getTrackedEntityName() + { + return trackedEntityName; + } + + public void setTrackedEntityName( String trackedEntityName ) + { + this.trackedEntityName = trackedEntityName; + } + public List getEnrollmentPrograms() { return enrollmentPrograms; @@ -146,6 +158,7 @@ dout.writeInt( this.getId() ); dout.writeUTF( this.getOrganisationUnitName() ); + dout.writeUTF( this.getTrackedEntityName() ); // Write Patient Attribute dout.writeInt( attributes.size() ); @@ -185,6 +198,7 @@ { this.setId( din.readInt() ); this.setOrganisationUnitName( din.readUTF() ); + this.setTrackedEntityName( din.readUTF() ); // Read Attribute int attsNumb = din.readInt(); === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-05-08 04:49:26 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-05-09 09:08:45 +0000 @@ -414,13 +414,6 @@ for ( TrackedEntityInstance patient : patients ) { - System.out.println( "----------------------------------------------------------------------------" ); - System.out.println( "Display Name: " + patient.getDisplayName() ); - System.out.println( "Name: " + patient.getName() ); - System.out.println( "Tracked Entity Display Name: " + patient.getTrackedEntity().getDisplayName() ); - System.out.println( "Tracked Entity Name: " + patient.getTrackedEntity().getName() ); - System.out.println( "----------------------------------------------------------------------------" ); - resultSet += patient.getId() + "/"; String attText = ""; for ( TrackedEntityAttribute displayAttribute : displayAttributes ) @@ -765,6 +758,11 @@ { patientModel.setOrganisationUnitName( patient.getOrganisationUnit().getName() ); } + + if ( patient.getTrackedEntity() != null ) + { + patientModel.setTrackedEntityName( patient.getTrackedEntity().getName() ); + } this.setSetting( getSettings() );