dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39595
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20048: Analytics/event analytics. Added support for completedOnly parameter.
------------------------------------------------------------
revno: 20048
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-09-08 20:09:34 +0200
message:
Analytics/event analytics. Added support for completedOnly parameter.
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsService.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/MockAnalyticsService.java
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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AnalyticsController.java
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/mapping/GeoFeatureController.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/AnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsService.java 2015-08-26 09:42:00 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsService.java 2015-09-08 18:09:34 +0000
@@ -156,6 +156,7 @@
* @param skipData whether to skip the data part of the response.
* @param skipRounding whether to skip rounding and provide full precision
* for values.
+ * @param completedOnly whether to only include completed events.
* @param hierarchyMeta whether to include meta data about the organisation
* units in the hierarchy.
* @param ignoreLimit whether to ignore the max number of cells limit.
@@ -174,9 +175,9 @@
* @return a data query parameter object created based on the given URL info.
*/
DataQueryParams getFromUrl( Set<String> dimensionParams, Set<String> filterParams, AggregationType aggregationType, String measureCriteria,
- boolean skipMeta, boolean skipData, boolean skipRounding, boolean hierarchyMeta, boolean ignoreLimit, boolean hideEmptyRows, boolean showHierarchy,
- DisplayProperty displayProperty, IdentifiableProperty outputIdScheme, String approvalLevel, Date relativePeriodDate, String userOrgUnit,
- String program, String stage, I18nFormat format );
+ boolean skipMeta, boolean skipData, boolean skipRounding, boolean completedOnly, boolean hierarchyMeta, boolean ignoreLimit,
+ boolean hideEmptyRows, boolean showHierarchy, DisplayProperty displayProperty, IdentifiableProperty outputIdScheme, String approvalLevel,
+ Date relativePeriodDate, String userOrgUnit, String program, String stage, I18nFormat format );
/**
* Creates a data query parameter object from the given BaseAnalyticalObject.
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2015-09-04 14:25:32 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2015-09-08 18:09:34 +0000
@@ -155,6 +155,11 @@
* Indicates that full precision should be provided for values.
*/
protected boolean skipRounding;
+
+ /**
+ * Indicates whether to include completed events only.
+ */
+ protected boolean completedOnly;
/**
* Indicates i) if the names of all ancestors of the organisation units part
@@ -267,6 +272,7 @@
params.skipMeta = this.skipMeta;
params.skipData = this.skipData;
params.skipRounding = this.skipRounding;
+ params.completedOnly = this.completedOnly;
params.hierarchyMeta = this.hierarchyMeta;
params.ignoreLimit = this.ignoreLimit;
params.hideEmptyRows = this.hideEmptyRows;
@@ -1290,6 +1296,16 @@
this.skipRounding = skipRounding;
}
+ public boolean isCompletedOnly()
+ {
+ return completedOnly;
+ }
+
+ public void setCompletedOnly( boolean completedOnly )
+ {
+ this.completedOnly = completedOnly;
+ }
+
public boolean isHierarchyMeta()
{
return hierarchyMeta;
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-09-08 07:17:53 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-09-08 18:09:34 +0000
@@ -908,7 +908,7 @@
@Override
public DataQueryParams getFromUrl( Set<String> dimensionParams, Set<String> filterParams, AggregationType aggregationType,
- String measureCriteria, boolean skipMeta, boolean skipData, boolean skipRounding, boolean hierarchyMeta, boolean ignoreLimit,
+ String measureCriteria, boolean skipMeta, boolean skipData, boolean skipRounding, boolean completedOnly, boolean hierarchyMeta, boolean ignoreLimit,
boolean hideEmptyRows, boolean showHierarchy, DisplayProperty displayProperty, IdentifiableProperty outputIdScheme,
String approvalLevel, Date relativePeriodDate, String userOrgUnit, String program, String stage, I18nFormat format )
{
@@ -935,6 +935,7 @@
params.setSkipMeta( skipMeta );
params.setSkipData( skipData );
params.setSkipRounding( skipRounding );
+ params.setCompletedOnly( completedOnly );
params.setHierarchyMeta( hierarchyMeta );
params.setHideEmptyRows( hideEmptyRows );
params.setShowHierarchy( showHierarchy );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/MockAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/MockAnalyticsService.java 2015-08-26 09:42:00 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/MockAnalyticsService.java 2015-09-08 18:09:34 +0000
@@ -84,7 +84,7 @@
@Override
public DataQueryParams getFromUrl( Set<String> dimensionParams, Set<String> filterParams, AggregationType aggregationType,
- String measureCriteria, boolean skipMeta, boolean skipData, boolean skipRounding, boolean hierarchyMeta, boolean ignoreLimit, boolean hideEmptyRows,
+ String measureCriteria, boolean skipMeta, boolean skipData, boolean skipRounding, boolean completedOnly, boolean hierarchyMeta, boolean ignoreLimit, boolean hideEmptyRows,
boolean showHierarchy, DisplayProperty displayProperty, IdentifiableProperty idScheme, String approvalLevel, Date relativePeriodDate, String userOrgUnit,
String program, String stage, I18nFormat format )
{
=== 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-09-03 15:25:27 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsService.java 2015-09-08 18:09:34 +0000
@@ -64,6 +64,7 @@
* @param skipMeta whether to skip meta-data in the response.
* @param skipData whether to skip data in the response.
* @param skipRounding whether to skip rounding of values in response.
+ * @param completedOnly whether to only include completed events.
* @param hierarchyMeta whether to include hierarchy meta-data in the response.
* @param showHierarchy whether to include hierarchy meta-data names in the response.
* @param sortOrder the sort order of the aggregate values.
@@ -76,7 +77,7 @@
*/
EventQueryParams getFromUrl( String program, String stage, String startDate, String endDate,
Set<String> dimension, Set<String> filter, String value, AggregationType aggregationType,
- boolean skipMeta, boolean skipData, boolean skipRounding, boolean hierarchyMeta, boolean showHierarchy, SortOrder sortOrder, Integer limit,
+ boolean skipMeta, boolean skipData, boolean skipRounding, boolean completedOnly, boolean hierarchyMeta, boolean showHierarchy, SortOrder sortOrder, Integer limit,
EventOutputType outputType, boolean collapseDataDimensions, boolean aggregateData, DisplayProperty displayProperty, I18nFormat format );
/**
@@ -93,6 +94,7 @@
* @param desc the dimensions to be sorted descending.
* @param skipMeta whether to skip meta-data in the response.
* @param skipData whether to skip data in the response.
+ * @param completedOnly whether to only include completed events.
* @param hierarchyMeta whether to include hierarchy meta-data in the response.
* @param coordinatesOnly whether to only return events which have coordinates.
* @param displayProperty the display property to use for meta-data.
@@ -101,7 +103,7 @@
* @param format the i18n 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, boolean skipMeta, boolean skipData, boolean hierarchyMeta, boolean coordinatesOnly,
+ String ouMode, Set<String> asc, Set<String> desc, boolean skipMeta, boolean skipData, boolean completedOnly, boolean hierarchyMeta, boolean coordinatesOnly,
DisplayProperty displayProperty, Integer page, Integer pageSize, I18nFormat format );
EventQueryParams getFromAnalyticalObject( EventAnalyticalObject object, 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 2015-09-03 17:06:56 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2015-09-08 18:09:34 +0000
@@ -79,7 +79,7 @@
private List<String> asc = new ArrayList<>();
private List<String> desc = new ArrayList<>();
-
+
private String organisationUnitMode;
private Integer page;
@@ -131,6 +131,7 @@
params.programIndicator = this.programIndicator;
params.asc = new ArrayList<>( this.asc );
params.desc = new ArrayList<>( this.desc );
+ params.completedOnly = this.completedOnly;
params.organisationUnitMode = this.organisationUnitMode;
params.page = this.page;
params.pageSize = this.pageSize;
=== 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-09-03 16:53:01 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2015-09-08 18:09:34 +0000
@@ -384,11 +384,11 @@
@Override
public EventQueryParams getFromUrl( String program, String stage, String startDate, String endDate,
Set<String> dimension, Set<String> filter, String value, AggregationType aggregationType, boolean skipMeta, boolean skipData, boolean skipRounding,
- boolean hierarchyMeta, boolean showHierarchy, SortOrder sortOrder, Integer limit, EventOutputType outputType, boolean collapseDataDimensions,
+ boolean completedOnly, boolean hierarchyMeta, boolean showHierarchy, SortOrder sortOrder, Integer limit, EventOutputType outputType, boolean collapseDataDimensions,
boolean aggregateData, DisplayProperty displayProperty, I18nFormat format )
{
EventQueryParams params = getFromUrl( program, stage, startDate, endDate, dimension, filter, null, null, null,
- skipMeta, skipData, hierarchyMeta, false, displayProperty, null, null, format );
+ skipMeta, skipData, completedOnly, hierarchyMeta, false, displayProperty, null, null, format );
params.setValue( getValueDimension( value ) );
params.setAggregationType( aggregationType );
@@ -406,7 +406,8 @@
@Override
public EventQueryParams getFromUrl( String program, String stage, String startDate, String endDate,
Set<String> dimension, Set<String> filter, String ouMode, Set<String> asc, Set<String> desc,
- boolean skipMeta, boolean skipData, boolean hierarchyMeta, boolean coordinatesOnly, DisplayProperty displayProperty, Integer page, Integer pageSize, I18nFormat format )
+ boolean skipMeta, boolean skipData, boolean completedOnly, boolean hierarchyMeta, boolean coordinatesOnly,
+ DisplayProperty displayProperty, Integer page, Integer pageSize, I18nFormat format )
{
EventQueryParams params = new EventQueryParams();
@@ -501,6 +502,7 @@
params.setOrganisationUnitMode( ouMode );
params.setSkipMeta( skipMeta );
params.setSkipData( skipData );
+ params.setCompletedOnly( completedOnly );
params.setHierarchyMeta( hierarchyMeta );
params.setCoordinatesOnly( coordinatesOnly );
params.setDisplayProperty( displayProperty );
=== 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 2015-09-07 20:02:22 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2015-09-08 18:09:34 +0000
@@ -555,13 +555,18 @@
}
// ---------------------------------------------------------------------
- // Coordinates
+ // Various filters
// ---------------------------------------------------------------------
if ( params.isCoordinatesOnly() )
{
sql += "and (longitude is not null and latitude is not null) ";
}
+
+ if ( params.isCompletedOnly() )
+ {
+ sql += "and completeddate is not null ";
+ }
return sql;
}
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2015-09-08 17:39:20 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2015-09-08 18:09:34 +0000
@@ -320,13 +320,14 @@
String[] erd = { quote( "enrollmentdate" ), "timestamp", "pi.enrollmentdate" };
String[] ed = { quote( "executiondate" ), "timestamp", "psi.executiondate" };
String[] dd = { quote( "duedate" ), "timestamp", "psi.duedate" };
+ String[] cd = { quote( "completeddate" ), "timestamp", "psi.completeddate" };
String[] longitude = { quote( "longitude" ), dbl, "psi.longitude" };
String[] latitude = { quote( "latitude" ), dbl, "psi.latitude" };
String[] ou = { quote( "ou" ), "character(11) not null", "ou.uid" };
String[] oun = { quote( "ouname" ), "character varying(230) not null", "ou.name" };
String[] ouc = { quote( "oucode" ), "character varying(50)", "ou.code" };
- columns.addAll( Lists.newArrayList( psi, pi, ps, erd, ed, dd, longitude, latitude, ou, oun, ouc ) );
+ columns.addAll( Lists.newArrayList( psi, pi, ps, erd, ed, dd, cd, longitude, latitude, ou, oun, ouc ) );
if ( table.hasProgram() && table.getProgram().isRegistration() )
{
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java 2015-08-26 09:42:00 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java 2015-09-08 18:09:34 +0000
@@ -193,7 +193,7 @@
filterParams.add( "ou:" + ouA.getUid() + ";" + ouB.getUid() + ";" + ouC.getUid() + ";" + ouD.getUid() + ";" + ouE.getUid() );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, filterParams, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 4, params.getDataElements().size() );
assertEquals( 3, params.getPeriods().size() );
@@ -211,7 +211,7 @@
filterParams.add( "ou:" + ouA.getUid() );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, filterParams, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 4, params.getDataElements().size() );
assertEquals( 1, params.getFilterOrganisationUnits().size() );
@@ -227,7 +227,7 @@
filterParams.add( "ou:" + ouA.getUid() );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, filterParams, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 2, params.getDataElements().size() );
assertEquals( 2, params.getProgramDataElements().size() );
@@ -244,7 +244,7 @@
filterParams.add( "ou:" + ouA.getUid() );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, filterParams, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 2, params.getDataElements().size() );
assertEquals( 2, params.getProgramAttributes().size() );
@@ -263,7 +263,7 @@
filterParams.add( "ou:" + ouA.getUid() + ";" + ouB.getUid() + ";" + ouC.getUid() );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, filterParams, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 3, params.getDataElements().size() );
assertEquals( 2, params.getPeriods().size() );
@@ -282,7 +282,7 @@
filterParams.add( "ou:" + ouA.getUid() + ";" + ouB.getUid() );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, filterParams, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 4, params.getDataElements().size() );
assertEquals( 12, params.getPeriods().size() );
@@ -298,7 +298,7 @@
dimensionParams.add( "pe:2011;2012" );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, null, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 1, params.getOrganisationUnits().size() );
assertEquals( 2, params.getDataElements().size() );
@@ -314,7 +314,7 @@
dimensionParams.add( "pe:2011;2012" );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, null, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 3, params.getOrganisationUnits().size() );
assertEquals( 2, params.getDataElements().size() );
@@ -330,7 +330,7 @@
dimensionParams.add( "pe:2011;2012" );
DataQueryParams params = analyticsService.getFromUrl( dimensionParams, null, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
assertEquals( 2, params.getOrganisationUnits().size() );
assertEquals( 2, params.getDataElements().size() );
@@ -345,7 +345,7 @@
dimensionParams.add( "pe:2012,2012S1,2012S2" );
analyticsService.getFromUrl( dimensionParams, null, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
}
@Test( expected = IllegalQueryException.class )
@@ -356,7 +356,7 @@
dimensionParams.add( "pe" );
analyticsService.getFromUrl( dimensionParams, null, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
}
@Test( expected = IllegalQueryException.class )
@@ -367,7 +367,7 @@
dimensionParams.add( "ou" );
analyticsService.getFromUrl( dimensionParams, null, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
}
@Test( expected = IllegalQueryException.class )
@@ -378,7 +378,7 @@
dimensionParams.add( "yebo:2012,2012S1,2012S2" );
analyticsService.getFromUrl( dimensionParams, null, null, null,
- false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
+ false, false, false, false, false, false, false, false, null, null, null, null, null, null, null, null );
}
@Test
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java 2015-08-04 11:09:17 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java 2015-09-08 18:09:34 +0000
@@ -181,7 +181,7 @@
filterParams.add( "pe:201401;201402" );
EventQueryParams params = analyticsService.getFromUrl( prA.getUid(), null,
- null, null, dimensionParams, filterParams, null, null, false, false, false, false, false, null, null, null, false, false, null, null );
+ null, null, dimensionParams, filterParams, null, null, false, false, false, false, false, false, null, null, null, false, false, null, null );
assertEquals( prA, params.getProgram() );
assertEquals( 1, params.getOrganisationUnits().size() );
@@ -200,7 +200,7 @@
filterParams.add( "pe:201401" );
EventQueryParams params = analyticsService.getFromUrl( prA.getUid(), null,
- null, null, dimensionParams, filterParams, deA.getUid(), AggregationType.AVERAGE, false, false, false, false, false, null, null, null, false, false, null, null );
+ null, null, dimensionParams, filterParams, deA.getUid(), AggregationType.AVERAGE, false, false, false, false, false, false, null, null, null, false, false, null, null );
assertEquals( prA, params.getProgram() );
assertEquals( 1, params.getOrganisationUnits().size() );
@@ -339,7 +339,7 @@
filterParams.add( atA.getUid() + ":LE:5" );
EventQueryParams params = analyticsService.getFromUrl( prA.getUid(), null,
- null, null, dimensionParams, filterParams, null, null, false, false, false, false, false, null, null, null, false, false, null, null );
+ null, null, dimensionParams, filterParams, null, null, false, false, false, false, false, false, null, null, null, false, false, null, null );
assertEquals( prA, params.getProgram() );
assertEquals( 1, params.getItems().size() );
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AnalyticsController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AnalyticsController.java 2015-08-26 09:42:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AnalyticsController.java 2015-09-08 18:09:34 +0000
@@ -84,6 +84,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -101,7 +102,7 @@
Model model,
HttpServletResponse response ) throws Exception
{
- DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, hierarchyMeta,
+ DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta,
ignoreLimit, hideEmptyRows, showHierarchy, displayProperty, outputIdScheme, approvalLevel, relativePeriodDate, userOrgUnit, program, stage, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_JSON, CacheStrategy.RESPECT_SYSTEM_SETTING );
@@ -120,6 +121,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -137,7 +139,7 @@
Model model,
HttpServletResponse response ) throws Exception
{
- DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, hierarchyMeta,
+ DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta,
ignoreLimit, hideEmptyRows, showHierarchy, displayProperty, outputIdScheme, approvalLevel, relativePeriodDate, userOrgUnit, program, stage, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_XML, CacheStrategy.RESPECT_SYSTEM_SETTING );
@@ -154,6 +156,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -171,7 +174,7 @@
Model model,
HttpServletResponse response ) throws Exception
{
- DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, hierarchyMeta,
+ DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta,
ignoreLimit, hideEmptyRows, showHierarchy, displayProperty, outputIdScheme, approvalLevel, relativePeriodDate, userOrgUnit, program, stage, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING );
@@ -188,6 +191,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -205,7 +209,7 @@
Model model,
HttpServletResponse response ) throws Exception
{
- DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, hierarchyMeta,
+ DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta,
ignoreLimit, hideEmptyRows, showHierarchy, displayProperty, outputIdScheme, approvalLevel, relativePeriodDate, userOrgUnit, program, stage, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING );
@@ -222,6 +226,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -239,7 +244,7 @@
Model model,
HttpServletResponse response ) throws Exception
{
- DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, hierarchyMeta,
+ DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta,
ignoreLimit, hideEmptyRows, showHierarchy, displayProperty, outputIdScheme, approvalLevel, relativePeriodDate, userOrgUnit, program, stage, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_CSV, CacheStrategy.RESPECT_SYSTEM_SETTING, "data.csv", true );
@@ -256,6 +261,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -273,7 +279,7 @@
Model model,
HttpServletResponse response ) throws Exception
{
- DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, hierarchyMeta,
+ DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta,
ignoreLimit, hideEmptyRows, showHierarchy, displayProperty, outputIdScheme, approvalLevel, relativePeriodDate, userOrgUnit, program, stage, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_EXCEL, CacheStrategy.RESPECT_SYSTEM_SETTING, "data.xls", true );
@@ -290,6 +296,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -308,7 +315,7 @@
HttpServletResponse response ) throws Exception
{
DataQueryParams params = analyticsService.getFromUrl( dimension, filter, null, null,
- true, false, false, false, false, false, false, null, null, null, null, null, null, null, i18nManager.getI18nFormat() );
+ true, false, false, false, false, false, false, false, null, null, null, null, null, null, null, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_XML, CacheStrategy.RESPECT_SYSTEM_SETTING, "data.jrxml", false );
Grid grid = analyticsService.getAggregatedDataValues( params );
@@ -325,6 +332,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean ignoreLimit,
@RequestParam( required = false ) boolean tableLayout,
@@ -342,7 +350,7 @@
Model model,
HttpServletResponse response ) throws Exception
{
- DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, hierarchyMeta,
+ DataQueryParams params = analyticsService.getFromUrl( dimension, filter, aggregationType, measureCriteria, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta,
ignoreLimit, hideEmptyRows, showHierarchy, displayProperty, outputIdScheme, approvalLevel, relativePeriodDate, userOrgUnit, program, stage, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_TEXT, CacheStrategy.NO_CACHE, "debug.sql", false );
=== 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-09-03 17:21:28 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EventAnalyticsController.java 2015-09-08 18:09:34 +0000
@@ -88,6 +88,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean showHierarchy,
@RequestParam( required = false ) SortOrder sortOrder,
@@ -100,7 +101,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- value, aggregationType, skipMeta, skipData, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
+ value, aggregationType, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
collapseDataDimensions, aggregateData, displayProperty, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_JSON, CacheStrategy.RESPECT_SYSTEM_SETTING );
@@ -123,6 +124,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean showHierarchy,
@RequestParam( required = false ) SortOrder sortOrder,
@@ -135,7 +137,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- value, aggregationType, skipMeta, skipData, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
+ value, aggregationType, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
collapseDataDimensions, aggregateData, displayProperty, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_XML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.xml", false );
@@ -156,6 +158,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean showHierarchy,
@RequestParam( required = false ) SortOrder sortOrder,
@@ -168,7 +171,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- value, aggregationType, skipMeta, skipData, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
+ value, aggregationType, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
collapseDataDimensions, aggregateData, displayProperty, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_EXCEL, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.xls", true );
@@ -189,6 +192,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean showHierarchy,
@RequestParam( required = false ) SortOrder sortOrder,
@@ -201,7 +205,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- value, aggregationType, skipMeta, skipData, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
+ value, aggregationType, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
collapseDataDimensions, aggregateData, displayProperty, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_CSV, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.csv", true );
@@ -222,6 +226,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean showHierarchy,
@RequestParam( required = false ) SortOrder sortOrder,
@@ -234,7 +239,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- value, aggregationType, skipMeta, skipData, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
+ value, aggregationType, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
collapseDataDimensions, aggregateData, displayProperty, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.html", false );
@@ -255,6 +260,7 @@
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
@RequestParam( required = false ) boolean skipRounding,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean showHierarchy,
@RequestParam( required = false ) SortOrder sortOrder,
@@ -267,7 +273,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- value, aggregationType, skipMeta, skipData, skipRounding, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
+ value, aggregationType, skipMeta, skipData, skipRounding, completedOnly, hierarchyMeta, showHierarchy, sortOrder, limit, outputType,
collapseDataDimensions, aggregateData, displayProperty, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.html", false );
@@ -292,6 +298,7 @@
@RequestParam( required = false ) Set<String> desc,
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean coordinatesOnly,
@RequestParam( required = false ) Integer page,
@@ -300,8 +307,8 @@
Model model,
HttpServletResponse response ) throws Exception
{
- EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter, ouMode,
- asc, desc, skipMeta, skipData, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
+ EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
+ ouMode, asc, desc, skipMeta, skipData, completedOnly, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_JSON, CacheStrategy.RESPECT_SYSTEM_SETTING );
Grid grid = analyticsService.getEvents( params );
@@ -323,6 +330,7 @@
@RequestParam( required = false ) Set<String> desc,
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean coordinatesOnly,
@RequestParam( required = false ) Integer page,
@@ -332,7 +340,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- ouMode, asc, desc, skipMeta, skipData, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
+ ouMode, asc, desc, skipMeta, skipData, completedOnly, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_XML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.xml", false );
Grid grid = analyticsService.getEvents( params );
@@ -352,6 +360,7 @@
@RequestParam( required = false ) Set<String> desc,
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean coordinatesOnly,
@RequestParam( required = false ) Integer page,
@@ -361,7 +370,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- ouMode, asc, desc, skipMeta, skipData, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
+ ouMode, asc, desc, skipMeta, skipData, completedOnly, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_EXCEL, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.xls", true );
Grid grid = analyticsService.getEvents( params );
@@ -381,6 +390,7 @@
@RequestParam( required = false ) Set<String> desc,
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean coordinatesOnly,
@RequestParam( required = false ) Integer page,
@@ -390,7 +400,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- ouMode, asc, desc, skipMeta, skipData, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
+ ouMode, asc, desc, skipMeta, skipData, completedOnly, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_CSV, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.csv", true );
Grid grid = analyticsService.getEvents( params );
@@ -410,6 +420,7 @@
@RequestParam( required = false ) Set<String> desc,
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean coordinatesOnly,
@RequestParam( required = false ) Integer page,
@@ -419,7 +430,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- ouMode, asc, desc, skipMeta, skipData, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
+ ouMode, asc, desc, skipMeta, skipData, completedOnly, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.html", false );
Grid grid = analyticsService.getEvents( params );
@@ -439,6 +450,7 @@
@RequestParam( required = false ) Set<String> desc,
@RequestParam( required = false ) boolean skipMeta,
@RequestParam( required = false ) boolean skipData,
+ @RequestParam( required = false ) boolean completedOnly,
@RequestParam( required = false ) boolean hierarchyMeta,
@RequestParam( required = false ) boolean coordinatesOnly,
@RequestParam( required = false ) Integer page,
@@ -448,7 +460,7 @@
HttpServletResponse response ) throws Exception
{
EventQueryParams params = analyticsService.getFromUrl( program, stage, startDate, endDate, dimension, filter,
- ouMode, asc, desc, skipMeta, skipData, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
+ ouMode, asc, desc, skipMeta, skipData, completedOnly, hierarchyMeta, coordinatesOnly, displayProperty, page, pageSize, i18nManager.getI18nFormat() );
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING, "events.html", false );
Grid grid = analyticsService.getEvents( params );
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java 2015-08-26 09:42:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java 2015-09-08 18:09:34 +0000
@@ -170,7 +170,7 @@
set.add( ou );
DataQueryParams params = analyticsService.getFromUrl( set, null, AggregationType.SUM, null,
- false, false, false, false, false, false, false, displayProperty, null, null, relativePeriodDate, userOrgUnit, null, null, null );
+ false, false, false, false, false, false, false, false, displayProperty, null, null, relativePeriodDate, userOrgUnit, null, null, null );
DimensionalObject dim = params.getDimension( DimensionalObject.ORGUNIT_DIM_ID );
