=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java 2011-01-11 16:58:18 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java 2011-03-01 08:17:42 +0000 @@ -33,7 +33,6 @@ import java.util.List; import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodType; @@ -119,9 +118,13 @@ Period getPreviousPeriod( Period selectedPeriod ); - // List getDataNotSentOrgUnits( DataSet dataSet, Period period, OrganisationUnit rootOrgunit ); - String getResultSurveyValue( String formula, OrganisationUnit organisationUnit ); - + + String getSurveyDesc( String formula ); + String getResultDataValueFromAggregateTable( String formula, Collection periodIds, OrganisationUnit organisationUnit , String reportModelTB ); + + String getAggCountForTextData( String formula, Date startDate, Date endDate, OrganisationUnit organisationUnit ); + + String getCountForTextData( String formula, Date startDate, Date endDate, OrganisationUnit organisationUnit ); }