=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2016-01-19 09:31:27 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2016-02-10 11:02:18 +0000 @@ -36,7 +36,7 @@
-
+
{{registeringUnitLabel}}
@@ -45,7 +45,7 @@ value="{{selectedOrgUnit.name|| pleaseSelectLabel}}" disabled="">
-
+
{{programLabel}}
@@ -61,7 +61,7 @@
-
+
{{category.name}}
@@ -75,7 +75,7 @@
-
+
{{'section'| translate}}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2016-02-04 10:43:43 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2016-02-10 11:02:18 +0000 @@ -36,7 +36,7 @@ $scope.showHelpText = function(attributeId){ $scope.helpTexts[attributeId] = $scope.helpTexts[attributeId] ? false : true; - } + }; $scope.attributesById = CurrentSelection.getAttributesById(); if(!$scope.attributesById){ @@ -424,9 +424,10 @@ actionButtonText: 'yes', headerText: 'cancel', bodyText: 'are_you_sure_to_cancel_registration' - } + }; + ModalService.showModal({}, modalOptions).then(function(){ cancelFunction(); }); - } + }; });