=== 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-01-31 05:43:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-01-31 06:22:35 +0000
@@ -55,8 +55,8 @@
 							</select>
 						</td>
 					</tr>
-					<tr>
-						<td id='programStageIdLabel' class='textColumn'><label for="programStageId">$i18n.getString( "program_stage" )</label></td>
+					<tr id='programStageIdTR' >
+						<td class='textColumn'><label for="programStageId">$i18n.getString( "program_stage" )</label></td>
 						<td>
 							<select id="programStageId" name="programStageId" class="criteria" onchange="javascript:loadDataEntry();" >
 							</select>
@@ -72,8 +72,8 @@
 							</script>
 					</tr>
 					
-					<tr>
-						<td id='dueDateLabel' class='textColumn'><label for="dueDate">$i18n.getString( "due_date" ) </label></td>
+					<tr id='dueDateTR'>
+						<td class='textColumn'><label for="dueDate">$i18n.getString( "due_date" ) </label></td>
 						<td><input type="text" id="dueDate" name="dueDate" class="criteria" value="$!format.formatDate( $programStageInstance.dueDate )" readonly> </td>
 					</tr>
 				</table>

=== 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-01-31 05:43:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-01-31 06:22:35 +0000
@@ -37,6 +37,8 @@
 			if(singleEvent=='true')
 			{
 				byId('programStageId').selectedIndex = 1;
+				jQuery('#programStageIdTR').attr('class','hidden');
+				jQuery('#dueDateTR').attr('class','hidden');
 				enable('completeBtn');
 				enable('validationBtn');
 				
@@ -70,6 +72,10 @@
 				
 				disable('completeBtn');
 				disable('validationBtn');
+				
+				jQuery('#programStageIdTR').removeAttr('class');
+				jQuery('#dueDateTR').removeAttr('class');
+				
 			}
 			
 	});