dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21977
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2016-02-16 14:14:58 +0100
message:
  tracker-capture: bug fix in program report details
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.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/components/report/tei-report-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js	2015-12-16 09:43:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js	2016-02-16 13:14:58 +0000
@@ -4,6 +4,7 @@
 trackerCapture.controller('TeiReportController',
         function($scope,
                 $filter,
+                $translate,
                 CurrentSelection,
                 SessionStorageService,
                 DateUtils,
@@ -14,6 +15,7 @@
     $scope.showProgramReportDetailsDiv = false;
     $scope.enrollmentsByProgram = [];
     $scope.dashboardReady = false;
+    $scope.orgUnitLabel = $translate.instant('org_unit');
 
     $scope.$on('dashboardWidgets', function(event, args) {
         $scope.showProgramReportDetailsDiv = false;
@@ -150,9 +152,7 @@
                 });
 
                 //get enrollment details
-                EnrollmentService.get(enr).then(function(enrollment){
-                    enrollment.enrollmentDate = DateUtils.formatFromApiToUser(enrollment.enrollmentDate);
-                    enrollment.incidentDate = DateUtils.formatFromApiToUser(enrollment.incidentDate);            
+                EnrollmentService.get(enr).then(function(enrollment){            
                     angular.forEach(enrollment.notes, function(note){
                         note.storedDate = DateUtils.formatToHrsMins(note.storedDate);
                     });