dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3293
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-04-06 14:55:28 +0700
message:
  Fix bug: NBITS - The selected program may disappear after user select program-stage several times.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CustomDataEntryAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties


--
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/caseentry/CustomDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CustomDataEntryAction.java	2011-03-31 05:48:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CustomDataEntryAction.java	2011-04-06 07:55:28 +0000
@@ -155,6 +155,18 @@
         return id;
     }
 
+    private Integer programId;
+
+    public void setProgramId( Integer programId )
+    {
+        this.programId = programId;
+    }
+
+    public Integer getProgramId()
+    {
+        return programId;
+    }
+
     private Integer programStageId;
 
     public Integer getProgramStageId()
@@ -308,8 +320,8 @@
         patient = patientService.getPatient( id );
 
         patientIdentifier = patientIdentifierService.getPatientIdentifier( patient );
-        
-        program = selectedStateManager.getSelectedProgram( );
+
+        program = selectedStateManager.getSelectedProgram();
 
         programStage = programStageService.getProgramStage( programStageId );
 

=== 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	2011-04-06 06:44:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2011-04-06 07:55:28 +0000
@@ -72,7 +72,7 @@
 report_management 												= Report Management
 name_based_data_entry 											= Name based data entry
 visit_plan 														= Visit Plans
-intro_data_entry 												= Enter data for Beneficiaries and their respective programs and program stages.
+intro_data_entry 												= Enter data for beneficiaries and their respective programs and program stages.
 intro_summary_report 											= View the summary report to get an overview of the services provided for a program.
 intro_visit_plan 												= View the visit plan to get an overview of outstanding, pending and completed visits.
 use_default_form 												= Use default form
@@ -295,4 +295,4 @@
 blood_group														= Blood group
 program_stage_lack_data_elements 								= The program stage lack data elements 
 multiple_dataentry												= Multiple Data Entry
-intro_multiple_dataentry 										= Enter data for Beneficiaries by selecting a program and program stages.
+intro_multiple_dataentry 										= Enter data for beneficiaries by selecting a program.