------------------------------------------------------------
revno: 9605
committer: Tran Chau <[email protected]>
branch nick: dhis2
timestamp: Thu 2013-01-24 20:47:32 +0700
message:
Minor fix.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.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/UpdateProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2013-01-23 04:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2013-01-24 13:47:32 +0000
@@ -201,9 +201,17 @@
program.setType( type );
program.setDisplayProvidedOtherFacility( displayProvidedOtherFacility );
program.setDisplayIncidentDate( displayIncidentDate );
- program.setGeneratedByEnrollmentDate( generateBydEnrollmentDate );
- program.setIgnoreOverdueEvents( ignoreOverdueEvents );
program.setBlockEntryForm( blockEntryForm );
+ if ( type == Program.MULTIPLE_EVENTS_WITH_REGISTRATION )
+ {
+ program.setGeneratedByEnrollmentDate( generateBydEnrollmentDate );
+ program.setIgnoreOverdueEvents( ignoreOverdueEvents );
+ }
+ else
+ {
+ program.setGeneratedByEnrollmentDate( true );
+ program.setIgnoreOverdueEvents( false );
+ }
List<PatientIdentifierType> identifierTypes = new ArrayList<PatientIdentifierType>();
List<PatientAttribute> patientAttributes = new ArrayList<PatientAttribute>();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
