dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25138
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12396: Event analytics, added parameter for limiting number of records to return
------------------------------------------------------------
revno: 12396
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-10-02 16:21:56 +0200
message:
Event analytics, added parameter for limiting number of records to return
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/EventQueryParams.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-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/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 2013-10-02 13:20:09 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsService.java 2013-10-02 14:21:56 +0000
@@ -43,7 +43,7 @@
Grid getEvents( EventQueryParams params );
EventQueryParams getFromUrl( String program, String stage, String startDate, String endDate,
- Set<String> dimension, Set<String> filter, I18nFormat format );
+ Set<String> dimension, Set<String> filter, Integer limit, I18nFormat format );
EventQueryParams getFromUrl( String program, String stage, String startDate, String endDate,
Set<String> dimension, Set<String> filter, String ouMode, Set<String> asc, Set<String> desc, Integer page, Integer pageSize, I18nFormat format );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2013-09-29 21:05:46 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2013-10-02 14:21:56 +0000
@@ -75,6 +75,8 @@
private Integer pageSize;
+ private Integer limit;
+
// -------------------------------------------------------------------------
// Transient properties
// -------------------------------------------------------------------------
@@ -113,6 +115,7 @@
params.tableName = this.tableName;
params.page = this.page;
params.pageSize = this.pageSize;
+ params.limit = this.limit;
params.periodType = this.periodType;
return params;
@@ -170,6 +173,11 @@
return ( getPageWithDefault() - 1 ) * getPageSizeWithDefault();
}
+ public boolean hasLimit()
+ {
+ return limit != null && limit > 0;
+ }
+
public String toString()
{
return "[" +
@@ -316,6 +324,16 @@
this.pageSize = pageSize;
}
+ public Integer getLimit()
+ {
+ return limit;
+ }
+
+ public void setLimit( Integer limit )
+ {
+ this.limit = limit;
+ }
+
public String getPeriodType()
{
return periodType;
=== 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 2013-10-02 13:20:09 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-10-02 14:21:56 +0000
@@ -234,9 +234,12 @@
}
public EventQueryParams getFromUrl( String program, String stage, String startDate, String endDate,
- Set<String> dimension, Set<String> filter, I18nFormat format )
+ Set<String> dimension, Set<String> filter, Integer limit, I18nFormat format )
{
- return getFromUrl( program, stage, startDate, endDate, dimension, filter, null, null, null, null, null, format );
+ EventQueryParams params = getFromUrl( program, stage, startDate, endDate, dimension, filter, null, null, null, null, null, format );
+ params.setLimit( limit );
+
+ return params;
}
public EventQueryParams getFromUrl( String program, String stage, String startDate, String endDate,
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2013-10-01 07:04:49 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2013-10-02 14:21:56 +0000
@@ -84,8 +84,17 @@
// Group by
// ---------------------------------------------------------------------
- sql += "group by " + getSelectColumns( params );
-
+ sql += "group by " + getSelectColumns( params ) + " ";
+
+ // ---------------------------------------------------------------------
+ // Limit
+ // ---------------------------------------------------------------------
+
+ if ( params.hasLimit() )
+ {
+ sql += "limit " + params.getLimit();
+ }
+
// ---------------------------------------------------------------------
// Grid
// ---------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/EventAnalyticsController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/EventAnalyticsController.java 2013-10-02 13:20:09 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/EventAnalyticsController.java 2013-10-02 14:21:56 +0000
@@ -78,10 +78,11 @@
@RequestParam(required=false) String endDate,
@RequestParam Set<String> dimension,
@RequestParam(required=false) Set<String> filter,
+ @RequestParam(required=false) Integer limit,
Model model,
HttpServletResponse response ) throws Exception
{
- EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter, i18nManager.getI18nFormat() );
+ EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter, limit, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_JSON, CacheStrategy.RESPECT_SYSTEM_SETTING );
Grid grid = analyticsService.getAggregatedEventData( params );
@@ -98,10 +99,11 @@
@RequestParam(required=false) String endDate,
@RequestParam Set<String> dimension,
@RequestParam(required=false) Set<String> filter,
+ @RequestParam(required=false) Integer limit,
Model model,
HttpServletResponse response ) throws Exception
{
- EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter, i18nManager.getI18nFormat() );
+ EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter, limit, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_EXCEL, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.xls", true );
Grid grid = analyticsService.getAggregatedEventData( params );
