=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-09-27 08:00:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-10-22 06:58:24 +0000
@@ -45,7 +45,7 @@
 						<input type='button' class='patient-object' value='$value' onclick='javascript:showPatientHistory( "$programInstance.patient.id" );' title='$i18n.getString( "patient_dashboard" )'>
 					</td>
 					<td class='bold' name="toggleFlowBtn" style='cursor:pointer;font-size:25px' onclick="eventFlowToggle($programInstance.id)">
-						<a>&raquo;</a>
+						<a href='#'>&raquo;</a>
 					</td>
 					#set( $programStageInstances = $programInstance.programStageInstances )
 					<td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2012-10-18 04:49:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2012-10-22 06:58:24 +0000
@@ -108,7 +108,7 @@
 		showById("ps_" + id );
 	}
 	
-	jQuery(".table-flow").each( function(){
+	jQuery("#tb_" + programInstanceId + " .table-flow").each( function(){
 		var scheduledEvent = jQuery(this).find("[status='3']:first");
 		scheduledEvent.focus();
 	});

=== 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	2012-10-18 04:28:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2012-10-22 06:58:24 +0000
@@ -49,7 +49,6 @@
 
 <script type="text/javascript">
 	jQuery('#patientForm').ready(	function(){
-		showById('inputCriteriaDiv');
 		enable('validationBtn');
 		#if($programStageInstance.completed=='true') 
 			disable('completeBtn');