=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java	2011-07-08 07:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java	2011-07-08 08:34:57 +0000
@@ -40,14 +40,10 @@
 import org.hisp.dhis.dataentryform.DataEntryForm;
 import org.hisp.dhis.i18n.I18n;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
-import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.patient.PatientService;
 import org.hisp.dhis.patientdatavalue.PatientDataValue;
 import org.hisp.dhis.patientdatavalue.PatientDataValueService;
 import org.hisp.dhis.program.ProgramDataEntryService;
 import org.hisp.dhis.program.ProgramInstance;
-import org.hisp.dhis.program.ProgramInstanceService;
 import org.hisp.dhis.program.ProgramStage;
 import org.hisp.dhis.program.ProgramStageDataElement;
 import org.hisp.dhis.program.ProgramStageDataElementService;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java	2011-05-20 09:23:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java	2011-07-08 08:34:57 +0000
@@ -259,12 +259,7 @@
 
         patientIdentifier = patientIdentifierService.getPatientIdentifier( patient );
         
-        selectedStateManager.setSelectedPatient( patient );
-        
-        selectedStateManager.setSelectedProgram( program );
-
-        selectedStateManager.setSelectedProgramStage( programStage );
-
+        selectedStateManager.setSelectedProgramStageInstance( programStageInstance );
 
         Collection<PatientDataValue> patientDataValues = patientDataValueService.getPatientDataValues(
              programStageInstance );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/SelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/SelectedStateManager.java	2011-07-08 07:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/SelectedStateManager.java	2011-07-08 08:34:57 +0000
@@ -45,7 +45,7 @@
     // -------------------------------------------------------------------------
     // Patient
     // -------------------------------------------------------------------------
-    
+
     void setSelectedPatient( Patient patient );
 
     Patient getSelectedPatient();
@@ -61,7 +61,7 @@
     ProgramInstance getSelectedProgramInstance();
 
     void clearSelectedProgramInstance();
-    
+
     // -------------------------------------------------------------------------
     // Program-stage-instance
     // -------------------------------------------------------------------------
@@ -71,22 +71,31 @@
     ProgramStageInstance getSelectedProgramStageInstance();
 
     void clearSelectedProgramStageInstance();
-    
-    
-    
-    
+
+    // -------------------------------------------------------------------------
+    // Progam
+    // -------------------------------------------------------------------------
+
     void setSelectedProgram( Program program );
 
     Program getSelectedProgram();
 
     void clearSelectedProgram();
 
+    // -------------------------------------------------------------------------
+    // Progam-stages
+    // -------------------------------------------------------------------------
+
     void setSelectedProgramStage( ProgramStage programStage );
 
     ProgramStage getSelectedProgramStage();
 
     void clearSelectedProgramStage();
 
+    // -------------------------------------------------------------------------
+    // for searching patients
+    // -------------------------------------------------------------------------
+
     void setListAll( boolean listAll );
 
     boolean getListAll();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2011-07-08 07:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2011-07-08 08:34:57 +0000
@@ -71,9 +71,10 @@
 
   <bean id="org.hisp.dhis.caseentry.action.caseentry.SaveDateValueAction" class="org.hisp.dhis.caseentry.action.caseentry.SaveDateValueAction"
     scope="prototype">
+    <property name="programStageInstanceService" ref="org.hisp.dhis.program.ProgramStageInstanceService" />
     <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-    <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
     <property name="patientDataValueService" ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
+    <property name="selectedStateManager" ref="org.hisp.dhis.caseentry.state.SelectedStateManager" />
   </bean>
 
   <bean id="org.hisp.dhis.caseentry.action.caseentry.SaveProvidingFacilityAction" class="org.hisp.dhis.caseentry.action.caseentry.SaveProvidingFacilityAction"

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-07-08 07:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-07-08 08:34:57 +0000
@@ -189,4 +189,18 @@
 <script type="text/javascript">
     initCustomCheckboxes();
     DRAG_DIV.init(); 
-</script>
+	
+	var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
+	var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
+	var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';
+	var i18n_value_must_negative_integer = '$encoder.jsEscape( $i18n.getString( "value_must_negative_integer" ) , "'")';
+    var i18n_invalid_date =   '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")' + ".\n " 
+							+ '$encoder.jsEscape( $i18n.getString( "format_date" ) , "'")' + " '" 
+							+ dateFormat.replace('yy', 'yyyy') + " '" ; 
+    var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
+    var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
+    var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
+    var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
+    var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
+	var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
+	var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';</script>