=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java 2011-12-06 19:40:38 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java 2011-12-15 14:24:21 +0000 @@ -44,7 +44,7 @@ private static final long serialVersionUID = -6569434956128470844L; private int dataElementId; - + private int categoryOptionComboId; private int periodId; @@ -142,7 +142,7 @@ // ---------------------------------------------------------------------- // Getters and setters // ---------------------------------------------------------------------- - + public int getDataElementId() { return dataElementId; === added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AggregatedValueController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AggregatedValueController.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AggregatedValueController.java 2011-12-15 14:24:21 +0000 @@ -0,0 +1,207 @@ +package org.hisp.dhis.api.controller; + +/* + * Copyright (c) 2004-2011, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.aggregation.AggregatedDataValue; +import org.hisp.dhis.aggregation.AggregatedDataValueService; +import org.hisp.dhis.aggregation.AggregatedIndicatorValue; +import org.hisp.dhis.api.view.JacksonUtils; +import org.hisp.dhis.dataelement.DataElementService; +import org.hisp.dhis.i18n.I18nManager; +import org.hisp.dhis.i18n.I18nManagerException; +import org.hisp.dhis.indicator.IndicatorService; +import org.hisp.dhis.organisationunit.OrganisationUnitService; +import org.hisp.dhis.period.Period; +import org.hisp.dhis.period.PeriodService; +import org.hisp.dhis.period.RelativePeriods; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * @author Morten Olav Hansen + */ +@Controller +@RequestMapping( value = AggregatedValueController.RESOURCE_PATH ) +public class AggregatedValueController +{ + public static final String RESOURCE_PATH = "/aggregatedValues"; + + @Autowired + private AggregatedDataValueService aggregatedDataValueService; + + @Autowired + private IndicatorService indicatorService; + + @Autowired + private DataElementService dataElementService; + + @Autowired + private PeriodService periodService; + + @Autowired + private OrganisationUnitService organisationUnitService; + + @Autowired + private I18nManager i18nManager; + + //------------------------------------------------------------------------------------------------------- + // GET + //------------------------------------------------------------------------------------------------------- + + @RequestMapping( method = RequestMethod.GET ) + public void getAggregatedValues( + @RequestParam( required = false ) boolean lastMonth, + @RequestParam( required = false ) boolean monthsThisYear, + @RequestParam( required = false ) boolean monthsLastYear, + @RequestParam( required = false ) boolean lastQuarter, + @RequestParam( required = false ) boolean quartersThisYear, + @RequestParam( required = false ) boolean quartersLastYear, + @RequestParam( required = false ) boolean thisYear, + @RequestParam( required = false ) boolean lastYear, + @RequestParam( required = false ) boolean lastFiveYears, + @RequestParam( value = "ou" ) List organisationUnitsUids, + @RequestParam( value = "i", required = false ) List indicatorUids, + @RequestParam( value = "de", required = false ) List dataElementUids, + HttpServletResponse response + ) throws IOException, I18nManagerException + { + RelativePeriods rp = new RelativePeriods(); + rp.setReportingMonth( lastMonth ); + rp.setMonthsThisYear( monthsThisYear ); + rp.setMonthsLastYear( monthsLastYear ); + rp.setReportingQuarter( lastQuarter ); + rp.setQuartersThisYear( quartersThisYear ); + rp.setQuartersLastYear( quartersLastYear ); + rp.setThisYear( thisYear ); + rp.setLastYear( lastYear ); + rp.setLast5Years( lastFiveYears ); + + Collection periods = periodService.reloadPeriods( rp.getRelativePeriods() ); + + Collection periodIds = new ArrayList(); + + for ( Period period : periods ) + { + periodIds.add( period.getId() ); + } + + List organisationUnitIds = new ArrayList(); + + for ( String uid : organisationUnitsUids ) + { + organisationUnitIds.add( organisationUnitService.getOrganisationUnit( uid ).getId() ); + } + + List indicatorValues = null; + List dataElementValues = null; + + if ( indicatorUids != null ) + { + List indicatorIds = new ArrayList(); + + for ( String uid : indicatorUids ) + { + indicatorIds.add( indicatorService.getIndicator( uid ).getId() ); + } + + indicatorValues = new ArrayList( aggregatedDataValueService. + getAggregatedIndicatorValues( indicatorIds, periodIds, organisationUnitIds ) ); + + for ( AggregatedIndicatorValue value : indicatorValues ) + { + value.setIndicatorName( indicatorService.getIndicator( value.getIndicatorId() ).getShortName() ); + value.setPeriodName( i18nManager.getI18nFormat().formatPeriod( periodService.getPeriod( value.getPeriodId() ) ) ); + value.setOrganisationUnitName( organisationUnitService.getOrganisationUnit( + value.getOrganisationUnitId() ).getName() ); + } + } + else if ( dataElementUids != null ) + { + List dataElementIds = new ArrayList(); + + for ( String uid : dataElementUids ) + { + dataElementIds.add( dataElementService.getDataElement( uid ).getId() ); + } + + dataElementValues = new ArrayList( aggregatedDataValueService. + getAggregatedDataValueTotals( dataElementIds, periodIds, organisationUnitIds ) ); + + for ( AggregatedDataValue value : dataElementValues ) + { + value.setDataElementName( dataElementService.getDataElement( value.getDataElementId() ).getShortName() ); + value.setPeriodName( i18nManager.getI18nFormat().formatPeriod( periodService.getPeriod( value.getPeriodId() ) ) ); + value.setOrganisationUnitName( organisationUnitService.getOrganisationUnit( + value.getOrganisationUnitId() ).getName() ); + } + } + + List valueList = new ArrayList(); + + if ( indicatorValues != null ) + { + for ( AggregatedIndicatorValue indicatorValue : indicatorValues ) + { + List values = new ArrayList(); + values.add( indicatorValue.getValue() ); + values.add( indicatorValue.getIndicatorName() ); + values.add( indicatorValue.getPeriodName() ); + values.add( indicatorValue.getOrganisationUnitName() ); + + valueList.add( values ); + } + } + else if ( dataElementValues != null ) + { + for ( AggregatedDataValue dataValue : dataElementValues ) + { + List values = new ArrayList(); + values.add( dataValue.getValue() ); + values.add( dataValue.getDataElementName() ); + values.add( dataValue.getPeriodName() ); + values.add( dataValue.getOrganisationUnitName() ); + + valueList.add( values ); + } + } + + JacksonUtils.writeObject( valueList, response.getOutputStream() ); + + response.setContentType( "application/json" ); + response.setStatus( HttpServletResponse.SC_OK ); + } +}