dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8216
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-09-24 08:10:48 +0200
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.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 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java	2012-09-24 05:42:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java	2012-09-24 06:10:48 +0000
@@ -142,6 +142,8 @@
      */
     Grid getReportTableGrid( ReportTable reportTable, I18nFormat format, Date reportingPeriod, String organisationUnitUid, boolean minimal );
     
+    ReportTable getReportTable( String uid, String mode );
+    
     Collection<ReportTable> getReportTablesBetween( int first, int max );
 
     Collection<ReportTable> getReportTablesBetweenByName( String name, int first, int max );

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java	2012-09-24 05:42:39 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java	2012-09-24 06:10:48 +0000
@@ -154,6 +154,19 @@
 
         return getGrid( reportTable, minimal );
     }
+
+    public ReportTable getReportTable( String uid, String mode )
+    {
+        if ( mode.equals( MODE_REPORT_TABLE ) )
+        {
+            return getReportTable( uid );
+        }
+        else if ( mode.equals( MODE_REPORT ) )
+        {
+            return reportService.getReport( uid ).getReportTable();
+        }
+        return null;
+    }
     
     // -------------------------------------------------------------------------
     // Persistence