=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Program.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Program.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/Program.java 2014-05-06 06:48:29 +0000 @@ -57,6 +57,8 @@ private String dateOfEnrollmentDescription = "Date of Enrollment"; private String dateOfIncidentDescription = "Date of Incident"; + + private String trackedEntityName = "Tracked Entity"; private List programStages = new ArrayList(); @@ -121,6 +123,16 @@ { this.dateOfIncidentDescription = dateOfIncidentDescription; } + + public String getTrackedEntityName() + { + return trackedEntityName; + } + + public void setTrackedEntityName( String trackedEntityName ) + { + this.trackedEntityName = trackedEntityName; + } public List getProgramAttributes() { @@ -141,6 +153,7 @@ dout.writeInt( this.getType() ); dout.writeUTF( getDateOfEnrollmentDescription() ); dout.writeUTF( getDateOfIncidentDescription() ); + dout.writeUTF( getTrackedEntityName() ); // Write program stage dout.writeInt( programStages.size() ); @@ -169,6 +182,7 @@ this.setType( dataInputStream.readInt() ); this.setDateOfEnrollmentDescription( dataInputStream.readUTF() ); this.setDateOfIncidentDescription( dataInputStream.readUTF() ); + this.setTrackedEntityName( dataInputStream.readUTF() ); // Read program stage int programStageNumber = dataInputStream.readInt(); === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java 2014-04-15 07:23:09 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java 2014-05-06 06:48:29 +0000 @@ -190,6 +190,10 @@ pr.setVersion( program.getVersion() ); pr.setDateOfEnrollmentDescription( program.getDateOfEnrollmentDescription() ); pr.setDateOfIncidentDescription( program.getDateOfIncidentDescription() ); + if( program.getTrackedEntity() != null && program.getTrackedEntity().getName() != null) + { + pr.setTrackedEntityName( program.getTrackedEntity().getName() ); + } List prStgs = new ArrayList();