=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2011-10-20 13:05:27 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2011-11-25 21:13:08 +0000 @@ -285,21 +285,10 @@ final Collection relevantSources = getRelevantSources( dataSet, children ); - final DataSetCompletenessResult result = new DataSetCompletenessResult(); - - result.setSources( getSources( dataSet, relevantSources ) ); + final DataSetCompletenessResult result = getDataSetCompleteness( period, deadline, unit, relevantSources, dataSet ); if ( result.getSources() > 0 ) { - result.setName( unit.getName() ); - result.setRegistrations( getRegistrations( dataSet, relevantSources, period ) ); - result.setRegistrationsOnTime( deadline != null ? getRegistrationsOnTime( dataSet, relevantSources, - period, deadline ) : 0 ); - - result.setDataSetId( dataSetId ); - result.setPeriodId( periodId ); - result.setOrganisationUnitId( unit.getId() ); - results.add( result ); } }