=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-10-21 12:50:22 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-11-10 04:32:05 +0000 @@ -285,7 +285,7 @@ var eventStage = $scope.stagesById[dhis2Event.programStage]; if (angular.isObject(eventStage)) { dhis2Event.name = eventStage.name; - dhis2Event.excecutionDateLabel = eventStage.excecutionDateLabel ? eventStage.excecutionDateLabel : $translate.instant('event_date'); + dhis2Event.excecutionDateLabel = eventStage.excecutionDateLabel ? eventStage.excecutionDateLabel : $translate.instant('report_date'); dhis2Event.dueDate = DateUtils.formatFromApiToUser(dhis2Event.dueDate); dhis2Event.sortingDate = dhis2Event.dueDate; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-10-21 12:50:22 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-11-10 04:32:05 +0000 @@ -217,6 +217,7 @@ program_stage=Program stage due_date=Due date event_date=Event date +report_date=Report date enable_rescheduling=Enable rescheduling disable_rescheduling=Disable rescheduling show_hide_scheduling=Show/hide scheduling form === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-10-20 09:44:15 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-11-10 04:32:05 +0000 @@ -1543,7 +1543,7 @@ }; }) -.service('EventUtils', function(DateUtils, CommonUtils, PeriodService, CalendarService, $filter, orderByFilter){ +.service('EventUtils', function(DateUtils, CommonUtils, PeriodService, CalendarService, $translate, $filter, orderByFilter){ var getEventDueDate = function(eventsByStage, programStage, enrollment){ @@ -1612,7 +1612,7 @@ orgUnit: orgUnit.id, orgUnitName: orgUnit.name, name: programStage.name, - excecutionDateLabel: programStage.excecutionDateLabel, + excecutionDateLabel: programStage.excecutionDateLabel ? programStage.excecutionDateLabel : $translate.instant('report_date'), enrollmentStatus: 'ACTIVE', enrollment: enrollment.enrollment, status: 'SCHEDULED'};