dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20470
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9351: chart and update contact for mobile
------------------------------------------------------------
revno: 9351
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-12-18 15:47:37 +0700
message:
chart and update contact for mobile
modified:
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java
dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java
dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetChartAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java
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/struts.xml
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.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-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java 2011-11-04 11:27:33 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java 2012-12-18 08:47:37 +0000
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Locale;
+import org.hisp.dhis.api.mobile.model.Contact;
import org.hisp.dhis.api.mobile.model.DataSet;
import org.hisp.dhis.api.mobile.model.DataSetList;
import org.hisp.dhis.api.mobile.model.DataSetValue;
@@ -58,6 +59,8 @@
public DataSetList getUpdatedDataSet(DataSetList dataSetList, OrganisationUnit unit, String locale);
public DataSetList getDataSetsForLocale( OrganisationUnit unit, String locale );
+
+ public Contact updateContactForMobile();
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java 2012-07-31 03:07:26 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java 2012-12-18 08:47:37 +0000
@@ -61,6 +61,8 @@
public static double currentVersion = 2.9;
private String updateNewVersionUrl;
+
+ private String updateContactUrl;
@XmlAttribute
public int getId()
@@ -173,6 +175,16 @@
{
this.updateNewVersionUrl = updateNewVersionUrl;
}
+
+ public String getUpdateContactUrl()
+ {
+ return updateContactUrl;
+ }
+
+ public void setUpdateContactUrl( String updateContactUrl )
+ {
+ this.updateContactUrl = updateContactUrl;
+ }
public void serialize( DataOutputStream dataOutputStream )
@@ -188,6 +200,7 @@
dataOutputStream.writeUTF( this.changeUpdateDataSetLangUrl );
dataOutputStream.writeUTF( this.searchUrl );
dataOutputStream.writeUTF( this.updateNewVersionUrl );
+ dataOutputStream.writeUTF( this.updateContactUrl );
}
public void deSerialize( DataInputStream dataInputStream )
@@ -203,6 +216,7 @@
this.changeUpdateDataSetLangUrl = dataInputStream.readUTF();
this.searchUrl = dataInputStream.readUTF();
this.updateNewVersionUrl = dataInputStream.readUTF();
+ this.updateContactUrl = dataInputStream.readUTF();
}
@Override
@@ -234,6 +248,7 @@
dataOutputStream.writeUTF( this.changeUpdateDataSetLangUrl );
dataOutputStream.writeUTF( this.searchUrl );
dataOutputStream.writeUTF( this.updateNewVersionUrl );
+ dataOutputStream.writeUTF( this.updateContactUrl );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java 2012-04-20 08:30:53 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java 2012-12-18 08:47:37 +0000
@@ -41,6 +41,7 @@
import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.api.mobile.FacilityReportingService;
import org.hisp.dhis.api.mobile.NotAllowedException;
+import org.hisp.dhis.api.mobile.model.Contact;
import org.hisp.dhis.api.mobile.model.DataElement;
import org.hisp.dhis.api.mobile.model.DataSet;
import org.hisp.dhis.api.mobile.model.DataSetList;
@@ -52,6 +53,7 @@
import org.hisp.dhis.dataset.CompleteDataSetRegistration;
import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.DailyPeriodType;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.hisp.dhis.period.Period;
@@ -91,6 +93,8 @@
private CompleteDataSetRegistrationService registrationService;
private CurrentUserService currentUserService;
+
+ private OrganisationUnitService oUnitService;
// -------------------------------------------------------------------------
// Service methods
@@ -479,5 +483,32 @@
this.currentUserService = currentUserService;
}
+ @Required
+ public void setoUnitService( OrganisationUnitService oUnitService )
+ {
+ this.oUnitService = oUnitService;
+ }
+
+ @Override
+ public Contact updateContactForMobile()
+ {
+
+ Contact contact = new Contact();
+
+ List<String> listOfContacts = new ArrayList<String>();
+
+ List<OrganisationUnit> listOfOrgUnit = (List<OrganisationUnit>) oUnitService.getAllOrganisationUnits();
+
+ for ( OrganisationUnit each : listOfOrgUnit )
+ {
+ String contactDetail = each.getName() + "/" + each.getPhoneNumber();
+ listOfContacts.add( contactDetail );
+ }
+
+ contact.setListOfContacts( listOfContacts );
+
+ return contact;
+ }
+
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2012-12-18 08:47:37 +0000
@@ -14,6 +14,7 @@
<property name="registrationService" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
<property name="modelMapping" ref="org.hisp.dhis.mobile.service.ModelMapping" />
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ <property name="oUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService"></property>
</bean>
<bean id="org.hisp.dhis.mobile.api.ActivityReportingService" class="org.hisp.dhis.mobile.service.ActivityReportingServiceImpl">
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java 2012-07-10 11:10:30 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java 2012-12-18 08:47:37 +0000
@@ -57,6 +57,7 @@
unit.setChangeUpdateDataSetLangUrl( "changeUpdateDataSetLangUrl" );
unit.setSearchUrl( "search" );
unit.setUpdateNewVersionUrl( "" );
+ unit.setUpdateContactUrl( "updateContactUrl" );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream( baos );
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java 2012-07-20 09:20:22 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java 2012-12-18 08:47:37 +0000
@@ -82,6 +82,7 @@
unit.setChangeUpdateDataSetLangUrl( "changeUpdateDataSetLangUrl" );
unit.setSearchUrl( "search" );
unit.setUpdateNewVersionUrl( "test" );
+ unit.setUpdateContactUrl( "updateContactUrl" );
return unit;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java 2012-07-20 08:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java 2012-12-18 08:47:37 +0000
@@ -89,6 +89,7 @@
orgUnit.setUpdateDataSetUrl( getUrl( request, unit.getId(), "updateDataSets" ) );
orgUnit.setChangeUpdateDataSetLangUrl( getUrl( request, unit.getId(), "changeLanguageDataSet" ) );
orgUnit.setSearchUrl( getUrl( request, unit.getId(), "search" ) );
+ orgUnit.setUpdateContactUrl( getUrl( request, unit.getId(), "updateContactForMobile" ) );
// generate URL for download new version
String full = UrlUtils.buildFullRequestUrl( request );
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java 2012-10-12 18:20:54 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java 2012-12-18 08:47:37 +0000
@@ -10,6 +10,7 @@
import org.hisp.dhis.api.mobile.NotAllowedException;
import org.hisp.dhis.api.mobile.model.ActivityPlan;
import org.hisp.dhis.api.mobile.model.ActivityValue;
+import org.hisp.dhis.api.mobile.model.Contact;
import org.hisp.dhis.api.mobile.model.DataSetList;
import org.hisp.dhis.api.mobile.model.DataSetValue;
import org.hisp.dhis.api.mobile.model.DataStreamSerializable;
@@ -233,7 +234,13 @@
{
return facilityReportingService.getDataSetsForLocale( getUnit( id ), locale );
}
-
+
+ @RequestMapping( method = RequestMethod.GET, value = "{clientVersion}/orgUnits/{id}/updateContactForMobile" )
+ @ResponseBody
+ public Contact updateContactForMobile()
+ {
+ return facilityReportingService.updateContactForMobile();
+ }
// Supportive methods
private Collection<String> getLocalStrings( Collection<Locale> locales )
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetChartAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetChartAction.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetChartAction.java 2012-12-18 08:47:37 +0000
@@ -114,9 +114,8 @@
{
chart = chartService.getJFreeChart( id, format );
- height = 280;
-
- width = 400;
+ height = 600;
+ width = 600;
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java 2011-09-28 10:34:08 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java 2012-12-18 08:47:37 +0000
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.hisp.dhis.chart.Chart;
+import org.hisp.dhis.chart.ChartService;
import org.hisp.dhis.dashboard.DashboardConfiguration;
import org.hisp.dhis.dashboard.DashboardContent;
import org.hisp.dhis.dashboard.DashboardManager;
@@ -41,6 +43,13 @@
{
this.currentUserService = currentUserService;
}
+
+ private ChartService chartService;
+
+ public void setChartService( ChartService chartService )
+ {
+ this.chartService = chartService;
+ }
// -------------------------------------------------------------------------
// Output
@@ -66,6 +75,14 @@
{
return charts;
}
+
+ private List<Chart> chartsForAll;
+
+ public List<Chart> getChartsForAll()
+ {
+ return chartsForAll;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
@@ -74,6 +91,8 @@
public String execute()
throws Exception
{
+ chartsForAll = new ArrayList<Chart>( chartService.getSystemAndUserCharts() );
+
DashboardConfiguration config = dashboardManager.getConfiguration();
for ( int i = 0; i < 8; i++ )
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java 2012-11-06 03:41:55 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java 2012-12-18 08:47:37 +0000
@@ -274,11 +274,8 @@
if ( dataSet.isAllowFuturePeriods() )
{
List<Period> periods = new ArrayList<Period>();
- //if ( periodType.getName().equals( "Monthly" ) || periodType.getName().equals( "Quarterly" ))
- //{
- periods = periodType.generatePeriods( new Date() );
- Collections.reverse( periods );
- //}
+ periods = periodType.generatePeriods( new Date() );
+ Collections.reverse( periods );
return periods;
}
else
=== 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-12-14 13:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2012-12-18 08:47:37 +0000
@@ -1,572 +1,581 @@
<?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.2.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" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </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="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" />
- <property name="registrationService"
- ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
- </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.UndoCompleteAction"
- class="org.hisp.dhis.light.dataentry.action.UndoCompleteAction" scope="prototype">
- <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.GetProgramStageSectionAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageSectionAction">
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.MarkCompleteProgramStageAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.MarkCompleteProgramStageAction">
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- <property name="patientDataValueService"
- ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="programStageSectionService"
- ref="org.hisp.dhis.program.ProgramStageSectionService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.utils.NamebasedUtils" class="org.hisp.dhis.light.utils.NamebasedUtils">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
- <property name="modelMapping" ref="org.hisp.dhis.mobile.service.ModelMapping" />
- </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="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="dataElementCategoryService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
- <property name="programStageDataElementService" ref="org.hisp.dhis.program.ProgramStageDataElementService" />
- <property name="programStageInstanceService" ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- <property name="programValidationService" ref="org.hisp.dhis.program.ProgramValidationService" />
- <property name="programStageSectionService" ref="org.hisp.dhis.program.ProgramStageSectionService" />
- <property name="programExpressionService" ref="org.hisp.dhis.program.ProgramExpressionService" />
- <property name="patientDataValueService" ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
-
- </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>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.GetPatientProgramListAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientProgramListAction"
- scope="prototype">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="relationshipService"
- ref="org.hisp.dhis.relationship.RelationshipService" />
- <property name="relationshipTypeService"
- ref="org.hisp.dhis.relationship.RelationshipTypeService" />
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- <property name="patientIdentifierService" ref="org.hisp.dhis.patient.PatientIdentifierService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageListAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageListAction">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.GetRepeatableEventRegistrationFormAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetRepeatableEventRegistrationFormAction">
- <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.SaveRepeatableEventAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.SaveRepeatableEventAction">
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.GetAddNewRelationshipFormAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetAddNewRelationshipFormAction">
- <property name="relationshipTypeService"
- ref="org.hisp.dhis.relationship.RelationshipTypeService" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.AddNewRalationshipAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.AddNewRalationshipAction"
- scope="prototype">
- <property name="relationshipTypeService"
- ref="org.hisp.dhis.relationship.RelationshipTypeService" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="relationshipService"
- ref="org.hisp.dhis.relationship.RelationshipService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.RegisterPatientLocationAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.RegisterPatientLocationAction">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="organisationUnitService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.GetPatientLocationFormAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientLocationFormAction">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </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">
- <property name="patientIdentifierTypeService"
- ref="org.hisp.dhis.patient.PatientIdentifierTypeService" />
- <property name="patientAttributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction"
- class="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction"
- scope="prototype">
- <property name="organisationUnitService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="patientIdentifierTypeService"
- ref="org.hisp.dhis.patient.PatientIdentifierTypeService" />
- <property name="patientAttributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService" />
- <property name="patientAttributeOptionService"
- ref="org.hisp.dhis.patient.PatientAttributeOptionService" />
- <property name="patientIdentifierService"
- ref="org.hisp.dhis.patient.PatientIdentifierService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </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>
-
- <bean
- id="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction"
- class="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction"
- scope="prototype">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.beneficiaryenrollment.action.GetEnrollmentProgramListAction"
- class="org.hisp.dhis.light.beneficiaryenrollment.action.GetEnrollmentProgramListAction"
- scope="prototype">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.beneficiaryenrollment.action.GetProgramEnrollmentFormAction"
- class="org.hisp.dhis.light.beneficiaryenrollment.action.GetProgramEnrollmentFormAction"
- scope="prototype">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.beneficiaryenrollment.action.SaveMobileProgramEnrollmentAction"
- class="org.hisp.dhis.light.beneficiaryenrollment.action.SaveMobileProgramEnrollmentAction"
- scope="prototype">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- <property name="formUtils"
- ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
- <property name="patientAttributeValueService"
- ref="org.hisp.dhis.patientattributevalue.PatientAttributeValueService" />
- <property name="patientAttributeOptionService"
- ref="org.hisp.dhis.patient.PatientAttributeOptionService" />
- <property name="patientAttributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService" />
- <property name="patientIdentifierService"
- ref="org.hisp.dhis.patient.PatientIdentifierService" />
- </bean>
-
- <!-- Single Event -->
-
- <bean id="org.hisp.dhis.light.singleevent.action.GetSingleEventAction"
- class="org.hisp.dhis.light.singleevent.action.GetSingleEventAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="organisationUnitService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.singleevent.action.GetSingleEventBeneficiaryAction"
- class="org.hisp.dhis.light.singleevent.action.GetSingleEventBeneficiaryAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="organisationUnitService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction"
- class="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="patientDataValueService"
- ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.singleevent.action.SaveSingleEventAction"
- class="org.hisp.dhis.light.singleevent.action.SaveSingleEventAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="patientDataValueService"
- ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
- <property name="organisationUnitService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="programStageDataElementService"
- ref="org.hisp.dhis.program.ProgramStageDataElementService" />
- </bean>
-
-
- <bean
- id="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction"
- class="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction">
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- </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" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </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
- id="org.hisp.dhis.light.anonymous.action.GetAllAnonymousProgramAction"
- class="org.hisp.dhis.light.anonymous.action.GetAllAnonymousProgramAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.anonymous.action.ShowAnonymousFormAction"
- class="org.hisp.dhis.light.anonymous.action.ShowAnonymousFormAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
-
- <bean id="org.hisp.dhis.light.anonymous.action.SaveAnonymousProgramAction"
- class="org.hisp.dhis.light.anonymous.action.SaveAnonymousProgramAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
- <property name="patientDataValueService"
- ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
- <property name="programStageDataElementService"
- ref="org.hisp.dhis.program.ProgramStageDataElementService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.namebaseddataentry.action.DeleteRelationshipAction"
- class="org.hisp.dhis.light.namebaseddataentry.action.DeleteRelationshipAction">
- <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
- <property name="relationshipService"
- ref="org.hisp.dhis.relationship.RelationshipService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.light.messaging.action.FindUserAction"
- class="org.hisp.dhis.light.messaging.action.FindUserAction">
- <property name="userService" ref="org.hisp.dhis.user.UserService" />
- </bean>
-
+ 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" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ </bean>
+
+ <!-- Chart -->
+ <bean id="org.hisp.dhis.light.chart.action.GetDataSetInfoForChartAction" class="org.hisp.dhis.light.chart.action.GetDataSetInfoForChartAction"
+ scope="prototype">
+ <property name="serviceProvider" ref="dataCompletenessServiceProvider" />
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="selectionTreeManager" ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </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="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" />
+ <property name="registrationService"
+ ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
+ </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.UndoCompleteAction"
+ class="org.hisp.dhis.light.dataentry.action.UndoCompleteAction" scope="prototype">
+ <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.GetProgramStageSectionAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageSectionAction">
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.MarkCompleteProgramStageAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.MarkCompleteProgramStageAction">
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService"/>
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ <property name="patientDataValueService"
+ ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="programStageSectionService"
+ ref="org.hisp.dhis.program.ProgramStageSectionService"/>
+ </bean>
+
+ <bean id="org.hisp.dhis.light.utils.NamebasedUtils" class="org.hisp.dhis.light.utils.NamebasedUtils">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
+ <property name="modelMapping" ref="org.hisp.dhis.mobile.service.ModelMapping" />
+ </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="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
+ <property name="programStageDataElementService" ref="org.hisp.dhis.program.ProgramStageDataElementService" />
+ <property name="programStageInstanceService" ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ <property name="programValidationService" ref="org.hisp.dhis.program.ProgramValidationService" />
+ <property name="programStageSectionService" ref="org.hisp.dhis.program.ProgramStageSectionService"/>
+ <property name="programExpressionService" ref="org.hisp.dhis.program.ProgramExpressionService" />
+ <property name="patientDataValueService" ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
+
+ </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>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetFindBeneficiaryFormAction">
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.FindBeneficiarytAction">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetPatientProgramListAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientProgramListAction"
+ scope="prototype">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="relationshipService"
+ ref="org.hisp.dhis.relationship.RelationshipService" />
+ <property name="relationshipTypeService"
+ ref="org.hisp.dhis.relationship.RelationshipTypeService" />
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
+ <property name="patientIdentifierService" ref="org.hisp.dhis.patient.PatientIdentifierService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageListAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageListAction">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetRepeatableEventRegistrationFormAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetRepeatableEventRegistrationFormAction">
+ <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.SaveRepeatableEventAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.SaveRepeatableEventAction">
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetAddNewRelationshipFormAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetAddNewRelationshipFormAction">
+ <property name="relationshipTypeService"
+ ref="org.hisp.dhis.relationship.RelationshipTypeService" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.AddNewRalationshipAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.AddNewRalationshipAction"
+ scope="prototype">
+ <property name="relationshipTypeService"
+ ref="org.hisp.dhis.relationship.RelationshipTypeService" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="relationshipService"
+ ref="org.hisp.dhis.relationship.RelationshipService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.RegisterPatientLocationAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.RegisterPatientLocationAction">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.GetPatientLocationFormAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.GetPatientLocationFormAction">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ </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">
+ <property name="patientIdentifierTypeService"
+ ref="org.hisp.dhis.patient.PatientIdentifierTypeService" />
+ <property name="patientAttributeService"
+ ref="org.hisp.dhis.patient.PatientAttributeService" />
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction"
+ class="org.hisp.dhis.light.beneficiaryregistration.action.SaveBeneficiaryAction"
+ scope="prototype">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="patientIdentifierTypeService"
+ ref="org.hisp.dhis.patient.PatientIdentifierTypeService" />
+ <property name="patientAttributeService"
+ ref="org.hisp.dhis.patient.PatientAttributeService" />
+ <property name="patientAttributeOptionService"
+ ref="org.hisp.dhis.patient.PatientAttributeOptionService" />
+ <property name="patientIdentifierService"
+ ref="org.hisp.dhis.patient.PatientIdentifierService" />
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ </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>
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction"
+ class="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction"
+ scope="prototype">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryenrollment.action.GetEnrollmentProgramListAction"
+ class="org.hisp.dhis.light.beneficiaryenrollment.action.GetEnrollmentProgramListAction"
+ scope="prototype">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryenrollment.action.GetProgramEnrollmentFormAction"
+ class="org.hisp.dhis.light.beneficiaryenrollment.action.GetProgramEnrollmentFormAction"
+ scope="prototype">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.beneficiaryenrollment.action.SaveMobileProgramEnrollmentAction"
+ class="org.hisp.dhis.light.beneficiaryenrollment.action.SaveMobileProgramEnrollmentAction"
+ scope="prototype">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ <property name="formUtils"
+ ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
+ <property name="patientAttributeValueService"
+ ref="org.hisp.dhis.patientattributevalue.PatientAttributeValueService" />
+ <property name="patientAttributeOptionService"
+ ref="org.hisp.dhis.patient.PatientAttributeOptionService" />
+ <property name="patientAttributeService"
+ ref="org.hisp.dhis.patient.PatientAttributeService" />
+ <property name="patientIdentifierService"
+ ref="org.hisp.dhis.patient.PatientIdentifierService" />
+ </bean>
+
+ <!-- Single Event -->
+
+ <bean id="org.hisp.dhis.light.singleevent.action.GetSingleEventAction"
+ class="org.hisp.dhis.light.singleevent.action.GetSingleEventAction"
+ scope="prototype">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.singleevent.action.GetSingleEventBeneficiaryAction"
+ class="org.hisp.dhis.light.singleevent.action.GetSingleEventBeneficiaryAction"
+ scope="prototype">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction"
+ class="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction"
+ scope="prototype">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="patientDataValueService"
+ ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.light.singleevent.action.SaveSingleEventAction"
+ class="org.hisp.dhis.light.singleevent.action.SaveSingleEventAction"
+ scope="prototype">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="patientDataValueService"
+ ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="programStageDataElementService"
+ ref="org.hisp.dhis.program.ProgramStageDataElementService" />
+ </bean>
+
+
+ <bean
+ id="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction"
+ class="org.hisp.dhis.light.singleevent.action.FindSingleEventOptionSetAction">
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ </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" />
+ <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
+ </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" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ </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
+ id="org.hisp.dhis.light.anonymous.action.GetAllAnonymousProgramAction"
+ class="org.hisp.dhis.light.anonymous.action.GetAllAnonymousProgramAction"
+ scope="prototype">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.light.anonymous.action.ShowAnonymousFormAction"
+ class="org.hisp.dhis.light.anonymous.action.ShowAnonymousFormAction"
+ scope="prototype">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.light.anonymous.action.SaveAnonymousProgramAction"
+ class="org.hisp.dhis.light.anonymous.action.SaveAnonymousProgramAction"
+ scope="prototype">
+ <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="util" ref="org.hisp.dhis.light.utils.NamebasedUtils" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="programStageInstanceService"
+ ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+ <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
+ <property name="patientDataValueService"
+ ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
+ <property name="programStageDataElementService"
+ ref="org.hisp.dhis.program.ProgramStageDataElementService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.namebaseddataentry.action.DeleteRelationshipAction"
+ class="org.hisp.dhis.light.namebaseddataentry.action.DeleteRelationshipAction">
+ <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
+ <property name="relationshipService"
+ ref="org.hisp.dhis.relationship.RelationshipService" />
+ </bean>
+
+ <bean
+ id="org.hisp.dhis.light.messaging.action.FindUserAction"
+ class="org.hisp.dhis.light.messaging.action.FindUserAction">
+ <property name="userService" ref="org.hisp.dhis.user.UserService" />
+ </bean>
</beans>
=== 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-12-13 08:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2012-12-18 08:47:37 +0000
@@ -13,6 +13,15 @@
<param name="page">/dhis-web-light/menu.vm</param>
</action>
+ <!-- chart
+
+ <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"
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm 2011-10-13 14:29:49 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm 2012-12-18 08:47:37 +0000
@@ -1,7 +1,13 @@
<div class="headerDiv"><span class="header">$i18n.getString("dashboard_charts")</span></div>
<div class="contentDiv">
+new:$chartsForAll.size()
#foreach( $id in $charts )
<div class="contentChartDiv"><img src="getChart.action?id=${id}" style="width:100%"></div>
#end
+<div class="contentChartDiv">
+#foreach( $chart in $chartsForAll )
+<a href="getChart.action?id=$chart.id">$chart.name</a></br>
+#end
+</div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.vm 2012-10-12 09:22:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.vm 2012-12-18 08:47:37 +0000
@@ -2,7 +2,6 @@
<div class="header-box" align="center">
<h3 style="text-align: left; background-color: #719953; border-color: #719953; color: white;">$organisationUnit.name</h3>
<p style="text-align: left;">
-
</p>
</div>
