------------------------------------------------------------
revno: 20522
committer: Abyot Asalefew Gizaw <[email protected]>
branch nick: dhis2
timestamp: Tue 2015-10-06 15:54:28 +0200
message:
tracker-capture: use default event date lable when program stage comes with
empty report date description
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-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/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-09-24 14:38:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-10-06 13:54:28 +0000
@@ -268,7 +268,7 @@
var eventStage = $scope.stagesById[dhis2Event.programStage];
if (angular.isObject(eventStage)) {
dhis2Event.name = eventStage.name;
- dhis2Event.reportDateDescription = eventStage.reportDateDescription;
+ dhis2Event.reportDateDescription = eventStage.reportDateDescription ? eventStage.reportDateDescription : $translate.instant('event_date');
dhis2Event.dueDate = DateUtils.formatFromApiToUser(dhis2Event.dueDate);
dhis2Event.sortingDate = dhis2Event.dueDate;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
