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
e416065c
Commit
e416065c
authored
Jul 19, 2019
by
Vijay Akula
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix:Resolved the response problem while adding engage resource to project
parent
60934eb4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
ResourceController.java
.../java/com/nisum/myteam/controller/ResourceController.java
+1
-1
ResourceService.java
...n/java/com/nisum/myteam/service/impl/ResourceService.java
+7
-2
No files found.
src/main/java/com/nisum/myteam/controller/ResourceController.java
View file @
e416065c
...
@@ -53,7 +53,7 @@ public class ResourceController {
...
@@ -53,7 +53,7 @@ public class ResourceController {
if
(
resourceService
.
validateAllocationAgainstPrevAllocation
(
resourceAllocationReq
))
{
if
(
resourceService
.
validateAllocationAgainstPrevAllocation
(
resourceAllocationReq
))
{
Resource
resourcePersisted
=
resourceService
.
addResource
(
resourceAllocationReq
,
loginEmpId
);
Resource
resourcePersisted
=
resourceService
.
addResource
(
resourceAllocationReq
,
loginEmpId
);
ResponseDetails
createResponseDetails
=
new
ResponseDetails
(
new
Date
(),
800
,
"Resource has been created"
,
ResponseDetails
createResponseDetails
=
new
ResponseDetails
(
new
Date
(),
800
,
resourceService
.
respMap
.
get
(
"message"
).
toString
()
,
"Resource description"
,
null
,
request
.
getContextPath
(),
"details"
,
resourcePersisted
);
"Resource description"
,
null
,
request
.
getContextPath
(),
"details"
,
resourcePersisted
);
return
new
ResponseEntity
<
ResponseDetails
>(
createResponseDetails
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<
ResponseDetails
>(
createResponseDetails
,
HttpStatus
.
OK
);
}
}
...
...
src/main/java/com/nisum/myteam/service/impl/ResourceService.java
View file @
e416065c
...
@@ -93,6 +93,7 @@ public class ResourceService implements IResourceService {
...
@@ -93,6 +93,7 @@ public class ResourceService implements IResourceService {
//resource is not yet released from latest project
//resource is not yet released from latest project
}
else
{
}
else
{
resourcePers
=
resourceRepo
.
save
(
resourceReq
);
resourcePers
=
resourceRepo
.
save
(
resourceReq
);
respMap
.
put
(
"message"
,
"Resource has been created"
);
}
}
return
resourcePers
;
return
resourcePers
;
}
}
...
@@ -372,6 +373,7 @@ public class ResourceService implements IResourceService {
...
@@ -372,6 +373,7 @@ public class ResourceService implements IResourceService {
}
}
public
boolean
isReleased
(
Resource
resourceReq
){
public
boolean
isReleased
(
Resource
resourceReq
){
String
message
=
""
;
boolean
released
=
false
;
boolean
released
=
false
;
List
<
Resource
>
resourceList
=
resourceRepo
.
findByEmployeeId
(
resourceReq
.
getEmployeeId
());
List
<
Resource
>
resourceList
=
resourceRepo
.
findByEmployeeId
(
resourceReq
.
getEmployeeId
());
Resource
currentAllocation
=
getCurrentAllocationIfNotReturnNull
(
resourceReq
.
getEmployeeId
());
Resource
currentAllocation
=
getCurrentAllocationIfNotReturnNull
(
resourceReq
.
getEmployeeId
());
...
@@ -379,13 +381,16 @@ public class ResourceService implements IResourceService {
...
@@ -379,13 +381,16 @@ public class ResourceService implements IResourceService {
Resource
latestAllocation
=
getLatestAllocation
(
resourceList
.
stream
().
filter
(
r
->
r
.
getBillingEndDate
().
compareTo
(
resourceReq
.
getBillingStartDate
())
<
0
).
collect
(
Collectors
.
toList
()));
Resource
latestAllocation
=
getLatestAllocation
(
resourceList
.
stream
().
filter
(
r
->
r
.
getBillingEndDate
().
compareTo
(
resourceReq
.
getBillingStartDate
())
<
0
).
collect
(
Collectors
.
toList
()));
if
(
latestAllocation
!=
null
&&
latestAllocation
.
getStatus
().
equals
(
MyTeamUtils
.
STATUS_ENGAGED
)){
if
(
latestAllocation
!=
null
&&
latestAllocation
.
getStatus
().
equals
(
MyTeamUtils
.
STATUS_ENGAGED
)){
//not released
//not released
message
=
"Resource is not released from "
+
projectService
.
getProjectByProjectId
(
latestAllocation
.
getProjectId
()).
getProjectName
();
respMap
.
put
(
"statusCode"
,
810
);
respMap
.
put
(
"statusCode"
,
810
);
respMap
.
put
(
"message"
,
"Resource is not released from "
+
projectService
.
getProjectByProjectId
(
latestAllocation
.
getProjectId
()).
getProjectName
());
}
else
{
}
else
{
released
=
true
;
released
=
true
;
}
}
}
else
{
released
=
true
;
}
}
respMap
.
put
(
"message"
,
message
);
return
released
;
return
released
;
}
}
...
...
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