=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2016-02-15 09:46:27 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2016-02-16 13:34:14 +0000 @@ -42,8 +42,7 @@ $scope.enrollments = selections.enrollments; $scope.programExists = args.programExists; $scope.programNames = selections.prNames; - - console.log('the names: ', $scope.programNames); + $scope.programStageNames = selections.prStNames; $scope.attributesById = CurrentSelection.getAttributesById(); $scope.activeEnrollments =  []; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2016-02-11 13:47:50 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2016-02-16 13:34:14 +0000 @@ -365,7 +365,7 @@ $scope.doSearch = true; if(!$scope.sortColumn.id){ - $scope.sortGrid({id: 'created', name: 'registration_date', valueType: 'date', displayInListNoProgram: false, showFilter: false, show: false}); + $scope.sortGrid({id: 'created', displayName: 'registration_date', valueType: 'date', displayInListNoProgram: false, showFilter: false, show: false}); } }); === 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 2016-02-15 15:47:13 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2016-02-16 13:34:14 +0000 @@ -1627,9 +1627,9 @@ } //also add extra columns which are not part of attributes (orgunit for example) - columns.push({id: 'orgUnitName', name: $translate.instant('registering_unit'), valueType: 'TEXT', displayInListNoProgram: false, attribute: false}); - columns.push({id: 'created', name: $translate.instant('registration_date'), valueType: 'DATE', displayInListNoProgram: false, attribute: false}); - columns.push({id: 'inactive', name: $translate.instant('inactive'), valueType: 'BOOLEAN', displayInListNoProgram: false, attribute: false}); + columns.push({id: 'orgUnitName', displayName: $translate.instant('registering_unit'), valueType: 'TEXT', displayInListNoProgram: false, attribute: false}); + columns.push({id: 'created', displayName: $translate.instant('registration_date'), valueType: 'DATE', displayInListNoProgram: false, attribute: false}); + columns.push({id: 'inactive', displayName: $translate.instant('inactive'), valueType: 'BOOLEAN', displayInListNoProgram: false, attribute: false}); columns = columns.concat(returnAttributes ? returnAttributes : []); //generate grid column for the selected program/attributes