dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14293
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Wed 2014-03-19 14:02:28 +0100
message:
  query and attribute not mandatory for listing tracked entity instances
modified:
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js


--
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-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java	2014-03-19 11:22:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java	2014-03-19 13:02:28 +0000
@@ -140,10 +140,6 @@
     // Implementation methods
     // -------------------------------------------------------------------------
 
-    //TODO queries with multiple words
-    //TODO case sensitivity
-    //TODO lower index on attribute value?
-    
     @Override
     public Grid getTrackedEntityInstances( TrackedEntityInstanceQueryParams params )
     {
@@ -216,11 +212,6 @@
         {
             throw new IllegalQueryException( "Params cannot be null" );
         }
-        
-        if ( !params.hasQuery() && !params.hasAttributes() )
-        {
-            violation = "At least one of query and attributes must be specified";
-        }
 
         if ( !params.hasOrganisationUnits() )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2014-03-17 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2014-03-19 13:02:28 +0000
@@ -116,7 +116,7 @@
             return promise;
         },
         getByOrgUnitAndProgram: function(orgUnitUid, programUid) {
-            promise = $http.get(  '../api/trackedEntityInstances.json?orgUnit=' + orgUnitUid + '&program=' + programUid ).then(function(response){
+            promise = $http.get(  '../api/trackedEntityInstances.json?ou=' + orgUnitUid + '&program=' + programUid ).then(function(response){
                 
                 var trackedEntityList = response.data.personList;
                 
@@ -127,7 +127,7 @@
             return promise;
         },
         getByOrgUnit: function(orgUnitUid) {
-            promise = $http.get(  '../api/trackedEntityInstances.json?orgUnit=' + orgUnitUid ).then(function(response){
+            promise = $http.get(  '../api/trackedEntityInstances.json?ou=' + orgUnitUid ).then(function(response){
                 
                 var trackedEntityList = response.data.personList;