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
2688c5b8
Unverified
Commit
2688c5b8
authored
Aug 13, 2018
by
mshaik-nisum-com
Committed by
GitHub
Aug 13, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #148 from nisum-inc/FEATURE/MT-136_ProjectName_Duplicate_check
modified as per service changes
parents
77deca1b
ac1d27a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
+19
-4
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+16
-3
assignAccountsController.js
...in/webapp/WEB-INF/controllers/assignAccountsController.js
+3
-1
No files found.
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
2688c5b8
...
...
@@ -1231,11 +1231,11 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
}
else
{
addOrUpdateProject
(
record
,
$scope
.
templateTitle
);
$timeout
(
function
()
{
updateGrid
(
$scope
.
templateTitle
,
record
)
},
500
);
//
$timeout(function () { updateGrid($scope.templateTitle, record) }, 500);
}
}
else
{
addOrUpdateProject
(
record
,
$scope
.
templateTitle
);
$timeout
(
function
()
{
updateGrid
(
$scope
.
templateTitle
,
record
)
},
500
);
//
$timeout(function () { updateGrid($scope.templateTitle, record) }, 500);
}
}}
$scope
.
cancel
=
function
()
{
...
...
@@ -1531,7 +1531,20 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
data
:
record
}
$http
(
req
).
then
(
function
mySuccess
(
response
)
{
$scope
.
result
=
"Success"
;
console
.
log
(
response
.
data
);
if
(
response
.
data
.
message
==
"Project name already exist !!! try with new"
){
$mdDialog
.
show
(
$mdDialog
.
alert
({
skipHide
:
true
,
title
:
'Attention'
,
textContent
:
response
.
data
.
message
,
ok
:
'ok'
}));
}
else
{
$scope
.
result
=
"Success"
;
$timeout
(
function
()
{
updateGrid
(
$scope
.
templateTitle
,
record
)
},
500
);
}
},
function
myError
(
response
)
{
$scope
.
result
=
"Error"
;
});
...
...
src/main/webapp/WEB-INF/controllers/assignAccountsController.js
View file @
2688c5b8
...
...
@@ -63,7 +63,9 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
$scope
.
gridOptions
.
data
[
i
].
status
=
"Active"
;
}
else
if
(
response
.
data
[
i
].
status
==
'N'
){
$scope
.
gridOptions
.
data
[
i
].
status
=
"InActive"
;
}
}
else
if
(
response
.
data
[
i
].
status
==
'B'
){
$scope
.
gridOptions
.
data
[
i
].
status
=
"Bench"
;
}
}
},
function
myError
(
response
)
{
showAlert
(
"Something went wrong while fetching data!!!"
);
...
...
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