Commit c8e144f5 authored by dgoud-nisum-com's avatar dgoud-nisum-com Committed by rbonthala-nisum-com

Defect Fixed for MT-69 (#49)

parent e8f9ef32
......@@ -211,9 +211,9 @@ myApp.controller("domainController",
e.stopPropagation();
}
$scope.searchFilter = function(obj) {
var re = new RegExp($scope.searchTerm, 'i');
return !$scope.searchTerm
|| re.test(obj.employeeName);
var re = $scope.searchTerm;
var filteredWord = !$scope.searchTerm || obj.employeeName.startsWith(re);
return filteredWord;
};
$scope.clearSearchTerm = function() {
$scope.searchTerm = '';
......
......@@ -277,8 +277,9 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
e.stopPropagation();
}
$scope.searchFilter = function (obj) {
var re = new RegExp($scope.searchTerm, 'i');
return !$scope.searchTerm || re.test(obj.employeeName);
var re = $scope.searchTerm;
var filteredWord = !$scope.searchTerm || obj.employeeName.startsWith(re);
return filteredWord;
};
......
......@@ -300,10 +300,9 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
e.stopPropagation();
}
$scope.searchFilter = function (obj) {
var re = new RegExp($scope.searchTerm, 'i');
// searching the employee based on name , employeeid and email
//return !$scope.searchTerm || re.test(obj.employeeId) || re.test(obj.employeeName) ||re.test(obj.emailId) ;
return !$scope.searchTerm || re.test(obj.employeeName) ;
var re = $scope.searchTerm;
var filteredWord = !$scope.searchTerm || obj.employeeName.startsWith(re);
return filteredWord; ;
};
......
......@@ -26,6 +26,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
{name : 'Actions', displayName: 'Actions',cellTemplate: getCellTemplate, enableColumnMenu: false, enableSorting: false, enableFiltering:false,width:130}
]
};
$scope.nameFields = ['employeeName']
$scope.gridOptions.data = $scope.records;
$scope.getRowData = function(row, action){
$scope.parentData.id = row.entity.id;
......@@ -58,7 +59,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
$('#home').addClass('md-scroll-mask');
userData.action = action;
$mdDialog.show ({
clickOutsideToClose: true,
clickOutsideToClose: false,
scope: $scope,
preserveScope: true,
templateUrl: 'templates/newAccount.html',
......@@ -165,8 +166,9 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
e.stopPropagation();
}
$scope.searchFilter = function (obj) {
var re = new RegExp($scope.searchTerm, 'i');
return !$scope.searchTerm || re.test(obj.employeeName);
var re = $scope.searchTerm;
var filteredWord = !$scope.searchTerm || obj.employeeName.startsWith(re);
return filteredWord;
};
$scope.removeSelectedLead = function(item){
var index = $scope.managersSelectedList.indexOf(item);
......@@ -292,4 +294,5 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
}
}
}
});
\ No newline at end of file
});
......@@ -78,7 +78,7 @@
<span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span>
</md-select-header>
<md-optgroup label="managers" class="optionScroll">
<md-option ng-value="manager" ng-repeat="manager in managerDetails | filter:searchTerm">{{manager.employeeName}}</md-option>
<md-option ng-value="manager" ng-repeat="manager in managerDetails | filter:searchFilter">{{manager.employeeName}}</md-option>
</md-optgroup>
</md-select>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment