Commit 9eae800a authored by rammula-nisum-com's avatar rammula-nisum-com Committed by tdutta-nisum-com

mutiple_select_issue (#62)

parent b8667711
...@@ -229,6 +229,7 @@ myApp.controller("domainController", ...@@ -229,6 +229,7 @@ myApp.controller("domainController",
$scope.employeeList = employees; $scope.employeeList = employees;
$scope.employeeNamesArray = []; $scope.employeeNamesArray = [];
$scope.employeeModel; $scope.employeeModel;
$scope.selectedEmployeeNames = [];
$scope.templateTitle = dataToPass.action; $scope.templateTitle = dataToPass.action;
$scope.accounts = myFactory.getAccounts(); $scope.accounts = myFactory.getAccounts();
...@@ -339,13 +340,18 @@ myApp.controller("domainController", ...@@ -339,13 +340,18 @@ myApp.controller("domainController",
$scope.domainName = dataToPass.domainName; $scope.domainName = dataToPass.domainName;
$scope.AccountInfo = dataToPass.AccountName; $scope.AccountInfo = dataToPass.AccountName;
$scope.AccountId = dataToPass.AccountId; $scope.AccountId = dataToPass.AccountId;
$scope.employeeModel = dataToPass.deliveryManagers;
var accounts1 = myFactory.getAccounts(); var accounts1 = myFactory.getAccounts();
for (var i = 0; i < accounts1.length; i++) { for (var i = 0; i < accounts1.length; i++) {
if (accounts1[i].accountName == dataToPass.AccountName) { if (accounts1[i].accountName == dataToPass.AccountName) {
$scope.AccountInfo = accounts1[i]; $scope.AccountInfo = accounts1[i];
} }
} }
for (key in dataToPass.deliveryManagers) {
$scope.selectedEmployeeNames.push(dataToPass.deliveryManagers[key].employeeName);
}
}
$scope.ifEmployeeNameExists = function(empName) {
return $scope.selectedEmployeeNames.includes(empName);
} }
$scope.validateFields = function(action){ $scope.validateFields = function(action){
var domainId = $scope.domainId; var domainId = $scope.domainId;
......
...@@ -113,6 +113,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo ...@@ -113,6 +113,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
} }
function addController($scope, $mdDialog, dataToPass, gridOptionsData, $mdSelect) { function addController($scope, $mdDialog, dataToPass, gridOptionsData, $mdSelect) {
$scope.selectedEmployeeNames = [];
$scope.accountName; $scope.accountName;
$scope.industryType; $scope.industryType;
$scope.clientAddress; $scope.clientAddress;
...@@ -142,7 +143,13 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo ...@@ -142,7 +143,13 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
$scope.accountName = dataToPass.accountName; $scope.accountName = dataToPass.accountName;
$scope.industryType = dataToPass.industryType; $scope.industryType = dataToPass.industryType;
$scope.clientAddress = dataToPass.clientAddress; $scope.clientAddress = dataToPass.clientAddress;
$scope.managersSelectedList = dataToPass.deliveryManagers; //$scope.managersSelectedList = dataToPass.deliveryManagers;
for (key in dataToPass.deliveryManagers) {
$scope.selectedEmployeeNames.push(dataToPass.deliveryManagers[key].employeeName);
}
}
$scope.ifEmployeeNameExists = function(empName) {
return $scope.selectedEmployeeNames.includes(empName);
} }
$scope.getDeliveryManagers = function(){ $scope.getDeliveryManagers = function(){
$http({ $http({
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span> <span class="glyphicon glyphicon-remove close-mdselect" ng-click="closeSelectBox()"></span>
</md-select-header> </md-select-header>
<md-optgroup label="managers" class="optionScroll"> <md-optgroup label="managers" class="optionScroll">
<md-option ng-value="manager" ng-repeat="manager in managerDetails | filter:searchFilter">{{manager.employeeName}}</md-option> <md-option ng-value="manager" ng-repeat="manager in managerDetails | filter:searchFilter" ng-selected="ifEmployeeNameExists(manager.employeeName)">{{manager.employeeName}}</md-option>
</md-optgroup> </md-optgroup>
</md-select> </md-select>
</div> </div>
......
...@@ -63,9 +63,10 @@ ...@@ -63,9 +63,10 @@
placeholder="Please Search for a lead" placeholder="Please Search for a lead"
class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" /> class="searchBoxHeader demo-header-searchbox md-text search-spacingleft" />
<span class="glyphicon glyphicon-remove close-mdselect" <span class="glyphicon glyphicon-remove close-mdselect"
ng-click="closeSelectBox()"></span> </md-select-header> <md-optgroup class="optionScroll" ng-click="closeSelectBox()"></span> </md-select-header>
label="Employee"> <md-option ng-value="employee" <md-optgroup class="optionScroll"
ng-repeat="employee in employeeList | filter:searchFilter">{{employee.employeeName}}</md-option> label="Employee">
<md-option ng-value="employee" ng-repeat="employee in employeeList | filter:searchFilter" ng-selected="ifEmployeeNameExists(employee.employeeName)">{{employee.employeeName}}</md-option>
</md-optgroup> </md-select> </div> </md-optgroup> </md-select> </div>
</td> </td>
</tr> </tr>
......
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