=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-09-18 01:55:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-09-19 13:30:52 +0000
@@ -452,4 +452,5 @@
 one_month = 1 month
 remove_this_event = Remove this event
 overdue_scheduled = Overdue/Scheduled
-scheduled_overdue_incomplete = Scheduled/Overdue/Incomplete
\ No newline at end of file
+scheduled_overdue_incomplete = Scheduled/Overdue/Incomplete
+relationships = Relationships
\ No newline at end of file

=== 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-15 09:55:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-09-19 13:30:52 +0000
@@ -10,11 +10,10 @@
 			setFieldValue( 'dueDate', "$!format.formatDate( $programStageInstance.dueDate )" );
 			setFieldValue( 'executionDate', "$!format.formatDate( $programStageInstance.executionDate )" );
 		#end
-		
 		$('#executionDate').unbind("change");
 		$('#executionDate').change(function() {
-				saveExecutionDate( getFieldValue('programId'), getFieldValue('executionDate') );
-			});
+			saveExecutionDate( getFieldValue('programId'), getFieldValue('executionDate') );
+		});
 		
 		entryFormContainerOnReady();
 	});
@@ -29,7 +28,6 @@
 <input type='hidden' name='completed' id='completed' value='$!programStageInstance.completed'>
 <input type='hidden' name='programStageId' id='programStageId' value='$!programStageInstance.programStage.id'>
 
-
 <div id='entryForm' #if($!programStageInstance.executionDate) class='visible' #else class='hidden' #end>					
 	#if( $customDataEntryFormCode )
 		#parse( "/dhis-web-caseentry/customDataEntryForm.vm" )
@@ -52,5 +50,11 @@
 
 <script>
 	var i18n_create_new_event = '$encoder.jsEscape( $i18n.getString( "create_new_event" ) , "'" )';
+	#if( $programStageInstance.programInstance.completed=="true")
+		jQuery("[id=entryFormContainer] :input").prop('disabled', true);
+		jQuery("[id=entryFormContainer] :input").datepicker("destroy");
+		jQuery("[id=executionDate]").prop('disabled', true);
+		jQuery("[id=executionDate]").datepicker("destroy");
+	#end
 </script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-11 07:31:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-19 13:30:52 +0000
@@ -66,30 +66,20 @@
 										<td>$attributeValue.value</td>
 									</tr>
 									#end
-									
-									#foreach( $rel in $relationship )
-										#if($rel.patientA.id==$patient.id)
-											<tr>
-												<td>$rel.relationshipType.bIsToA</td>
-												<td>$rel.patientB.getFullName()</td>
-											</tr>
-										#else
-											<tr>
-												<td>$rel.relationshipType.aIsToB</td>
-												<td>$rel.patientA.getFullName()</td>
-											</tr>
-										#end
-									#end
 								</table>
 							</div>
 						</div>
 					</td>
-					<td class="link-area" style="vertical-align:top">
-						<div class="link-area" style='height:160px;border:none;'>
+					<td>
+						<div class="link-area" style='height:150px;'>
 							<table width='100%'>
-								<tr><th>$i18n.getString("active_programs")</th></tr>
+								<tr><th>
+										$i18n.getString("active_programs")
+										<input type='button' value='$i18n.getString("enroll_program")' onclick='showProgramEnrollmentForm( "$patient.id" )'/>
+									</th>
+								</tr>
 							</table>
-							<div class="contentProviderTable">
+							<div class="contentProviderTable" style='height:100px;'>
 								<table width='100%' id='activeTB'>
 									#foreach( $programInstance in $activeProgramInstances )
 										#set($programStageInstanceId = '')
@@ -129,14 +119,12 @@
 								</table>
 							</div>
 						</div>
-						<br><input type='button' value='$i18n.getString("enroll_program")' onclick='showProgramEnrollmentForm( "$patient.id" )'/>
-					</td>
-					<td>
-						<div class="link-area">
+						
+						<div class="link-area" style='height:100px;'>
 							<table width='100%'>
 								<tr><th>$i18n.getString("completed_programs")</th></tr>
 							</table>
-							<div class="contentProviderTable">
+							<div class="contentProviderTable" style='height:50px;'>
 								<table id='completedTB' width='100%'>
 									#foreach($programInstance in $completedProgramInstances)
 										#set($programStageInstanceId = '')
@@ -156,12 +144,35 @@
 							</div>
 						</div>
 					</td>
+					<td>
+						<div class="link-area">
+							<table width='100%'>
+								<tr><th>$i18n.getString("relationships")</th></tr>
+							</table>
+							<div class="contentProviderTable">
+								<table width='100%'>
+									#foreach( $rel in $relationship )
+										#if($rel.patientA.id==$patient.id)
+											<tr>
+												<td>$rel.relationshipType.bIsToA</td>
+												<td>$rel.patientB.getFullName()</td>
+											</tr>
+										#else
+											<tr>
+												<td>$rel.relationshipType.aIsToB</td>
+												<td>$rel.patientA.getFullName()</td>
+											</tr>
+										#end
+									#end
+								</table>
+							</div>
+						</div>
+					</td>
 				</tr>
 			</table>
 		</td>
 	</tr>
 </table>
 
-<p>&nbsp;</p>
 <div id='programEnrollmentDiv' class='hidden'></div>
 <div id='dataEntryFormDiv'></div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-09-13 13:49:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-09-19 13:30:52 +0000
@@ -196,8 +196,11 @@
 		#end
 		
 		#if( $programInstance.completed)
-			jQuery(":input").prop('disabled', true);
-			jQuery(":input").datepicker("destroy");
+			jQuery("[id=tab-2] :input").prop('disabled', true);
+			jQuery("[id=tab-3] :input").prop('disabled', true);
+			jQuery("[id=tab-4] :input").prop('disabled', true);
+			jQuery("[id=tab-5] :input").prop('disabled', true);
+			jQuery("[id=tab-3] :input").datepicker("destroy");
 		#else
 			datePickerInRangeValid( 'dateOfIncident' , 'enrollmentDate' );
 		#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-18 03:50:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-19 13:30:52 +0000
@@ -208,7 +208,7 @@
   padding-right:1px;
   padding-left:1px;
   padding-bottom:0px;
-  height:200px;
+  height:252px;
   width:350px;
   overflow:hidden;
   position:relative;
@@ -216,8 +216,8 @@
 
 .contentProviderTable
 {
-  height: 150px;
-  width: 340px;
+  height: 202px;
+  width: 350px;
   overflow-y: auto;
   overflow-x:hidden;
 }