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
70aa0fe2
Commit
70aa0fe2
authored
Jul 23, 2019
by
Prayas Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated validation message for alias and updated checkbox message
parent
128a3390
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
DashboardController.js
src/main/webapp/WEB-INF/controllers/DashboardController.js
+1
-1
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+3
-3
projectTeamDetails.html
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
+2
-5
No files found.
src/main/webapp/WEB-INF/controllers/DashboardController.js
View file @
70aa0fe2
...
...
@@ -34,7 +34,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
{
field
:
'accountName'
,
displayName
:
'Client'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
100
},
{
field
:
'domain'
,
displayName
:
'Domain'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
100
},
{
field
:
'projectName'
,
displayName
:
'Project'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
true
,
width
:
150
},
{
field
:
'onBehalfOf'
,
displayName
:
'
Alias For
'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
180
},
{
field
:
'onBehalfOf'
,
displayName
:
'
On Behalf Of
'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
180
},
{
field
:
'billableStatus'
,
displayName
:
'Billable Status'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
120
},
{
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
},
...
...
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
70aa0fe2
...
...
@@ -649,7 +649,7 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
direction
:
uiGridConstants
.
ASC
,
priority
:
0
,
}
},
{
name
:
'onBehalfOf'
,
displayName
:
'
Alias For
'
,
enableColumnMenu
:
true
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
'*'
},
{
name
:
'onBehalfOf'
,
displayName
:
'
On Behalf Of
'
,
enableColumnMenu
:
true
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
'*'
},
// { field: 'emailId', displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false },
// { field: 'experience', displayName: 'Exp', enableColumnMenu: true, enableSorting: true, width: 80 },
{
...
...
@@ -1533,11 +1533,11 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
angular
.
element
(
document
.
getElementById
(
'empRole'
)).
focus
();
}
else
if
(
action
===
"Add"
&&
$scope
.
toggleAlias
==
true
&&
$scope
.
aliasModel
.
employeeName
==
undefined
||
$scope
.
aliasModel
==
{}){
$scope
.
alertMsg
=
"Please select a
Alias
Resource"
;
$scope
.
alertMsg
=
"Please select a
OnBehalf Of
Resource"
;
angular
.
element
(
document
.
getElementById
(
'selectAlias'
)).
focus
();
}
else
if
(
action
===
"Add"
&&
employeeModel
!=
undefined
&&
employeeModel
.
employeeName
!=
undefined
&&
employeeModel
.
employeeName
==
$scope
.
aliasModel
.
employeeName
){
$scope
.
alertMsg
=
"Selected Employee and
Alias
Resource could not be same"
;
$scope
.
alertMsg
=
"Selected Employee and
OnBehalf Of
Resource could not be same"
;
angular
.
element
(
document
.
getElementById
(
'selectAlias'
)).
focus
();
}
else
if
(
action
===
"Add"
&&
$scope
.
empAllocationStatus
==
undefined
){
...
...
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @
70aa0fe2
...
...
@@ -186,13 +186,10 @@
<td></td>
<td
class=
"Employee"
><md-checkbox
ng-model=
"toggleAlias"
ng-change=
"changeCheckboxValue(toggleAlias)"
aria-label=
"aliasCheck"
class=
"md-primary"
style=
"margin: 10px 0px 10px -7.5pc;"
id=
"selectAlias"
>
Do You want to add alias resource for this Employee ?
</md-checkbox></td>
<!-- <td><input type="checkbox" ng-model="toggleAlias" ng-change="changeCheckboxValue(toggleAlias)" aria-label="aliasCheck" /></td>
<td>Do You want to add alias resource for this Employee ?</td> -->
Are you adding this resource on behalf of any other resource ?
</md-checkbox></td>
</tr>
<tr
ng-show=
"toggleAlias"
>
<td>
Alias For
</td>
<td>
Behalf Of
</td>
<td>
<md-select
ng-model=
"aliasModel"
data-md-container-class=
"selectHeader"
md-selected-text=
"getSelectedAlias() "
id=
"selectAlias"
name=
"aliasModel"
>
...
...
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