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
b907c59b
Commit
b907c59b
authored
Jun 24, 2019
by
Soumya Gouri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added alert message
parent
6bd109e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
AssignRolesController.js
src/main/webapp/WEB-INF/controllers/AssignRolesController.js
+11
-4
newRoleTemplate.html
src/main/webapp/WEB-INF/templates/newRoleTemplate.html
+2
-2
No files found.
src/main/webapp/WEB-INF/controllers/AssignRolesController.js
View file @
b907c59b
...
@@ -193,7 +193,7 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
...
@@ -193,7 +193,7 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
showAlert
(
'Employee updated successfully'
);
showAlert
(
'Employee updated successfully'
);
}
}
else
if
(
result
==
"Cancelled"
)
{
else
if
(
result
==
"Cancelled"
)
{
$scope
.
getUserRoles
();
}
}
else
{
else
{
showAlert
(
'Role assigning/updation failed!!!'
);
showAlert
(
'Role assigning/updation failed!!!'
);
...
@@ -476,10 +476,17 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
...
@@ -476,10 +476,17 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
}
}
$http
(
req
).
then
(
function
mySuccess
(
response
)
{
$http
(
req
).
then
(
function
mySuccess
(
response
)
{
$scope
.
result
=
"Success"
;
$scope
.
result
=
"Success"
;
if
(
response
.
data
.
message
==
"Resource substatus updated successfully!"
){
if
(
response
.
data
.
message
==
"Sub status end updated successfully"
){
$scope
.
alertMsg
=
response
.
data
.
message
;
$mdDialog
.
show
(
$mdDialog
.
alert
({
skipHide
:
true
,
textContent
:
response
.
data
.
message
,
ok
:
'ok'
})).
then
(
function
()
{
$scope
.
myForm
.
$setPristine
();
})
}
else
{
}
else
{
$scope
.
alertMsg
=
""
;
$scope
.
alertMsg
=
response
.
data
.
message
;
}
}
},
function
myError
(
response
){
},
function
myError
(
response
){
$scope
.
result
=
"Error"
;
$scope
.
result
=
"Error"
;
...
...
src/main/webapp/WEB-INF/templates/newRoleTemplate.html
View file @
b907c59b
...
@@ -110,8 +110,8 @@
...
@@ -110,8 +110,8 @@
<tr
ng-show=
"empSubStatus != null && empSubStatus != '' && empStatus == 'Active' && templateTitle != 'Add'"
>
<tr
ng-show=
"empSubStatus != null && empSubStatus != '' && empStatus == 'Active' && templateTitle != 'Add'"
>
<td
colspan=
"4"
>
<td
colspan=
"4"
>
<md-button
class=
"md-raised"
ng-show=
"disableSubStatus"
ng-click=
"endSubStatus()"
style=
"margin-top:10px;width:
88
px;background: #3f51b5;color:white;"
>
<md-button
class=
"md-raised"
ng-show=
"disableSubStatus"
ng-click=
"endSubStatus()"
style=
"margin-top:10px;width:
142
px;background: #3f51b5;color:white;"
>
End
</md-button>
End
Sub status
</md-button>
</td>
</td>
</tr>
</tr>
...
...
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