------------------------------------------------------------ revno: 10680 committer: Tran Chau <tran.hispviet...@gmail.com> branch nick: dhis2 timestamp: Wed 2013-04-24 16:20:40 +0700 message: Error when to enroll a person into a single event with registration program. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.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/patient/SaveProgramEnrollmentAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java 2013-04-10 03:13:47 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java 2013-04-24 09:20:40 +0000 @@ -201,7 +201,8 @@ Date dueDate = DateUtils .getDateAfterAddition( dateCreatedEvent, programStage.getMinDaysFromStart() ); - if ( !(program.getIgnoreOverdueEvents() && dueDate.before( currentDate )) ) + if ( !program.getIgnoreOverdueEvents() + || !(program.getIgnoreOverdueEvents() && dueDate.before( currentDate )) ) { ProgramStageInstance programStageInstance = new ProgramStageInstance(); programStageInstance.setProgramInstance( programInstance ); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-04-24 08:29:12 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-04-24 09:20:40 +0000 @@ -635,4 +635,5 @@ intro_program_stage_completeness = Monitor completeness of events by program program_stage_completeness_form = Program stage completeness number_of_events = Number of events -followup = Follow-up \ No newline at end of file +followup = Follow-up +filter_on_section = Filter on section \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java 2013-04-11 03:23:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java 2013-04-24 09:20:40 +0000 @@ -221,7 +221,7 @@ { minDaysFromStart = (minDaysFromStart == null) ? 0 : minDaysFromStart; irregular = (irregular == null) ? false : irregular; - autoGenerateEvent = (autoGenerateEvent == null) ? false : autoGenerateEvent; + autoGenerateEvent = (autoGenerateEvent == null) ? true : autoGenerateEvent; validCompleteOnly = (validCompleteOnly == null) ? false : validCompleteOnly; displayGenerateEventBox = (displayGenerateEventBox == null) ? false : displayGenerateEventBox; captureCoordinates = (captureCoordinates == null) ? false : captureCoordinates;
_______________________________________________ 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