Commit de349758 authored by Prayas Jain's avatar Prayas Jain

Fixed Dropdown Issue

parent d55f627f
myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $http, appConfig, $timeout){ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $http, appConfig, $timeout,$window,$mdSelect){
$scope.records = []; $scope.records = [];
$scope.empSearchId = ""; $scope.empSearchId = "";
$scope.status = "Active"; $scope.status = "Active";
...@@ -236,6 +236,11 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $ ...@@ -236,6 +236,11 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
} }
} }
$window.addEventListener('click', function (e) {
if (e.target.type !== 'search') {
$mdSelect.hide();
}
});
function AddRoleController($scope, $mdDialog, dataToPass, gridOptionsData) { function AddRoleController($scope, $mdDialog, dataToPass, gridOptionsData) {
$scope.templateTitle = dataToPass.action; $scope.templateTitle = dataToPass.action;
......
...@@ -609,7 +609,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor ...@@ -609,7 +609,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
var getCellTemplate1 = '<p class="col-lg-12"><i ng-show="!row.entity.editrow" class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.edit(row)"></i>'+ var getCellTemplate1 = '<p class="col-lg-12"><i ng-show="!row.entity.editrow" class="fa fa-pencil-square-o fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.edit(row)"></i>'+
'<i ng-show="row.entity.editrow" class="fa fa-save fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.saveRow(row.entity,\'Update\')"></i>' '<i ng-show="row.entity.editrow" class="fa fa-save fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.saveRow(row.entity,\'Update\')"></i>'
+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.editrow" id="cancelEdit" class="fa fa-times fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.cancelEdit(row.entity)"></i>' +'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.editrow" id="cancelEdit" class="fa fa-times fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.cancelEdit(row.entity)"></i>'
+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="grid.appScope.status == \'InActive\'" id="moveEdit" class="fa fa-arrow-circle-right fa-2x" aria-hidden="true" style="font-size:1.8em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.moveToBench(row.entity)"></i></p>' +'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="grid.appScope.showMoveToBenchIcon(row.entity)" id="moveEdit" class="fa fa-arrow-circle-right fa-2x" aria-hidden="true" style="font-size:1.8em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.moveToBench(row.entity)"></i></p>';
//'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>'; //'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>';
var getCellActiveTemplate = '<div ng-show="COL_FIELD==true"><p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>'; var getCellActiveTemplate = '<div ng-show="COL_FIELD==true"><p class="col-lg-12">Y</P></div><div ng-show="COL_FIELD==false"><p class="col-lg-12">N</p></div>';
...@@ -686,6 +686,14 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor ...@@ -686,6 +686,14 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
showAlert("Something went wrong while fetching data!!!"); showAlert("Something went wrong while fetching data!!!");
$scope.gridOptions.data = []; $scope.gridOptions.data = [];
}); });
$scope.showMoveToBenchIcon = function(row){
if($scope.status == 'InActive' && row.projectId != 'Nisum0000'){
return true;
}
}
$scope.parentData = { $scope.parentData = {
"employeeId":"", "employeeId":"",
"projectId": "", "projectId": "",
......
...@@ -546,7 +546,7 @@ top: 22px; ...@@ -546,7 +546,7 @@ top: 22px;
.md-dialog-container { .md-dialog-container {
z-index: 100 !important; z-index: 100 !important;
} }
.md-select-menu-container { .md-select-menu-container {
z-index: 100 !important; z-index: 100 !important;
} }
.md-dialog-custom-height { .md-dialog-custom-height {
...@@ -673,3 +673,6 @@ cursor: pointer; ...@@ -673,3 +673,6 @@ cursor: pointer;
.viewTeamDetails{ .viewTeamDetails{
width:100%; width:100%;
} }
md-content {
overflow : hidden;
}
\ No newline at end of file
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
</div> </div>
</div> </div>
<div class="form-group col-lg-7 col-md-7 col-sm-7 col-xs-12"></div> <div class="form-group col-lg-9 col-md-9 col-sm-9 col-xs-12"></div>
<div class="row col-lg-12" style="margin-left: 0px;"> <div class="row col-lg-12" style="margin-left: 0px;">
<input type="radio" ng-model="status" value="Active" ng-click="getTeamMates()"> Active <input type="radio" ng-model="status" value="Active" ng-click="getTeamMates()"> Active
<input type="radio" ng-model="status" value="InActive" ng-click="getTeamMates()"> Inactive <input type="radio" ng-model="status" value="InActive" ng-click="getTeamMates()"> Inactive
<input type="radio" ng-model="status" value="Both" ng-click="getTeamMates()"> Both <input type="radio" ng-model="status" value="Both" ng-click="getTeamMates()"> Both
</div> </div>
<div id="gridTest" class="grid-half-view" ui-grid="gridOptions " ui-grid-edit ui-grid-pagination style="width:99%;height:230px;margin-left:10px; "> <div id="gridTest" class="grid-half-view" ui-grid="gridOptions " ui-grid-edit ui-grid-pagination style="width:94.5%;margin-left:25px; ">
<div class="watermark " ng-show="!gridOptions.data.length ">No data available</div> <div class="watermark " ng-show="!gridOptions.data.length ">No data available</div>
</div> </div>
<div ng-if ='templateTitle == "View"' role="alert"> <div ng-if ='templateTitle == "View"' role="alert">
......
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