dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21897
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2016-02-06 14:49:46 +0100
message:
  DataSetReportStore, javadoc
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/jdbc/AnalyticsDataSetReportStore.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-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java	2016-02-06 13:49:46 +0000
@@ -42,11 +42,51 @@
 {
     String SEPARATOR = "-";
     
-    Map<String, Object> getAggregatedValues( DataSet dataSet, Period period, OrganisationUnit unit, Set<String> dimensions, boolean rawData );
+    /**
+     * Get a mapping from dimensional identifiers to aggregated values.
+     * 
+     * @param dataSet the data set.
+     * @param period the period.
+     * @param unit the organisation unit.
+     * @param dimensions the dimensions on the analytics dimension format, e.g.
+     *        <dim-id>:<dim-item>;<dim-item>
+     * @return a mapping from dimensional identifiers to aggregated values.
+     */
+    Map<String, Object> getAggregatedValues( DataSet dataSet, Period period, OrganisationUnit unit, Set<String> dimensions );
 
+    /**
+     * Get a mapping from dimensional identifiers to aggregated sub-total values.
+     * 
+     * @param dataSet the data set.
+     * @param period the period.
+     * @param unit the organisation unit.
+     * @param dimensions the dimensions on the analytics dimension format, e.g.
+     *        <dim-id>:<dim-item>;<dim-item>
+     * @return a mapping from dimensional identifiers to aggregated sub-total values.
+     */
     Map<String, Object> getAggregatedSubTotals( DataSet dataSet, Period period, OrganisationUnit unit, Set<String> dimensions );
-    
+
+    /**
+     * Get a mapping from dimensional identifiers to aggregated total values.
+     * 
+     * @param dataSet the data set.
+     * @param period the period.
+     * @param unit the organisation unit.
+     * @param dimensions the dimensions on the analytics dimension format, e.g.
+     *        <dim-id>:<dim-item>;<dim-item>
+     * @return a mapping from dimensional identifiers to aggregated total values.
+     */
     Map<String, Object> getAggregatedTotals( DataSet dataSet, Period period, OrganisationUnit unit, Set<String> dimensions );
-    
+
+    /**
+     * Get a mapping from dimensional identifiers to aggregated indicator values.
+     * 
+     * @param dataSet the data set.
+     * @param period the period.
+     * @param unit the organisation unit.
+     * @param dimensions the dimensions on the analytics dimension format, e.g.
+     *        <dim-id>:<dim-item>;<dim-item>
+     * @return a mapping from dimensional identifiers to aggregated indicator values.
+     */
     Map<String, Object> getAggregatedIndicatorValues( DataSet dataSet, Period period, OrganisationUnit unit, Set<String> dimensions );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java	2016-02-06 13:49:46 +0000
@@ -107,7 +107,7 @@
     public String getCustomDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Set<String> dimensions,
         boolean selectedUnitOnly, I18nFormat format )
     {
-        Map<String, Object> valueMap = dataSetReportStore.getAggregatedValues( dataSet, period, unit, dimensions, selectedUnitOnly );
+        Map<String, Object> valueMap = dataSetReportStore.getAggregatedValues( dataSet, period, unit, dimensions );
         
         valueMap.putAll( dataSetReportStore.getAggregatedTotals( dataSet, period, unit, dimensions ) );
         
@@ -139,7 +139,7 @@
         List<Section> sections = new ArrayList<>( dataSet.getSections() );
         Collections.sort( sections, new SectionOrderComparator() );
 
-        Map<String, Object> valueMap = dataSetReportStore.getAggregatedValues( dataSet, period, unit, dimensions, selectedUnitOnly );
+        Map<String, Object> valueMap = dataSetReportStore.getAggregatedValues( dataSet, period, unit, dimensions );
         Map<String, Object> subTotalMap = dataSetReportStore.getAggregatedSubTotals( dataSet, period, unit, dimensions );
         Map<String, Object> totalMap = dataSetReportStore.getAggregatedTotals( dataSet, period, unit, dimensions );
 

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/jdbc/AnalyticsDataSetReportStore.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/jdbc/AnalyticsDataSetReportStore.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/jdbc/AnalyticsDataSetReportStore.java	2016-02-06 13:49:46 +0000
@@ -73,7 +73,7 @@
 
     @Override
     public Map<String, Object> getAggregatedValues( DataSet dataSet, Period period, OrganisationUnit unit, 
-        Set<String> dimensions, boolean rawData )
+        Set<String> dimensions )
     {
         List<DataElement> dataElements = new ArrayList<>( dataSet.getDataElements() );