------------------------------------------------------------ revno: 20181 committer: Abyot Asalefew Gizaw <aby...@gmail.com> branch nick: dhis2 timestamp: Wed 2015-09-16 16:17:44 +0200 message: tracker-capture: set search field focused by default modified: 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/views/home.html dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.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/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-09-15 13:51:19 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-09-16 14:17:44 +0000 @@ -53,6 +53,7 @@ $scope.enrollment = {programStartDate: '', programEndDate: '', operator: $scope.defaultOperators[0]}; $scope.searchMode = { listAll: 'LIST_ALL', freeText: 'FREE_TEXT', attributeBased: 'ATTRIBUTE_BASED' }; $scope.optionSets = null; + $scope.doSearch = true; //Registration $scope.showRegistrationDiv = false; @@ -97,7 +98,7 @@ $scope.showHideLabel = $translate.instant('show_hide_columns'); $scope.listProgramsLabel = $translate.instant('list_programs'); $scope.settingsLabel = $translate.instant('settings'); - + $scope.loadPrograms($scope.selectedOrgUnit); } }); @@ -247,6 +248,7 @@ $scope.searchingOrgUnit = $scope.selectedOrgUnit; } + $scope.doSearch = false; $scope.fetchTeis(); }; === 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-09-15 13:51:19 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-09-16 14:17:44 +0000 @@ -125,7 +125,7 @@ <!-- simple/advanced search begins --> <div id="searchDropDownParent" class="input-group col-md-4 hideInPrint"> - <input type="text" placeholder="{{searchCriteriaLabel}}" ng-model="searchText" class="form-control expanded" d2-enter="search(searchMode.freeText)" ng-class="{true: 'invalid - input'} [!searchText && emptySearchText]" ng-focus="showHideSearch()" ng-disabled="showRegistrationDiv"> + <input type="text" placeholder="{{searchCriteriaLabel}}" ng-model="searchText" class="form-control expanded" d2-enter="search(searchMode.freeText)" ng-class="{true: 'invalid - input'} [!searchText && emptySearchText]" ng-focus="showHideSearch()" ng-disabled="showRegistrationDiv" d2-set-focus={{doSearch}}> <div class="input-group-btn"> <button class="btn btn-default search-dropdown-button trim" type="button" title="{{advancedSearchLabel}}" data-toggle="dropdown" ng-click="showHideSearch()" ng-disabled="showRegistrationDiv"><i class="fa fa-caret-down"></i></button> <button class="btn btn-primary trim" type="button" title="{{searchLabel}}" ng-disabled="showRegistrationDiv" ng-click="search(searchMode.freeText)"><i class="fa fa-search"></i></button> === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js 2015-09-15 13:51:19 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js 2015-09-16 14:17:44 +0000 @@ -7,6 +7,22 @@ var d2Directives = angular.module('d2Directives', []) +.directive('d2SetFocus', function ($timeout) { + + return { + scope: { trigger: '@d2SetFocus' }, + link: function(scope, element) { + scope.$watch('trigger', function(value) { + if(value === "true") { + $timeout(function() { + element[0].focus(); + }); + } + }); + } + }; +}) + .directive('d2OuSearch', function () { return {
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp