=== 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 2015-03-06 15:15:45 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-03-10 07:49:07 +0000 @@ -42,7 +42,6 @@ $scope.defaultOperators = OperatorFactory.defaultOperators; $scope.boolOperators = OperatorFactory.boolOperators; $scope.enrollment = {programStartDate: '', programEndDate: '', operator: $scope.defaultOperators[0]}; - $scope.searchState = true; $scope.searchMode = { listAll: 'LIST_ALL', freeText: 'FREE_TEXT', attributeBased: 'ATTRIBUTE_BASED' }; $scope.optionSets = null; @@ -209,8 +208,7 @@ $scope.programUrl, $scope.attributeUrl.url, $scope.pager, - true).then(function(data){ - //$scope.trackedEntityList = data; + true).then(function(data){ if(data.rows){ $scope.teiCount = data.rows.length; } @@ -272,10 +270,8 @@ $scope.showRegistrationDiv = !$scope.showRegistrationDiv; $scope.showTrackedEntityDiv = false; $scope.showSearchDiv = false; - $scope.searchState = false; if(!$scope.showRegistrationDiv){ - $scope.searchState = true; $scope.doSearch = true; $scope.getProgramAttributes($scope.selectedProgram); } === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-03-06 16:52:13 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-03-10 07:49:07 +0000 @@ -60,7 +60,7 @@
- + {{selectedProgram.trackedEntity.name}} {{'search'| translate}}({{'total' | translate}}: {{pager.total}})