------------------------------------------------------------
revno: 13437
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Fri 2013-12-27 11:01:23 +0700
message:
Fixed bug - Person identifier types cannot be re-used across programs.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowAddProgramFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowUpdateProgramFormAction.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-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowAddProgramFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowAddProgramFormAction.java 2013-10-25 05:00:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowAddProgramFormAction.java 2013-12-27 04:01:23 +0000
@@ -143,22 +143,15 @@
programs = new ArrayList<Program>( programService.getAllPrograms() );
programs.removeAll( programService.getPrograms( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) );
Collections.sort( programs, IdentifiableObjectNameComparator.INSTANCE );
-
-
+
availableAttributes = patientAttributeService.getAllPatientAttributes();
-
availableIdentifierTypes = patientIdentifierTypeService.getAllPatientIdentifierTypes();
- for ( Program p : programs )
- {
- availableIdentifierTypes
- .removeAll( new HashSet<PatientIdentifierType>( p.getPatientIdentifierTypes() ) );
- }
-
+
userGroups = new ArrayList<UserGroup>( userGroupService.getAllUserGroups() );
-
- relationshipTypes = new ArrayList<RelationshipType>(relationshipTypeService.getAllRelationshipTypes());
+
+ relationshipTypes = new ArrayList<RelationshipType>( relationshipTypeService.getAllRelationshipTypes() );
Collections.sort( relationshipTypes, IdentifiableObjectNameComparator.INSTANCE );
-
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowUpdateProgramFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowUpdateProgramFormAction.java 2013-10-25 05:00:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowUpdateProgramFormAction.java 2013-12-27 04:01:23 +0000
@@ -202,24 +202,18 @@
program = programService.getProgram( id );
availableIdentifierTypes = patientIdentifierTypeService.getAllPatientIdentifierTypes();
+ availableIdentifierTypes.removeAll( new HashSet<PatientIdentifierType>( program.getPatientIdentifierTypes() ) );
availableAttributes = patientAttributeService.getAllPatientAttributes();
availableAttributes.removeAll( new HashSet<PatientAttribute>( program.getPatientAttributes() ) );
-
+
programs = new ArrayList<Program>( programService.getAllPrograms() );
programs.removeAll( programService.getPrograms( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) );
-
- for ( Program p : programs )
- {
- availableIdentifierTypes
- .removeAll( new HashSet<PatientIdentifierType>( p.getPatientIdentifierTypes() ) );
- }
-
- userGroups = new ArrayList<UserGroup>( userGroupService.getAllUserGroups() );
-
programs.remove( program );
Collections.sort( programs, IdentifiableObjectNameComparator.INSTANCE );
+ userGroups = new ArrayList<UserGroup>( userGroupService.getAllUserGroups() );
+
relationshipTypes = new ArrayList<RelationshipType>( relationshipTypeService.getAllRelationshipTypes() );
Collections.sort( relationshipTypes, IdentifiableObjectNameComparator.INSTANCE );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
