dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21262
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-12-02 12:45:57 +0100
message:
  tracker-capture: bug fix for orgunit name not showing in overdue events report
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html


--
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/upcoming-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js	2015-11-23 17:03:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js	2015-12-02 11:45:57 +0000
@@ -115,9 +115,8 @@
 
                     upcomingEvent.dueDate = DateUtils.formatFromApiToUser(row.dueDate);
                     upcomingEvent.event = row.event;
-                    upcomingEvent.eventName = $scope.programStages[row.programStage].name;
-                    upcomingEvent.eventOrgUnitName = row.eventOrgUnitName;
-                    upcomingEvent.orgUnitName = row.eventOrgUnitName;
+                    upcomingEvent.eventName = $scope.programStages[row.programStage].name;                    
+                    upcomingEvent.orgUnitName = row.orgUnitName; 
                     upcomingEvent.followup = row.followup;
                     upcomingEvent.program = row.program;
                     upcomingEvent.programStage = row.programStage;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html	2015-11-23 17:03:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html	2015-12-02 11:45:57 +0000
@@ -227,10 +227,10 @@
                                 ng-click="showDashboard(upcomingEvent.trackedEntityInstance)"
                                 title="{{'go_to_dashboard'| translate}}">
                                 <td ng-repeat="gridColumn in gridColumns | filter:{show: true, eventCol: false}" 
-                                    ng-if='displayMode.onlyMarkedFollowup ? overdueEvent.followup:true'>                                                
+                                    ng-if='displayMode.onlyMarkedFollowup ? upcomingEvent.followup:true'>                                                
                                     {{upcomingEvent[gridColumn.id]}}
                                 </td>
-                                <td ng-repeat="gridColumn in gridColumns | filter:{show: true, eventCol: true}" ng-if='displayMode.onlyMarkedFollowup ? overdueEvent.followup:true'>                                                
+                                <td ng-repeat="gridColumn in gridColumns | filter:{show: true, eventCol: true}" ng-if='displayMode.onlyMarkedFollowup ? upcomingEvent.followup:true'>                                                
                                     {{upcomingEvent[gridColumn.id]}}
                                 </td>                               
                             </tr>