=== 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-20 04:13:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-09-20 08:09:14 +0000
@@ -346,7 +346,7 @@
 			title: i18n_enroll_program,
 			maximize: true, 
 			closable: true,
-			modal:true,
+			modal:false,
 			overlay:{background:'#000000', opacity:0.1},
 			width: 500,
 			height: 200
@@ -415,8 +415,9 @@
 							+ "' type='" + type +"'"
 							+ " programStageInstanceId='" + programStageInstanceId + "'>"
 							+ " <td id='td_" + programInstanceId + "'>"
-							+ " <a href='javascript:loadActiveProgramStageRecords(" + programInstanceId + "," + programStageInstanceId + "')'>"
-							+ programName + "(" + enrollmentDate + ")</a></td>"
+							+ " <a href='javascript:loadActiveProgramStageRecords(" + programInstanceId + "," + programStageInstanceId + ")'>"
+							+ "<span id='infor_" + programInstanceId + "' class='selected bold'>" 
+							+ programName + "(" + enrollmentDate + ")</span></a></td>"
 							+ "</tr>";
 			
 			activedRow += "<tr id='tr2_" + programInstanceId +"'"+
@@ -548,8 +549,7 @@
 		data: "programInstanceId=" + programInstanceId,
 		success: function( json ) 
 		{
-			var completedRow = jQuery('#td_' + programInstanceId).html();
-			jQuery('#completedTB' ).prepend("<tr><td>" + completedRow + "</td></tr>");
+			jQuery('#completedList' ).append('<option value="' +  programInstanceId + '">' + getInnerHTML('infor_' + programInstanceId ) + '</option>');
 			hideById('tr1_' + programInstanceId );
 			hideById('tr2_' + programInstanceId );
 			hideById('programEnrollmentDiv');

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-09-20 03:00:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-09-20 08:09:14 +0000
@@ -1,8 +1,16 @@
 #if($programs.size()==0)
-	$i18n.getString("no_program_available_for_enrollment");
+	<table>
+		<tr>
+			<td>$i18n.getString("no_program_available_for_enrollment")</td>
+		</tr>
+	</table>
 #else
 <script>
-	jQuery(document).ready(	function(){
+	jQuery("#programEnrollmentSelectDiv").ready(function(){
+		validation( 'programEnrollmentSelectDiv', function(form){
+			form.submit();
+		});
+	
 		datePickerInRangeValid( 'dateOfIncidentField' , 'enrollmentDateField' );
 		setFieldValue("dateOfIncidentField", "");
 		var unSave = false;
@@ -18,7 +26,7 @@
 				<select id="programId" name="programId" onchange='programOnchange(this.value);'>
 					<option value="">[$i18n.getString( "select" )]</option>
 					#foreach( $program in $programs )
-					<option value="$program.id" type='$program.type' 
+					<option value="$program.id" programType='$program.type' 
 						displayIncidentDate='$!program.displayIncidentDate'
 						dateOfEnrollmentDescription='$!program.dateOfEnrollmentDescription'
 						dateOfIncidentDescription='$!program.dateOfIncidentDescription'>$encoder.htmlEncode( $program.name )</option>