dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14651: [mobile light] fixed authorities and user role, remove patient.name in enrollment form

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 08:15:38 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 14651
committer: Hong Em <em.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-04-04 15:11:18 +0700
message:
  [mobile light] fixed authorities and user role, remove patient.name in enrollment form
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2014-03-04 07:06:42 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2014-04-04 08:11:18 +0000
@@ -3,531 +3,546 @@
     "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
     "http://struts.apache.org/dtds/struts-2.0.dtd";>
 <struts>
-  <include file="dhis-web-commons.xml" />
-
-  <package name="dhis-web-light" extends="dhis-web-commons"
-      namespace="/light">
-
-    <action name="index" class="org.hisp.dhis.light.action.MenuAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/menu.vm</param>
-    </action>
-
-	<!--	
-	<action name="viewChart" class="org.hisp.dhis.light.chart.action.GetDataSetInfoForChartAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/chart/viewChartInfo.vm</param>
-    </action>	
-	-->
-	
-    <!-- data entry -->
-
-    <action name="selectOrganisationUnit"
-        class="org.hisp.dhis.light.dataentry.action.GetOrganisationUnitsAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/selectOrganisationUnit.vm</param>
-      <result name="selectDataSet" type="redirect">
-        /light/selectDataSet.action?organisationUnitId=${organisationUnitId}
-      </result>
-      <result name="selectPeriod" type="redirect">
-        /light/selectPeriod.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}
-      </result>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD</param>
-    </action>
-
-    <action name="selectDataSet"
-        class="org.hisp.dhis.light.dataentry.action.GetDataSetsAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/selectDataSet.vm</param>
-      <result name="selectPeriod" type="redirect">
-        /light/selectPeriod.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}
-      </result>
-    </action>
-
-    <action name="selectPeriod"
-        class="org.hisp.dhis.light.dataentry.action.GetPeriodsAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/selectPeriod.vm</param>
-    </action>
-
-    <action name="dataEntry"
-        class="org.hisp.dhis.light.dataentry.action.GetDataSetOverviewAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/dataEntryOverview.vm</param>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD</param>
-    </action>
-
-    <action name="dataEntrySection"
-        class="org.hisp.dhis.light.dataentry.action.GetSectionFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/dataEntrySection.vm</param>
-    </action>
-
-    <action name="saveSectionForm"
-        class="org.hisp.dhis.light.dataentry.action.SaveSectionFormAction">
-      <result name="success" type="redirect">
-        /light/dataEntry.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}&amp;isoPeriod=${isoPeriod}&amp;sectionId=${sectionId}&amp;validated=${validated}
-      </result>
-      <result name="error" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/dataEntrySection.vm</param>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
-    </action>
-
-    <action name="markComplete"
-        class="org.hisp.dhis.light.dataentry.action.MarkComplete">
-      <result name="success" type="redirect">
-        /light/index.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}&amp;isoPeriod=${isoPeriod}&amp;complete=true
-      </result>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD</param>
-    </action>
-	
-	<action name="inComplete"
-        class="org.hisp.dhis.light.dataentry.action.UndoCompleteAction">
-      <result name="success" type="redirect">
-        /light/dataEntry.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}&amp;isoPeriod=${isoPeriod}
-      </result>
-      <param name="requiredAuthorities">F_DATAVALUE_DELETE</param>
-    </action>
-
-    <!-- Namebased Data Entry -->
-
-    <action name="trackingMenu" class="org.hisp.dhis.light.action.NoAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/trackingMenu.vm</param>
-    </action>
-    <action name="selectNamebasedOrganisationUnit"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction">
-		<result name="redirect" type="redirect">/light/selectActivityType.action?orgUnitId=${orgUnitId}</result>
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm</param>
-    </action>
-
-    <action name="selectActivityType"
-        class="org.hisp.dhis.light.namebaseddataentry.action.ShowActivityTypeAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/selectActivityType.vm</param>
-    </action>
-
-    <action name="selectBeneficiary"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryListAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/beneficiaryList.vm</param>
-    </action>
-
-    <action name="selectActivity"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetActivityListAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/selectActivity.vm</param>
-    </action>
-    
-    <action name="showProgramStageSection"
-		class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageSectionAction">
-	  <result name="redirect" type="redirect">showProgramStageForm.action?programStageSectionId=0&amp;programId=${programId}&amp;programStageId=${programStageInstance.getProgramStage().getId()}&amp;programStageInstanceId=${programStageInstance.getId()}&amp;patientId=${patient.getId()}&amp;programInstanceId=${programStageInstance.getProgramInstance().getId()}&amp;orgUnitId=0</result>
-	  <result name="redirectCompletedForm" type="redirect">showCompletedProgramStageForm.action?programStageSectionId=0&amp;programId=${programId}&amp;programStageId=${programStageInstance.getProgramStage().getId()}&amp;programStageInstanceId=${programStageInstance.getId()}&amp;patientId=${patient.getId()}&amp;programInstanceId=${programStageInstance.getProgramInstance().getId()}&amp;orgUnitId=0</result>
-	  <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-	  <param name="page">/dhis-web-light/namebased/selectProgramStageSection.vm</param>		
-	</action>
-	
-    <action name="showProgramStageForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-
-    <action name="showCompletedProgramStageForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/completedProgramStageForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-    
-    <action name="markCompleteProgramStageHasSection"
-        class="org.hisp.dhis.light.namebaseddataentry.action.MarkCompleteProgramStageAction">
-      <result name="success" type="redirect">showPatientProgramList.action?patientId=${patientId}</result>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-
-    <action name="saveProgramStageForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction">
-      <result name="success" type="redirect">
-        /light/selectBeneficiary.action?organisationUnitId=${orgUnitId}&amp;current=${current}&amp;validated=true
-      </result>
-      <result name="success_back_to_programStage" type="redirect">
-        /light/showPatientProgramList.action?patientId=${patientId}
-      </result>
-      <result name="success_back_to_programStageSection" type="redirect">
-        /light/showProgramStageSection.action?programId=${programId}&amp;programStageId=${programStageId}&amp;programStageInstanceId=${programStageInstanceId}&amp;patientId=${patientId}&amp;programInstanceId=${programInstanceId}&amp;validated=${validated}&amp;programStageSectionId=${programStageSectionId}&amp;orgUnitId=0
-      </result>
-      <result name="register_next_duedate" type="redirect">
-        showRepeatableEventRegistrationForm.action?programInstanceId=${programInstanceId}&amp;programStageId=${programStageId}&amp;currentProgramStageInstanceId=${programStageInstanceId}
-      </result>
-      <result name="error" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-
-    <action name="showBeneficiaryDetail"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/beneficiaryDetail.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
-    </action>
-
-    <action name="showBeneficiaryDetailInSearchPage"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/beneficiaryDetail.vm</param>
-      <param name="previouspage">showPatientProgramList.action?patientId=${patientId}</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
-    </action>
-
-    <action name="showFindBeneficiaryForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/findBeneficiaryForm.vm</param>
-	   <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
-    </action>
-    
-
-    <action name="showFindRelatedPatientForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/findRelatedPatientForm.vm</param>
-	   <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
-    </action>
-
-    <action name="findBeneficiary"
-        class="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction">
-      <result name="redirect" type="redirect">showPatientProgramList.action?patientId=${patientId}</result>
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/beneficiaryList.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
-    </action>
-
-    <action name="showAddNewRelationshipForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetAddNewRelationshipFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/addNewRelationshipForm.vm</param>
-    </action>
-
-    <action name="findRelatedPatient"
-        class="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction">
-      <result name="redirect" type="redirect">
-        showAddNewRelationshipForm.action?originalPatientId=${originalPatientId}&amp;relatedPatientId=${patientId}&amp;relationshipTypeId=${relationshipTypeId}
-      </result>
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/relatedPatientList.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
-    </action>
-
-    <action name="addNewRelationship"
-        class="org.hisp.dhis.light.namebaseddataentry.action.AddNewRalationshipAction">
-      <result name="redirect" type="redirect">showPatientProgramList.action?patientId=${originalPatientId}&amp;validated=true
-      </result>
-	  <param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
-    </action>
-    
-    <action name="deleteRelationship"
-    	class="org.hisp.dhis.light.namebaseddataentry.action.DeleteRelationshipAction">
-      <result name="redirect" type="redirect">showPatientProgramList.action?patientId=${currentPatientId}&amp;validated=true
-      </result>
-	  <param name="requiredAuthorities">F_RELATIONSHIP_DELETE</param>
-    </action>
-
-    <action name="showPatientProgramList"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientProgramListAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/beneficiaryProgramList.vm</param>
-	  <param name="requiredAuthorities">F_PATIENT_DASHBOARD</param>
-    </action>
-
-    <action name="showPatientProgramStageList"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageListAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/beneficiaryProgramStageList.vm</param>
-    </action>
-
-    <action name="showRepeatableEventRegistrationForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetRepeatableEventRegistrationFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/namebased/repeatableEventRegistrationForm.vm</param>
-    </action>
-
-    <action name="saveRepeatableEvent"
-        class="org.hisp.dhis.light.namebaseddataentry.action.SaveRepeatableEventAction">
-      <result name="success" type="redirect">showPatientProgramStageList.action?patientId=${patientId}&amp;programInstanceId=${programInstanceId}&amp;programId=${programId}&amp;validated=false
-      </result>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-	  
-	  <action name="showPatientLocationForm"
-        class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientLocationFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-	  <param name="page">/dhis-web-light/namebased/patientLocationForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
-    </action>
-	  
-	  <action name="registerPatientLocation"
-        class="org.hisp.dhis.light.namebaseddataentry.action.RegisterPatientLocationAction">
-      <result name="success" type="redirect">showPatientProgramList.action?patientId=${patientId}</result>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
-    </action>
-
-    <!-- Beneficiary Registration -->
-
-    <action name="selectRegistrationOrganisationUnit"
-        class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction">
-	  <result name="redirect" type="redirect">/light/registerBeneficiary.action?orgUnitId=${orgUnitId}</result>	
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/registration/selectRegistrationOrganisationUnits.vm</param>
-    </action>
-
-    <action name="registerBeneficiary"
-        class="org.hisp.dhis.light.beneficiaryregistration.action.RegisterBeneficiaryAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/registration/beneficiaryRegistrationForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
-    </action>
-
-    <action name="saveBeneficiary"
-        class="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction">
-      <result name="success" type="redirect">/light/showPatientProgramList.action?patientId=${patientId}</result>
-      <result name="error" type="velocity">/dhis-web-light/main.vm</result>
-	  <result name="redirect" type="redirect">/light/showAddNewRelationshipForm.action?originalPatientId=${originalPatientId}&amp;relatedPatientId=${patientId}&amp;relationshipTypeId=${relationshipTypeId}</result>
-      <result name="error" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/registration/beneficiaryRegistrationForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
-    </action>
-
-    <!-- Beneficiary Enrollment -->
-
-    <action name="selectEnrollmentOrganisationUnit"
-        class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm</param>
-    </action>
-
-    <action name="showBeneficiarySearchingForm"
-        class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/enrollment/beneficiarySearchingForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
-    </action>
-
-    <action name="searchBeneficiary"
-        class="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/enrollment/beneficiarySearchResult.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
-    </action>
-
-    <action name="selectEnrollmentProgram"
-        class="org.hisp.dhis.light.beneficiaryenrollment.action.GetEnrollmentProgramListAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/enrollment/enrollmentProgramList.vm</param>
-    </action>
-
-    <action name="showProgramEnrollmentForm"
-        class="org.hisp.dhis.light.beneficiaryenrollment.action.GetProgramEnrollmentFormAction">
-      	<result name="success" type="velocity">/dhis-web-light/main.vm</result>
-       <result name="redirect" type="redirect">/light/showSingleEventForm.action?programId=${program.getId()}&amp;patientId=${patient.getId()}&amp;organisationUnitId=${patient.getOrganisationUnit().getId()}&amp;isEditing=false</result>
-      <param name="page">/dhis-web-light/enrollment/programEnrollmentForm.vm</param>
-    </action>
-
-    <action name="saveMobileProgramEnrollment"
-        class="org.hisp.dhis.light.beneficiaryenrollment.action.SaveMobileProgramEnrollmentAction">
-      <result name="success" type="redirect">/light/showPatientProgramList.action?patientId=${patientId}</result>
-      <result name="error" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/enrollment/programEnrollmentForm.vm</param>
-	  <param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
-    </action>
-
-    <!-- Single Event -->
-
-    <action name="selectSingleEvent"
-        class="org.hisp.dhis.light.singleevent.action.GetSingleEventAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/singleevent/selectSingleEvent.vm</param>
-    </action>
-
-    <action name="selectSingleEventBeneficiary"
-        class="org.hisp.dhis.light.singleevent.action.GetSingleEventBeneficiaryAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm</param>
-    </action>
-
-    <action name="showSingleEventForm"
-	class="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-
-    <action name="saveSingleEvent"
-        class="org.hisp.dhis.light.singleevent.action.SaveSingleEventAction">
-      <result name="success" type="redirect">
-        /light/showPatientProgramList.action?patientId=${patientId}
-      </result>
-      <result name="error" type="velocity">/dhis-web-light/main.vm</result>
-      <result name="redirect" type="redirect">findSingleEventOptionSet.action?keyword=${keyword}&amp;dataElementIdForSearching=${dataElementIdForSearching}&amp;organisationUnitId=${organisationUnitId}&amp;patientId=${patientId}&amp;programId=${programId}&amp;programStageInstanceId=${programStageInstanceId}&amp;isEditing=${isEditing}</result>
-      <param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
-	   <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-    
-    <action name="findSingleEventOptionSet"
-    	class="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction">
-    	<!--<result name="success" type="redirect">showSingleEventForm.action?organisationUnitId=559&amp;patientId=1149378&amp;programId=1149486</result>
-    	-->
-    	<result name="success" type="velocity">/dhis-web-light/main.vm</result>
-    	<param name="page">/dhis-web-light/singleevent/singleEventOptionSetFindForm.vm</param>
-    </action>
-
-    <!-- Reports -->
-
-    <action name="reports"
-        class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/reports.vm</param>
-    </action>
-
-    <action name="dashboard-charts"
-        class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
-      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
-      <param name="page">/dhis-web-light/dashboard_charts.vm</param>
-    </action>
-
-    <action name="dashboard-reports"
-        class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
-      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
-      <param name="page">/dhis-web-light/dashboard_reports.vm</param>
-    </action>
-
-    <action name="dashboard-documents"
-        class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
-      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
-      <param name="page">/dhis-web-light/dashboard_documents.vm</param>
-    </action>
-
-    <action name="getReport"
-        class="org.hisp.dhis.light.dashboard.action.GetReportAction">
-      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
-      <param name="page">/dhis-web-commons/ajax/htmlGrid.vm</param>
-    </action>
-
-    <action name="getReportParams"
-        class="org.hisp.dhis.light.dashboard.action.GetReportParamsAction">
-      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
-      <param name="page">/dhis-web-light/inputReportParamsForm.vm</param>
-    </action>
-
-    <action name="getChart"
-        class="org.hisp.dhis.light.dashboard.action.GetChartAction">
-      <result name="success" type="chart">
-        <param name="width">480</param>
-        <param name="height">800</param>
-      </result>
-    </action>
-
-    <!-- Settings -->
-
-    <action name="settings"
-        class="org.hisp.dhis.light.settings.action.GetSettingsAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/settings.vm</param>
-    </action>
-
-    <action name="saveSettingsForm"
-        class="org.hisp.dhis.light.settings.action.SaveSettingsFormAction">
-      <result name="success" type="redirect">/light/index.action</result>
-    </action>
-
-    <!-- Messages -->
-
-    <action name="messages"
-        class="org.hisp.dhis.light.message.action.GetMessagesAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/messages.vm</param>
-    </action>
-
-    <action name="reply"
-        class="org.hisp.dhis.light.message.action.GetMessageAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/message.vm</param>
-    </action>
-
-    <action name="sendReply"
-        class="org.hisp.dhis.light.message.action.SendReplyAction">
-      <result name="success" type="redirect">/light/messages.action</result>
-    </action>
-
-    <action name="feedback" class="org.hisp.dhis.light.action.NoAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/feedback.vm</param>
-    </action>
-
-    <action name="sendFeedback"
-        class="org.hisp.dhis.light.message.action.SendFeedbackAction">
-      <result name="success" type="redirect">/light/index.action</result>
-    </action>
-    
-    <action name="searchUser"
-        class="org.hisp.dhis.light.messaging.action.FindUserAction">
-    <result name="redirect" type="redirect">showUserList.action?userId=${userId}</result>
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/messages.vm</param>
-    </action>
-    
-    
-    <action name="showUserList"
-        class="org.hisp.dhis.light.messaging.action.GetMessageRecipientsAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/sendMessageOnMobile.vm</param>
-    </action>
-    
-    <action name="sendMessage"
-        class="org.hisp.dhis.light.messaging.action.SendMessagesAction">
-      <result name="success" type="redirect">/light/messages.action</result>
-    </action>
-    
-    <action name="recipients"
-        class="org.hisp.dhis.light.messaging.action.GetLastRecipientsAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/messages.vm</param>
-    </action>
-
-    <!-- Anonymous -->
-    
-    <!-- <action name="selectAnonymousOrgUnit"
-        class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction"> -->
-        
-    <action name="selectAnonymousOrgUnit"
-        class="org.hisp.dhis.light.anonymous.action.SearchOrgUnitAction">
-	  <result name="redirect" type="redirect">/light/anonymous.action?orgUnitId=${orgUnitId}</result>	
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/anonymous/selectAnonymousOrgUnit.vm</param>
-    </action>
-    
-    <action name="anonymous"
-        class="org.hisp.dhis.light.anonymous.action.GetAllAnonymousProgramAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/anonymous/anonymousProgramSelection.vm</param>
-    </action>
-
-    <action name="showAnonymousForm"
-        class="org.hisp.dhis.light.anonymous.action.ShowAnonymousFormAction">
-      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/anonymous/anonymousProgramForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-
-    <action name="saveAnonymousForm"
-        class="org.hisp.dhis.light.anonymous.action.SaveAnonymousProgramAction">
-      <result name="success" type="redirect">/light/anonymous.action?validated=true&amp;orgUnitId=${orgUnitId}</result>
-      <result name="error" type="velocity">/dhis-web-light/main.vm</result>
-      <param name="page">/dhis-web-light/anonymous/anonymousProgramForm.vm</param>
-	  <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
-    </action>
-    
-  </package>
+	<include file="dhis-web-commons.xml" />
+
+	<package name="dhis-web-light" extends="dhis-web-commons"
+		namespace="/light">
+
+		<action name="index" class="org.hisp.dhis.light.action.MenuAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/menu.vm</param>
+		</action>
+
+		<!-- <action name="viewChart" class="org.hisp.dhis.light.chart.action.GetDataSetInfoForChartAction"> 
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result> <param 
+			name="page">/dhis-web-light/chart/viewChartInfo.vm</param> </action> -->
+
+		<!-- data entry -->
+
+		<action name="selectOrganisationUnit"
+			class="org.hisp.dhis.light.dataentry.action.GetOrganisationUnitsAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/selectOrganisationUnit.vm</param>
+			<result name="selectDataSet" type="redirect">
+				/light/selectDataSet.action?organisationUnitId=${organisationUnitId}
+			</result>
+			<result name="selectPeriod" type="redirect">
+				/light/selectPeriod.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}
+			</result>
+			<param name="requiredAuthorities">F_DATAVALUE_ADD</param>
+		</action>
+
+		<action name="selectDataSet"
+			class="org.hisp.dhis.light.dataentry.action.GetDataSetsAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/selectDataSet.vm</param>
+			<result name="selectPeriod" type="redirect">
+				/light/selectPeriod.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}
+			</result>
+		</action>
+
+		<action name="selectPeriod"
+			class="org.hisp.dhis.light.dataentry.action.GetPeriodsAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/selectPeriod.vm</param>
+		</action>
+
+		<action name="dataEntry"
+			class="org.hisp.dhis.light.dataentry.action.GetDataSetOverviewAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/dataEntryOverview.vm</param>
+			<param name="requiredAuthorities">F_DATAVALUE_ADD</param>
+		</action>
+
+		<action name="dataEntrySection"
+			class="org.hisp.dhis.light.dataentry.action.GetSectionFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/dataEntrySection.vm</param>
+		</action>
+
+		<action name="saveSectionForm"
+			class="org.hisp.dhis.light.dataentry.action.SaveSectionFormAction">
+			<result name="success" type="redirect">
+				/light/dataEntry.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}&amp;isoPeriod=${isoPeriod}&amp;sectionId=${sectionId}&amp;validated=${validated}
+			</result>
+			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/dataEntrySection.vm</param>
+			<param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="markComplete"
+			class="org.hisp.dhis.light.dataentry.action.MarkComplete">
+			<result name="success" type="redirect">
+				/light/index.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}&amp;isoPeriod=${isoPeriod}&amp;complete=true
+			</result>
+			<param name="requiredAuthorities">F_DATAVALUE_ADD</param>
+		</action>
+
+		<action name="inComplete"
+			class="org.hisp.dhis.light.dataentry.action.UndoCompleteAction">
+			<result name="success" type="redirect">
+				/light/dataEntry.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}&amp;isoPeriod=${isoPeriod}
+			</result>
+			<param name="requiredAuthorities">F_DATAVALUE_DELETE</param>
+		</action>
+
+		<!-- Namebased Data Entry -->
+
+		<action name="trackingMenu" class="org.hisp.dhis.light.action.NoAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/trackingMenu.vm</param>
+		</action>
+		<action name="selectNamebasedOrganisationUnit"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction">
+			<result name="redirect" type="redirect">/light/selectActivityType.action?orgUnitId=${orgUnitId}
+			</result>
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm</param>
+		</action>
+
+		<action name="selectActivityType"
+			class="org.hisp.dhis.light.namebaseddataentry.action.ShowActivityTypeAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/selectActivityType.vm</param>
+		</action>
+
+		<action name="selectBeneficiary"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryListAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/beneficiaryList.vm</param>
+		</action>
+
+		<action name="selectActivity"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetActivityListAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/selectActivity.vm</param>
+		</action>
+
+		<action name="showProgramStageSection"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageSectionAction">
+			<result name="redirect" type="redirect">showProgramStageForm.action?programStageSectionId=0&amp;programId=${programId}&amp;programStageId=${programStageInstance.getProgramStage().getId()}&amp;programStageInstanceId=${programStageInstance.getId()}&amp;patientId=${patient.getId()}&amp;programInstanceId=${programStageInstance.getProgramInstance().getId()}&amp;orgUnitId=0
+			</result>
+			<result name="redirectCompletedForm" type="redirect">showCompletedProgramStageForm.action?programStageSectionId=0&amp;programId=${programId}&amp;programStageId=${programStageInstance.getProgramStage().getId()}&amp;programStageInstanceId=${programStageInstance.getId()}&amp;patientId=${patient.getId()}&amp;programInstanceId=${programStageInstance.getProgramInstance().getId()}&amp;orgUnitId=0
+			</result>
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/selectProgramStageSection.vm</param>
+		</action>
+
+		<action name="showProgramStageForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="showCompletedProgramStageForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/completedProgramStageForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="markCompleteProgramStageHasSection"
+			class="org.hisp.dhis.light.namebaseddataentry.action.MarkCompleteProgramStageAction">
+			<result name="success" type="redirect">showPatientProgramList.action?patientId=${patientId}
+			</result>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="saveProgramStageForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction">
+			<result name="success" type="redirect">
+				/light/selectBeneficiary.action?organisationUnitId=${orgUnitId}&amp;current=${current}&amp;validated=true
+			</result>
+			<result name="success_back_to_programStage" type="redirect">
+				/light/showPatientProgramList.action?patientId=${patientId}
+			</result>
+			<result name="success_back_to_programStageSection" type="redirect">
+				/light/showProgramStageSection.action?programId=${programId}&amp;programStageId=${programStageId}&amp;programStageInstanceId=${programStageInstanceId}&amp;patientId=${patientId}&amp;programInstanceId=${programInstanceId}&amp;validated=${validated}&amp;programStageSectionId=${programStageSectionId}&amp;orgUnitId=0
+			</result>
+			<result name="register_next_duedate" type="redirect">
+				showRepeatableEventRegistrationForm.action?programInstanceId=${programInstanceId}&amp;programStageId=${programStageId}&amp;currentProgramStageInstanceId=${programStageInstanceId}
+			</result>
+			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="showBeneficiaryDetail"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/beneficiaryDetail.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
+		</action>
+
+		<action name="showBeneficiaryDetailInSearchPage"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/beneficiaryDetail.vm</param>
+			<param name="previouspage">showPatientProgramList.action?patientId=${patientId}</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
+		</action>
+
+		<action name="showFindBeneficiaryForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/findBeneficiaryForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
+		</action>
+
+
+		<action name="showFindRelatedPatientForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/findRelatedPatientForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
+		</action>
+
+		<action name="findBeneficiary"
+			class="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction">
+			<result name="redirect" type="redirect">showPatientProgramList.action?patientId=${patientId}
+			</result>
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/beneficiaryList.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
+		</action>
+
+		<action name="showAddNewRelationshipForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetAddNewRelationshipFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/addNewRelationshipForm.vm</param>
+		</action>
+
+		<action name="findRelatedPatient"
+			class="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction">
+			<result name="redirect" type="redirect">
+				showAddNewRelationshipForm.action?originalPatientId=${originalPatientId}&amp;relatedPatientId=${patientId}&amp;relationshipTypeId=${relationshipTypeId}
+			</result>
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/relatedPatientList.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
+		</action>
+
+		<action name="addNewRelationship"
+			class="org.hisp.dhis.light.namebaseddataentry.action.AddNewRalationshipAction">
+			<result name="redirect" type="redirect">showPatientProgramList.action?patientId=${originalPatientId}&amp;validated=true
+			</result>
+			<param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
+		</action>
+
+		<action name="deleteRelationship"
+			class="org.hisp.dhis.light.namebaseddataentry.action.DeleteRelationshipAction">
+			<result name="redirect" type="redirect">showPatientProgramList.action?patientId=${currentPatientId}&amp;validated=true
+			</result>
+			<param name="requiredAuthorities">F_RELATIONSHIP_DELETE</param>
+		</action>
+
+		<action name="showPatientProgramList"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientProgramListAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/beneficiaryProgramList.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
+		</action>
+
+		<action name="showPatientProgramStageList"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageListAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/beneficiaryProgramStageList.vm</param>
+		</action>
+
+		<action name="showRepeatableEventRegistrationForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetRepeatableEventRegistrationFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/repeatableEventRegistrationForm.vm</param>
+		</action>
+
+		<action name="saveRepeatableEvent"
+			class="org.hisp.dhis.light.namebaseddataentry.action.SaveRepeatableEventAction">
+			<result name="success" type="redirect">showPatientProgramStageList.action?patientId=${patientId}&amp;programInstanceId=${programInstanceId}&amp;programId=${programId}&amp;validated=false
+			</result>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="showPatientLocationForm"
+			class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientLocationFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/namebased/patientLocationForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
+		</action>
+
+		<action name="registerPatientLocation"
+			class="org.hisp.dhis.light.namebaseddataentry.action.RegisterPatientLocationAction">
+			<result name="success" type="redirect">showPatientProgramList.action?patientId=${patientId}
+			</result>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_MANAGEMENT</param>
+		</action>
+
+		<!-- Beneficiary Registration -->
+
+		<action name="selectRegistrationOrganisationUnit"
+			class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction">
+			<result name="redirect" type="redirect">/light/registerBeneficiary.action?orgUnitId=${orgUnitId}
+			</result>
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/registration/selectRegistrationOrganisationUnits.vm</param>
+		</action>
+
+		<action name="registerBeneficiary"
+			class="org.hisp.dhis.light.beneficiaryregistration.action.RegisterBeneficiaryAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/registration/beneficiaryRegistrationForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
+		</action>
+
+		<action name="saveBeneficiary"
+			class="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction">
+			<result name="success" type="redirect">/light/showPatientProgramList.action?patientId=${patientId}
+			</result>
+			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
+			<result name="redirect" type="redirect">/light/showAddNewRelationshipForm.action?originalPatientId=${originalPatientId}&amp;relatedPatientId=${patientId}&amp;relationshipTypeId=${relationshipTypeId}
+			</result>
+			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/registration/beneficiaryRegistrationForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
+		</action>
+
+		<!-- Beneficiary Enrollment -->
+
+		<action name="selectEnrollmentOrganisationUnit"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm</param>
+		</action>
+
+		<action name="showBeneficiarySearchingForm"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/enrollment/beneficiarySearchingForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
+		</action>
+
+		<action name="searchBeneficiary"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/enrollment/beneficiarySearchResult.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
+		</action>
+
+		<action name="selectEnrollmentProgram"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetEnrollmentProgramListAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/enrollment/enrollmentProgramList.vm</param>
+		</action>
+
+		<action name="showProgramEnrollmentForm"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetProgramEnrollmentFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<result name="redirect" type="redirect">/light/showSingleEventForm.action?programId=${program.getId()}&amp;patientId=${patient.getId()}&amp;organisationUnitId=${patient.getOrganisationUnit().getId()}&amp;isEditing=false
+			</result>
+			<param name="page">/dhis-web-light/enrollment/programEnrollmentForm.vm</param>
+		</action>
+
+		<action name="saveMobileProgramEnrollment"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.SaveMobileProgramEnrollmentAction">
+			<result name="success" type="redirect">/light/showPatientProgramList.action?patientId=${patientId}
+			</result>
+			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/enrollment/programEnrollmentForm.vm</param>
+			<param name="requiredAuthorities">F_PROGRAM_ENROLLMENT</param>
+		</action>
+
+		<!-- Single Event -->
+
+		<action name="selectSingleEvent"
+			class="org.hisp.dhis.light.singleevent.action.GetSingleEventAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/singleevent/selectSingleEvent.vm</param>
+		</action>
+
+		<action name="selectSingleEventBeneficiary"
+			class="org.hisp.dhis.light.singleevent.action.GetSingleEventBeneficiaryAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm</param>
+		</action>
+
+		<action name="showSingleEventForm"
+			class="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="saveSingleEvent"
+			class="org.hisp.dhis.light.singleevent.action.SaveSingleEventAction">
+			<result name="success" type="redirect">
+				/light/showPatientProgramList.action?patientId=${patientId}
+			</result>
+			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
+			<result name="redirect" type="redirect">findSingleEventOptionSet.action?keyword=${keyword}&amp;dataElementIdForSearching=${dataElementIdForSearching}&amp;organisationUnitId=${organisationUnitId}&amp;patientId=${patientId}&amp;programId=${programId}&amp;programStageInstanceId=${programStageInstanceId}&amp;isEditing=${isEditing}
+			</result>
+			<param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="findSingleEventOptionSet"
+			class="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction">
+			<!--<result name="success" type="redirect">showSingleEventForm.action?organisationUnitId=559&amp;patientId=1149378&amp;programId=1149486</result> -->
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/singleevent/singleEventOptionSetFindForm.vm</param>
+		</action>
+
+		<!-- Reports -->
+
+		<action name="reports"
+			class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/reports.vm</param>
+		</action>
+
+		<action name="dashboard-charts"
+			class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+			<result name="success" type="velocity">/dhis-web-light/dashboard_page.vm
+			</result>
+			<param name="page">/dhis-web-light/dashboard_charts.vm</param>
+		</action>
+
+		<action name="dashboard-reports"
+			class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+			<result name="success" type="velocity">/dhis-web-light/dashboard_page.vm
+			</result>
+			<param name="page">/dhis-web-light/dashboard_reports.vm</param>
+		</action>
+
+		<action name="dashboard-documents"
+			class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+			<result name="success" type="velocity">/dhis-web-light/dashboard_page.vm
+			</result>
+			<param name="page">/dhis-web-light/dashboard_documents.vm</param>
+		</action>
+
+		<action name="getReport"
+			class="org.hisp.dhis.light.dashboard.action.GetReportAction">
+			<result name="success" type="velocity">/dhis-web-light/dashboard_page.vm
+			</result>
+			<param name="page">/dhis-web-commons/ajax/htmlGrid.vm</param>
+		</action>
+
+		<action name="getReportParams"
+			class="org.hisp.dhis.light.dashboard.action.GetReportParamsAction">
+			<result name="success" type="velocity">/dhis-web-light/dashboard_page.vm
+			</result>
+			<param name="page">/dhis-web-light/inputReportParamsForm.vm</param>
+		</action>
+
+		<action name="getChart"
+			class="org.hisp.dhis.light.dashboard.action.GetChartAction">
+			<result name="success" type="chart">
+				<param name="width">480</param>
+				<param name="height">800</param>
+			</result>
+		</action>
+
+		<!-- Settings -->
+
+		<action name="settings"
+			class="org.hisp.dhis.light.settings.action.GetSettingsAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/settings.vm</param>
+		</action>
+
+		<action name="saveSettingsForm"
+			class="org.hisp.dhis.light.settings.action.SaveSettingsFormAction">
+			<result name="success" type="redirect">/light/index.action</result>
+		</action>
+
+		<!-- Messages -->
+
+		<action name="messages"
+			class="org.hisp.dhis.light.message.action.GetMessagesAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/messages.vm</param>
+		</action>
+
+		<action name="reply"
+			class="org.hisp.dhis.light.message.action.GetMessageAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/message.vm</param>
+		</action>
+
+		<action name="sendReply"
+			class="org.hisp.dhis.light.message.action.SendReplyAction">
+			<result name="success" type="redirect">/light/messages.action</result>
+		</action>
+
+		<action name="feedback" class="org.hisp.dhis.light.action.NoAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/feedback.vm</param>
+		</action>
+
+		<action name="sendFeedback"
+			class="org.hisp.dhis.light.message.action.SendFeedbackAction">
+			<result name="success" type="redirect">/light/index.action</result>
+		</action>
+
+		<action name="searchUser"
+			class="org.hisp.dhis.light.messaging.action.FindUserAction">
+			<result name="redirect" type="redirect">showUserList.action?userId=${userId}
+			</result>
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/messages.vm</param>
+		</action>
+
+
+		<action name="showUserList"
+			class="org.hisp.dhis.light.messaging.action.GetMessageRecipientsAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/sendMessageOnMobile.vm</param>
+		</action>
+
+		<action name="sendMessage"
+			class="org.hisp.dhis.light.messaging.action.SendMessagesAction">
+			<result name="success" type="redirect">/light/messages.action</result>
+		</action>
+
+		<action name="recipients"
+			class="org.hisp.dhis.light.messaging.action.GetLastRecipientsAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/messages.vm</param>
+		</action>
+
+		<!-- Anonymous -->
+
+		<!-- <action name="selectAnonymousOrgUnit" class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction"> -->
+
+		<action name="selectAnonymousOrgUnit"
+			class="org.hisp.dhis.light.anonymous.action.SearchOrgUnitAction">
+			<result name="redirect" type="redirect">/light/anonymous.action?orgUnitId=${orgUnitId}
+			</result>
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/anonymous/selectAnonymousOrgUnit.vm</param>
+		</action>
+
+		<action name="anonymous"
+			class="org.hisp.dhis.light.anonymous.action.GetAllAnonymousProgramAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/anonymous/anonymousProgramSelection.vm</param>
+		</action>
+
+		<action name="showAnonymousForm"
+			class="org.hisp.dhis.light.anonymous.action.ShowAnonymousFormAction">
+			<result name="success" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/anonymous/anonymousProgramForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+		<action name="saveAnonymousForm"
+			class="org.hisp.dhis.light.anonymous.action.SaveAnonymousProgramAction">
+			<result name="success" type="redirect">/light/anonymous.action?validated=true&amp;orgUnitId=${orgUnitId}
+			</result>
+			<result name="error" type="velocity">/dhis-web-light/main.vm</result>
+			<param name="page">/dhis-web-light/anonymous/anonymousProgramForm.vm</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
+		</action>
+
+	</package>
 </struts>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	2014-01-23 14:18:27 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm	2014-04-04 08:11:18 +0000
@@ -1,4 +1,4 @@
-<h2>$i18n.getString( "enroll" ) $patient.name to $program.getName()</h2>
+<h2>$i18n.getString( "enroll" ) to $program.getName()</h2>
 <form action="saveMobileProgramEnrollment.action" method="POST">
 <div class="header-box" align="center">
 <input type="hidden" name="patientId" value="$patientId"/>	
@@ -22,17 +22,13 @@
 				#if( $validationMap.get( $key ) )
 		           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( $key ))</span>
 		     	#end
-				#if($patientAttribute.getValueType() == "COMBO")
+				#if($patientAttribute.getValueType() == "combo")
 					<select type="text" name="$key">
-					#foreach($option in $patientAttribute.getAttributeOptions())
-						<option value="$option.id"
-							#if( $prevDataValues.get( $key ) == $option.id ) 
-								selected="selected"
-							#end
-							> $option.getName() </option>
+					#foreach($option in $patientAttribute.optionSet.options )
+						<option value="$option" #if("$value"=="$option") selected #end>$option</option>
 					#end
 					</select>
-				#elseif( $patientAttribute.getValueType() == "YES/NO" )
+				#elseif( $patientAttribute.getValueType() == "bool" )
 					<select name="$key">
 							<option #if( $prevDataValues.get( $key ) == "true" ) selected="selected" #end value="true">$i18n.getString("yes")</option>
 							<option #if( $prevDataValues.get( $key ) == "false" ) selected="selected" #end value="false">$i18n.getString("no")</option>