dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14593
committer: sherylyn.marie
branch nick: trunk
timestamp: Wed 2014-04-02 07:30:59 +0800
message:
  Implementation: J2ME Tracker 2.15 (History)
  https://blueprints.launchpad.net/dhis-mobile/+spec/j2me-tracker-2.15
modified:
  dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.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/PatientAttribute.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.java	2014-03-31 10:24:23 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.java	2014-04-01 23:30:59 +0000
@@ -55,12 +55,13 @@
     // Constructors
     // -------------------------------------------------------------------------
 
-    public PatientAttribute( String name, String value, String type, boolean isMandatory, OptionSet optionSet )
+    public PatientAttribute( String name, String value, String type, boolean isMandatory, boolean isDisplayedInList, OptionSet optionSet )
     {
         this.name = name;
         this.value = value;
         this.type = type;
         this.isMandatory = isMandatory;
+        this.isDisplayedInList = isDisplayedInList;
         this.optionSet = optionSet;
     }
 

=== 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-03-31 07:36:28 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2014-04-01 23:30:59 +0000
@@ -760,9 +760,9 @@
             if ( value != null )
             {
                 org.hisp.dhis.api.mobile.model.PatientAttribute patientAttribute = new org.hisp.dhis.api.mobile.model.PatientAttribute(
-                    value.getAttribute().getName(), value.getValue(), value.getAttribute().getValueType(), false,
-                    new OptionSet() );
-                
+                    value.getAttribute().getName(), value.getValue(), value.getAttribute().getValueType(), false, value
+                        .getAttribute().getDisplayInListNoProgram(), new OptionSet() );
+
                 patientAtts.add( patientAttribute );
             }
         }
@@ -1388,7 +1388,8 @@
 
         for ( TrackedEntityAttribute patientAtt : getPatientAtts( null ) )
         {
-            list.add( new PatientAttribute( patientAtt.getName(), null, patientAtt.getValueType(), false, new OptionSet() ) );
+            list.add( new PatientAttribute( patientAtt.getName(), null, patientAtt.getValueType(), false, patientAtt
+                .getDisplayInListNoProgram(), new OptionSet() ) );
         }
 
         return list;
@@ -1407,7 +1408,7 @@
             patientAttribute.setName( name );
             patientAttribute.setType( pa.getValueType() );
             patientAttribute.setValue( "" );
-           
+
             list.add( patientAttribute );
         }
         return list;
@@ -1675,8 +1676,8 @@
                 && lostEvent.getSMS() != null )
             {
                 List<User> recipientsList = new ArrayList<User>();
-                for ( TrackedEntityAttributeValue attrValue : programStageInstance.getProgramInstance().getEntityInstance()
-                    .getAttributeValues() )
+                for ( TrackedEntityAttributeValue attrValue : programStageInstance.getProgramInstance()
+                    .getEntityInstance().getAttributeValues() )
                 {
                     if ( attrValue.getAttribute().getValueType().equals( "phoneNumber" ) )
                     {