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
6574f8fd
Commit
6574f8fd
authored
Jun 07, 2019
by
Vijay Akula
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes to allocationchange page
parent
817dadbe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
AllocationChangeVO.java
...in/java/com/nisum/myteam/model/vo/AllocationChangeVO.java
+2
-2
ResourceRepo.java
src/main/java/com/nisum/myteam/repository/ResourceRepo.java
+2
-0
ResourceService.java
...n/java/com/nisum/myteam/service/impl/ResourceService.java
+5
-1
No files found.
src/main/java/com/nisum/myteam/model/vo/AllocationChangeVO.java
View file @
6574f8fd
...
...
@@ -17,9 +17,9 @@ public class AllocationChangeVO {
private
String
employeeName
;
private
String
prev
ious
AccountName
;
private
String
prevAccountName
;
private
String
prev
ious
ProjectName
;
private
String
prevProjectName
;
private
String
prevBillingStatus
;
...
...
src/main/java/com/nisum/myteam/repository/ResourceRepo.java
View file @
6574f8fd
...
...
@@ -23,6 +23,8 @@ public interface ResourceRepo
List
<
Resource
>
findByBillingStartDateGreaterThan
(
Date
billingStartDate
);
List
<
Resource
>
findByBillingStartDateBetween
(
Date
fromDate
,
Date
toDate
);
// List<Resource> findByEmployeeIdAndActive(String employeeId, boolean status);
// List<Resource> findByEmployeeIdAndProjectIdAndActive(String employeeId, String projectId, boolean status);
...
...
src/main/java/com/nisum/myteam/service/impl/ResourceService.java
View file @
6574f8fd
...
...
@@ -804,8 +804,12 @@ public class ResourceService implements IResourceService {
return
resourceRepo
.
findByBillingStartDateGreaterThan
(
billingStartDate
);
}
public
List
<
Resource
>
getResourcesBetweenBillingStartDates
(
Date
fromDate
,
Date
toDate
)
{
return
resourceRepo
.
findByBillingStartDateBetween
(
fromDate
,
toDate
);
}
public
List
<
AllocationChangeVO
>
getAllocationReports
(
Date
fromDate
,
Date
toDate
)
{
return
prepareAllocationResources
(
getResources
GreaterThanBillingStartDate
(
from
Date
));
return
prepareAllocationResources
(
getResources
BetweenBillingStartDates
(
fromDate
,
to
Date
));
}
public
List
<
AllocationChangeVO
>
prepareAllocationResources
(
List
<
Resource
>
resourcesList
)
{
...
...
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