dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12775
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-10-21 10:23:55 +0700
message:
  Add identifier-types and dynamic attributes which belong to the selected program into 
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.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-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.java	2013-10-16 19:49:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.java	2013-10-21 03:23:55 +0000
@@ -155,19 +155,11 @@
 
         if ( program != null && program.isRegistration() )
         {
-            identifierTypes = identifierTypeService.getAllPatientIdentifierTypes();
-            patientAttributes = attributeService.getAllPatientAttributes();
-
-            Collection<Program> programs = programService.getAllPrograms();
-            programs.remove( program );
-
-            for ( Program _program : programs )
-            {
-                identifierTypes.removeAll( _program.getPatientIdentifierTypes() );
-                patientAttributes.removeAll( _program.getPatientAttributes() );
-            }
+            identifierTypes = program.getPatientIdentifierTypes();
+            patientAttributes = program.getPatientAttributes();
+
         }
-        
+
         return SUCCESS;
     }
 }