=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetSelectedOrgunitAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetSelectedOrgunitAction.java	2011-05-10 07:25:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetSelectedOrgunitAction.java	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004-2009, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.caseentry.action.caseentry;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * @version $ GetSelectedOrgunitAction.java May 7, 2011 12:39:43 PM $
- * 
- */
-public class GetSelectedOrgunitAction
-implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private OrganisationUnitSelectionManager selectionManager;
-
-    public void setSelectionManager( OrganisationUnitSelectionManager selectionManager )
-    {
-        this.selectionManager = selectionManager;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private OrganisationUnit organisationUnit;
-
-    public OrganisationUnit getOrganisationUnit()
-    {
-        return organisationUnit;
-    }
-
-    // -------------------------------------------------------------------------
-    // Implementation Action
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        organisationUnit = selectionManager.getSelectedOrganisationUnit();
-        
-        return SUCCESS;
-    }
-}
-

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2011-07-15 08:43:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2011-07-25 06:49:16 +0000
@@ -28,11 +28,6 @@
     <property name="patientAttributeService" ref="org.hisp.dhis.patient.PatientAttributeService" />
   </bean>
 
-  <bean id="org.hisp.dhis.caseentry.action.caseentry.GetSelectedOrgunitAction" class="org.hisp.dhis.caseentry.action.caseentry.GetSelectedOrgunitAction"
-    scope="prototype">
-    <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
-  </bean>
-
   <bean id="org.hisp.dhis.caseentry.action.caseentry.ValidateSearchAction" class="org.hisp.dhis.caseentry.action.caseentry.ValidateSearchAction"
     scope="prototype">
     <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2011-07-15 08:07:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2011-07-25 06:49:16 +0000
@@ -26,10 +26,6 @@
         ../dhis-web-commons/javascripts/date.js</param>
     </action>
 
-    <action name="searchform" class="org.hisp.dhis.caseentry.action.caseentry.GetSelectedOrgunitAction">
-      <result name="success" type="velocity-xml">/dhis-web-caseentry/responseOrgUnit.vm</result>
-    </action>
-
     <action name="validateSearch" class="org.hisp.dhis.caseentry.action.caseentry.ValidateSearchAction">
       <result name="success" type="velocity-xml">/dhis-web-caseentry/responseSuccess.vm</result>
       <result name="error" type="velocity-xml">/dhis-web-caseentry/responseError.vm</result>
@@ -129,6 +125,12 @@
       <param name="page">/dhis-web-caseentry/programStageDataEntryForm.vm</param>
       <param name="javascripts">javascript/dataEntry.js,../dhis-web-commons/javascripts/date.js</param>
     </action>
+    
+     <action name="loadProgramStageRecords" class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
+      <param name="javascripts">javascript/dataEntry.js,../dhis-web-commons/javascripts/date.js</param>
+    </action>
 
     <action name="completeProgramStageDataEntry" class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
       <result name="success" type="redirect">getDataRecords.action?programId=${programId}</result>

=== 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	2011-07-25 02:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2011-07-25 06:49:16 +0000
@@ -2,6 +2,10 @@
 jQuery("#entryFormContainer").ready(function(){
     setFieldValue( 'dueDate', "$!format.formatDate( $programStageInstance.dueDate )" );
 	setFieldValue( 'executionDate', "$!format.formatDate( $programStageInstance.executionDate )" );
+	
+	$('#executionDate').change(function() {
+		saveExecutionDate( $programStageInstance.id, byId('programStageId').text );
+	});
 	entryFormContainerOnReady();
 });
 </script>

=== 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	2011-07-25 02:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2011-07-25 06:49:16 +0000
@@ -40,7 +40,7 @@
             </select>
         </td>
 		<td><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
-		<td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" >
+		<td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" >
 			<script type="text/javascript">
 			   datePickerValid( 'executionDate', false );
 			</script>  
@@ -52,10 +52,16 @@
 			<input type="button" id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" style="width:12em" disabled="disabled" >
 			<input type="button" id="validationBtn" value="$i18n.getString('validation')" onClick="javascript: runValidation();", '_blank', 'width=800, height=400, scrollbars=yes, resizable=yes' );" style="width:12em " disabled="disabled" >
 		</td>
-		<td align='right'>
-			<input type="checkbox" id="useDefaultForm" name="useDefaultForm" value="true" onclick="loadDataEntry();" />
-			<label>$i18n.getString( "use_default_form" )</label><br>	
-		</td>
+		<td></td>
+	</tr>
+	
+	<tr>
+		<td></td>
+		<td></td>
+		<td></td>
+		<td>
+			<input type="radio" id="useDefaultForm" name="useDefaultForm" value="true" onclick="loadDataEntry();" /><label>$i18n.getString( "use_default_form" )</label><br>	
+			<input type="radio" id="useDefaultForm" name="useDefaultForm" value="false" onclick="loadDataEntry();" checked /><label>$i18n.getString( "use_custom_form" )</label>
 		</td>
 	</tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js	2011-07-25 02:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js	2011-07-25 06:49:16 +0000
@@ -1,28 +1,17 @@
 
-function organisationUnitSelected( orgUnits )
+function organisationUnitSelected( orgUnits, orgUnitNames )
 {
-	showLoader();
 	setInnerHTML( 'contentDiv', '' );
+	setFieldValue( 'orgunitName', orgUnitNames[0] );
+	
 	hideById('dataEntryFormDiv');
 	hideById('dataRecordingSelectDiv');
 	showById('searchPatientDiv');
-
-	$.ajax({
-		url: "searchform.action",
-		dataType: "xml",
-		cache: false,
-		success: function (data)
-			{
-				enable('listPatientBtn');
-				enable('searchingAttributeId');
-				enable('searchBtn');
-				jQuery('#searchText').removeAttr( 'readonly' );
-				
-				setFieldValue( 'orgunitName', $(data).find( "name" ).text() );
-			
-				hideLoader();
-			}
-		});
+	
+	enable('searchingAttributeId');
+	enable('searchText');
+	enable('searchBtn');	
+	enable('listPatientBtn');
 }
 
 selection.setListenerFunction( organisationUnitSelected );
@@ -60,7 +49,8 @@
 isAjax = true;
 function listAllPatient()
 {
-	jQuery('#contentDiv').load( 'listAllPatients.action',
+	showLoader();
+	jQuery('#contentDiv').load( 'listAllPatients.action',{},
 		function()
 		{
 			hideById('dataRecordingSelectDiv');
@@ -155,24 +145,21 @@
 	}
 	
 	showLoader();
-	var useDefaultForm = jQuery("#useDefaultForm").attr('checked') ? true : false;
+	var useDefaultForm = jQuery("input[id='useDefaultForm']:checked").val();
 	
-	$.ajax({
-		url: "dataentryform.action",
-		data: 'programStageId='+getFieldValue('programStageId')+'&useDefaultForm=' +useDefaultForm,
-		cache: false,
-		dataType: "html",
-		success: function( html )
+	$( '#dataEntryFormDiv' ).load( "dataentryform.action", 
+		{ 
+			programStageId:getFieldValue('programStageId'), 
+			useDefaultForm:useDefaultForm
+		},function( )
 		{
-			setInnerHTML('dataEntryFormDiv', html );
 			enable('validationBtn');
 			enable('completeBtn');
 			enable('useDefaultForm');
 			
 			hideLoader();
 			hideById('contentDiv'); 
-		}
-	});
+		} );
 }
 
 //-----------------------------------------------------------------------------
@@ -228,11 +215,11 @@
     }
     else if ( type == 'error' )
     {
-        window.alert( i18n_searching_patient_failed + ':' + '\n' + message );
+        showErrorMessage( i18n_searching_patient_failed + ':' + '\n' + message );
     }
     else if ( type == 'input' )
     {
-        setMessage( message );
+        showWarningMessage( message );
     }
 }
 
@@ -544,9 +531,9 @@
             }
         }
     }
-    
+   
     if ( key == 13 ) /* CR */
-    {
+    { alert(key);
         nextField = getNextEntryField( field );
         if ( nextField )
         {
@@ -1064,17 +1051,35 @@
 
 function viewPrgramStageRecords( programStageInstanceId ) 
 {
-	var url = 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId;
 	$('#contentDataRecord').dialog('destroy').remove();
-    $('<div id="contentDataRecord">' ).load(url).dialog({
-        title: 'ProgramStage',
-		maximize: true, 
-		closable: true,
-		modal:true,
-		overlay:{background:'#000000', opacity:0.1},
-		width: 800,
-        height: 400
-    });
+    $('<div id="contentDataRecord">' ).load("viewProgramStageRecords.action",
+		{
+			programStageInstanceId: programStageInstanceId
+			
+		}).dialog(
+		{
+			title: 'ProgramStage',
+			maximize: true, 
+			closable: true,
+			modal:true,
+			overlay:{background:'#000000', opacity:0.1},
+			width: 800,
+			height: 400
+		});
+}
+
+function loadProgramStageRecords( programStageInstanceId ) 
+{
+	setInnerHTML('dataEntryFormDiv', '');
+	showLoader();
+	var useDefaultForm = jQuery("#useDefaultForm").attr('checked') ? true : false;
+    $('#dataEntryFormDiv' ).load("loadProgramStageRecords.action",
+		{
+			programStageInstanceId: programStageInstanceId,
+			useDefaultForm:useDefaultForm
+		}, function() {
+			hideLoader();
+		});
 }
 
 function entryFormContainerOnReady()

=== 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	2011-07-25 02:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-07-25 06:49:16 +0000
@@ -9,7 +9,8 @@
         <td>
             <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
             <strong>$i18n.getString( "gender" ):</strong>$encoder.htmlEncode( $patient.gender )<br>
-            <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
+            <strong>$i18n.getString( "date_of_birth" ):</strong>
+			$format.formatDate( $patient.birthDate )<br>
             <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
         </td>
 	</tr>
@@ -48,18 +49,26 @@
 		<td><input type="button" id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" #if($programStageInstance.executionDate) #else disabled #end>
 			<input type="button" id="validationBtn" value="$i18n.getString('validation')" onClick="javascript: runValidation();" style="width:12em " #if($programStageInstance.executionDate) #else disabled #end>
 		</td>
-		<td align='right'>
-			<input type="checkbox" id="useDefaultForm" name="useDefaultForm" value="true" onclick="loadDataEntry();" />
-			<label>$i18n.getString( "use_default_form" )</label><br>
-		</td>
+		<td></td>
+		<td></td>
+    </tr>
+	
+	<tr>
+		<td></td>
+		<td></td>
+		<td></td>
 		<td>
+			<input type="radio" id="useDefaultForm" name="useDefaultForm" value="true" onclick="loadProgramStageRecords($programStageInstance.id);" /><label>$i18n.getString( "use_default_form" )</label><br>	
+			<input type="radio" id="useDefaultForm" name="useDefaultForm" value="false" onclick="loadProgramStageRecords($programStageInstance.id);" checked='true' /><label>$i18n.getString( "use_custom_form" )</label>
 		</td>
-    </tr>
+	</tr>
 </table>
 
 </form>
 
-<form id="dataEntryFormDiv" name="dataEntryFormDiv" method="post" action="selectDataRecording.action">
+#parse( "dhis-web-commons/loader/loader.vm" )
+
+<div id="dataEntryFormDiv" name="dataEntryFormDiv" method="post" action="selectDataRecording.action">
 
 <hr style="clear:both">