=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2011-10-20 12:52:57 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2011-10-21 09:24:04 +0000 @@ -27,15 +27,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.chart.Chart.DIMENSION_COMPLETENESS_PERIOD; import static org.hisp.dhis.chart.Chart.DIMENSION_DATAELEMENT_PERIOD; import static org.hisp.dhis.chart.Chart.DIMENSION_INDICATOR_PERIOD; -import static org.hisp.dhis.chart.Chart.DIMENSION_COMPLETENESS_PERIOD; +import static org.hisp.dhis.chart.Chart.DIMENSION_ORGANISATIONUNIT_COMPLETENESS; import static org.hisp.dhis.chart.Chart.DIMENSION_ORGANISATIONUNIT_DATAELEMENT; import static org.hisp.dhis.chart.Chart.DIMENSION_ORGANISATIONUNIT_INDICATOR; -import static org.hisp.dhis.chart.Chart.DIMENSION_ORGANISATIONUNIT_COMPLETENESS; +import static org.hisp.dhis.chart.Chart.DIMENSION_PERIOD_COMPLETENESS; import static org.hisp.dhis.chart.Chart.DIMENSION_PERIOD_DATAELEMENT; import static org.hisp.dhis.chart.Chart.DIMENSION_PERIOD_INDICATOR; -import static org.hisp.dhis.chart.Chart.DIMENSION_PERIOD_COMPLETENESS; import static org.hisp.dhis.chart.Chart.SIZE_NORMAL; import static org.hisp.dhis.chart.Chart.TYPE_BAR; import static org.hisp.dhis.chart.Chart.TYPE_BAR3D; @@ -54,6 +54,7 @@ import java.awt.Color; import java.awt.Font; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -73,6 +74,8 @@ import org.hisp.dhis.chart.ChartStore; import org.hisp.dhis.common.GenericIdentifiableObjectStore; import org.hisp.dhis.common.NameableObject; +import org.hisp.dhis.completeness.DataSetCompletenessResult; +import org.hisp.dhis.completeness.DataSetCompletenessService; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataset.DataSet; @@ -203,6 +206,13 @@ this.currentUserService = currentUserService; } + private DataSetCompletenessService dataSetCompletenessService; + + public void setDataSetCompletenessService( DataSetCompletenessService dataSetCompletenessService ) + { + this.dataSetCompletenessService = dataSetCompletenessService; + } + private GenericIdentifiableObjectStore chartGroupStore; public void setChartGroupStore( GenericIdentifiableObjectStore chartGroupStore ) @@ -904,7 +914,19 @@ } else if ( isCompletenessChart ) { - // Completeness value here + List dataSetCompleteness = new ArrayList( + dataSetCompletenessService.getDataSetCompleteness( period.getId(), + Arrays.asList( selectedOrganisationUnit.getId() ), dataSets.get( i ).getId() ) ); + + if ( !dataSetCompleteness.isEmpty() ) + { + DataSetCompletenessResult dataSetCompletenessResult = dataSetCompleteness.get( 0 ); + value = dataSetCompletenessResult.getPercentage(); + } + else + { + value = 0d; + } } if ( chart.isDimension( DIMENSION_PERIOD_INDICATOR ) @@ -981,7 +1003,19 @@ } else if ( isCompletenessChart ) { - // Completeness value here + List dataSetCompleteness = new ArrayList( + dataSetCompletenessService.getDataSetCompleteness( selectedPeriod.getId(), + Arrays.asList( unit.getId() ), dataSets.get( i ).getId() ) ); + + if ( !dataSetCompleteness.isEmpty() ) + { + DataSetCompletenessResult dataSetCompletenessResult = dataSetCompleteness.get( 0 ); + value = dataSetCompletenessResult.getPercentage(); + } + else + { + value = 0d; + } } regularDataSet.addValue( value != null ? value : 0, shortName, unit.getShortName() ); === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-10-11 15:11:09 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-10-21 09:24:04 +0000 @@ -4,7 +4,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> - + @@ -39,7 +39,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -57,12 +57,12 @@ - - + + - + - + @@ -70,7 +70,7 @@ - + @@ -87,8 +87,9 @@ + - + @@ -100,7 +101,7 @@ - + @@ -148,7 +149,7 @@ - + @@ -158,7 +159,7 @@ - + @@ -167,7 +168,7 @@ - + @@ -179,7 +180,7 @@ - + @@ -211,7 +212,7 @@ - + @@ -251,7 +252,7 @@ - + @@ -259,14 +260,14 @@ - + - + - + @@ -311,7 +312,7 @@ - + @@ -328,7 +329,7 @@ - + @@ -341,12 +342,17 @@ - - + + - - - + + + === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessAction.java 2011-10-20 13:05:27 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessAction.java 2011-10-21 09:24:04 +0000 @@ -155,14 +155,8 @@ { Grid _grid = (Grid) SessionUtils.getSessionVar( KEY_DATA_COMPLETENESS ); - if ( _grid != null && type != null && !type.equals( DEFAULT_TYPE ) ) // Use - // last - // grid - // for - // any - // format - // except - // html + // Uselast grid for any format except html + if ( _grid != null && type != null && !type.equals( DEFAULT_TYPE ) ) { grid = _grid;