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
5258a233
Commit
5258a233
authored
Jul 24, 2019
by
vikram singh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added onBehalfof Field in reports
parent
df61f94d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
0 deletions
+4
-0
ReportsController.java
...n/java/com/nisum/myteam/controller/ReportsController.java
+2
-0
Reports.java
src/main/java/com/nisum/myteam/model/Reports.java
+1
-0
ReportService.java
...ain/java/com/nisum/myteam/service/impl/ReportService.java
+1
-0
No files found.
src/main/java/com/nisum/myteam/controller/ReportsController.java
View file @
5258a233
...
...
@@ -467,6 +467,8 @@ public class ReportsController {
report
.
setBillableStatus
(
e
.
getBillableStatus
());
report
.
setBillingStartDate
(
e
.
getBillingStartDate
());
report
.
setBillingEndDate
(
e
.
getBillingEndDate
());
report
.
setOnBehalfOf
(
e
.
getOnBehalfOf
()!=
null
?
employeeService
.
getEmployeeById
(
e
.
getOnBehalfOf
()).
getEmployeeName
():
""
);
reports
.
add
(
report
);
...
...
src/main/java/com/nisum/myteam/model/Reports.java
View file @
5258a233
...
...
@@ -26,5 +26,6 @@ public class Reports implements Serializable {
private
Date
billingStartDate
;
private
Date
billingEndDate
;
private
String
functionalGroup
;
private
String
onBehalfOf
;
}
src/main/java/com/nisum/myteam/service/impl/ReportService.java
View file @
5258a233
...
...
@@ -189,6 +189,7 @@ public class ReportService implements IReportService {
if
(
resourceObj
!=
null
)
{
Project
project
=
projectService
.
getProjectByProjectId
(
resourceObj
.
getProjectId
());
Reports
.
setProjectName
(
project
.
getProjectName
());
Reports
.
setOnBehalfOf
(
resourceObj
.
getOnBehalfOf
()!=
null
?
employeeService
.
getEmployeeById
(
resourceObj
.
getOnBehalfOf
()).
getEmployeeName
():
""
);
Reports
.
setBillingStartDate
(
resourceObj
.
getBillingStartDate
());
Reports
.
setBillableStatus
(
resourceObj
.
getBillableStatus
());
Reports
.
setBillingEndDate
(
resourceObj
.
getBillingEndDate
());
...
...
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