dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27177
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13487: use getDataDimension* in analytics for ouGroupSets and deGroupSets
------------------------------------------------------------
revno: 13487
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-30 12:25:14 +0100
message:
use getDataDimension* in analytics for ouGroupSets and deGroupSets
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java
--
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-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2013-12-23 17:18:05 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2013-12-30 11:25:14 +0000
@@ -189,10 +189,10 @@
List<String[]> columns = new ArrayList<String[]>();
Collection<DataElementGroupSet> dataElementGroupSets =
- dataElementService.getAllDataElementGroupSets();
+ dataElementService.getDataDimensionDataElementGroupSets();
Collection<OrganisationUnitGroupSet> orgUnitGroupSets =
- organisationUnitGroupService.getAllOrganisationUnitGroupSets();
+ organisationUnitGroupService.getDataDimensionOrganisationUnitGroupSets();
Collection<DataElementCategory> disaggregationCategories =
categoryService.getDisaggregationDataDimensionCategories();
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java 2013-12-10 14:17:42 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java 2013-12-30 11:25:14 +0000
@@ -142,7 +142,7 @@
List<String[]> columns = new ArrayList<String[]>();
Collection<OrganisationUnitGroupSet> orgUnitGroupSets =
- organisationUnitGroupService.getAllOrganisationUnitGroupSets();
+ organisationUnitGroupService.getDataDimensionOrganisationUnitGroupSets();
Collection<OrganisationUnitLevel> levels =
organisationUnitService.getOrganisationUnitLevels();
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java 2013-11-27 19:02:17 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java 2013-12-30 11:25:14 +0000
@@ -136,7 +136,7 @@
List<String[]> columns = new ArrayList<String[]>();
Collection<OrganisationUnitGroupSet> orgUnitGroupSets =
- organisationUnitGroupService.getAllOrganisationUnitGroupSets();
+ organisationUnitGroupService.getDataDimensionOrganisationUnitGroupSets();
Collection<OrganisationUnitLevel> levels =
organisationUnitService.getOrganisationUnitLevels();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java 2013-11-07 17:16:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java 2013-12-30 11:25:14 +0000
@@ -56,11 +56,14 @@
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementGroupSet;
+import org.hisp.dhis.dataelement.DataElementGroupSetStore;
import org.hisp.dhis.dataelement.DataElementOperandService;
+import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
@@ -89,7 +92,13 @@
@Autowired
private PeriodService periodService;
-
+
+ @Autowired
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ @Autowired
+ private DataElementService dataElementService;
+
@Autowired
private CurrentUserService currentUserService;
@@ -164,8 +173,8 @@
public List<DimensionalObject> getAllDimensions()
{
Collection<DataElementCategory> dcs = categoryService.getDataDimensionDataElementCategories();
- Collection<DataElementGroupSet> degs = identifiableObjectManager.getAll( DataElementGroupSet.class );
- Collection<OrganisationUnitGroupSet> ougs = identifiableObjectManager.getAll( OrganisationUnitGroupSet.class );
+ Collection<DataElementGroupSet> degs = dataElementService.getDataDimensionDataElementGroupSets();
+ Collection<OrganisationUnitGroupSet> ougs = organisationUnitGroupService.getDataDimensionOrganisationUnitGroupSets();
final List<DimensionalObject> dimensions = new ArrayList<DimensionalObject>();