=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportService.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportService.java 2014-10-28 10:29:40 +0000 @@ -29,7 +29,7 @@ */ import java.util.List; -import java.util.Map; +import java.util.Set; import org.hisp.dhis.common.Grid; import org.hisp.dhis.dataset.DataSet; @@ -55,7 +55,7 @@ * @param format the i18n format. * @return */ - String getCustomDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, boolean selectedUnitOnly, I18nFormat format ); + String getCustomDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format ); /** * Generates a list of Grids based on the HTML code for a custom data set report. @@ -68,7 +68,7 @@ * @param format the i18n format. * @return a list of Grids. */ - List getCustomDataSetReportAsGrid( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, + List getCustomDataSetReportAsGrid( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format ); /** @@ -84,7 +84,7 @@ * @param i18n the i18n object. * @return a list of Grids. */ - List getDefaultDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, boolean selectedUnitOnly, I18nFormat format, I18n i18n ); + List getDefaultDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format, I18n i18n ); /** * Generates a list of Grids representing a data set report. The data elements @@ -99,5 +99,5 @@ * @param i18n the i18n object. * @return a Grid. */ - List getSectionDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, boolean selectedUnitOnly, I18nFormat format, I18n i18n ); + List getSectionDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format, I18n i18n ); } === 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 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java 2014-10-28 10:29:40 +0000 @@ -29,6 +29,7 @@ */ import java.util.Map; +import java.util.Set; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.organisationunit.OrganisationUnit; @@ -41,11 +42,11 @@ { final String SEPARATOR = "-"; - Map getAggregatedValues( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, boolean rawData ); + Map getAggregatedValues( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean rawData ); - Map getAggregatedSubTotals( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions ); - - Map getAggregatedTotals( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions ); - - Map getAggregatedIndicatorValues( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions ); + Map getAggregatedSubTotals( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions ); + + Map getAggregatedTotals( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions ); + + Map getAggregatedIndicatorValues( DataSet dataSet, Period period, OrganisationUnit unit, Set 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 2014-10-16 06:17:19 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java 2014-10-28 10:29:40 +0000 @@ -39,6 +39,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import org.hisp.dhis.common.Grid; @@ -103,7 +104,7 @@ // ------------------------------------------------------------------------- @Override - public String getCustomDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, + public String getCustomDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format ) { Map valueMap = dataSetReportStore.getAggregatedValues( dataSet, period, unit, dimensions, selectedUnitOnly ); @@ -116,7 +117,7 @@ } @Override - public List getCustomDataSetReportAsGrid( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, + public List getCustomDataSetReportAsGrid( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format ) { String html = getCustomDataSetReport( dataSet, period, unit, dimensions, selectedUnitOnly, format ); @@ -132,7 +133,7 @@ } @Override - public List getSectionDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, + public List getSectionDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format, I18n i18n ) { List
sections = new ArrayList<>( dataSet.getSections() ); @@ -197,7 +198,7 @@ for ( DataElement dataElement : dataElements ) { grid.addRow(); - grid.addValue( new GridValue( dataElement.getFormName() ) ); // Data element name + grid.addValue( new GridValue( dataElement.getFormNameFallback() ) ); // Data element name for ( DataElementCategoryOptionCombo optionCombo : optionCombos ) // Values { @@ -246,7 +247,7 @@ } @Override - public List getDefaultDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions, + public List getDefaultDataSetReport( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions, boolean selectedUnitOnly, I18nFormat format, I18n i18n ) { ListMap map = new ListMap<>(); === 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 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/jdbc/AnalyticsDataSetReportStore.java 2014-10-28 10:29:40 +0000 @@ -28,13 +28,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.system.util.ListUtils.getList; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import org.hisp.dhis.analytics.AnalyticsService; import org.hisp.dhis.analytics.DataQueryParams; @@ -68,7 +67,7 @@ @Override public Map getAggregatedValues( DataSet dataSet, Period period, OrganisationUnit unit, - Map dimensions, boolean rawData ) + Set dimensions, boolean rawData ) { List dataElements = new ArrayList<>( dataSet.getDataElements() ); @@ -88,10 +87,7 @@ if ( dimensions != null ) { - for ( String dim : dimensions.keySet() ) - { - params.setFilters( analyticsService.getDimension( dim, getList( dimensions.get( dim ) ), null, null, false ) ); - } + params.setFilters( analyticsService.getDimensionalObjects( dimensions, null ) ); } Map map = analyticsService.getAggregatedDataValueMapping( params ); @@ -108,7 +104,7 @@ } @Override - public Map getAggregatedSubTotals( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions ) + public Map getAggregatedSubTotals( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions ) { Map dataMap = new HashMap<>(); @@ -140,10 +136,7 @@ if ( dimensions != null ) { - for ( String dim : dimensions.keySet() ) - { - params.setFilters( analyticsService.getDimension( dim, getList( dimensions.get( dim ) ), null, null, false ) ); - } + params.setFilters( analyticsService.getDimensionalObjects( dimensions, null ) ); } Map map = analyticsService.getAggregatedDataValueMapping( params ); @@ -160,7 +153,7 @@ } @Override - public Map getAggregatedTotals( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions ) + public Map getAggregatedTotals( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions ) { List dataElements = new ArrayList<>( dataSet.getDataElements() ); @@ -179,10 +172,7 @@ if ( dimensions != null ) { - for ( String dim : dimensions.keySet() ) - { - params.setFilters( analyticsService.getDimension( dim, getList( dimensions.get( dim ) ), null, null, false ) ); - } + params.setFilters( analyticsService.getDimensionalObjects( dimensions, null ) ); } Map map = analyticsService.getAggregatedDataValueMapping( params ); @@ -199,7 +189,7 @@ } @Override - public Map getAggregatedIndicatorValues( DataSet dataSet, Period period, OrganisationUnit unit, Map dimensions ) + public Map getAggregatedIndicatorValues( DataSet dataSet, Period period, OrganisationUnit unit, Set dimensions ) { List indicators = new ArrayList<>( dataSet.getIndicators() ); @@ -216,10 +206,7 @@ if ( dimensions != null ) { - for ( String dim : dimensions.keySet() ) - { - params.setFilters( analyticsService.getDimension( dim, getList( dimensions.get( dim ) ), null, null, false ) ); - } + params.setFilters( analyticsService.getDimensionalObjects( dimensions, null ) ); } Map map = analyticsService.getAggregatedDataValueMapping( params ); === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2014-10-17 12:27:51 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2014-10-28 10:29:40 +0000 @@ -291,6 +291,8 @@ * based on the given set of dimension strings. Splits the strings using : as * separator. Returns null of dimensions are null or empty. * + * TODO remove + * * @param dimensions the set of strings on format dimension:dimension-option. * @return a map of dimensions and dimension options. */ === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java 2014-10-28 10:29:40 +0000 @@ -33,7 +33,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Set; import javax.servlet.http.HttpServletResponse; @@ -257,8 +256,6 @@ selectedOrgunit = organisationUnitService.getOrganisationUnit( ou ); - Map dimensions = ContextUtils.getDimensionsAndOptions( dimension ); - String dataSetType = selectedDataSet.getDataSetType(); DataElementCategoryOptionCombo attributeOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo(); @@ -269,20 +266,20 @@ { if ( type != null ) { - grids = dataSetReportService.getCustomDataSetReportAsGrid( selectedDataSet, selectedPeriod, selectedOrgunit, dimensions, selectedUnitOnly, format ); + grids = dataSetReportService.getCustomDataSetReportAsGrid( selectedDataSet, selectedPeriod, selectedOrgunit, dimension, selectedUnitOnly, format ); } else { - customDataEntryFormCode = dataSetReportService.getCustomDataSetReport( selectedDataSet, selectedPeriod, selectedOrgunit, dimensions, selectedUnitOnly, format ); + customDataEntryFormCode = dataSetReportService.getCustomDataSetReport( selectedDataSet, selectedPeriod, selectedOrgunit, dimension, selectedUnitOnly, format ); } } else if ( TYPE_SECTION.equals( dataSetType ) ) { - grids = dataSetReportService.getSectionDataSetReport( selectedDataSet, selectedPeriod, selectedOrgunit, dimensions, selectedUnitOnly, format, i18n ); + grids = dataSetReportService.getSectionDataSetReport( selectedDataSet, selectedPeriod, selectedOrgunit, dimension, selectedUnitOnly, format, i18n ); } else { - grids = dataSetReportService.getDefaultDataSetReport( selectedDataSet, selectedPeriod, selectedOrgunit, dimensions, selectedUnitOnly, format, i18n ); + grids = dataSetReportService.getDefaultDataSetReport( selectedDataSet, selectedPeriod, selectedOrgunit, dimension, selectedUnitOnly, format, i18n ); } return type != null ? type : dataSetType;