=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-09-24 14:44:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-09-25 02:08:39 +0000
@@ -56,8 +56,5 @@
 		jQuery("[id=executionDate]").prop('disabled', true);
 		jQuery("[id=executionDate]").datepicker("destroy");
 	#end
-	#if( $programStageInstance.executionDate)
-		showById('inputCriteriaDiv');
-	#end
 </script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-09-21 07:44:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-09-25 02:08:39 +0000
@@ -453,8 +453,8 @@
 					var fieldId = "value_" + programStageInstanceId + "_date";
 					jQuery("#" + fieldId).css('background-color', SUCCESS_COLOR);
 					jQuery('#executionDate').val(executionDate);
-					
 					jQuery("#org_" + programStageInstanceId ).html(getFieldValue("orgunitName"));
+					showById('inputCriteriaDiv');
 					
 					handleResponse (result);
 			   },

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-09-24 10:15:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-09-25 02:08:39 +0000
@@ -222,13 +222,17 @@
 			{
 				disable('validationBtn');
 			}
-			else if( executionDate != '' && completed == 'false' )
-			{
-				disableCompletedButton(false);
-			}
-			else if( completed == 'true' )
-			{
-				disableCompletedButton(true);
+			else if( executionDate != ''){
+				showById('inputCriteriaDiv');
+				if ( completed == 'false' )
+				{
+					disableCompletedButton(false);
+				}
+				else if( completed == 'true' )
+				{
+					showById('inputCriteriaDiv');
+					disableCompletedButton(true);
+				}
 			}
 			resize();
 			hideLoader();