dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19385
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2015-06-13 18:56:08 +0200
message:
  Reverted r 19383
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsService.java
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EventAnalyticsController.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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsService.java	2015-06-13 15:31:21 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsService.java	2015-06-13 16:56:08 +0000
@@ -44,9 +44,9 @@
  */
 public interface EventAnalyticsService
 {    
-    Grid getAggregatedEvents( EventQueryParams params );
+    Grid getAggregatedEventData( EventQueryParams params );
     
-    Grid getAggregatedEvents( AnalyticalObject object, I18nFormat format );
+    Grid getAggregatedEventData( AnalyticalObject object, I18nFormat format );
     
     Grid getEvents( EventQueryParams params );
 

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2015-06-13 16:16:08 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2015-06-13 16:56:08 +0000
@@ -164,7 +164,7 @@
     // TODO sorting in queries
 
     @Override
-    public Grid getAggregatedEvents( EventQueryParams params )
+    public Grid getAggregatedEventData( EventQueryParams params )
     {
         securityManager.decideAccess( params );
         
@@ -273,11 +273,11 @@
     }
     
     @Override
-    public Grid getAggregatedEvents( AnalyticalObject object, I18nFormat format )
+    public Grid getAggregatedEventData( AnalyticalObject object, I18nFormat format )
     {
         EventQueryParams params = getFromAnalyticalObject( (EventAnalyticalObject) object, format );
         
-        return getAggregatedEvents( params );
+        return getAggregatedEventData( params );
     }
 
     @Override

=== 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	2015-06-13 15:31:21 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2015-06-13 16:56:08 +0000
@@ -805,7 +805,7 @@
         }
         else if ( chart.isAnalyticsType( AnalyticsType.EVENT ) )
         {
-            Grid grid = eventAnalyticsService.getAggregatedEvents( chart, chart.getFormat() );
+            Grid grid = eventAnalyticsService.getAggregatedEventData( chart, chart.getFormat() );
                         
             chart.setDataItemGrid( grid );
                         

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EventAnalyticsController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EventAnalyticsController.java	2015-06-13 15:31:21 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EventAnalyticsController.java	2015-06-13 16:56:08 +0000
@@ -103,7 +103,7 @@
             value, aggregationType, skipMeta, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType, collapseDataDimensions, displayProperty, i18nManager.getI18nFormat() );
 
         contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_JSON, CacheStrategy.RESPECT_SYSTEM_SETTING );
-        Grid grid = analyticsService.getAggregatedEvents( params );
+        Grid grid = analyticsService.getAggregatedEventData( params );
         model.addAttribute( "model", grid );
         model.addAttribute( "viewClass", "detailed" );
         return "grid";
@@ -135,7 +135,7 @@
             value, aggregationType, skipMeta, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType, collapseDataDimensions, displayProperty, i18nManager.getI18nFormat() );
 
         contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_XML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.xml", false );
-        Grid grid = analyticsService.getAggregatedEvents( params );
+        Grid grid = analyticsService.getAggregatedEventData( params );
         GridUtils.toXml( substituteMetaData( grid ), response.getOutputStream() );
     }
 
@@ -165,7 +165,7 @@
             value, aggregationType, skipMeta, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType, collapseDataDimensions, displayProperty, i18nManager.getI18nFormat() );
 
         contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_EXCEL, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.xls", true );
-        Grid grid = analyticsService.getAggregatedEvents( params );
+        Grid grid = analyticsService.getAggregatedEventData( params );
         GridUtils.toXls( substituteMetaData( grid ), response.getOutputStream() );
     }
 
@@ -195,7 +195,7 @@
             value, aggregationType, skipMeta, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType, collapseDataDimensions, displayProperty, i18nManager.getI18nFormat() );
 
         contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_CSV, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.csv", true );
-        Grid grid = analyticsService.getAggregatedEvents( params );
+        Grid grid = analyticsService.getAggregatedEventData( params );
         GridUtils.toCsv( substituteMetaData( grid ), response.getOutputStream() );
     }
 
@@ -225,7 +225,7 @@
             value, aggregationType, skipMeta, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType, collapseDataDimensions, displayProperty, i18nManager.getI18nFormat() );
 
         contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.html", false );
-        Grid grid = analyticsService.getAggregatedEvents( params );
+        Grid grid = analyticsService.getAggregatedEventData( params );
         GridUtils.toHtml( substituteMetaData( grid ), response.getWriter() );
     }