=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CompleteDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CompleteDataEntryAction.java 2012-05-23 15:02:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CompleteDataEntryAction.java 2012-09-07 09:53:13 +0000
@@ -99,11 +99,6 @@
ProgramStageInstance programStageInstance = programStageInstanceService
.getProgramStageInstance( programStageInstanceId );
- if ( programStageInstance == null )
- {
- return SUCCESS;
- }
-
programStageInstance.setCompleted( true );
programStageInstanceService.updateProgramStageInstance( programStageInstance );
@@ -113,7 +108,8 @@
// ProgramInstance
// ----------------------------------------------------------------------
- if ( !programStageInstance.getProgramInstance().getProgram().getType().equals( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) )
+ if ( !programStageInstance.getProgramInstance().getProgram().getType()
+ .equals( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) )
{
ProgramInstance programInstance = programStageInstance.getProgramInstance();
@@ -121,7 +117,7 @@
for ( ProgramStageInstance stageInstance : stageInstances )
{
- if ( !stageInstance.isCompleted() || stageInstance.getProgramStage().getIrregular() )
+ if ( !stageInstance.isCompleted() || stageInstance.getProgramStage().getIrregular() )
{
return SUCCESS;
}
@@ -132,7 +128,7 @@
programInstanceService.updateProgramInstance( programInstance );
}
-
- return SUCCESS;
+
+ return "programcompleted";
}
}
=== 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 2012-09-07 09:18:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-09-07 09:53:13 +0000
@@ -423,7 +423,7 @@
please_select_program_stage = Please select program stage
comment_added = Comment added
enroll_program = Enroll program
-comments_and_sms_message = Comments and SMS messages
+comments_and_sms_message = Comments and messages
no_message = No message
program_reports = Program reports
show_hide_content = Show/Hide content
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-09-07 07:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-09-07 09:53:13 +0000
@@ -68,9 +68,8 @@
+