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
4319b7a8
Commit
4319b7a8
authored
Jun 24, 2019
by
Soumya Gouri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sub status added
parent
653c71ef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
1 deletion
+49
-1
AssignRolesController.js
src/main/webapp/WEB-INF/controllers/AssignRolesController.js
+35
-0
newRoleTemplate.html
src/main/webapp/WEB-INF/templates/newRoleTemplate.html
+14
-1
No files found.
src/main/webapp/WEB-INF/controllers/AssignRolesController.js
View file @
4319b7a8
...
...
@@ -445,6 +445,41 @@ myApp.controller("assignRoleController",function($scope, myFactory, $mdDialog, $
$
(
'.md-datepicker-input'
)[
3
].
value
=
null
;
$
(
'.md-datepicker-input'
)[
4
].
value
=
null
;
}
$scope
.
endSubStatus
=
function
()
{
var
record
=
{
id
:
null
,
employeeID
:
$scope
.
empId
,
subStatus
:
$scope
.
empSubStatus
,
fromDate
:
$scope
.
subStatusStartDate
,
toDate
:
$scope
.
subStatusEndDate
};
var
empId
=
myFactory
.
getEmpId
();
var
req
=
{
method
:
'PUT'
,
url
:
appConfig
.
appUri
+
"subStatus?loginEmpId="
+
empId
,
headers
:
{
"Content-type"
:
"application/json"
},
data
:
record
}
$http
(
req
).
then
(
function
mySuccess
(
response
)
{
$scope
.
result
=
"Success"
;
if
(
response
.
data
.
message
==
"Resource substatus updated successfully!"
){
$scope
.
alertMsg
=
response
.
data
.
message
;
}
else
{
$scope
.
alertMsg
=
""
;
}
},
function
myError
(
response
){
$scope
.
result
=
"Error"
;
});
$scope
.
empSubStatus
=
null
;
$scope
.
subStatusStartDate
=
null
;
$scope
.
subStatusEndDate
=
null
;
};
$scope
.
validateFields
=
function
(){
var
today
=
new
Date
();
if
(
$scope
.
templateTitle
==
"Add"
){
...
...
src/main/webapp/WEB-INF/templates/newRoleTemplate.html
View file @
4319b7a8
...
...
@@ -79,7 +79,7 @@
md-max-date=
"maxDate"
onkeydown=
"return false"
></md-datepicker>
</td>
</tr>
<tr
ng-show=
"empStatus == 'Active' && templateTitle != 'Add' "
>
<tr
ng-show=
"empStatus == 'Active' && templateTitle != 'Add'
&& empSubStatus == null
"
>
<td
colspan=
"4"
><b>
Select Sub Status :
</b></td>
<td
colspan=
"8"
><md-select
ng-model=
"empSubStatus"
name =
"empSubStatus"
ng-model =
"empSubStatus"
placeholder =
"Select a Sub Status Type"
id=
"empSubStatus"
ng-change=
"changeEmpSubStatus()"
>
...
...
@@ -88,6 +88,11 @@
<md-option
ng-value=
"status"
ng-repeat=
"status in empSubStatuses"
>
{{status}}
</md-option>
</md-optgroup>
</md-select></td>
</tr>
<tr
ng-show=
"empStatus == 'Active' && templateTitle != 'Add' && empSubStatus != null
|| subStatusStartDate !=null || subStatusEndDate !=null"
>
<td
colspan=
"4"
><b>
Sub Status :
</b></td>
<td
colspan=
"8"
>
{{ empSubStatus }}
</td>
</tr>
<tr
ng-show=
"empSubStatus != null && empSubStatus != '' && empStatus == 'Active' && templateTitle != 'Add'"
>
<td
colspan=
"4"
><b>
{{empSubStatus}} Start Date:
</b><span
class=
"mandatory"
></span></td>
<td
colspan=
"8"
><md-datepicker
ng-model=
"subStatusStartDate"
name=
"subStatusStartDate"
id=
"subStatusStartDate"
...
...
@@ -103,6 +108,14 @@
</td>
</tr>
<tr
ng-show=
"empSubStatus != null && empSubStatus != '' && empStatus == 'Active' && templateTitle != 'Add'"
>
<td
colspan=
"4"
>
<md-button
class=
"md-raised"
ng-click=
"endSubStatus()"
style=
"margin-top:10px;width:88px;background: #3f51b5;color:white;"
>
End
</md-button>
</td>
</tr>
<tr>
<td
colspan=
"12"
>
<div
role=
"alert"
>
...
...
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