Commit 83caefce authored by Prayas Jain's avatar Prayas Jain

updated new employee sub status

parent 9c90c6a1
...@@ -25,7 +25,7 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $ ...@@ -25,7 +25,7 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
{field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: true, enableSorting: true,enableFiltering: true,cellClass: 'grid-align',width:180}, {field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: true, enableSorting: true,enableFiltering: true,cellClass: 'grid-align',width:180},
{field : 'mobileNumber',displayName: 'Mobile', enableColumnMenu: false, enableSorting: false,enableFiltering: false,cellClass: 'grid-align'}, {field : 'mobileNumber',displayName: 'Mobile', enableColumnMenu: false, enableSorting: false,enableFiltering: false,cellClass: 'grid-align'},
{field : 'empStatus',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:80}, {field : 'empStatus',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:80},
{field : 'empSubStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:120,cellClass:function(grid,row,col){ {field : 'empSubStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:140,cellClass:function(grid,row,col){
if(grid.getCellValue(row,col)==='Maternity Leave') { if(grid.getCellValue(row,col)==='Maternity Leave') {
return 'blue'; return 'blue';
...@@ -39,6 +39,9 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $ ...@@ -39,6 +39,9 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
else if(grid.getCellValue(row,col)==='Resigned') { else if(grid.getCellValue(row,col)==='Resigned') {
return 'red'; return 'red';
} }
else if(grid.getCellValue(row,col)==='At Client Location') {
return 'violet';
}
}}, }},
{field : 'emailId',displayName: 'Email', enableColumnMenu: false, enableSorting: false,enableFiltering: true,cellClass: 'grid-align', width:180}, {field : 'emailId',displayName: 'Email', enableColumnMenu: false, enableSorting: false,enableFiltering: true,cellClass: 'grid-align', width:180},
{field : 'baseTechnology',displayName: 'Skill', enableColumnMenu: false, enableSorting: false,enableFiltering: false,cellClass: 'grid-align'}, {field : 'baseTechnology',displayName: 'Skill', enableColumnMenu: false, enableSorting: false,enableFiltering: false,cellClass: 'grid-align'},
......
...@@ -37,20 +37,23 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export ...@@ -37,20 +37,23 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
{field : 'billingStartDate',displayName: 'Billing Start Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150}, {field : 'billingStartDate',displayName: 'Billing Start Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
{field : 'billingEndDate',displayName: 'Billing End Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150}, {field : 'billingEndDate',displayName: 'Billing End Date', enableColumnMenu: false, enableSorting: true,cellFilter: 'date:"dd-MMM-yyyy"',enableFiltering:false,width:150},
{field : 'empStatus',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:80}, {field : 'empStatus',displayName: 'Status', enableColumnMenu: false, enableSorting: true,enableFiltering: true,width:80},
{field : 'empSubStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:120,cellClass:function(grid,row,col){ {field : 'empSubStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: true,enableFiltering:true,width:140,cellClass:function(grid,row,col){
if(grid.getCellValue(row,col)==='Maternity Leave') { if(grid.getCellValue(row,col)==='Maternity Leave') {
return 'blue'; return 'blue';
} }
if(grid.getCellValue(row,col)==='Onsite Travel') { if(grid.getCellValue(row,col)==='Onsite Travel') {
return 'green'; return 'green';
} }
else if(grid.getCellValue(row,col)==='Long Leave') { else if(grid.getCellValue(row,col)==='Long Leave') {
return 'orange'; return 'orange';
} }
else if(grid.getCellValue(row,col)==='Resigned') { else if(grid.getCellValue(row,col)==='Resigned') {
return 'red'; return 'red';
} }
else if(grid.getCellValue(row,col)==='At Client Location') {
return 'violet';
}
}}, }},
{field : 'functionalGroup',displayName: 'Functional Org', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100}, {field : 'functionalGroup',displayName: 'Functional Org', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
{field : 'emailId',displayName: 'Email Id', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100}, {field : 'emailId',displayName: 'Email Id', enableColumnMenu: false, enableSorting: true,enableFiltering:false,width:100},
......
...@@ -25,7 +25,7 @@ myApp.controller("leftmenuController",function($scope, myFactory, $compile){ ...@@ -25,7 +25,7 @@ myApp.controller("leftmenuController",function($scope, myFactory, $compile){
if($scope.menuItems[i].menu.indexOf('Manage') !== -1) { if($scope.menuItems[i].menu.indexOf('Manage') !== -1) {
$scope.manageGroup.push($scope.menuItems[i]); $scope.manageGroup.push($scope.menuItems[i]);
} }
else if($scope.menuItems[i].menu.indexOf('Report') !== -1 || $scope.menuItems[i].menu.indexOf('Efforts') !== -1 ) { else if($scope.menuItems[i].menu.indexOf('Report') !== -1 || $scope.menuItems[i].menu.indexOf('Efforts') !== -1 || $scope.menuItems[i].menu.indexOf('Dashboard') !== -1) {
$scope.reportsGroup.push($scope.menuItems[i]); $scope.reportsGroup.push($scope.menuItems[i]);
} }
else{ else{
......
...@@ -182,7 +182,7 @@ i.fa.fa-refresh:hover { ...@@ -182,7 +182,7 @@ i.fa.fa-refresh:hover {
background: transparent; background: transparent;
} }
#sidebar-wrapper .sidebar-nav li ul.reportsGroup { #sidebar-wrapper .sidebar-nav li ul.reportsGroup {
max-height: 165px; max-height: 207px;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
...@@ -576,6 +576,11 @@ top: 22px; ...@@ -576,6 +576,11 @@ top: 22px;
color:white; color:white;
font-weight:bold; font-weight:bold;
} }
.violet{
background-color:violet !important;
color:white;
font-weight:bold;
}
/* .manage-accounts .ui-grid-viewport { /* .manage-accounts .ui-grid-viewport {
height: 400px !important; height: 400px !important;
} */ } */
......
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