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
8a8b4903
Commit
8a8b4903
authored
Aug 02, 2018
by
rbonthala-nisum-com
Committed by
tdutta-nisum-com
Aug 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes add to capture exit date (#104)
parent
d40b50fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
0 deletions
+7
-0
EmployeeRoles.java
src/main/java/com/nisum/mytime/model/EmployeeRoles.java
+3
-0
UserServiceImpl.java
src/main/java/com/nisum/mytime/service/UserServiceImpl.java
+3
-0
MyTimeUtils.java
src/main/java/com/nisum/mytime/utils/MyTimeUtils.java
+1
-0
No files found.
src/main/java/com/nisum/mytime/model/EmployeeRoles.java
View file @
8a8b4903
...
...
@@ -102,4 +102,7 @@ public class EmployeeRoles implements Serializable {
@ExcelCellName
(
"Last Modified"
)
private
Date
lastModifiedOn
;
@ExcelCellName
(
"Exit Date"
)
private
Date
endDate
;
}
src/main/java/com/nisum/mytime/service/UserServiceImpl.java
View file @
8a8b4903
...
...
@@ -213,6 +213,9 @@ public class UserServiceImpl implements UserService {
update
.
set
(
"hasB1"
,
employeeRoles
.
getHasB1
());
update
.
set
(
"passportExpiryDate"
,
employeeRoles
.
getPassportExpiryDate
());
update
.
set
(
"b1ExpiryDate"
,
employeeRoles
.
getB1ExpiryDate
());
if
(
employeeRoles
.
getEmpStatus
().
equalsIgnoreCase
(
MyTimeUtils
.
IN_ACTIVE_SPACE
))
{
update
.
set
(
"endDate"
,
employeeRoles
.
getEndDate
());
}
// update employee location
if
(
employeeRoles
.
getEmpLocation
()
!=
null
&&
!
employeeRoles
.
getEmpLocation
().
equals
(
""
))
{
...
...
src/main/java/com/nisum/mytime/utils/MyTimeUtils.java
View file @
8a8b4903
...
...
@@ -52,6 +52,7 @@ public class MyTimeUtils {
public
static
final
String
DELIVERY_MANAGERS
=
"deliveryManagers"
;
public
static
final
String
ACTIVE
=
"Active"
;
public
static
final
String
IN_ACTIVE
=
"InActive"
;
public
static
final
String
IN_ACTIVE_SPACE
=
"In Active"
;
public
final
static
String
TEAMDETAILS_COLLECTION_NAME
=
"TeamDetails"
;
public
final
static
String
BILLINGDETAILS_COLLECTION_NAME
=
"BillingDetails"
;
public
final
static
String
ENDDATE_COLUMN
=
"endDate"
;
...
...
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