dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24279
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11870: Fixed build fail.
------------------------------------------------------------
revno: 11870
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-03 08:20:58 +0700
message:
Fixed build fail.
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.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-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2013-09-03 01:20:58 +0000
@@ -457,7 +457,7 @@
programStageInstance.setProgramStage( programStage );
Date dateCreatedEvent = sdf.parseDateTime( incidentDate ).toDate();
- if ( program.getGeneratedByEnrollmentDate() )
+ if ( programStage.getGeneratedByEnrollmentDate() )
{
dateCreatedEvent = sdf.parseDateTime( enrollmentDate ).toDate();
}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.java 2013-09-03 01:20:58 +0000
@@ -267,7 +267,7 @@
}
if ( this.listOfProgramStageSections.size() == 0 && programStageInstance.isCompleted() == true
- && programStage.getProgram().getBlockEntryForm() )
+ && programStage.getBlockEntryForm() )
{
return REDIRECT_COMPLETED_FORM;
}