dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03238
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1078: Updated Dashboard module to work with GlobalModules
------------------------------------------------------------
revno: 1078
committer: Bharath Kumar <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-11-23 09:45:00 +0530
message:
Updated Dashboard module to work with GlobalModules
modified:
local/in/dhis-web-dashboard/pom.xml
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/GetDataElementsAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/topten/action/GenerateTopTenAnalysisDataAction.java
local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml
--
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 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml 2009-11-18 11:06:48 +0000
+++ local/in/dhis-web-dashboard/pom.xml 2009-11-23 04:15:00 +0000
@@ -29,10 +29,12 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-organisationunit</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/GetDataElementsAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/GetDataElementsAction.java 2009-11-18 11:06:48 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/GetDataElementsAction.java 2009-11-23 04:15:00 +0000
@@ -36,7 +36,7 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
@@ -63,10 +63,10 @@
this.dataElementService = dataElementService;
}
- private DataElementCategoryOptionComboService dataElementCategoryOptionComboService;
+ private DataElementCategoryService dataElementCategoryOptionComboService;
public void setDataElementCategoryOptionComboService(
- DataElementCategoryOptionComboService dataElementCategoryOptionComboService )
+ DataElementCategoryService dataElementCategoryOptionComboService )
{
this.dataElementCategoryOptionComboService = dataElementCategoryOptionComboService;
}
@@ -186,7 +186,7 @@
{
DataElementCategoryOptionCombo decoc = optionComboIterator.next();
optionComboIds.add( de.getId()+":"+decoc.getId());
- optionComboNames.add( de.getName()+":"+dataElementCategoryOptionComboService.getOptionNames( decoc ));
+ optionComboNames.add( de.getName()+":"+decoc.getName() );
}
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java 2009-11-18 11:06:48 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java 2009-11-23 04:15:00 +0000
@@ -54,7 +54,7 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.datavalue.DataValue;
@@ -88,10 +88,10 @@
// Dependencies
// -------------------------------------------------------------------------
- private DataElementCategoryOptionComboService dataElementCategoryOptionComboService;
+ private DataElementCategoryService dataElementCategoryOptionComboService;
public void setDataElementCategoryOptionComboService(
- DataElementCategoryOptionComboService dataElementCategoryOptionComboService )
+ DataElementCategoryService dataElementCategoryOptionComboService )
{
this.dataElementCategoryOptionComboService = dataElementCategoryOptionComboService;
}
@@ -535,8 +535,8 @@
DataElementCategoryOptionCombo decoc = dataElementCategoryOptionComboService
.getDataElementCategoryOptionCombo( optionComboId );
selectedOptionComboList.add( decoc );
- chartTitle += dataElement.getName() + " : "
- + dataElementCategoryOptionComboService.getOptionNames( decoc ) + ", ";
+ chartTitle += dataElement.getName() + " : " + decoc.getName() + ", ";
+
}
}
else
@@ -776,12 +776,11 @@
*/
{
series1[countForServiceList] = dElement.getName() + " : "
- + dataElementCategoryOptionComboService.getOptionNames( decoc );
+ + decoc.getName();
series2[countForServiceList] = dElement.getName() + " : "
- + dataElementCategoryOptionComboService.getOptionNames( decoc ) + " (Target)";
+ + decoc.getName() + " (Target)";
}
- yseriesList.add( dElement.getName() + " : "
- + dataElementCategoryOptionComboService.getOptionNames( decoc ) );
+ yseriesList.add( dElement.getName() + " : " + decoc.getName() );
}
else
{
@@ -1219,13 +1218,10 @@
* decoc ) + " (Target)"; } else
*/
{
- series1[countForServiceList] = dElement.getName() + " : "
- + dataElementCategoryOptionComboService.getOptionNames( decoc );
- series2[countForServiceList] = dElement.getName() + " : "
- + dataElementCategoryOptionComboService.getOptionNames( decoc ) + " (Target)";
+ series1[countForServiceList] = dElement.getName() + " : " + decoc.getName();
+ series2[countForServiceList] = dElement.getName() + " : " + decoc.getName() + " (Target)";
}
- yseriesList.add( dElement.getName() + " : "
- + dataElementCategoryOptionComboService.getOptionNames( decoc ) );
+ yseriesList.add( dElement.getName() + " : " + decoc.getName() );
}
else
{
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java 2009-11-18 11:06:48 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java 2009-11-23 04:15:00 +0000
@@ -57,7 +57,7 @@
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.indicator.Indicator;
@@ -105,10 +105,10 @@
this.organisationUnitService = organisationUnitService;
}
- private DataElementCategoryOptionComboService dataElementCategoryOptionComboService;
+ private DataElementCategoryService dataElementCategoryOptionComboService;
public void setDataElementCategoryOptionComboService(
- DataElementCategoryOptionComboService dataElementCategoryOptionComboService )
+ DataElementCategoryService dataElementCategoryOptionComboService )
{
this.dataElementCategoryOptionComboService = dataElementCategoryOptionComboService;
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/topten/action/GenerateTopTenAnalysisDataAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/topten/action/GenerateTopTenAnalysisDataAction.java 2009-11-18 11:06:48 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/topten/action/GenerateTopTenAnalysisDataAction.java 2009-11-23 04:15:00 +0000
@@ -14,7 +14,7 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOption;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -59,10 +59,10 @@
this.aggregationService = aggregationService;
}
- private DataElementCategoryOptionComboService dataElementCategoryOptionComboService;
+ private DataElementCategoryService dataElementCategoryOptionComboService;
public void setDataElementCategoryOptionComboService(
- DataElementCategoryOptionComboService dataElementCategoryOptionComboService )
+ DataElementCategoryService dataElementCategoryOptionComboService )
{
this.dataElementCategoryOptionComboService = dataElementCategoryOptionComboService;
}
=== modified file 'local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2009-11-18 11:06:48 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2009-11-23 04:15:00 +0000
@@ -57,7 +57,7 @@
</property>
<property name="dataElementCategoryOptionComboService">
<ref
- bean="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</property>
<property name="dashBoardService">
<ref bean="org.hisp.dhis.dashboard.util.DashBoardService"/>
@@ -517,7 +517,7 @@
<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
</property>
<property name="dataElementCategoryOptionComboService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</property>
<property name="indicatorService">
<ref bean="org.hisp.dhis.indicator.IndicatorService"/>
@@ -539,7 +539,7 @@
</property>
<property name="dataElementCategoryOptionComboService">
<ref
- bean="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</property>
</bean>
@@ -651,7 +651,7 @@
</property>
<property name="dataElementCategoryOptionComboService">
<ref
- bean="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</property>
</bean>
