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
22afad5e
Commit
22afad5e
authored
Aug 02, 2018
by
dgoud-nisum-com
Committed by
rbonthala-nisum-com
Aug 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes done (#102)
parent
1d33ba36
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
38 deletions
+4
-38
DomainController.js
src/main/webapp/WEB-INF/controllers/DomainController.js
+1
-9
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+0
-1
assignAccountsController.js
...in/webapp/WEB-INF/controllers/assignAccountsController.js
+3
-4
newAccount.html
src/main/webapp/WEB-INF/templates/newAccount.html
+0
-7
newDomain.html
src/main/webapp/WEB-INF/templates/newDomain.html
+0
-9
newProject.html
src/main/webapp/WEB-INF/templates/newProject.html
+0
-8
No files found.
src/main/webapp/WEB-INF/controllers/DomainController.js
View file @
22afad5e
...
@@ -23,14 +23,6 @@ myApp.controller("domainController",
...
@@ -23,14 +23,6 @@ myApp.controller("domainController",
pageSize
:
10
,
pageSize
:
10
,
enableFiltering
:
true
,
enableFiltering
:
true
,
columnDefs
:
[
columnDefs
:
[
{
field
:
'domainId'
,
displayName
:
'Domain ID'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
120
,
},
{
{
field
:
'domainName'
,
field
:
'domainName'
,
displayName
:
'Domain'
,
displayName
:
'Domain'
,
...
@@ -247,7 +239,7 @@ myApp.controller("domainController",
...
@@ -247,7 +239,7 @@ myApp.controller("domainController",
if
(
$scope
.
employeeModel
.
length
<=
0
){
if
(
$scope
.
employeeModel
.
length
<=
0
){
return
"Please select a Delivery Lead"
;
return
"Please select a Delivery Lead"
;
}
}
return
"
Delivery Leads selected : "
+
$scope
.
employeeModel
.
length
;
return
"
"
;
}
else
{
}
else
{
return
"Please select a Delivery Lead"
;
return
"Please select a Delivery Lead"
;
}
}
...
...
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
22afad5e
...
@@ -45,7 +45,6 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
...
@@ -45,7 +45,6 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
pageSize
:
10
,
pageSize
:
10
,
enableFiltering
:
true
,
enableFiltering
:
true
,
columnDefs
:
[
columnDefs
:
[
{
field
:
'projectId'
,
displayName
:
'Project ID'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
120
},
{
field
:
'projectName'
,
displayName
:
'Project '
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
},
{
field
:
'projectName'
,
displayName
:
'Project '
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
},
{
field
:
'account'
,
displayName
:
'Account '
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
},
{
field
:
'account'
,
displayName
:
'Account '
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
},
//{field : 'managerId',displayName: 'Manager ID ', enableColumnMenu: false, enableSorting: false},
//{field : 'managerId',displayName: 'Manager ID ', enableColumnMenu: false, enableSorting: false},
...
...
src/main/webapp/WEB-INF/controllers/assignAccountsController.js
View file @
22afad5e
...
@@ -18,11 +18,10 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
...
@@ -18,11 +18,10 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
pageSize
:
10
,
pageSize
:
10
,
enableFiltering
:
true
,
enableFiltering
:
true
,
columnDefs
:
[
columnDefs
:
[
{
field
:
'accountId'
,
displayName
:
'Account ID'
,
enableColumnMenu
:
true
,
enableSorting
:
true
,
enableFiltering
:
false
,
width
:
120
,
cellClass
:
'grid-align'
},
{
field
:
'accountName'
,
displayName
:
'Account Name'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
true
,
cellClass
:
'grid-align'
},
{
field
:
'accountName'
,
displayName
:
'Account Name'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
true
,
cellClass
:
'grid-align'
},
{
field
:
'industryType'
,
displayName
:
'Industry Type'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
cellClass
:
'grid-align'
},
{
field
:
'industryType'
,
displayName
:
'Industry Type'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
cellClass
:
'grid-align'
},
{
field
:
'status'
,
displayName
:
'Status'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
cellClass
:
'grid-align'
},
{
field
:
'status'
,
displayName
:
'Status'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
cellClass
:
'grid-align'
},
{
field
:
'deliveryManagers'
,
displayName
:
'Delivery Managers'
,
cellTemplate
:
'<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
fals
e
,
cellClass
:
'grid-align'
},
{
field
:
'deliveryManagers'
,
displayName
:
'Delivery Managers'
,
cellTemplate
:
'<div ng-repeat= "item in row.entity[col.field]">{{item.employeeName}}<span ng-hide="$last">,</span></div>'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
tru
e
,
cellClass
:
'grid-align'
},
{
name
:
'Actions'
,
displayName
:
'Actions'
,
cellTemplate
:
getCellTemplate
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
130
}
{
name
:
'Actions'
,
displayName
:
'Actions'
,
cellTemplate
:
getCellTemplate
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
130
}
]
]
};
};
...
@@ -279,7 +278,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
...
@@ -279,7 +278,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
if
(
$scope
.
managersSelectedList
.
length
<=
0
){
if
(
$scope
.
managersSelectedList
.
length
<=
0
){
return
"Please select Delivery Manager"
;
return
"Please select Delivery Manager"
;
}
}
return
"
Delivery Managers selected : "
+
$scope
.
managersSelectedList
.
length
;
return
"
"
;
}
else
{
}
else
{
return
"Please select Delivery Manager"
;
return
"Please select Delivery Manager"
;
}
}
...
...
src/main/webapp/WEB-INF/templates/newAccount.html
View file @
22afad5e
...
@@ -15,13 +15,6 @@
...
@@ -15,13 +15,6 @@
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"row"
>
<div
class=
"row"
>
<table
width=
"450px"
>
<table
width=
"450px"
>
<tr>
<td
colspan=
"4"
>
<b
>
Account ID
</b></td>
<td
colspan=
"8"
><input
type=
"text"
class=
"form-control"
id=
"accountId"
name=
"accountId"
ng-model=
"accountId"
placeholder=
"Account Id Auto Generates"
ng-blur=
""
ng-disabled=
"true"
/>
</td>
<tr>
<td
colspan=
"4"
>
<td
colspan=
"4"
>
<b
>
Account Name
</b></td>
<b
>
Account Name
</b></td>
<td
colspan=
"8"
>
<td
colspan=
"8"
>
...
...
src/main/webapp/WEB-INF/templates/newDomain.html
View file @
22afad5e
...
@@ -15,15 +15,6 @@
...
@@ -15,15 +15,6 @@
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"row"
>
<div
class=
"row"
>
<table
width=
"450px"
>
<table
width=
"450px"
>
<tr>
<td
colspan=
"4"
><b>
Domain ID
</b></td>
<td
colspan=
"8"
><input
type=
"text"
class=
"form-control ng-pristine ng-untouched ng-valid ng-empty"
id=
"domainId"
name=
"domainId"
ng-model=
"domainId"
placeholder=
"Domain Id Auto Generates"
ng-blur=
""
ng-disabled=
"true"
disabled=
"disabled"
aria-invalid=
"false"
style=
""
></td>
</tr>
<tr>
<tr>
<td
colspan=
"4"
><b>
Account
</b></td>
<td
colspan=
"4"
><b>
Account
</b></td>
<td
colspan=
"8"
><md-select
ng-model=
"AccountInfo"
ng-disabled=
"isDisabled"
<td
colspan=
"8"
><md-select
ng-model=
"AccountInfo"
ng-disabled=
"isDisabled"
...
...
src/main/webapp/WEB-INF/templates/newProject.html
View file @
22afad5e
...
@@ -15,14 +15,6 @@
...
@@ -15,14 +15,6 @@
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"row"
>
<div
class=
"row"
>
<table
width=
"450px"
>
<table
width=
"450px"
>
<tr>
<td
colspan=
"4"
>
<b>
Project ID
</b>
</td>
<td
colspan=
"8"
>
<input
type=
"text"
class=
"form-control"
id=
"projectId"
name=
"projectId"
ng-model=
"projectId"
placeholder=
"Project Id Auto Generates"
ng-disabled=
"true"
/>
</td>
</tr>
<tr>
<tr>
<td
colspan=
"4"
>
<td
colspan=
"4"
>
<b>
Project Name
</b>
<b>
Project Name
</b>
...
...
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