dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22018
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-02-22 17:07:38 +0100
message:
  tracker-capture: bug fix in fetching todays events
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.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-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2016-02-16 13:34:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2016-02-22 16:07:38 +0000
@@ -291,7 +291,7 @@
         $scope.teiFetched = false;
         $scope.selectedEventsTodayFilter = eventsTodayFilter;
         $scope.trackedEntityList = null;
-        var today = DateUtils.getToday();
+        var today = DateUtils.formatFromUserToApi(DateUtils.getToday());
         var promises = [];
         
         if(!eventsTodayFilter.status){
@@ -305,7 +305,7 @@
             $scope.trackedEntityList = { rows: {own:[]}};
             var ids = [];
             angular.forEach(data, function(result){
-                if(result.eventRows){
+                if(result && result.eventRows){
                     angular.forEach(result.eventRows, function(eventRow){
                         if(ids.indexOf(eventRow.trackedEntityInstance) === -1){