dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16892
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6556: [mobile] minor fix
------------------------------------------------------------
revno: 6556
committer: Long <thanhlongngo1988>
branch nick: dhis2
timestamp: Fri 2012-04-13 10:30:35 +0700
message:
[mobile] minor fix
added:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiaryEnrollmentOrganisationUnitAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiarySearchingFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SearchBeneficiaryAction.java
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectEnrollmentOrganisationUnits.vm
modified:
dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
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/beneficiaryRegistrationForm.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programStageForm.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivity.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
=== added directory 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment'
=== added directory 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action'
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiaryEnrollmentOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiaryEnrollmentOrganisationUnitAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiaryEnrollmentOrganisationUnitAction.java 2012-04-13 03:30:35 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2004-2011, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.light.beneficiaryenrollment.action;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.user.CurrentUserService;
+import org.hisp.dhis.user.User;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetBeneficiaryEnrollmentOrganisationUnitAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private CurrentUserService currentUserService;
+
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & Output
+ // -------------------------------------------------------------------------
+
+ private List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>();
+
+ public List<OrganisationUnit> getOrganisationUnits()
+ {
+ return organisationUnits;
+ }
+
+ @Override
+ public String execute()
+ throws Exception
+ {
+ User user = currentUserService.getCurrentUser();
+
+ if ( user != null )
+ {
+ organisationUnits = new ArrayList<OrganisationUnit>( user.getOrganisationUnits() );
+ Collections.sort( organisationUnits, IdentifiableObjectNameComparator.INSTANCE );
+ }
+
+ return SUCCESS;
+ }
+}
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiarySearchingFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiarySearchingFormAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiarySearchingFormAction.java 2012-04-13 03:30:35 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2004-2011, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.light.beneficiaryenrollment.action;
+
+import org.hisp.dhis.user.CurrentUserService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetBeneficiarySearchingFormAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private CurrentUserService currentUserService;
+
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & Output
+ // -------------------------------------------------------------------------
+
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage( String message )
+ {
+ this.message = message;
+ }
+
+ @Override
+ public String execute()
+ throws Exception
+ {
+ return SUCCESS;
+ }
+
+}
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SearchBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SearchBeneficiaryAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SearchBeneficiaryAction.java 2012-04-13 03:30:35 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2004-2011, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.light.beneficiaryenrollment.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientService;
+
+import com.opensymphony.xwork2.Action;
+
+public class SearchBeneficiaryAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private PatientService patientService;
+
+ public PatientService getPatientService()
+ {
+ return patientService;
+ }
+
+ public void setPatientService( PatientService patientService )
+ {
+ this.patientService = patientService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & Output
+ // -------------------------------------------------------------------------
+
+ private String keyword;
+
+ public String getKeyword()
+ {
+ return keyword;
+ }
+
+ public void setKeyword( String keyword )
+ {
+ this.keyword = keyword;
+ }
+
+ public List<Patient> patientList;
+
+ public List<Patient> getPatientList()
+ {
+ return patientList;
+ }
+
+ public void setPatientList( List<Patient> patientList )
+ {
+ this.patientList = patientList;
+ }
+
+ @Override
+ public String execute()
+ throws Exception
+ {
+ patientList = new ArrayList<Patient>( patientService.getPatientsByNames( keyword ) );
+ return SUCCESS;
+ }
+
+}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2012-04-13 03:30:35 +0000
@@ -1,153 +1,222 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
-
- <bean id="org.hisp.dhis.light.action.NoAction" class="org.hisp.dhis.light.action.NoAction" scope="prototype" />
-
- <bean id="org.hisp.dhis.light.action.MenuAction" class="org.hisp.dhis.light.action.MenuAction" scope="prototype">
- <property name="messageService" ref="org.hisp.dhis.message.MessageService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- </bean>
-
- <!-- Data entry -->
-
- <bean id="org.hisp.dhis.light.dataentry.utils.FormUtils" class="org.hisp.dhis.light.utils.FormUtils">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="stdDevOutlierAnalysisService" ref="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService" />
- <property name="minMaxOutlierAnalysisService" ref="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService" />
- <property name="minMaxValuesGenerationService"
- ref="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService" />
- <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />
- <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
- <property name="validationRuleService" ref="org.hisp.dhis.validation.ValidationRuleService" />
- <property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dataentry.action.GetOrganisationUnitsAction"
- class="org.hisp.dhis.light.dataentry.action.GetOrganisationUnitsAction"
- scope="prototype">
- <property name="formUtils" ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dataentry.action.GetDataSetsAction"
- class="org.hisp.dhis.light.dataentry.action.GetDataSetsAction"
- scope="prototype">
- <property name="formUtils" ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dataentry.action.GetPeriodsAction"
- class="org.hisp.dhis.light.dataentry.action.GetPeriodsAction"
- scope="prototype">
- <property name="formUtils" ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dataentry.action.GetDataSetOverviewAction"
- class="org.hisp.dhis.light.dataentry.action.GetDataSetOverviewAction"
- scope="prototype">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- <property name="formUtils" ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dataentry.action.MarkComplete"
- class="org.hisp.dhis.light.dataentry.action.MarkComplete"
- scope="prototype">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dataentry.action.GetSectionFormAction"
- class="org.hisp.dhis.light.dataentry.action.GetSectionFormAction"
- scope="prototype">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- <property name="formUtils" ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dataentry.action.SaveSectionFormAction"
- class="org.hisp.dhis.light.dataentry.action.SaveSectionFormAction"
- scope="prototype">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- <property name="formUtils" ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
- </bean>
-
- <!-- Namebased Data entry -->
- <bean id="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction"
- scope="prototype">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryListAction" class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryListAction">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="activityReportingService" ref="org.hisp.dhis.mobile.api.ActivityReportingService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.namebaseddataentry.action.ShowActivityTypeAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.ShowActivityTypeAction"
- scope="prototype"/>
-
- <bean id="org.hisp.dhis.light.namebaseddataentry.action.GetActivityListAction" class="org.hisp.dhis.light.namebaseddataentry.action.GetActivityListAction">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="activityReportingService" ref="org.hisp.dhis.mobile.api.ActivityReportingService" />
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- </bean>
-
- <bean id="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction" class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- </bean>
-
- <bean id="org.hisp.dhis.light.utils.NamebasedUtils" class="org.hisp.dhis.light.utils.NamebasedUtils">
- <property name="programService" ref="org.hisp.dhis.mobile.api.IProgramService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction" class="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="activityReportingService" ref="org.hisp.dhis.mobile.api.ActivityReportingService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- </bean>
-
- <bean id="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction" class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- </bean>
-
- <!-- Beneficiary Registration -->
-
- <bean id="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction"
- class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction"
- scope="prototype">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.beneficiaryregistration.action.RegisterBeneficiaryAction"
- class="org.hisp.dhis.light.beneficiaryregistration.action.RegisterBeneficiaryAction"
- scope="prototype">
- </bean>
-
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+
+ <bean id="org.hisp.dhis.light.action.NoAction"
+ class="org.hisp.dhis.light.action.NoAction" scope="prototype"/>
+
+ <bean id="org.hisp.dhis.light.action.MenuAction"
+ class="org.hisp.dhis.light.action.MenuAction" scope="prototype">
+ <property name="messageService"
+ ref="org.hisp.dhis.message.MessageService"/>
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="dataSetService"
+ ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
+ </bean>
+
+ <!-- Data entry -->
+
+ <bean id="org.hisp.dhis.light.dataentry.utils.FormUtils"
+ class="org.hisp.dhis.light.utils.FormUtils">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ <property name="dataValueService"
+ ref="org.hisp.dhis.datavalue.DataValueService"/>
+ <property name="dataSetService"
+ ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="stdDevOutlierAnalysisService"
+ ref="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
+ <property name="minMaxOutlierAnalysisService"
+ ref="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"/>
+ <property name="minMaxValuesGenerationService"
+ ref="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService"/>
+ <property name="minMaxDataElementService"
+ ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
+ <property name="systemSettingManager"
+ ref="org.hisp.dhis.setting.SystemSettingManager"/>
+ <property name="validationRuleService"
+ ref="org.hisp.dhis.validation.ValidationRuleService"/>
+ <property name="expressionService"
+ ref="org.hisp.dhis.expression.ExpressionService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dataentry.action.GetOrganisationUnitsAction"
+ class="org.hisp.dhis.light.dataentry.action.GetOrganisationUnitsAction"
+ scope="prototype">
+ <property name="formUtils"
+ ref="org.hisp.dhis.light.dataentry.utils.FormUtils"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dataentry.action.GetDataSetsAction"
+ class="org.hisp.dhis.light.dataentry.action.GetDataSetsAction"
+ scope="prototype">
+ <property name="formUtils"
+ ref="org.hisp.dhis.light.dataentry.utils.FormUtils"/>
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dataentry.action.GetPeriodsAction"
+ class="org.hisp.dhis.light.dataentry.action.GetPeriodsAction"
+ scope="prototype">
+ <property name="formUtils"
+ ref="org.hisp.dhis.light.dataentry.utils.FormUtils"/>
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="dataSetService"
+ ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="registrationService"
+ ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dataentry.action.GetDataSetOverviewAction"
+ class="org.hisp.dhis.light.dataentry.action.GetDataSetOverviewAction"
+ scope="prototype">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="dataSetService"
+ ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
+ <property name="formUtils"
+ ref="org.hisp.dhis.light.dataentry.utils.FormUtils"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dataentry.action.MarkComplete"
+ class="org.hisp.dhis.light.dataentry.action.MarkComplete"
+ scope="prototype">
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="dataSetService"
+ ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="registrationService"
+ ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"/>
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dataentry.action.GetSectionFormAction"
+ class="org.hisp.dhis.light.dataentry.action.GetSectionFormAction"
+ scope="prototype">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="dataSetService"
+ ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
+ <property name="formUtils"
+ ref="org.hisp.dhis.light.dataentry.utils.FormUtils"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dataentry.action.SaveSectionFormAction"
+ class="org.hisp.dhis.light.dataentry.action.SaveSectionFormAction"
+ scope="prototype">
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="dataElementService"
+ ref="org.hisp.dhis.dataelement.DataElementService"/>
+ <property name="categoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+ <property name="dataValueService"
+ ref="org.hisp.dhis.datavalue.DataValueService"/>
+ <property name="dataSetService"
+ ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="registrationService"
+ ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService"/>
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
+ <property name="formUtils"
+ ref="org.hisp.dhis.light.dataentry.utils.FormUtils"/>
+ </bean>
+
+ <!-- Namebased Data entry -->
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction"
+ scope="prototype">
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryListAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryListAction">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="activityReportingService"
+ ref="org.hisp.dhis.mobile.api.ActivityReportingService"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.ShowActivityTypeAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.ShowActivityTypeAction"
+ scope="prototype"/>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetActivityListAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetActivityListAction">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="activityReportingService"
+ ref="org.hisp.dhis.mobile.api.ActivityReportingService"/>
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.utils.NamebasedUtils"
+ class="org.hisp.dhis.light.utils.NamebasedUtils">
+ <property name="programService"
+ ref="org.hisp.dhis.mobile.api.IProgramService"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ <property name="activityReportingService"
+ ref="org.hisp.dhis.mobile.api.ActivityReportingService"/>
+ <property name="dataElementService"
+ ref="org.hisp.dhis.dataelement.DataElementService"/>
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetBeneficiaryDetailAction">
+ <property name="patientService"
+ ref="org.hisp.dhis.patient.PatientService"/>
+ </bean>
+
+ <!-- Beneficiary Registration -->
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction"
+ class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction"
+ scope="prototype">
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryregistration.action.RegisterBeneficiaryAction"
+ class="org.hisp.dhis.light.beneficiaryregistration.action.RegisterBeneficiaryAction"
+ scope="prototype">
+ </bean>
+
<bean
id="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction"
class="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction"
@@ -156,76 +225,112 @@
ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
<property name="patientService"
ref="org.hisp.dhis.patient.PatientService"/>
- </bean>
-
- <!-- Dashboard -->
-
- <bean id="org.hisp.dhis.light.dashboard.action.ProvideContentAction"
- class="org.hisp.dhis.light.dashboard.action.ProvideContentAction"
- scope="prototype">
- <property name="dashboardManager" ref="org.hisp.dhis.dashboard.DashboardManager" />
- <property name="dashboardService" ref="org.hisp.dhis.dashboard.DashboardService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dashboard.action.GetReportAction"
- class="org.hisp.dhis.light.dashboard.action.GetReportAction"
- scope="prototype">
- <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dashboard.action.GetChartAction"
- class="org.hisp.dhis.light.dashboard.action.GetChartAction"
- scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.dashboard.action.GetReportParamsAction"
- class="org.hisp.dhis.light.dashboard.action.GetReportParamsAction"
- scope="prototype">
- <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
- <property name="selectionTreeManager" ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
- </bean>
-
- <!-- Settings -->
-
- <bean id="org.hisp.dhis.light.settings.action.GetSettingsAction"
- class="org.hisp.dhis.light.settings.action.GetSettingsAction"
- scope="prototype">
- <property name="resourceBundleManager" ref="org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager" />
- <property name="localeManager" ref="org.hisp.dhis.i18n.locale.LocaleManager" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.settings.action.SaveSettingsFormAction"
- class="org.hisp.dhis.light.settings.action.SaveSettingsFormAction"
- scope="prototype">
- <property name="localeManagerInterface" ref="org.hisp.dhis.i18n.locale.LocaleManager" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="userService" ref="org.hisp.dhis.user.UserService" />
- </bean>
-
- <!-- Messages -->
-
- <bean id="org.hisp.dhis.light.message.action.GetMessagesAction"
- class="org.hisp.dhis.light.message.action.GetMessagesAction" scope="prototype">
- <property name="messageService" ref="org.hisp.dhis.message.MessageService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.message.action.GetMessageAction"
- class="org.hisp.dhis.light.message.action.GetMessageAction" scope="prototype">
- <property name="messageService" ref="org.hisp.dhis.message.MessageService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.message.action.SendReplyAction"
- class="org.hisp.dhis.light.message.action.SendReplyAction" scope="prototype">
- <property name="messageService" ref="org.hisp.dhis.message.MessageService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.message.action.SendFeedbackAction"
- class="org.hisp.dhis.light.message.action.SendFeedbackAction" scope="prototype">
- <property name="messageService" ref="org.hisp.dhis.message.MessageService" />
- </bean>
-
+ </bean>
+
+ <!-- Beneficiary Enrollment -->
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction"
+ class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction"
+ scope="prototype">
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiarySearchingFormAction"
+ class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiarySearchingFormAction"
+ scope="prototype">
+ </bean>
+
+ <!-- Dashboard -->
+
+ <bean id="org.hisp.dhis.light.dashboard.action.ProvideContentAction"
+ class="org.hisp.dhis.light.dashboard.action.ProvideContentAction"
+ scope="prototype">
+ <property name="dashboardManager"
+ ref="org.hisp.dhis.dashboard.DashboardManager"/>
+ <property name="dashboardService"
+ ref="org.hisp.dhis.dashboard.DashboardService"/>
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dashboard.action.GetReportAction"
+ class="org.hisp.dhis.light.dashboard.action.GetReportAction"
+ scope="prototype">
+ <property name="reportTableService"
+ ref="org.hisp.dhis.reporttable.ReportTableService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dashboard.action.GetChartAction"
+ class="org.hisp.dhis.light.dashboard.action.GetChartAction"
+ scope="prototype">
+ <property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.dashboard.action.GetReportParamsAction"
+ class="org.hisp.dhis.light.dashboard.action.GetReportParamsAction"
+ scope="prototype">
+ <property name="reportTableService"
+ ref="org.hisp.dhis.reporttable.ReportTableService"/>
+ <property name="selectionTreeManager"
+ ref="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
+ </bean>
+
+ <!-- Settings -->
+
+ <bean id="org.hisp.dhis.light.settings.action.GetSettingsAction"
+ class="org.hisp.dhis.light.settings.action.GetSettingsAction"
+ scope="prototype">
+ <property name="resourceBundleManager"
+ ref="org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager"/>
+ <property name="localeManager"
+ ref="org.hisp.dhis.i18n.locale.LocaleManager"/>
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.settings.action.SaveSettingsFormAction"
+ class="org.hisp.dhis.light.settings.action.SaveSettingsFormAction"
+ scope="prototype">
+ <property name="localeManagerInterface"
+ ref="org.hisp.dhis.i18n.locale.LocaleManager"/>
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ <property name="userService" ref="org.hisp.dhis.user.UserService"/>
+ </bean>
+
+ <!-- Messages -->
+
+ <bean id="org.hisp.dhis.light.message.action.GetMessagesAction"
+ class="org.hisp.dhis.light.message.action.GetMessagesAction"
+ scope="prototype">
+ <property name="messageService"
+ ref="org.hisp.dhis.message.MessageService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.message.action.GetMessageAction"
+ class="org.hisp.dhis.light.message.action.GetMessageAction"
+ scope="prototype">
+ <property name="messageService"
+ ref="org.hisp.dhis.message.MessageService"/>
+ <property name="currentUserService"
+ ref="org.hisp.dhis.user.CurrentUserService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.message.action.SendReplyAction"
+ class="org.hisp.dhis.light.message.action.SendReplyAction"
+ scope="prototype">
+ <property name="messageService"
+ ref="org.hisp.dhis.message.MessageService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.message.action.SendFeedbackAction"
+ class="org.hisp.dhis.light.message.action.SendFeedbackAction"
+ scope="prototype">
+ <property name="messageService"
+ ref="org.hisp.dhis.message.MessageService"/>
+ </bean>
+
</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-04-11 09:59:20 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-04-13 03:30:35 +0000
@@ -59,4 +59,7 @@
male=Male
female=Female
transgender=Transgender
-is_empty=Empty Field
\ No newline at end of file
+is_empty=Empty Field
+beneficiary_enrollment=Beneficiary Enrollment
+beneficiary_search=Beneficiary Search
+beneficiary_name=Beneficiary Name
\ No newline at end of file
=== 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 2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2012-04-13 03:30:35 +0000
@@ -5,183 +5,266 @@
<struts>
<include file="dhis-web-commons.xml" />
- <package name="dhis-web-light" extends="dhis-web-commons" namespace="/mobile">
-
- <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>
-
- <!-- 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">/mobile/selectDataSet.action?organisationUnitId=${organisationUnitId}</result>
- <result name="selectPeriod" type="redirect">/mobile/selectPeriod.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}</result>
- </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">/mobile/selectPeriod.action?organisationUnitId=${organisationUnitId}&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>
- </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">/mobile/dataEntry.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}&periodId=${periodId}&sectionId=${sectionId}&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_UPDATE,F_DATAVALUE_DELETE</param>
- </action>
-
- <action name="markComplete" class="org.hisp.dhis.light.dataentry.action.MarkComplete">
- <result name="success" type="redirect">/mobile/index.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}&periodId=${periodId}&complete=true</result>
- </action>
-
- <!-- Namebased Data Entry -->
-
- <action name="selectNamebasedOrganisationUnit" class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction">
- <result name="success" type="velocity">/dhis-web-light/main.vm</result>
- <param name="page">/dhis-web-light/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/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/selectActivity.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/programStageForm.vm</param>
- </action>
-
- <action name="saveProgramStageForm" class="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction">
- <result name="success" type="redirect">/mobile/selectBeneficiary.action?organisationUnitId=${orgUnitId}&current=${current}&validated=true</result>
- <result name="error" type="velocity">/dhis-web-light/main.vm</result>
- <param name="page">/dhis-web-light/programStageForm.vm</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/beneficiaryDetail.vm</param>
- </action>
-
- <!-- Beneficiary Registration -->
-
- <action name="selectRegistrationOrganisationUnit" class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction">
- <result name="success" type="velocity">/dhis-web-light/main.vm</result>
- <param name="page">/dhis-web-light/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/beneficiaryRegistrationForm.vm</param>
- </action>
-
- <action name="saveBeneficiary" class="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction">
- <result name="success" type="velocity">/dhis-web-light/main.vm</result>
- <param name="page">/dhis-web-light/beneficiaryRegistrationForm.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">/mobile/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">/mobile/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">/mobile/index.action</result>
- </action>
-
- </package>
+ <package name="dhis-web-light" extends="dhis-web-commons" namespace="/mobile">
+
+ <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>
+
+ <!-- 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">
+ /mobile/selectDataSet.action?organisationUnitId=${organisationUnitId}</result>
+ <result name="selectPeriod" type="redirect">
+ /mobile/selectPeriod.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}</result>
+ </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">
+ /mobile/selectPeriod.action?organisationUnitId=${organisationUnitId}&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>
+ </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">
+ /mobile/dataEntry.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}&periodId=${periodId}&sectionId=${sectionId}&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_UPDATE,F_DATAVALUE_DELETE</param>
+ </action>
+
+ <action name="markComplete"
+ class="org.hisp.dhis.light.dataentry.action.MarkComplete">
+ <result name="success" type="redirect">
+ /mobile/index.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}&periodId=${periodId}&complete=true</result>
+ </action>
+
+ <!-- Namebased Data Entry -->
+
+ <action name="selectNamebasedOrganisationUnit"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction">
+ <result name="success" type="velocity">
+ /dhis-web-light/main.vm</result>
+ <param name="page">
+ /dhis-web-light/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/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/selectActivity.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/programStageForm.vm</param>
+ </action>
+
+ <action name="saveProgramStageForm"
+ class="org.hisp.dhis.light.namebaseddataentry.action.SaveProgramStageFormAction">
+ <result name="success" type="redirect">
+ /mobile/selectBeneficiary.action?organisationUnitId=${orgUnitId}&current=${current}&validated=true</result>
+ <result name="error" type="velocity">/dhis-web-light/main.vm</result>
+ <param name="page">/dhis-web-light/programStageForm.vm</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/beneficiaryDetail.vm</param>
+ </action>
+
+ <!-- Beneficiary Registration -->
+
+ <action name="selectRegistrationOrganisationUnit"
+ class="org.hisp.dhis.light.beneficiaryregistration.action.GetBeneficiaryRegistrationOrganisationUnitAction">
+ <result name="success" type="velocity">
+ /dhis-web-light/main.vm</result>
+ <param name="page">
+ /dhis-web-light/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/beneficiaryRegistrationForm.vm</param>
+ </action>
+
+ <action name="saveBeneficiary"
+ class="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction">
+ <result name="success" type="velocity">
+ /dhis-web-light/main.vm</result>
+ <param name="page">
+ /dhis-web-light/beneficiaryRegistrationForm.vm</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/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/beneficiarySearchingForm.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">/mobile/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">
+ /mobile/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">/mobile/index.action</result>
+ </action>
+
+ </package>
</struts>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm 2012-04-11 09:59:20 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm 2012-04-13 03:30:35 +0000
@@ -71,7 +71,7 @@
<div id="footer">
<h2>$i18n.getString( "navigate_to" )</h2>
<ul>
- <li> <a href="activity.action?orgUnitId=$organisationUnit.id&beneficiaryId=$beneficiaryId&programStageId=$programStageId"> $i18n.getString("organisation_unit")</a> </li>
+ <li> <a href="selectRegistrationOrganisationUnit?orgUnitId=$orgUnitId"> $i18n.getString("organisation_unit")</a> </li>
<li><a href="index.action">$i18n.getString("home")</a></li>
</ul>
</div>
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm 2012-04-13 03:30:35 +0000
@@ -0,0 +1,37 @@
+<h2>$i18n.getString( "beneficiary_search" )</h2>
+
+ #if( $validated )
+ <div class="header-box">
+ <h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
+ </div>
+ #else
+
+ #end
+
+<form action="searchBeneficiary.action" method="POST">
+<div class="header-box" align="center">
+<input type="hidden" name="orgUnitId" value="$orgUnitId"/>
+ <p style="text-align: left;">
+ <label>$i18n.getString( "beneficiary_name" )</label>
+ #if( $validationMap.get( "fullName" ) )
+ <br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "fullName" ))</span>
+ #end
+ <input type="text" name="patientFullName" value="$!previousValues.get("fullName")" />
+ </p>
+</div>
+
+<div class="header-box" align="center">
+ <p>
+ <input type="submit" style="width: 100%;" value="$i18n.getString("search")" />
+ </p>
+</div>
+
+</form>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+ <li> <a href="selectRegistrationOrganisationUnit?orgUnitId=$orgUnitId"> $i18n.getString("organisation_unit")</a> </li>
+ <li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programStageForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programStageForm.vm 2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/programStageForm.vm 2012-04-13 03:30:35 +0000
@@ -103,7 +103,7 @@
<div id="footer">
<h2>$i18n.getString( "navigate_to" )</h2>
<ul>
- <li> <a href="activity.action?orgUnitId=$organisationUnit.id&beneficiaryId=$beneficiaryId&programStageId=$programStageId"> activity details </a> </li>
+ <li> <a href="selectActivity.action?organisationUnitId=$orgUnitId&beneficiaryId=$beneficiaryId¤t=$current"> $i18n.getString("activity_list") </a> </li>
<li><a href="index.action">$i18n.getString("home")</a></li>
</ul>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivity.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivity.vm 2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivity.vm 2012-04-13 03:30:35 +0000
@@ -8,7 +8,7 @@
<ul>
#foreach( $activity in $activities )
<li>
- <a href="showProgramStageForm.action?orgUnitId=$organisationUnitId&programStageId=$activity.getTask().getProgramStageId()&programId=$activity.getTask().getProgramId()&programStageInstanceId=$activity.task.id¤t=$current">
+ <a href="showProgramStageForm.action?orgUnitId=$organisationUnitId&programStageId=$activity.getTask().getProgramStageId()&programId=$activity.getTask().getProgramId()&programStageInstanceId=$activity.task.id¤t=$current&beneficiaryId=$beneficiaryId">
$util.getProgramStage($activity.getTask().getProgramId(), $activity.getTask().getProgramStageId()).getName()
</a>
</li>
=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectEnrollmentOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectEnrollmentOrganisationUnits.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectEnrollmentOrganisationUnits.vm 2012-04-13 03:30:35 +0000
@@ -0,0 +1,15 @@
+r<h2>$i18n.getString( "select_organisation_unit" )</h2>
+<p>
+<ul>
+#foreach( $organisationUnit in $organisationUnits )
+ <li><a href="selectEnrollmentProgram.action?orgUnitId=$organisationUnit.id">$!encoder.htmlEncode( ${organisationUnit.name} )</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+ <li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file
