Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mytime
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Narendar Vakiti
mytime
Commits
6ee8662d
Commit
6ee8662d
authored
Jun 13, 2019
by
Prayas Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Status Validation for showing Icon
parent
30c018f4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+11
-12
No files found.
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
6ee8662d
...
...
@@ -626,14 +626,14 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
rowEditWaitInterval
:
0
,
columnDefs
:
[
{
name
:
'employeeId'
,
displayName
:
'Emp ID'
,
enableColumnMenu
:
true
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
80
},
{
field
:
'employeeName'
,
displayName
:
'Emp Name'
,
enableColumnMenu
:
false
,
width
:
"*"
,
enableSorting
:
false
,
enableFiltering
:
true
,
sort
:
{
{
name
:
'employeeName'
,
displayName
:
'Emp Name'
,
width
:
'*'
,
enableSorting
:
false
,
enableColumnMenu
:
false
,
enableFiltering
:
true
,
sort
:
{
direction
:
uiGridConstants
.
ASC
,
priority
:
0
,
}
},
// { field: 'emailId', displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false },
// { field: 'experience', displayName: 'Exp', enableColumnMenu: true, enableSorting: true, width: 80 },
{
field
:
'resourceRole'
,
displayName
:
'Role'
,
enableColumnMenu
:
tru
e
,
width
:
"*"
,
enableSorting
:
false
,
enableFiltering
:
false
,
name
:
'resourceRole'
,
displayName
:
'Role'
,
enableColumnMenu
:
fals
e
,
width
:
"*"
,
enableSorting
:
false
,
enableFiltering
:
false
,
cellTemplate
:
'<div ng-if="!row.entity.editrow">{{COL_FIELD}}</div><div ng-if="row.entity.editrow" class="grid-Dropdown"><md-select ng-model="MODEL_COL_FIELD" id="empRole">'
+
'<md-optgroup label="employee role"><md-option ng-value="empRole" ng-repeat="empRole in col.colDef.editDropdownOptionsArray">{{empRole}}</md-option>'
+
'</md-optgroup></md-select></div>'
,
...
...
@@ -688,10 +688,9 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
});
$scope
.
showMoveToBenchIcon
=
function
(
row
){
if
(
$scope
.
status
==
'InActive'
&&
row
.
projectId
!=
'Nisum0000
'
){
if
(
$scope
.
status
==
'InActive'
&&
row
.
status
==
'Engaged
'
){
return
true
;
}
}
$scope
.
parentData
=
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment