=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2013-03-21 08:12:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2013-03-21 13:37:38 +0000
@@ -46,7 +46,7 @@
 			<tr>
 				<td><label>$i18n.getString('from')</label></td>
 				<td>
-					<input type="text" id='startDate' name='startDate' style="width:240px;" />
+					<input type="text" id='startDate' name='startDate' style="width:260px;" />
 				</td>
                 <td style="padding-left: 20px;">
                     <input type="checkbox" id="incompleted" name="incompleted" value="true">$i18n.getString("incomplete")</input>
@@ -55,7 +55,7 @@
             <tr>
 				<td><label>$i18n.getString('to')</label></td>
 				<td>
-					<input type="text" id='endDate' name='endDate' style="width:240px;" />
+					<input type="text" id='endDate' name='endDate' style="width:260px;" />
 				</td>
 				<td style="padding-left: 20px;">
 					<input type="button" class='large-button' style="width: 145px;" id='filterBtn' name="filterBtn" value='$i18n.getString( "show_filter" )' onclick="showFilterForm();" />

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm	2013-03-07 13:46:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm	2013-03-21 13:37:38 +0000
@@ -54,7 +54,7 @@
 			#elseif( $programStageDataElement.dataElement.type == "trueOnly" )
 				<input name="entryfield" type="checkbox" data="{compulsory: $programStageDataElement.compulsory, deType:'$programStageDataElement.dataElement.getType()'}" id="$id" name="entryfield" #if($patientDataValue.value=="true") checked #end onchange="saveVal( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
 			#elseif( $programStageDataElement.dataElement.type == "date" )
-				<input name="entryfield" type="text" data="{compulsory: $programStageDataElement.compulsory }" id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="date-field datefield" />
+				<input name="entryfield" type="text" data="{compulsory: $programStageDataElement.compulsory, deType:'$programStageDataElement.dataElement.getType()' }" id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="date-field datefield" />
 				<script type="text/javascript">
 					datePicker($programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val', false, false);
 				</script> 

=== 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	2013-03-15 04:08:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-03-21 13:37:38 +0000
@@ -73,6 +73,10 @@
                 return;
             }
         }
+		else if(type=='date')
+		{
+			field.focus();
+		}
     	
     }
     
@@ -183,7 +187,7 @@
             }
         }
     }
-   
+	
     if ( key == 13 )
     { 
         nextField = getNextEntryField( field );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2013-03-07 13:46:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2013-03-21 13:37:38 +0000
@@ -1,3 +1,4 @@
+#set( $tabIndex = 1 )
 #foreach( $section in $sections )
 	<table class="formSection" width='80%'>
 		<tr>
@@ -30,7 +31,6 @@
 						</thead>
 			#set( $dataElementRowCount = 0 )
 			#set( $mark = true )
-			#set( $tabIndex = 1 )
 			#foreach( $programStageDataElement in $section.programStageDataElements )
 						#set( $dataElementRowCount = $dataElementRowCount + 1 )    
 						#set( $mark = !$mark )
@@ -67,7 +67,7 @@
 								#elseif( $programStageDataElement.dataElement.type == "trueOnly" )
 									<input name="entryfield" type="checkbox" data="{compulsory: $programStageDataElement.compulsory, deType:'$programStageDataElement.dataElement.getType()'}" id="$id" name="entryfield" #if($patientDataValue.value=="true") checked #end onchange="saveVal( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
 								#elseif( $programStageDataElement.dataElement.type == "date" )
-									<input name="entryfield" type="text" data="{compulsory: $programStageDataElement.compulsory }" id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="date-field datefield" >
+									<input name="entryfield" type="text" data="{compulsory: $programStageDataElement.compulsory, deType:'$programStageDataElement.dataElement.getType()'}" id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="date-field datefield" >
 									<script type="text/javascript">
 										datePicker($programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val', false, false);
 									</script> 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm	2013-03-20 13:45:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm	2013-03-21 13:37:38 +0000
@@ -107,7 +107,7 @@
 											#elseif( $programStageDataElement.dataElement.type == "trueOnly" )
 												<input name="entryfield" type="checkbox" id="$id" class="{validate:{$validate}}" >
 											#elseif( $programStageDataElement.dataElement.type == "date" )
-												<input name="entryfield" class='datefield' type="text" id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )"class="{validate:{$validate}}">
+												<input name="entryfield" class='datefield' type="text" id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" class="{validate:{$validate}}">
 												<script type="text/javascript">
 													datePicker( $programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val', false, false);
 												</script>