=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-05-30 03:30:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-06-05 08:55:00 +0000
@@ -30,7 +30,7 @@
 <div class="actions">	
 	<input type="button" class='button' id="newEncounterBtn" value="$i18n.getString('create_new_encounter')" onClick="javascript: registerIrregularEncounter( getFieldValue('executionDate') );" disabled="disabled" >
 	<input type="button" class='button' id="validationBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();" disabled="disabled" >
-	<input type="button" class='button' id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" disabled="disabled" style="margin-bottom:10px">
+	<input type="button" class='button' id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" disabled="disabled" >
 	<input type="button" class='button' value="$i18n.getString( 'back_to_search' )" id='backBtnFromEntry' onclick="javascript:showSearchForm();" >
 </div>
 		
@@ -82,7 +82,6 @@
 
 </form>
 
-
 <div id='createNewEncounterDiv' class='hidden'>
 	<table>
 		<tr>

=== 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-06-04 10:03:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-06-05 08:55:00 +0000
@@ -11,8 +11,10 @@
 	setFieldValue('executionDate','');
 	setFieldValue('dueDate','');
 	disable('completeBtn');
+	disable('completeInBelowBtn');
 	disable('validationBtn');
 	disable('newEncounterBtn');
+	hideById('inputCriteriaDiv');
 		
 	var programId = jQuery('#dataRecordingSelectDiv [name=programId]').val();
 	if ( programId == 0 )
@@ -41,7 +43,7 @@
 				jQuery('#programStageIdTR').attr('class','hidden');
 				jQuery('#dueDateTR').attr('class','hidden');
 				enable('completeBtn');
-				enable('validationBtn');
+				enable('completeInBelowBtn');
 				hideById('historyPlanLink');
 				loadDataEntry();
 			}
@@ -70,11 +72,10 @@
 				showById('historyPlanLink');
 				
 				disable('completeBtn');
-				disable('validationBtn');
+				disable('completeInBelowBtn');
 				
 				jQuery('#programStageIdTR').removeAttr('class');
 				jQuery('#dueDateTR').removeAttr('class');
-				
 			}
 			
 	});
@@ -105,6 +106,7 @@
 	setFieldValue( 'executionDate', '' );
 	disable('validationBtn');
 	disable('completeBtn');
+	disable('completeInBelowBtn');
 	disable('newEncounterBtn');
 		
 	if( getFieldValue('programStageId') == null
@@ -124,14 +126,18 @@
 			var executionDate = jQuery('#dataRecordingSelectDiv input[id=executionDate]').val();
 			var completed = jQuery('#entryFormContainer input[id=completed]').val();
 			var irregular = jQuery('#entryFormContainer input[id=irregular]').val();
+			showById('inputCriteriaDiv');
+			enable('validationBtn');
 			
 			if( executionDate != '' && completed == 'false' )
 			{
 				enable('completeBtn');
+				enable('completeInBelowBtn');
 			}
 			else if( completed == 'true' )
 			{
 				disable('completeBtn');
+				disable('completeInBelowBtn');
 			}
 			
 			if( completed == 'true' && irregular == 'true' )
@@ -567,6 +573,7 @@
 				showWarningMessage( i18n_please_enter_report_date );
             }
 			hideById('dataEntryFormDiv');
+			hideById('inputCriteriaDiv');
         }
     }
 
@@ -625,6 +632,7 @@
 				function (data)
 				{
 					disable('completeBtn');
+					disable('completeInBelowBtn');
 					var irregular = jQuery('#entryFormContainer [name=irregular]').val();
 					if( irregular == 'true' )
 					{

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-05-30 07:10:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-06-05 08:55:00 +0000
@@ -58,6 +58,11 @@
 <div id='dataRecordingSelectDiv'></div>
 <div id='dataEntryFormDiv'></div>
 
+<div id='inputCriteriaDiv' class="page inputCriteria" style="display:none;width:480px;height:29px;">	
+	<input type="button" class='button' id="completeInBelowBtn" value="$i18n.getString('complete')" onClick="doComplete()" disabled="disabled">
+	<input type="button" class='button' id="validationBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();" >
+</div>
+
 #parse( "dhis-web-commons/loader/loader.vm" )
 
 <script type="text/javascript">