------------------------------------------------------------
revno: 21097
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Tue 2015-11-17 19:29:35 +0100
message:
TEI grid query. When searching with no program and no attributes, serach only
'attributes with no program'
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.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-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java 2015-10-20 06:46:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java 2015-11-17 18:29:35 +0000
@@ -191,12 +191,10 @@
}
else
{
- Collection<TrackedEntityAttribute> filters = attributeService.getAllTrackedEntityAttributes();
Collection<TrackedEntityAttribute> attributes = attributeService.getTrackedEntityAttributesDisplayInList();
- filters.removeAll( attributes );
params.addAttributesIfNotExist( QueryItem.getQueryItems( attributes ) );
- params.addFiltersIfNotExist( QueryItem.getQueryItems( filters ) );
+ params.addFiltersIfNotExist( QueryItem.getQueryItems( attributes ) );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2015-10-23 05:08:59 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2015-11-17 18:29:35 +0000
@@ -140,6 +140,7 @@
}
Set<String> orgUnits = TextUtils.splitToArray( ou, TextUtils.SEMICOLON );
+
TrackedEntityInstanceQueryParams params = instanceService.getFromUrl( query, attribute, filter, orgUnits, ouMode,
program, programStatus, followUp, programStartDate, programEndDate, trackedEntity,
eventStatus, eventStartDate, eventEndDate, skipMeta, page, pageSize, totalPages, skipPaging );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
