dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12131
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-09-18 16:04:09 +0700
message:
  clean code
modified:
  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/mobile/service/ActivityReportingServiceImpl.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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	2013-09-12 07:19:15 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Patient.java	2013-09-18 09:04:09 +0000
@@ -69,10 +69,6 @@
 
     private List<Program> programs;
 
-    //private List<Integer> programsID;
-
-    //private Map<Integer, String> patientDataValues;
-
     private List<Program> enrollmentPrograms;
 
     private List<Relationship> relationships;
@@ -109,26 +105,6 @@
         this.programs = programs;
     }
 
-    /*public List<Integer> getProgramsID()
-    {
-        return programsID;
-    }
-
-    public void setProgramsID( List<Integer> programsID )
-    {
-        this.programsID = programsID;
-    }
-    
-    public Map<Integer, String> getPatientDataValues()
-    {
-        return patientDataValues;
-    }
-
-    public void setPatientDataValues( Map<Integer, String> patientDataValues )
-    {
-        this.patientDataValues = patientDataValues;
-    }*/
-
     public List<Relationship> getRelationships()
     {
         return relationships;
@@ -332,8 +308,6 @@
         {
             dout.writeBoolean( false );
         }
-        // doesn't transfer blood group to client
-        dout.writeBoolean( false );
 
         if ( registrationDate != null )
         {
@@ -389,20 +363,6 @@
         {
             each.serialize( dout );
         }
-        
-        /*dout.writeInt( programsID.size() );
-        for ( Integer each : programsID )
-        {
-            dout.writeInt( each );
-        }
-
-        // Write Patient Data Value
-        dout.writeInt( patientDataValues.keySet().size() );
-        for ( Integer key : patientDataValues.keySet() )
-        {
-            dout.writeInt( key );
-            dout.writeUTF( patientDataValues.get( key ) );
-        }*/
 
         // Write Relationships
         dout.writeInt( relationships.size() );
@@ -486,9 +446,6 @@
             this.setBirthDate( null );
         }
 
-        // doesn't transfer blood group to client
-        din.readBoolean();
-
         // Registration Date
         if ( din.readBoolean() )
         {

=== 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	2013-09-18 03:49:35 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2013-09-18 09:04:09 +0000
@@ -884,7 +884,6 @@
                         new ArrayList<String>() ) );
                 }
             }
-
         }
 
         // Set all identifier
@@ -976,20 +975,12 @@
                 relationshipMobile.setName( eachRelationship.getRelationshipType().getaIsToB() );
                 relationshipMobile.setPersonBName( eachRelationship.getPatientB().getName() );
                 relationshipMobile.setPersonBId( eachRelationship.getPatientB().getId() );
-                // relationshipMobile.setPersonAName(
-                // eachRelationship.getPatientA().getName() );
-                // relationshipMobile.setPersonAId(
-                // eachRelationship.getPatientA().getId() );
             }
             else
             {
                 relationshipMobile.setName( eachRelationship.getRelationshipType().getbIsToA() );
                 relationshipMobile.setPersonBName( eachRelationship.getPatientA().getName() );
                 relationshipMobile.setPersonBId( eachRelationship.getPatientA().getId() );
-                // relationshipMobile.setPersonAName(
-                // eachRelationship.getPatientB().getName() );
-                // relationshipMobile.setPersonAId(
-                // eachRelationship.getPatientB().getId() );
             }
             relationshipList.add( relationshipMobile );
         }