=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetOptionsByDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetOptionsByDataElementAction.java	2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetOptionsByDataElementAction.java	2013-10-15 10:28:59 +0000
@@ -28,19 +28,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.List;
-
+import com.opensymphony.xwork2.Action;
 import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.ServletActionContext;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.option.OptionService;
 import org.hisp.dhis.option.OptionSet;
 import org.hisp.dhis.util.ContextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
-import com.opensymphony.xwork2.Action;
+import java.util.List;
 
 /**
  * @author Chau Thu Tran
- * 
  * @version $GetOptionsByDataElementAction.java Jun 15, 2012 10:36:29 AM$
  */
 public class GetOptionsByDataElementAction
@@ -51,14 +52,23 @@
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
-    
+
     private OptionService optionService;
 
+    @Autowired
     public void setOptionService( OptionService optionService )
     {
         this.optionService = optionService;
     }
 
+    private DataElementService dataElementService;
+
+    @Autowired
+    public void setDataElementService( DataElementService dataElementService )
+    {
+        this.dataElementService = dataElementService;
+    }
+
     // -------------------------------------------------------------------------
     // Input
     // -------------------------------------------------------------------------
@@ -98,6 +108,22 @@
 
         OptionSet optionSet = optionService.getOptionSet( id );
 
+        // retry using id as dataElementId
+        if ( optionSet == null )
+        {
+            DataElement dataElement = dataElementService.getDataElement( id );
+
+            if ( dataElement != null )
+            {
+                optionSet = dataElement.getOptionSet();
+            }
+        }
+
+        if ( optionSet == null )
+        {
+            return INPUT;
+        }
+
         // ---------------------------------------------------------------------
         // If the query is null and the option set has not changed since last
         // request we can tell the client to use its cached response (304)
@@ -106,7 +132,7 @@
         boolean isNotModified = (query == null && ContextUtils.isNotModified( ServletActionContext.getRequest(),
             ServletActionContext.getResponse(), optionSet ));
 
-        if ( !isNotModified && optionSet != null )
+        if ( !isNotModified )
         {
             options = optionService.getOptions( optionSet.getId(), query, MAX_OPTIONS_DISPLAYED );
         }

=== 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	2013-10-09 11:26:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2013-10-15 10:28:59 +0000
@@ -146,7 +146,6 @@
 		id="org.hisp.dhis.caseentry.action.caseentry.GetOptionsByDataElementAction"
 		class="org.hisp.dhis.caseentry.action.caseentry.GetOptionsByDataElementAction"
 		scope="prototype">
-		<property name="optionService" ref="org.hisp.dhis.option.OptionService" />
 	</bean>
 
 	<bean id="org.hisp.dhis.caseentry.action.caseentry.GetUsernameListAction"

=== 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	2013-10-11 07:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-10-15 10:28:59 +0000
@@ -4,1246 +4,1245 @@
   "http://struts.apache.org/dtds/struts-2.0.dtd">
 <struts>
 
-	<include file="dhis-web-commons.xml" />
-
-	<package name="dhis-web-caseentry" extends="dhis-web-commons"
-		namespace="/dhis-web-caseentry">
-
-		<action name="index" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/index.vm</param>
-			<param name="menu">/dhis-web-caseentry/menu.vm</param>
-		</action>
-
-		<!-- Data Entry -->
-
-		<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>
-			<result name="input" type="velocity-xml">
-				/dhis-web-caseentry/responseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-
-		<action name="searchAllFacilities" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_SEARCH_PATIENT_IN_ALL_FACILITIES</param>
-		</action>
-		
-		<action name="searchInOtherOrgunits" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_SEARCH_PATIENT_IN_OTHER_ORGUNITS</param>
-		</action>
-
-		<action name="searchPatient"
-			class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/listPatient.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_SEARCH</param>
-		</action>
-
-		<action name="listAllPatients"
-			class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="listAll">true</param>
-			<param name="page">/dhis-web-caseentry/listPatient.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_LIST</param>
-		</action>
-
-		<action name="selectDataRecording"
-			class="org.hisp.dhis.caseentry.action.caseentry.DataRecordingSelectAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/dataRecordingSelect.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="loadProgramStageInstances"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadProgramStageInstancesAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonProgramStageInstances.vm
-			</result>
-		</action>
-
-		<action name="getProgramStageInstance"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetProgramStageInstanceAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStageInstance.vm
-			</result>
-		</action>
-
-		<action name="editDataEntryForm" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="dataentryform"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
-			<param name="stylesheets">style/style.css</param>
-		</action>
-
-		<action name="completeDataEntry"
-			class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="programcompleted" type="velocity-json">/dhis-web-caseentry/jsonResponseProgramCompleted.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="uncompleteDataEntry"
-			class="org.hisp.dhis.caseentry.action.caseentry.UncompleteDataEntryAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="saveExecutionDate"
-			class="org.hisp.dhis.caseentry.action.caseentry.SaveExecutionDateAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="registerIrregularEncounter"
-			class="org.hisp.dhis.caseentry.action.caseentry.RegisterIrregularEncounterAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="cacheManifest" class="org.hisp.dhis.commons.action.NoAction">
-			<result name="success" type="velocity-cache-manifest">/dhis-web-caseentry/cacheManifest.vm
-			</result>
-		</action>
-
-		<action name="getProgramMetaData"
-			class="org.hisp.dhis.caseentry.action.GetProgramMetaDataAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramMetaData.vm
-			</result>
-		</action>
-
-		<action name="anonymousRegistration"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadAnonymousProgramsAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/anonymousRegistration.vm</param>
-			<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
-			<param name="manifest">../dhis-web-caseentry/cacheManifest.action</param>
-			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js
-				,javascript/commons.js
-				,javascript/anonymousRegistration.js
-				,javascript/entry.js
-				,../dhis-web-commons/javascripts/date.js
-			</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_ANONYMOUS_DATA_ENTRY</param>
-		</action>
-
-		<action name="anonymousPrograms"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadAnonymousProgramsAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonSingleEventPrograms.vm
-			</result>
-		</action>
-
-		<action name="createAnonymousEncounter"
-			class="org.hisp.dhis.caseentry.action.caseentry.CreateAnonymousEncounterAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="loadAnonymousPrograms"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadAnonymousProgramsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonProgramInstances.vm
-			</result>
-		</action>
-
-		<action name="uploadAnonymousEvent"
-			class="org.hisp.dhis.caseentry.action.caseentry.UploadAnonymousEventAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-		</action>
-
-		<action name="getOptionSet"
-			class="org.hisp.dhis.caseentry.action.GetOptionSetAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonOptionSet.vm
-			</result>
-		</action>
-
-		<action name="getUsernames"
-			class="org.hisp.dhis.caseentry.action.GetUsernamesAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonUsers.vm
-			</result>
-		</action>
-
-		<action name="removeCurrentEncounter"
-			class="org.hisp.dhis.caseentry.action.caseentry.RemoveCurrentEncounterAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_PROGRAM_STAGE_INSTANCE_DELETE</param>
-		</action>
-
-		<action name="validateProgram"
-			class="org.hisp.dhis.caseentry.action.caseentry.ValidateProgramInstanceAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/validationResult.vm</param>
-		</action>
-
-		<action name="getOptions"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetOptionsByDataElementAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonOptions.vm
-			</result>
-		</action>
-
-		<action name="getProgramStageDataElementList"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetProgramStageDataElementsAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStageDataElements.vm
-			</result>
-		</action>
-		
-		<action name="removeEmptyEvents"
-			class="org.hisp.dhis.caseentry.action.caseentry.RemoveEmptyEventsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-		</action>
-
-		<action name="getUsernameList"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetUsernameListAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonUsernames.vm
-			</result>
-		</action>
-
-		<action name="getOrganisationUnitPaths"
-			class="org.hisp.dhis.caseentry.action.report.GetOrganisationUnitsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonminOrganisationUnitPaths.vm
-			</result>
-		</action>
-
-		<action name="markForFollowup"
-			class="org.hisp.dhis.caseentry.action.caseentry.MarkForFollowupAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="saveProgramInstanceComment"
-			class="org.hisp.dhis.caseentry.action.caseentry.SaveProgramInstanceCommentAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<!-- save value -->
-
-		<action name="saveValue"
-			class="org.hisp.dhis.caseentry.action.caseentry.SaveValueAction">
-			<result name="success" type="velocity-xml">status.vm</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-caseentry/responseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="saveCoordinatesEvent"
-			class="org.hisp.dhis.caseentry.action.caseentry.SaveCoordinatesEventAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<!-- save providing-facility -->
-
-		<action name="saveProvidingFacility"
-			class="org.hisp.dhis.caseentry.action.caseentry.SaveProvidingFacilityAction">
-			<result name="success" type="velocity">status.vm</result>
-			<result name="input" type="velocity">status.vm</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<!-- Multi DataEntry -->
-
-		<action name="multipledataEntrySelect"
-			class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/multiDataEntrySelect.vm</param>
-			<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="javascripts">
-				../dhis-web-commons/ouwt/ouwt.js,
-				javascript/commons.js,
-				javascript/patient.js,
-				javascript/entry.js,
-				javascript/relationshipPatient.js,
-				javascript/multiDataEntry.js</param>
-			<param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
-		</action>
-
-		<action name="getPrograms"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetProgramsByOrgunitAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonPrograms.vm
-			</result>
-		</action>
-
-		<action name="getAllPrograms"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetAllProgramsAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonPrograms.vm
-			</result>
-		</action>
-
-		<action name="getDataRecords"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
-			<param name="stylesheets">style/style.css</param>
-		</action>
-
-		<action name="viewProgramStageRecords"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/reportDataEntryForm.vm</param>
-			<param name="stylesheets">style/style.css</param>
-		</action>
-
-		<action name="loadProgramStageRecords"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
-			<param name="javascripts">../dhis-web-commons/javascripts/date.js</param>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="completeProgramStageDataEntry"
-			class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
-			<result name="success" type="redirect">
-				getDataRecords.action?programId=${programId}
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<!-- Single-event DataEntry -->
-
-		<action name="singleEventSelect"
-			class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/singleEventSelect.vm</param>
-			<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
-			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js
-				,javascript/commons.js
-				,javascript/singleEvent.js
-				,javascript/form.js
-				,javascript/entry.js
-				,../dhis-web-commons/javascripts/date.js
-			</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_SINGLE_EVENT_DATA_ENTRY</param>
-		</action>
-
-		<action name="singleEventPrograms"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetSingleEventProgramListAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonSingleEventPrograms.vm
-			</result>
-		</action>
-
-		<action name="showEventWithRegistrationForm"
-			class="org.hisp.dhis.caseentry.action.caseentry.ShowEventWithRegistrationFormAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/addSingleEventRegistration.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="saveValues"
-			class="org.hisp.dhis.caseentry.action.caseentry.SaveValuesAction">
-			<result name="success" type="velocity-xml">status.vm</result>
-			<param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
-		</action>
-
-		<!-- Report -->
-
-		<action name="reportSelect"
-			class="org.hisp.dhis.caseentry.action.report.ReportSelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/reportSelect.vm</param>
-			<param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
-			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/report.js</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_GENERATE_PROGRAM_SUMMARY_REPORT</param>
-		</action>
-
-		<action name="generateReport"
-			class="org.hisp.dhis.caseentry.action.report.GenerateReportAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/report.vm</param>
-			<param name="javascripts">javascript/commons.js,javascript/report.js</param>
-			<param name="requiredAuthorities">F_GENERATE_PROGRAM_SUMMARY_REPORT</param>
-		</action>
-
-		<action name="viewRecords"
-			class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/reportDataEntryForm.vm</param>
-			<param name="stylesheets">style/style.css</param>
-		</action>
-
-		<action name="statisticalProgramReportSelect"
-			class="org.hisp.dhis.caseentry.action.report.ReportSelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/statisticalProgramReportSelect.vm</param>
-			<param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
-			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/statisticalReport.js</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_GENERATE_STATISTICAL_PROGRAM_REPORT</param>
-		</action>
-
-		<action name="generateStatisticalProgramReport"
-			class="org.hisp.dhis.caseentry.action.report.GenerateStatisticalProgramReportAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/statisticalProgramReport.vm</param>
-			<result name="xls" type="gridXlsResult" />
-			<param name="requiredAuthorities">F_GENERATE_STATISTICAL_PROGRAM_REPORT</param>
-		</action>
-
-		<!-- i18n -->
-
-		<action name="i18n" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-javascript">/dhis-web-caseentry/i18n.vm
-			</result>
-		</action>
-
-		<!-- Case Aggregation -->
-
-		<action name="caseAggregationForm"
-			class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationFormAction">
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/caseAggregationForm.vm</param>
-			<param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>
-			<param name="javascripts">javascript/caseagg.js,javascript/caseAggregationForm.js</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PATIENT_AGGREGATION</param>
-		</action>
-
-		<action name="validateCaseAggregation"
-			class="org.hisp.dhis.caseentry.action.caseaggregation.ValidationCaseAggregationAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-caseentry/responseSuccess.vm
-			</result>
-			<result name="error" type="velocity-xml">
-				/dhis-web-caseentry/responseError.vm
-			</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-caseentry/responseInput.vm
-			</result>
-		</action>
-
-		<action name="caseAggregationResult"
-			class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationResultAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/caseAggregationResult.vm</param>
-			<param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_AGGREGATION</param>
-		</action>
-
-		<action name="saveAggregateDataValue"
-			class="org.hisp.dhis.caseentry.action.caseaggregation.SaveAggregateDataValueAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
-		</action>
-
-		<action name="caseAggregationResultDetails"
-			class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationResultDetailsAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/caseAggregationResultDetails.vm</param>
-		</action>
-
-		<!-- Patient -->
-
-		<action name="patient"
-			class="org.hisp.dhis.caseentry.action.patient.SelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/selectPatient.vm</param>
-			<param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
-			<param name="javascripts">
-				../dhis-web-commons/ouwt/ouwt.js
-				,javascript/commons.js
-				,javascript/patient.js
-				,javascript/entry.js
-				,javascript/relationshipPatient.js
-			</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PATIENT_MANAGEMENT</param>
-		</action>
-
-		<action name="searchRegistrationPatient"
-			class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/patientRegistrationList.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_SEARCH</param>
-		</action>
-
-		<action name="removePatient"
-			class="org.hisp.dhis.caseentry.action.patient.RemovePatientAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_PATIENT_DELETE</param>
-		</action>
-
-		<action name="addPatient"
-			class="org.hisp.dhis.caseentry.action.patient.AddPatientAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_ADD</param>
-		</action>
-
-		<action name="showAddPatientForm"
-			class="org.hisp.dhis.caseentry.action.patient.ShowAddPatientFormAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/addPatientForm.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_ADD</param>
-		</action>
-
-		<action name="showUpdatePatientForm"
-			class="org.hisp.dhis.caseentry.action.patient.GetPatientAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">
-				/dhis-web-caseentry/updatePatientForm.vm
-			</param>
-			<param name="javascripts">
-				../dhis-web-commons/javascripts/jQuery/jquery-barcode.min.js
-			</param>
-			<param name="requiredAuthorities">F_PATIENT_ADD</param>
-		</action>
-
-		<action name="updatePatient"
-			class="org.hisp.dhis.caseentry.action.patient.UpdatePatientAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_ADD</param>
-		</action>
-
-		<action name="validatePatient"
-			class="org.hisp.dhis.caseentry.action.patient.ValidatePatientAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm
-			</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseInput.vm
-			</result>
-			<result name="duplicate" type="velocity-xml">
-				/dhis-web-caseentry/responseDuplicate.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-
-		<action name="showAddRepresentative"
-			class="org.hisp.dhis.caseentry.action.patient.ShowAddRepresentativeAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/underAgeForm.vm</param>
-			<param name="javascripts">javascript/underage.js,
-				../dhis-web-commons/javascripts/date.js
-			</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PATIENT_ADD</param>
-		</action>
-
-		<action name="searchPerson"
-			class="org.hisp.dhis.caseentry.action.patient.SearchPersonAction">
-			<result name="success" type="velocity-xml">responsePatients.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_SEARCH</param>
-		</action>
-
-		<action name="addRepresentative"
-			class="org.hisp.dhis.caseentry.action.patient.AddRepresentativeAction">
-			<result name="success" type="velocity-xml">responseRepresentative.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_ADD</param>
-		</action>
-
-		<action name="getPatientHistory"
-			class="org.hisp.dhis.caseentry.action.patient.GetPatientHistoryAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<result name="xls" type="gridXlsResult" />
-			<result name="pdf" type="gridPdfResult" />
-			<param name="page">/dhis-web-caseentry/patientHistory.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_HISTORY</param>
-		</action>
-
-		<action name="getProgramReportHistory"
-			class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceHistoryAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<result name="xls" type="gridXlsResult" />
-			<result name="pdf" type="gridPdfResult" />
-			<param name="page">/dhis-web-caseentry/programInstanceHistory.vm</param>
-		</action>
-
-		<action name="getPatientLocation"
-			class="org.hisp.dhis.caseentry.action.patient.GetPatientLocationAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/patientLocation.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_CHANGE_LOCATION</param>
-		</action>
-
-		<action name="registerPatientLocation"
-			class="org.hisp.dhis.caseentry.action.patient.RegisterPatientLocationAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_CHANGE_LOCATION</param>
-		</action>
-
-		<!-- Patient-Program Enrollment -->
-
-		<action name="showProgramEnrollmentForm"
-			class="org.hisp.dhis.caseentry.action.patient.ProgramEnrollmentSelectAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/programEnrollmentSelectForm.vm</param>
-			<param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
-		</action>
-
-		<action name="enrollmentform"
-			class="org.hisp.dhis.caseentry.action.patient.ProgramEnrollmentAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/programEnrollmentForm.vm</param>
-			<param name="requiredAuthorities">F_PROGRAM_INSTANCE_MANAGEMENT</param>
-		</action>
-
-		<action name="validatePatientProgramEnrollment"
-			class="org.hisp.dhis.caseentry.action.patient.ValidatePatientProgramEnrollmentAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm
-			</result>
-		</action>
-
-		<action name="saveProgramEnrollment"
-			class="org.hisp.dhis.caseentry.action.patient.SaveProgramEnrollmentAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonProgramEnrollment.vm
-			</result>
-			<param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
-		</action>
-
-		<action name="getProgramInstance"
-			class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/responseProgramInstance.vm
-			</result>
-		</action>
-
-		<action name="getEventMessages"
-			class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/eventMessage.vm</param>
-			<param name="requiredAuthorities">F_PROGRAM_STAGE_INSTANCE_REMINDER</param>
-		</action>
-
-		<action name="saveDueDate"
-			class="org.hisp.dhis.caseentry.action.patient.SaveDueDateAction">
-			<result name="success" type="velocity">status.vm</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
-		</action>
-
-		<action name="savePatientIdentifierAndAttribute"
-			class="org.hisp.dhis.caseentry.action.patient.SaveIdentifierAndAttributeAction">
-			<result name="success" type="velocity-xml">status.vm</result>
-			<param name="requiredAuthorities">F_PATIENT_ADD, F_PROGRAM_ENROLLMENT</param>
-		</action>
-
-		<action name="setProgramInstanceStatus"
-			class="org.hisp.dhis.caseentry.action.patient.SetProgramInstanceStatusAction">
-			<result name="success" type="velocity-xml">status.vm</result>
-			<param name="requiredAuthorities">F_PROGRAM_UNENROLLMENT</param>
-		</action>
-
-		<action name="getPatientIdentifierAndAttribute"
-			class="org.hisp.dhis.caseentry.action.patient.GetProgramAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/identifierAndAttributeForm.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_ADD</param>
-		</action>
-
-		<action name="getVisitSchedule"
-			class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/visitSchedule.vm</param>
-			<param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
-		</action>
-
-		<action name="validatePatientIdentifier"
-			class="org.hisp.dhis.caseentry.action.patient.ValidatePatientIdentifierAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-
-
-		<!-- Relationship -->
-
-		<action name="getPartner"
-			class="org.hisp.dhis.caseentry.action.patient.GetPartnerAction">
-			<result name="success" type="velocity-xml">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/detailsPartner.vm</param>
-		</action>
-
-		<action name="showRelationshipList"
-			class="org.hisp.dhis.caseentry.action.patient.ShowRelationshipListAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/relationshipList.vm</param>
-			<param name="javascripts">
-				../dhis-web-commons/javascripts/jQuery/jquery-barcode.min.js
-			</param>
-			<param name="requiredAuthorities">F_RELATIONSHIP_MANAGEMENT</param>
-		</action>
-
-		<action name="showAddRelationshipForm"
-			class="org.hisp.dhis.caseentry.action.patient.ShowAddRelationshipFormAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/addRelationshipForm.vm</param>
-			<param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
-		</action>
-
-		<action name="validateSearchRelationship"
-			class="org.hisp.dhis.caseentry.action.patient.ValidateSearchRelationshipAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm
-			</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-
-		<action name="searchRelationshipPatient"
-			class="org.hisp.dhis.caseentry.action.patient.SearchRelationshipPatientAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/relationshipPatients.vm</param>
-			<param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
-		</action>
-
-		<action name="saveRelationship"
-			class="org.hisp.dhis.caseentry.action.patient.SaveRelationshipAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm
-			</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
-		</action>
-
-		<action name="removeRelationship"
-			class="org.hisp.dhis.caseentry.action.patient.RemoveRelationshipAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_RELATIONSHIP_DELETE</param>
-		</action>
-
-		<action name="saveRepresentative"
-			class="org.hisp.dhis.caseentry.action.patient.SaveRepresentativeAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm
-			</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
-		</action>
-
-		<action name="removeRepresentative"
-			class="org.hisp.dhis.caseentry.action.patient.RemoveRepresentativeAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm
-			</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseInput.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_RELATIONSHIP_DELETE</param>
-		</action>
-
-		<action name="showAddRelationshipPatient"
-			class="org.hisp.dhis.caseentry.action.patient.GetPatientAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/addRelationshipPatientForm.vm</param>
-			<param name="requiredAuthorities">F_PATIENT_ADD, F_RELATIONSHIP_ADD</param>
-		</action>
-
-		<action name="validateAddRelationshipPatient"
-			class="org.hisp.dhis.caseentry.action.patient.ValidateAddRelationshipPatientAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm
-			</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseInput.vm
-			</result>
-			<result name="duplicate" type="velocity-xml">
-				/dhis-web-caseentry/responseDuplicate.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-		</action>
-
-		<action name="addRelationshipPatient"
-			class="org.hisp.dhis.caseentry.action.patient.AddRelationshipPatientAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
-		</action>
-
-		<!-- Tabular report -->
-		
-	    <action name="searchProgramStageInstances"
-	      class="org.hisp.dhis.caseentry.action.report.GenerateTabularReportAction">
-	      <result name="success" type="velocity">/content.vm</result>
-	      <param name="page">/dhis-web-caseentry/programStageInstancesList.vm</param>
-	    </action>
-    
-		<action name="generateTabularReport" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="getOrganisationUnitChildren"
-			class="org.hisp.dhis.caseentry.action.report.GetOrganisationUnitChildrenAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonminOrganisationUnitChildren.vm
-			</result>
-		</action>
-
-		<action name="tabularInitialize"
-			class="org.hisp.dhis.caseentry.action.report.TabularInitializeAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonTabularInitialize.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="loadReportProgramStages"
-			class="org.hisp.dhis.caseentry.action.report.LoadProgramStagesAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStages.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="loadProgramStageSections"
-			class="org.hisp.dhis.caseentry.action.report.GetProgramStageSectionsAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStageSections.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="loadDataElements"
-			class="org.hisp.dhis.caseentry.action.report.LoadDataElementsAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/responseDataElements.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="getTabularParams"
-			class="org.hisp.dhis.caseentry.action.report.GetTabularParamsAction">
-			<result name="success" type="velocity-json">/dhis-web-caseentry/responseTabularParams.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="validateTabularReport"
-			class="org.hisp.dhis.caseentry.action.report.ValidateTabularReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="saveTabularReport"
-			class="org.hisp.dhis.caseentry.action.report.SaveTabularReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="anyAuthorities">F_PATIENT_TABULAR_REPORT_PUBLIC_ADD,F_PATIENT_TABULAR_REPORT_PRIVATE_ADD</param>
-		</action>
-
-		<action name="getTabularReports"
-			class="org.hisp.dhis.caseentry.action.report.GetTabularReportsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonTabularReportList.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="getTabularReport"
-			class="org.hisp.dhis.caseentry.action.report.GetTabularReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonTabularReport.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="updateTabularReportName"
-			class="org.hisp.dhis.caseentry.action.report.UpdateTabularReportNameAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="deleteTabularReport"
-			class="org.hisp.dhis.caseentry.action.report.DeleteTabularReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<!-- Aggregate Report -->
-
-		<action name="getAggregateReportList"
-			class="org.hisp.dhis.caseentry.action.report.GetAggregateReportListAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonTabularReportList.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="saveAggregateReport"
-			class="org.hisp.dhis.caseentry.action.report.SaveAggregateReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="anyAuthorities">F_PATIENT_AGGREGATE_REPORT_PUBLIC_ADD,F_PATIENT_AGGREGATE_REPORT_PRIVATE_ADD</param>
-		</action>
-
-		<action name="getAggregateReports"
-			class="org.hisp.dhis.caseentry.action.report.GetAggregateReportsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonTabularReportList.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="getAggregateReport"
-			class="org.hisp.dhis.caseentry.action.report.GetAggregateReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonTabularAggregateReport.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="updateAggregateReportName"
-			class="org.hisp.dhis.caseentry.action.report.UpdateAggregateReportNameAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="deleteAggregateReport"
-			class="org.hisp.dhis.caseentry.action.report.DeleteAggregateReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<action name="getOrganisationUnitPathsByGroup"
-			class="org.hisp.dhis.caseentry.action.report.GetOrganisationUnitsByGroupAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-caseentry/jsonminOrganisationUnitPaths.vm
-			</result>
-		</action>
-
-		<action name="validateAggregateReport"
-			class="org.hisp.dhis.caseentry.action.report.ValidateAggregateReportAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm
-			</result>
-			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
-		</action>
-
-		<!-- SMS Reminder -->
-
-		<action name="smsReminderSelect"
-			class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/programTrackingSelect.vm</param>
-			<param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="javascripts">
-				../dhis-web-commons/ouwt/ouwt.js,
-				javascript/commons.js,
-				javascript/patient.js,
-				javascript/relationshipPatient.js,
-				javascript/entry.js,
-				javascript/smsReminder.js
-			</param>
-			<param name="requiredAuthorities">F_PROGRAM_TRACKING_MANAGEMENT</param>
-		</action>
-
-		<action name="getSMSPatientRecords"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/programTrackingRecords.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PROGRAM_TRACKING_SEARCH</param>
-		</action>
-
-		<action name="programTrackingList"
-			class="org.hisp.dhis.caseentry.action.reminder.GetProgramTrackingListAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/programTrackingList.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PROGRAM_TRACKING_LIST</param>
-		</action>
-
-		<action name="sendSMS"
-			class="org.hisp.dhis.caseentry.action.reminder.SendSmsAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="input" type="velocity-json">/dhis-web-commons/ajax/jsonResponseInput.vm
-			</result>
-			<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
-		</action>
-
-		<action name="sendSMSTotList"
-			class="org.hisp.dhis.caseentry.action.reminder.SendSmsToListAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<param name="onExceptionReturn">plainTextError</param>
-			<param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
-		</action>
-
-		<action name="setEventStatus"
-			class="org.hisp.dhis.caseentry.action.reminder.SetEventStatusAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
-		</action>
-
-		<action name="getProgramStageInstanceById"
-			class="org.hisp.dhis.caseentry.action.reminder.GetProgramStageInstanceByIdAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/trackingEventMessage.vm</param>
-			<param name="stylesheets">style/style.css</param>
-		</action>
-
-		<!-- Dashboard -->
-
-		<action name="patientDashboard"
-			class="org.hisp.dhis.caseentry.action.patient.PatientDashboardAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/patientDashboard.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PATIENT_DASHBOARD</param>
-		</action>
-
-		<action name="removeProgramInstance"
-			class="org.hisp.dhis.caseentry.action.caseentry.RemoveProgramInstanceAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<result name="error" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseError.vm
-			</result>
-			<param name="requiredAuthorities">F_PROGRAM_INSTANCE_DELETE</param>
-		</action>
-
-		<!-- Comment && Message -->
-
-		<action name="savePatientComment"
-			class="org.hisp.dhis.caseentry.action.reminder.SavePatientCommentAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_COMMENT_ADD</param>
-		</action>
-
-		<action name="removePatientComment"
-			class="org.hisp.dhis.caseentry.action.reminder.RemovePatientCommentAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_COMMENT_DELETE</param>
-		</action>
-
-		<action name="removeSms"
-			class="org.hisp.dhis.caseentry.action.reminder.RemoveSmsAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_PATIENT_COMMENT_DELETE</param>
-		</action>
-
-		<!-- Activity plan -->
-
-		<action name="activityPlanSelect"
-			class="org.hisp.dhis.caseentry.action.patient.ShowActivityPlanFormAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/activityPlanSelect.vm</param>
-			<param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="javascripts">
-				../dhis-web-commons/ouwt/ouwt.js,
-				javascript/commons.js,
-				javascript/patient.js,
-				javascript/entry.js,
-				javascript/relationshipPatient.js,
-				javascript/activityPlan.js
-			</param>
-			<param name="requiredAuthorities">F_ACTIVITY_PLAN</param>
-		</action>
-
-		<action name="getActivityPlanRecords"
-			class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/activityPlanRecords.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<result name="xls" type="gridXlsResult" />
-			<result name="pdf" type="gridPdfResult" />
-		</action>
-
-		<action name="accessPatientAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_ACCESS_PATIENT_ATTRIBUTES</param>
-		</action>
-
-		<action name="allowEditPatientFixedAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_ALLOW_EDIT_PATIENT_PROPERTIES</param>
-		</action>
-
-		<action name="allowEditPatientAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_ALLOW_EDIT_PATIENT_ATTRIBUTES</param>
-		</action>
-
-		<action name="allowEditPatientIdentifier" class="org.hisp.dhis.caseentry.action.NoAction">
-			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
-			</result>
-			<param name="requiredAuthorities">F_ALLOW_EDIT_PATIENT_IDENTIFIERS</param>
-		</action>
-
-
-		<!-- Program-stage-completeness -->
-
-		<action name="programStageCompletenessSelect"
-			class="org.hisp.dhis.caseentry.action.patient.SelectAction">
-			<interceptor-ref name="organisationUnitTreeStack" />
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-caseentry/programStageCompletenessSelect.vm</param>
-			<param name="menu">/dhis-web-caseentry/reportsMenuWithoutOrgunit.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<param name="javascripts">
-				javascript/commons.js,
-				javascript/programStageCompleteness.js</param>
-			<param name="requiredAuthorities">F_PROGRAM_STAGE_COMPLETENESS</param>
-		</action>
-
-		<action name="generateProgramStageCompleteness"
-			class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageInstanceCompletenessAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/programStageCompleteness.vm</param>
-			<param name="stylesheets">style/style.css</param>
-			<result name="xls" type="gridXlsResult" />
-			<result name="pdf" type="gridPdfResult" />
-			<param name="requiredAuthorities">F_PROGRAM_STAGE_COMPLETENESS</param>
-		</action>
-
-	</package>
+  <include file="dhis-web-commons.xml" />
+
+  <package name="dhis-web-caseentry" extends="dhis-web-commons"
+    namespace="/dhis-web-caseentry">
+
+    <action name="index" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/index.vm</param>
+      <param name="menu">/dhis-web-caseentry/menu.vm</param>
+    </action>
+
+    <!-- Data Entry -->
+
+    <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>
+      <result name="input" type="velocity-xml">
+        /dhis-web-caseentry/responseInput.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+
+    <action name="searchAllFacilities" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_SEARCH_PATIENT_IN_ALL_FACILITIES</param>
+    </action>
+
+    <action name="searchInOtherOrgunits" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_SEARCH_PATIENT_IN_OTHER_ORGUNITS</param>
+    </action>
+
+    <action name="searchPatient"
+      class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/listPatient.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_SEARCH</param>
+    </action>
+
+    <action name="listAllPatients"
+      class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="listAll">true</param>
+      <param name="page">/dhis-web-caseentry/listPatient.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_LIST</param>
+    </action>
+
+    <action name="selectDataRecording"
+      class="org.hisp.dhis.caseentry.action.caseentry.DataRecordingSelectAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/dataRecordingSelect.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="loadProgramStageInstances"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadProgramStageInstancesAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonProgramStageInstances.vm
+      </result>
+    </action>
+
+    <action name="getProgramStageInstance"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetProgramStageInstanceAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStageInstance.vm
+      </result>
+    </action>
+
+    <action name="editDataEntryForm" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="dataentryform"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
+      <param name="stylesheets">style/style.css</param>
+    </action>
+
+    <action name="completeDataEntry"
+      class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="programcompleted" type="velocity-json">/dhis-web-caseentry/jsonResponseProgramCompleted.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="uncompleteDataEntry"
+      class="org.hisp.dhis.caseentry.action.caseentry.UncompleteDataEntryAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="saveExecutionDate"
+      class="org.hisp.dhis.caseentry.action.caseentry.SaveExecutionDateAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="input" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseInput.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="registerIrregularEncounter"
+      class="org.hisp.dhis.caseentry.action.caseentry.RegisterIrregularEncounterAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="cacheManifest" class="org.hisp.dhis.commons.action.NoAction">
+      <result name="success" type="velocity-cache-manifest">/dhis-web-caseentry/cacheManifest.vm
+      </result>
+    </action>
+
+    <action name="getProgramMetaData"
+      class="org.hisp.dhis.caseentry.action.GetProgramMetaDataAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramMetaData.vm
+      </result>
+    </action>
+
+    <action name="anonymousRegistration"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadAnonymousProgramsAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/anonymousRegistration.vm</param>
+      <param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
+      <param name="manifest">../dhis-web-caseentry/cacheManifest.action</param>
+      <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js
+        ,javascript/commons.js
+        ,javascript/anonymousRegistration.js
+        ,javascript/entry.js
+        ,../dhis-web-commons/javascripts/date.js
+      </param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_ANONYMOUS_DATA_ENTRY</param>
+    </action>
+
+    <action name="anonymousPrograms"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadAnonymousProgramsAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonSingleEventPrograms.vm
+      </result>
+    </action>
+
+    <action name="createAnonymousEncounter"
+      class="org.hisp.dhis.caseentry.action.caseentry.CreateAnonymousEncounterAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="input" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseInput.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="loadAnonymousPrograms"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadAnonymousProgramsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonProgramInstances.vm
+      </result>
+    </action>
+
+    <action name="uploadAnonymousEvent"
+      class="org.hisp.dhis.caseentry.action.caseentry.UploadAnonymousEventAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+    </action>
+
+    <action name="getOptionSet"
+      class="org.hisp.dhis.caseentry.action.GetOptionSetAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonOptionSet.vm
+      </result>
+    </action>
+
+    <action name="getUsernames"
+      class="org.hisp.dhis.caseentry.action.GetUsernamesAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonUsers.vm
+      </result>
+    </action>
+
+    <action name="removeCurrentEncounter"
+      class="org.hisp.dhis.caseentry.action.caseentry.RemoveCurrentEncounterAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_PROGRAM_STAGE_INSTANCE_DELETE</param>
+    </action>
+
+    <action name="validateProgram"
+      class="org.hisp.dhis.caseentry.action.caseentry.ValidateProgramInstanceAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/validationResult.vm</param>
+    </action>
+
+    <action name="getOptions" class="org.hisp.dhis.caseentry.action.caseentry.GetOptionsByDataElementAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonOptions.vm</result>
+      <result name="input" type="velocity-xml">/dhis-web-caseentry/responseInput.vm</result>
+    </action>
+
+    <action name="getProgramStageDataElementList"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetProgramStageDataElementsAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStageDataElements.vm
+      </result>
+    </action>
+
+    <action name="removeEmptyEvents"
+      class="org.hisp.dhis.caseentry.action.caseentry.RemoveEmptyEventsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+    </action>
+
+    <action name="getUsernameList"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetUsernameListAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonUsernames.vm
+      </result>
+    </action>
+
+    <action name="getOrganisationUnitPaths"
+      class="org.hisp.dhis.caseentry.action.report.GetOrganisationUnitsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonminOrganisationUnitPaths.vm
+      </result>
+    </action>
+
+    <action name="markForFollowup"
+      class="org.hisp.dhis.caseentry.action.caseentry.MarkForFollowupAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="saveProgramInstanceComment"
+      class="org.hisp.dhis.caseentry.action.caseentry.SaveProgramInstanceCommentAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <!-- save value -->
+
+    <action name="saveValue"
+      class="org.hisp.dhis.caseentry.action.caseentry.SaveValueAction">
+      <result name="success" type="velocity-xml">status.vm</result>
+      <result name="input" type="velocity-xml">/dhis-web-caseentry/responseInput.vm</result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="saveCoordinatesEvent"
+      class="org.hisp.dhis.caseentry.action.caseentry.SaveCoordinatesEventAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <!-- save providing-facility -->
+
+    <action name="saveProvidingFacility"
+      class="org.hisp.dhis.caseentry.action.caseentry.SaveProvidingFacilityAction">
+      <result name="success" type="velocity">status.vm</result>
+      <result name="input" type="velocity">status.vm</result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <!-- Multi DataEntry -->
+
+    <action name="multipledataEntrySelect"
+      class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/multiDataEntrySelect.vm</param>
+      <param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="javascripts">
+        ../dhis-web-commons/ouwt/ouwt.js,
+        javascript/commons.js,
+        javascript/patient.js,
+        javascript/entry.js,
+        javascript/relationshipPatient.js,
+        javascript/multiDataEntry.js
+      </param>
+      <param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
+    </action>
+
+    <action name="getPrograms"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetProgramsByOrgunitAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonPrograms.vm
+      </result>
+    </action>
+
+    <action name="getAllPrograms"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetAllProgramsAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonPrograms.vm
+      </result>
+    </action>
+
+    <action name="getDataRecords"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
+      <param name="stylesheets">style/style.css</param>
+    </action>
+
+    <action name="viewProgramStageRecords"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/reportDataEntryForm.vm</param>
+      <param name="stylesheets">style/style.css</param>
+    </action>
+
+    <action name="loadProgramStageRecords"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
+      <param name="javascripts">../dhis-web-commons/javascripts/date.js</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="completeProgramStageDataEntry"
+      class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
+      <result name="success" type="redirect">
+        getDataRecords.action?programId=${programId}
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <!-- Single-event DataEntry -->
+
+    <action name="singleEventSelect"
+      class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/singleEventSelect.vm</param>
+      <param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
+      <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js
+        ,javascript/commons.js
+        ,javascript/singleEvent.js
+        ,javascript/form.js
+        ,javascript/entry.js
+        ,../dhis-web-commons/javascripts/date.js
+      </param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_SINGLE_EVENT_DATA_ENTRY</param>
+    </action>
+
+    <action name="singleEventPrograms"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetSingleEventProgramListAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonSingleEventPrograms.vm
+      </result>
+    </action>
+
+    <action name="showEventWithRegistrationForm"
+      class="org.hisp.dhis.caseentry.action.caseentry.ShowEventWithRegistrationFormAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/addSingleEventRegistration.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="saveValues"
+      class="org.hisp.dhis.caseentry.action.caseentry.SaveValuesAction">
+      <result name="success" type="velocity-xml">status.vm</result>
+      <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+    </action>
+
+    <!-- Report -->
+
+    <action name="reportSelect"
+      class="org.hisp.dhis.caseentry.action.report.ReportSelectAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/reportSelect.vm</param>
+      <param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
+      <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/report.js</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_GENERATE_PROGRAM_SUMMARY_REPORT</param>
+    </action>
+
+    <action name="generateReport"
+      class="org.hisp.dhis.caseentry.action.report.GenerateReportAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/report.vm</param>
+      <param name="javascripts">javascript/commons.js,javascript/report.js</param>
+      <param name="requiredAuthorities">F_GENERATE_PROGRAM_SUMMARY_REPORT</param>
+    </action>
+
+    <action name="viewRecords"
+      class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/reportDataEntryForm.vm</param>
+      <param name="stylesheets">style/style.css</param>
+    </action>
+
+    <action name="statisticalProgramReportSelect"
+      class="org.hisp.dhis.caseentry.action.report.ReportSelectAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/statisticalProgramReportSelect.vm</param>
+      <param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
+      <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/statisticalReport.js</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_GENERATE_STATISTICAL_PROGRAM_REPORT</param>
+    </action>
+
+    <action name="generateStatisticalProgramReport"
+      class="org.hisp.dhis.caseentry.action.report.GenerateStatisticalProgramReportAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/statisticalProgramReport.vm</param>
+      <result name="xls" type="gridXlsResult" />
+      <param name="requiredAuthorities">F_GENERATE_STATISTICAL_PROGRAM_REPORT</param>
+    </action>
+
+    <!-- i18n -->
+
+    <action name="i18n" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-javascript">/dhis-web-caseentry/i18n.vm
+      </result>
+    </action>
+
+    <!-- Case Aggregation -->
+
+    <action name="caseAggregationForm"
+      class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationFormAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/caseAggregationForm.vm</param>
+      <param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>
+      <param name="javascripts">javascript/caseagg.js,javascript/caseAggregationForm.js</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PATIENT_AGGREGATION</param>
+    </action>
+
+    <action name="validateCaseAggregation"
+      class="org.hisp.dhis.caseentry.action.caseaggregation.ValidationCaseAggregationAction">
+      <result name="success" type="velocity-xml">
+        /dhis-web-caseentry/responseSuccess.vm
+      </result>
+      <result name="error" type="velocity-xml">
+        /dhis-web-caseentry/responseError.vm
+      </result>
+      <result name="input" type="velocity-xml">
+        /dhis-web-caseentry/responseInput.vm
+      </result>
+    </action>
+
+    <action name="caseAggregationResult"
+      class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationResultAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/caseAggregationResult.vm</param>
+      <param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_AGGREGATION</param>
+    </action>
+
+    <action name="saveAggregateDataValue"
+      class="org.hisp.dhis.caseentry.action.caseaggregation.SaveAggregateDataValueAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
+    </action>
+
+    <action name="caseAggregationResultDetails"
+      class="org.hisp.dhis.caseentry.action.caseaggregation.CaseAggregationResultDetailsAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/caseAggregationResultDetails.vm</param>
+    </action>
+
+    <!-- Patient -->
+
+    <action name="patient"
+      class="org.hisp.dhis.caseentry.action.patient.SelectAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/selectPatient.vm</param>
+      <param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
+      <param name="javascripts">
+        ../dhis-web-commons/ouwt/ouwt.js
+        ,javascript/commons.js
+        ,javascript/patient.js
+        ,javascript/entry.js
+        ,javascript/relationshipPatient.js
+      </param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PATIENT_MANAGEMENT</param>
+    </action>
+
+    <action name="searchRegistrationPatient"
+      class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/patientRegistrationList.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_SEARCH</param>
+    </action>
+
+    <action name="removePatient"
+      class="org.hisp.dhis.caseentry.action.patient.RemovePatientAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_PATIENT_DELETE</param>
+    </action>
+
+    <action name="addPatient"
+      class="org.hisp.dhis.caseentry.action.patient.AddPatientAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
+    </action>
+
+    <action name="showAddPatientForm"
+      class="org.hisp.dhis.caseentry.action.patient.ShowAddPatientFormAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/addPatientForm.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
+    </action>
+
+    <action name="showUpdatePatientForm"
+      class="org.hisp.dhis.caseentry.action.patient.GetPatientAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">
+        /dhis-web-caseentry/updatePatientForm.vm
+      </param>
+      <param name="javascripts">
+        ../dhis-web-commons/javascripts/jQuery/jquery-barcode.min.js
+      </param>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
+    </action>
+
+    <action name="updatePatient"
+      class="org.hisp.dhis.caseentry.action.patient.UpdatePatientAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
+    </action>
+
+    <action name="validatePatient"
+      class="org.hisp.dhis.caseentry.action.patient.ValidatePatientAction">
+      <result name="success" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseError.vm
+      </result>
+      <result name="input" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseInput.vm
+      </result>
+      <result name="duplicate" type="velocity-xml">
+        /dhis-web-caseentry/responseDuplicate.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+
+    <action name="showAddRepresentative"
+      class="org.hisp.dhis.caseentry.action.patient.ShowAddRepresentativeAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/underAgeForm.vm</param>
+      <param name="javascripts">javascript/underage.js,
+        ../dhis-web-commons/javascripts/date.js
+      </param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
+    </action>
+
+    <action name="searchPerson"
+      class="org.hisp.dhis.caseentry.action.patient.SearchPersonAction">
+      <result name="success" type="velocity-xml">responsePatients.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_SEARCH</param>
+    </action>
+
+    <action name="addRepresentative"
+      class="org.hisp.dhis.caseentry.action.patient.AddRepresentativeAction">
+      <result name="success" type="velocity-xml">responseRepresentative.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
+    </action>
+
+    <action name="getPatientHistory"
+      class="org.hisp.dhis.caseentry.action.patient.GetPatientHistoryAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <result name="xls" type="gridXlsResult" />
+      <result name="pdf" type="gridPdfResult" />
+      <param name="page">/dhis-web-caseentry/patientHistory.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_HISTORY</param>
+    </action>
+
+    <action name="getProgramReportHistory"
+      class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceHistoryAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <result name="xls" type="gridXlsResult" />
+      <result name="pdf" type="gridPdfResult" />
+      <param name="page">/dhis-web-caseentry/programInstanceHistory.vm</param>
+    </action>
+
+    <action name="getPatientLocation"
+      class="org.hisp.dhis.caseentry.action.patient.GetPatientLocationAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/patientLocation.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_CHANGE_LOCATION</param>
+    </action>
+
+    <action name="registerPatientLocation"
+      class="org.hisp.dhis.caseentry.action.patient.RegisterPatientLocationAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_CHANGE_LOCATION</param>
+    </action>
+
+    <!-- Patient-Program Enrollment -->
+
+    <action name="showProgramEnrollmentForm"
+      class="org.hisp.dhis.caseentry.action.patient.ProgramEnrollmentSelectAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/programEnrollmentSelectForm.vm</param>
+      <param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
+    </action>
+
+    <action name="enrollmentform"
+      class="org.hisp.dhis.caseentry.action.patient.ProgramEnrollmentAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/programEnrollmentForm.vm</param>
+      <param name="requiredAuthorities">F_PROGRAM_INSTANCE_MANAGEMENT</param>
+    </action>
+
+    <action name="validatePatientProgramEnrollment"
+      class="org.hisp.dhis.caseentry.action.patient.ValidatePatientProgramEnrollmentAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <result name="input" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseInput.vm
+      </result>
+    </action>
+
+    <action name="saveProgramEnrollment"
+      class="org.hisp.dhis.caseentry.action.patient.SaveProgramEnrollmentAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonProgramEnrollment.vm
+      </result>
+      <param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
+    </action>
+
+    <action name="getProgramInstance"
+      class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/responseProgramInstance.vm
+      </result>
+    </action>
+
+    <action name="getEventMessages"
+      class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/eventMessage.vm</param>
+      <param name="requiredAuthorities">F_PROGRAM_STAGE_INSTANCE_REMINDER</param>
+    </action>
+
+    <action name="saveDueDate"
+      class="org.hisp.dhis.caseentry.action.patient.SaveDueDateAction">
+      <result name="success" type="velocity">status.vm</result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
+    </action>
+
+    <action name="savePatientIdentifierAndAttribute"
+      class="org.hisp.dhis.caseentry.action.patient.SaveIdentifierAndAttributeAction">
+      <result name="success" type="velocity-xml">status.vm</result>
+      <param name="requiredAuthorities">F_PATIENT_ADD, F_PROGRAM_ENROLLMENT</param>
+    </action>
+
+    <action name="setProgramInstanceStatus"
+      class="org.hisp.dhis.caseentry.action.patient.SetProgramInstanceStatusAction">
+      <result name="success" type="velocity-xml">status.vm</result>
+      <param name="requiredAuthorities">F_PROGRAM_UNENROLLMENT</param>
+    </action>
+
+    <action name="getPatientIdentifierAndAttribute"
+      class="org.hisp.dhis.caseentry.action.patient.GetProgramAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/identifierAndAttributeForm.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
+    </action>
+
+    <action name="getVisitSchedule"
+      class="org.hisp.dhis.caseentry.action.patient.GetProgramInstanceAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/visitSchedule.vm</param>
+      <param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
+    </action>
+
+    <action name="validatePatientIdentifier"
+      class="org.hisp.dhis.caseentry.action.patient.ValidatePatientIdentifierAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="input" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseInput.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+
+
+    <!-- Relationship -->
+
+    <action name="getPartner"
+      class="org.hisp.dhis.caseentry.action.patient.GetPartnerAction">
+      <result name="success" type="velocity-xml">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/detailsPartner.vm</param>
+    </action>
+
+    <action name="showRelationshipList"
+      class="org.hisp.dhis.caseentry.action.patient.ShowRelationshipListAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/relationshipList.vm</param>
+      <param name="javascripts">
+        ../dhis-web-commons/javascripts/jQuery/jquery-barcode.min.js
+      </param>
+      <param name="requiredAuthorities">F_RELATIONSHIP_MANAGEMENT</param>
+    </action>
+
+    <action name="showAddRelationshipForm"
+      class="org.hisp.dhis.caseentry.action.patient.ShowAddRelationshipFormAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/addRelationshipForm.vm</param>
+      <param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
+    </action>
+
+    <action name="validateSearchRelationship"
+      class="org.hisp.dhis.caseentry.action.patient.ValidateSearchRelationshipAction">
+      <result name="success" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseError.vm
+      </result>
+      <result name="input" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseInput.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+
+    <action name="searchRelationshipPatient"
+      class="org.hisp.dhis.caseentry.action.patient.SearchRelationshipPatientAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/relationshipPatients.vm</param>
+      <param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
+    </action>
+
+    <action name="saveRelationship"
+      class="org.hisp.dhis.caseentry.action.patient.SaveRelationshipAction">
+      <result name="success" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseError.vm
+      </result>
+      <result name="input" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseInput.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
+    </action>
+
+    <action name="removeRelationship"
+      class="org.hisp.dhis.caseentry.action.patient.RemoveRelationshipAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_RELATIONSHIP_DELETE</param>
+    </action>
+
+    <action name="saveRepresentative"
+      class="org.hisp.dhis.caseentry.action.patient.SaveRepresentativeAction">
+      <result name="success" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseError.vm
+      </result>
+      <result name="input" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseInput.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
+    </action>
+
+    <action name="removeRepresentative"
+      class="org.hisp.dhis.caseentry.action.patient.RemoveRepresentativeAction">
+      <result name="success" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseError.vm
+      </result>
+      <result name="input" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseInput.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_RELATIONSHIP_DELETE</param>
+    </action>
+
+    <action name="showAddRelationshipPatient"
+      class="org.hisp.dhis.caseentry.action.patient.GetPatientAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/addRelationshipPatientForm.vm</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD, F_RELATIONSHIP_ADD</param>
+    </action>
+
+    <action name="validateAddRelationshipPatient"
+      class="org.hisp.dhis.caseentry.action.patient.ValidateAddRelationshipPatientAction">
+      <result name="success" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseError.vm
+      </result>
+      <result name="input" type="velocity-xml">
+        /dhis-web-commons/ajax/xmlResponseInput.vm
+      </result>
+      <result name="duplicate" type="velocity-xml">
+        /dhis-web-caseentry/responseDuplicate.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+
+    <action name="addRelationshipPatient"
+      class="org.hisp.dhis.caseentry.action.patient.AddRelationshipPatientAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
+    </action>
+
+    <!-- Tabular report -->
+
+    <action name="searchProgramStageInstances"
+      class="org.hisp.dhis.caseentry.action.report.GenerateTabularReportAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/programStageInstancesList.vm</param>
+    </action>
+
+    <action name="generateTabularReport" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="getOrganisationUnitChildren"
+      class="org.hisp.dhis.caseentry.action.report.GetOrganisationUnitChildrenAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonminOrganisationUnitChildren.vm
+      </result>
+    </action>
+
+    <action name="tabularInitialize"
+      class="org.hisp.dhis.caseentry.action.report.TabularInitializeAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonTabularInitialize.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="loadReportProgramStages"
+      class="org.hisp.dhis.caseentry.action.report.LoadProgramStagesAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStages.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="loadProgramStageSections"
+      class="org.hisp.dhis.caseentry.action.report.GetProgramStageSectionsAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStageSections.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="loadDataElements"
+      class="org.hisp.dhis.caseentry.action.report.LoadDataElementsAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/responseDataElements.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="getTabularParams"
+      class="org.hisp.dhis.caseentry.action.report.GetTabularParamsAction">
+      <result name="success" type="velocity-json">/dhis-web-caseentry/responseTabularParams.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="validateTabularReport"
+      class="org.hisp.dhis.caseentry.action.report.ValidateTabularReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="input" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseInput.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="saveTabularReport"
+      class="org.hisp.dhis.caseentry.action.report.SaveTabularReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="anyAuthorities">F_PATIENT_TABULAR_REPORT_PUBLIC_ADD,F_PATIENT_TABULAR_REPORT_PRIVATE_ADD</param>
+    </action>
+
+    <action name="getTabularReports"
+      class="org.hisp.dhis.caseentry.action.report.GetTabularReportsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonTabularReportList.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="getTabularReport"
+      class="org.hisp.dhis.caseentry.action.report.GetTabularReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonTabularReport.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="updateTabularReportName"
+      class="org.hisp.dhis.caseentry.action.report.UpdateTabularReportNameAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="deleteTabularReport"
+      class="org.hisp.dhis.caseentry.action.report.DeleteTabularReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <!-- Aggregate Report -->
+
+    <action name="getAggregateReportList"
+      class="org.hisp.dhis.caseentry.action.report.GetAggregateReportListAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonTabularReportList.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="saveAggregateReport"
+      class="org.hisp.dhis.caseentry.action.report.SaveAggregateReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="anyAuthorities">F_PATIENT_AGGREGATE_REPORT_PUBLIC_ADD,F_PATIENT_AGGREGATE_REPORT_PRIVATE_ADD</param>
+    </action>
+
+    <action name="getAggregateReports"
+      class="org.hisp.dhis.caseentry.action.report.GetAggregateReportsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonTabularReportList.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="getAggregateReport"
+      class="org.hisp.dhis.caseentry.action.report.GetAggregateReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonTabularAggregateReport.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="updateAggregateReportName"
+      class="org.hisp.dhis.caseentry.action.report.UpdateAggregateReportNameAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="deleteAggregateReport"
+      class="org.hisp.dhis.caseentry.action.report.DeleteAggregateReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <action name="getOrganisationUnitPathsByGroup"
+      class="org.hisp.dhis.caseentry.action.report.GetOrganisationUnitsByGroupAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-caseentry/jsonminOrganisationUnitPaths.vm
+      </result>
+    </action>
+
+    <action name="validateAggregateReport"
+      class="org.hisp.dhis.caseentry.action.report.ValidateAggregateReportAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="input" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseInput.vm
+      </result>
+      <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
+    </action>
+
+    <!-- SMS Reminder -->
+
+    <action name="smsReminderSelect"
+      class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/programTrackingSelect.vm</param>
+      <param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="javascripts">
+        ../dhis-web-commons/ouwt/ouwt.js,
+        javascript/commons.js,
+        javascript/patient.js,
+        javascript/relationshipPatient.js,
+        javascript/entry.js,
+        javascript/smsReminder.js
+      </param>
+      <param name="requiredAuthorities">F_PROGRAM_TRACKING_MANAGEMENT</param>
+    </action>
+
+    <action name="getSMSPatientRecords"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/programTrackingRecords.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PROGRAM_TRACKING_SEARCH</param>
+    </action>
+
+    <action name="programTrackingList"
+      class="org.hisp.dhis.caseentry.action.reminder.GetProgramTrackingListAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/programTrackingList.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PROGRAM_TRACKING_LIST</param>
+    </action>
+
+    <action name="sendSMS"
+      class="org.hisp.dhis.caseentry.action.reminder.SendSmsAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="input" type="velocity-json">/dhis-web-commons/ajax/jsonResponseInput.vm
+      </result>
+      <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
+    </action>
+
+    <action name="sendSMSTotList"
+      class="org.hisp.dhis.caseentry.action.reminder.SendSmsToListAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
+    </action>
+
+    <action name="setEventStatus"
+      class="org.hisp.dhis.caseentry.action.reminder.SetEventStatusAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
+    </action>
+
+    <action name="getProgramStageInstanceById"
+      class="org.hisp.dhis.caseentry.action.reminder.GetProgramStageInstanceByIdAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/trackingEventMessage.vm</param>
+      <param name="stylesheets">style/style.css</param>
+    </action>
+
+    <!-- Dashboard -->
+
+    <action name="patientDashboard"
+      class="org.hisp.dhis.caseentry.action.patient.PatientDashboardAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/patientDashboard.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="requiredAuthorities">F_PATIENT_DASHBOARD</param>
+    </action>
+
+    <action name="removeProgramInstance"
+      class="org.hisp.dhis.caseentry.action.caseentry.RemoveProgramInstanceAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <result name="error" type="velocity-json">
+        /dhis-web-commons/ajax/jsonResponseError.vm
+      </result>
+      <param name="requiredAuthorities">F_PROGRAM_INSTANCE_DELETE</param>
+    </action>
+
+    <!-- Comment && Message -->
+
+    <action name="savePatientComment"
+      class="org.hisp.dhis.caseentry.action.reminder.SavePatientCommentAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_COMMENT_ADD</param>
+    </action>
+
+    <action name="removePatientComment"
+      class="org.hisp.dhis.caseentry.action.reminder.RemovePatientCommentAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_COMMENT_DELETE</param>
+    </action>
+
+    <action name="removeSms"
+      class="org.hisp.dhis.caseentry.action.reminder.RemoveSmsAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_PATIENT_COMMENT_DELETE</param>
+    </action>
+
+    <!-- Activity plan -->
+
+    <action name="activityPlanSelect"
+      class="org.hisp.dhis.caseentry.action.patient.ShowActivityPlanFormAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/activityPlanSelect.vm</param>
+      <param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="javascripts">
+        ../dhis-web-commons/ouwt/ouwt.js,
+        javascript/commons.js,
+        javascript/patient.js,
+        javascript/entry.js,
+        javascript/relationshipPatient.js,
+        javascript/activityPlan.js
+      </param>
+      <param name="requiredAuthorities">F_ACTIVITY_PLAN</param>
+    </action>
+
+    <action name="getActivityPlanRecords"
+      class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/activityPlanRecords.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <result name="xls" type="gridXlsResult" />
+      <result name="pdf" type="gridPdfResult" />
+    </action>
+
+    <action name="accessPatientAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_ACCESS_PATIENT_ATTRIBUTES</param>
+    </action>
+
+    <action name="allowEditPatientFixedAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_ALLOW_EDIT_PATIENT_PROPERTIES</param>
+    </action>
+
+    <action name="allowEditPatientAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_ALLOW_EDIT_PATIENT_ATTRIBUTES</param>
+    </action>
+
+    <action name="allowEditPatientIdentifier" class="org.hisp.dhis.caseentry.action.NoAction">
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+      </result>
+      <param name="requiredAuthorities">F_ALLOW_EDIT_PATIENT_IDENTIFIERS</param>
+    </action>
+
+
+    <!-- Program-stage-completeness -->
+
+    <action name="programStageCompletenessSelect"
+      class="org.hisp.dhis.caseentry.action.patient.SelectAction">
+      <interceptor-ref name="organisationUnitTreeStack" />
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-caseentry/programStageCompletenessSelect.vm</param>
+      <param name="menu">/dhis-web-caseentry/reportsMenuWithoutOrgunit.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <param name="javascripts">
+        javascript/commons.js,
+        javascript/programStageCompleteness.js
+      </param>
+      <param name="requiredAuthorities">F_PROGRAM_STAGE_COMPLETENESS</param>
+    </action>
+
+    <action name="generateProgramStageCompleteness"
+      class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageInstanceCompletenessAction">
+      <result name="success" type="velocity">/content.vm</result>
+      <param name="page">/dhis-web-caseentry/programStageCompleteness.vm</param>
+      <param name="stylesheets">style/style.css</param>
+      <result name="xls" type="gridXlsResult" />
+      <result name="pdf" type="gridPdfResult" />
+      <param name="requiredAuthorities">F_PROGRAM_STAGE_COMPLETENESS</param>
+    </action>
+
+  </package>
 </struts>