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
1439d978
Commit
1439d978
authored
Jul 19, 2019
by
vikram singh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added onBehalfOf property to the project and updated dashboard.service
parent
e416065c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
0 deletions
+7
-0
Resource.java
src/main/java/com/nisum/myteam/model/dao/Resource.java
+1
-0
EmployeeDashboardVO.java
...n/java/com/nisum/myteam/model/vo/EmployeeDashboardVO.java
+1
-0
ResourceVO.java
src/main/java/com/nisum/myteam/model/vo/ResourceVO.java
+1
-0
DashboardService.java
.../java/com/nisum/myteam/service/impl/DashboardService.java
+3
-0
ResourceService.java
...n/java/com/nisum/myteam/service/impl/ResourceService.java
+1
-0
No files found.
src/main/java/com/nisum/myteam/model/dao/Resource.java
View file @
1439d978
...
...
@@ -40,5 +40,6 @@ public class Resource extends AuditFields implements Serializable {
private
String
resourceRole
;
private
String
status
;
private
String
onBehalfOf
;
}
src/main/java/com/nisum/myteam/model/vo/EmployeeDashboardVO.java
View file @
1439d978
...
...
@@ -42,6 +42,7 @@ public class EmployeeDashboardVO {
private
String
empSubStatus
;
private
String
employmentType
;
private
String
domain
;
private
String
onBehalfOf
;
@DateTimeFormat
(
iso
=
ISO
.
DATE
)
private
Date
projectStartDate
;
...
...
src/main/java/com/nisum/myteam/model/vo/ResourceVO.java
View file @
1439d978
...
...
@@ -24,6 +24,7 @@ public class ResourceVO {
private
String
projectId
;
private
String
projectName
;
private
String
status
;
private
String
onBehalfOf
;
@DateTimeFormat
(
iso
=
DateTimeFormat
.
ISO
.
DATE
)
private
String
billableStatus
;
...
...
src/main/java/com/nisum/myteam/service/impl/DashboardService.java
View file @
1439d978
...
...
@@ -161,9 +161,12 @@ public class DashboardService implements IDashboardService {
employeeDashboard
.
stream
().
forEach
(
emp
->
{
Resource
resource
=
resourceService
.
getCurrentAllocation
(
emp
.
getEmployeeId
());
//resourceService.getLatestResourceByEmpId(emp.getEmployeeId());
Project
resourceProject
=
projectService
.
getProjectByProjectId
(
resource
.
getProjectId
());
if
(!
resourceProject
.
getStatus
().
equals
(
"Completed"
)){
emp
.
setProjectId
(
resourceProject
.
getProjectId
());
emp
.
setBillableStatus
(
resource
.
getBillableStatus
());
emp
.
setOnBehalfOf
(
resource
.
getOnBehalfOf
()!=
null
?
resource
.
getOnBehalfOf
():
""
);
emp
.
setProjectName
(
resourceProject
.
getProjectName
());
emp
.
setBillingStartDate
(
resource
.
getBillingStartDate
());
emp
.
setBillingEndDate
(
resource
.
getBillingEndDate
());
...
...
src/main/java/com/nisum/myteam/service/impl/ResourceService.java
View file @
1439d978
...
...
@@ -601,6 +601,7 @@ public class ResourceService implements IResourceService {
resourceVO
.
setBillableStatus
(
resource
.
getBillableStatus
());
resourceVO
.
setEmployeeId
(
resource
.
getEmployeeId
());
resourceVO
.
setStatus
(
resource
.
getStatus
());
resourceVO
.
setOnBehalfOf
(
resource
.
getOnBehalfOf
()!=
null
?
resource
.
getOnBehalfOf
():
""
);
Employee
employee
=
employeeService
.
getEmployeeById
(
resource
.
getEmployeeId
());
resourceVO
.
setEmailId
(
employee
.
getEmailId
());
...
...
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