dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #38411
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19558: TEI query, supporting ou mode CHILDREN
------------------------------------------------------------
revno: 19558
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-07-07 10:07:05 +0200
message:
TEI query, supporting ou mode CHILDREN
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.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/hibernate/HibernateTrackedEntityInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2015-07-07 06:11:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2015-07-07 08:07:05 +0000
@@ -58,8 +58,10 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static org.hisp.dhis.common.IdentifiableObjectUtils.getIdentifiers;
import static org.hisp.dhis.common.IdentifiableObjectUtils.getUids;
@@ -348,7 +350,11 @@
sql += hlp.whereAnd() + " tei.trackedentityid = " + params.getTrackedEntity().getId() + " ";
}
- if ( params.isOrganisationUnitMode( OrganisationUnitSelectionMode.DESCENDANTS ) )
+ if ( params.isOrganisationUnitMode( OrganisationUnitSelectionMode.ALL ) )
+ {
+ // No restriction
+ }
+ else if ( params.isOrganisationUnitMode( OrganisationUnitSelectionMode.DESCENDANTS ) )
{
SetMap<Integer, OrganisationUnit> levelOuMap = params.getLevelOrgUnitMap();
@@ -360,11 +366,20 @@
sql = removeLastOr( sql );
}
- else if ( params.isOrganisationUnitMode( OrganisationUnitSelectionMode.ALL ) )
+ else if ( params.isOrganisationUnitMode( OrganisationUnitSelectionMode.CHILDREN ) )
{
+ Set<OrganisationUnit> orgUnits = new HashSet<>();
+
+ for ( OrganisationUnit orgUnit : params.getOrganisationUnits() )
+ {
+ orgUnits.add( orgUnit );
+ orgUnits.addAll( orgUnit.getChildren() );
+ }
+
+ sql += hlp.whereAnd() + " tei.organisationunitid in ("
+ + getCommaDelimitedString( getIdentifiers( orgUnits ) ) + ") ";
}
- else
- // SELECTED (default)
+ else // SELECTED (default)
{
sql += hlp.whereAnd() + " tei.organisationunitid in ("
+ getCommaDelimitedString( getIdentifiers( params.getOrganisationUnits() ) ) + ") ";