dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2942
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-01 13:47:42 +0530
message:
  Merging changes from 2.0.6
modified:
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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<OrganisationUnit> getDataNotSentOrgUnits( DataSet dataSet, Period period, OrganisationUnit rootOrgunit );
-
     String getResultSurveyValue( String formula, OrganisationUnit organisationUnit );
-    
+
+    String getSurveyDesc( String formula );
+
     String getResultDataValueFromAggregateTable( String formula, Collection<Integer> 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 );
 }