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
abd738af
Commit
abd738af
authored
Jun 10, 2019
by
Vijay Akula
Browse files
Options
Browse Files
Download
Plain Diff
Allocation Change Service implementation
parents
f3e83121
125a898d
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
770 additions
and
616 deletions
+770
-616
ReportsController.java
...n/java/com/nisum/myteam/controller/ReportsController.java
+64
-38
BillableEmployee.java
src/main/java/com/nisum/myteam/model/BillableEmployee.java
+30
-0
ResourceRepo.java
src/main/java/com/nisum/myteam/repository/ResourceRepo.java
+7
-0
IEmployeeService.java
src/main/java/com/nisum/myteam/service/IEmployeeService.java
+58
-55
IResourceService.java
src/main/java/com/nisum/myteam/service/IResourceService.java
+83
-80
EmployeeService.java
...n/java/com/nisum/myteam/service/impl/EmployeeService.java
+357
-323
ResourceService.java
...n/java/com/nisum/myteam/service/impl/ResourceService.java
+141
-95
application.properties
src/main/resources/application.properties
+8
-8
AllocationChangeController.js
.../webapp/WEB-INF/controllers/AllocationChangeController.js
+11
-11
ChartsController.js
src/main/webapp/WEB-INF/controllers/ChartsController.js
+5
-2
custom-theme.css
src/main/webapp/WEB-INF/css/custom-theme.css
+3
-0
app.js
src/main/webapp/WEB-INF/js/app.js
+1
-1
login.html
src/main/webapp/WEB-INF/templates/login.html
+1
-2
projectTeamDetails.html
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
+1
-1
No files found.
src/main/java/com/nisum/myteam/controller/ReportsController.java
View file @
abd738af
package
com
.
nisum
.
myteam
.
controller
;
package
com
.
nisum
.
myteam
.
controller
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
static
org
.
springframework
.
data
.
mongodb
.
core
.
aggregation
.
Aggregation
.
group
;
import
com.nisum.myteam.exception.handler.ResponseDetails
;
import
static
org
.
springframework
.
data
.
mongodb
.
core
.
aggregation
.
Aggregation
.
newAggregation
;
import
com.nisum.myteam.model.ColumnChartData
;
import
static
org
.
springframework
.
data
.
mongodb
.
core
.
aggregation
.
Aggregation
.
project
;
import
com.nisum.myteam.model.GroupByCount
;
import
static
org
.
springframework
.
data
.
mongodb
.
core
.
aggregation
.
Aggregation
.
sort
;
import
com.nisum.myteam.model.ReportSeriesRecord
;
import
com.nisum.myteam.model.dao.Account
;
import
java.text.ParseException
;
import
com.nisum.myteam.model.dao.Employee
;
import
java.text.SimpleDateFormat
;
import
com.nisum.myteam.model.dao.Resource
;
import
java.util.ArrayList
;
import
com.nisum.myteam.model.vo.ReportVo
;
import
java.util.Calendar
;
import
com.nisum.myteam.model.vo.ResourceVO
;
import
java.util.Date
;
import
com.nisum.myteam.service.IAccountService
;
import
java.util.HashMap
;
import
com.nisum.myteam.service.IEmployeeService
;
import
java.util.List
;
import
com.nisum.myteam.service.IResourceService
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
...
@@ -25,19 +28,26 @@ import org.springframework.data.mongodb.core.query.Query;
...
@@ -25,19 +28,26 @@ import org.springframework.data.mongodb.core.query.Query;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
static
org
.
springframework
.
data
.
mongodb
.
core
.
aggregation
.
Aggregation
.*;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.model.BillableEmployee
;
import
com.nisum.myteam.model.ColumnChartData
;
import
com.nisum.myteam.model.GroupByCount
;
import
com.nisum.myteam.model.ReportSeriesRecord
;
import
com.nisum.myteam.model.dao.Account
;
import
com.nisum.myteam.model.dao.Employee
;
import
com.nisum.myteam.model.dao.Resource
;
import
com.nisum.myteam.model.vo.ReportVo
;
import
com.nisum.myteam.model.vo.ResourceVO
;
import
com.nisum.myteam.service.IAccountService
;
import
com.nisum.myteam.service.IEmployeeService
;
import
com.nisum.myteam.service.IResourceService
;
//import com.nisum.myteam.model.dao.Resource;
@RestController
@RestController
@RequestMapping
(
"/reports"
)
@RequestMapping
(
"/reports"
)
...
@@ -220,7 +230,6 @@ public class ReportsController {
...
@@ -220,7 +230,6 @@ public class ReportsController {
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
public
ResponseEntity
<
List
<
Map
<
String
,
List
<
GroupByCount
>>>>
getEmployeesByFunctionalGroup1
()
public
ResponseEntity
<
List
<
Map
<
String
,
List
<
GroupByCount
>>>>
getEmployeesByFunctionalGroup1
()
throws
MyTeamException
{
throws
MyTeamException
{
ProjectionOperation
projectToMatchModel
=
project
()
ProjectionOperation
projectToMatchModel
=
project
()
.
andExpression
(
"functionalGroup"
).
as
(
"name"
).
andExpression
(
"y"
)
.
andExpression
(
"functionalGroup"
).
as
(
"name"
).
andExpression
(
"y"
)
.
as
(
"y"
);
.
as
(
"y"
);
...
@@ -248,13 +257,13 @@ public class ReportsController {
...
@@ -248,13 +257,13 @@ public class ReportsController {
return
new
ResponseEntity
<>(
list
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
list
,
HttpStatus
.
OK
);
}
}
@RequestMapping
(
value
=
"/fetchEmployeeDetailsByFG"
,
@RequestMapping
(
value
=
"/fetchEmployeeDetailsByFG
AndBillability
"
,
method
=
RequestMethod
.
GET
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
public
ResponseEntity
<
List
<
Employee
>>
getEmployeesByFG
(
public
ResponseEntity
<
List
<
BillableEmployee
>>
getEmployeesByFGAndBillability
(
@RequestParam
(
"fGroup"
)
String
fGroup
)
throws
MyTeamException
{
@RequestParam
(
"fGroup"
)
String
fGroup
,
@RequestParam
(
"billableStatus"
)
String
billableStatus
)
throws
MyTeamException
{
List
<
Employee
>
empList
=
new
ArrayList
<>();
List
<
Billable
Employee
>
empList
=
new
ArrayList
<>();
empList
=
employeeService
.
getEmployee
sByFunctionalGrp
(
fGroup
);
empList
=
employeeService
.
getEmployee
DetailsByFGAndBillability
(
fGroup
,
billableStatus
);
return
new
ResponseEntity
<>(
empList
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
empList
,
HttpStatus
.
OK
);
}
}
...
@@ -311,7 +320,6 @@ public class ReportsController {
...
@@ -311,7 +320,6 @@ public class ReportsController {
return
new
ResponseEntity
<>(
empList
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
empList
,
HttpStatus
.
OK
);
}
}
@RequestMapping
(
value
=
"/billabilityByFunctionalGroup"
,
@RequestMapping
(
value
=
"/billabilityByFunctionalGroup"
,
method
=
RequestMethod
.
GET
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
...
@@ -320,44 +328,58 @@ public class ReportsController {
...
@@ -320,44 +328,58 @@ public class ReportsController {
ReportVo
reportVo
=
new
ReportVo
();
ReportVo
reportVo
=
new
ReportVo
();
Map
<
String
,
Object
>
billableData
=
new
HashMap
();
Map
<
String
,
Object
>
billableData
=
new
HashMap
();
Map
<
String
,
Object
>
nonBillableData
=
new
HashMap
();
Map
<
String
,
Object
>
nonBillableData
=
new
HashMap
();
Map
<
String
,
Object
>
traineeData
=
new
HashMap
();
List
<
Object
>
billableCount
=
new
ArrayList
<>();
List
<
Object
>
billableCount
=
new
ArrayList
<>();
List
<
Object
>
nonBillableCount
=
new
ArrayList
<>();
List
<
Object
>
nonBillableCount
=
new
ArrayList
<>();
List
<
Object
>
traineeCount
=
new
ArrayList
<>();
billableData
.
put
(
"name"
,
"Billable"
);
billableData
.
put
(
"name"
,
"Billable"
);
nonBillableData
.
put
(
"name"
,
"Non Billable"
);
nonBillableData
.
put
(
"name"
,
"Non-Billable"
);
traineeData
.
put
(
"name"
,
"Trainee"
);
for
(
String
functionalGroup:
reportVo
.
getCategoriesList
()){
for
(
String
functionalGroup:
reportVo
.
getCategoriesList
()){
Map
<
String
,
Object
>
billableObj
=
new
HashMap
();
Map
<
String
,
Object
>
billableObj
=
new
HashMap
();
Map
<
String
,
Object
>
nonbillableObj
=
new
HashMap
();
Map
<
String
,
Object
>
nonbillableObj
=
new
HashMap
();
// Map<String,Object> traineeObj = new HashMap();
Integer
billableC
=
0
;
Integer
billableC
=
0
;
Integer
nonBillableC
=
0
;
Integer
nonBillableC
=
0
;
Integer
traineeC
=
0
;
// float traineePer;
float
billper
;
float
billper
;
float
nonBillPer
;
float
nonBillPer
;
List
<
Employee
>
employeeList
=
employeeService
.
getAllEmployees
().
stream
().
List
<
Employee
>
employeeList
=
employeeService
.
getEmployeesByFunctionalGrp
(
functionalGroup
);
filter
(
e
->
e
.
getFunctionalGroup
().
equals
(
functionalGroup
)).
collect
(
Collectors
.
toList
());
for
(
Employee
employee:
employeeList
){
for
(
Employee
employee:
employeeList
){
Resource
resource
=
resourceService
.
getLatestResourceByEmpId
(
employee
.
getEmployeeId
());
Resource
resource
=
resourceService
.
getLatestResourceByEmpId
(
employee
.
getEmployeeId
());
if
(
resource
!=
null
&&
resource
.
getBillableStatus
().
equals
(
"Billable"
)){
if
(
resource
!=
null
&&
resource
.
getBillableStatus
().
equals
(
"Billable"
)){
billableC
++;
billableC
++;
}
else
{
}
else
if
(
resource
!=
null
&&
resource
.
getBillableStatus
().
equals
(
"Trainee"
))
{
traineeC
++;
}
else
{
nonBillableC
++;
nonBillableC
++;
}
}
}
}
billper
=
((
billableC
/
(
float
)
employeeList
.
size
())*
100
);
billper
=
((
billableC
/
(
float
)(
employeeList
.
size
()
-
traineeC
))*
100
);
nonBillPer
=
nonBillableC
/(
float
)
employeeList
.
size
()*
100
;
nonBillPer
=
nonBillableC
/(
float
)
(
employeeList
.
size
()-
traineeC
)*
100
;
// traineePer = traineeC / (float) employeeList.size()*100;
billableObj
.
put
(
"percent"
,
billper
);
billableObj
.
put
(
"percent"
,
billper
);
billableObj
.
put
(
"y"
,
billableC
);
billableObj
.
put
(
"y"
,
billableC
);
nonbillableObj
.
put
(
"percent"
,
nonBillPer
);
nonbillableObj
.
put
(
"percent"
,
nonBillPer
);
nonbillableObj
.
put
(
"y"
,
nonBillableC
);
nonbillableObj
.
put
(
"y"
,
nonBillableC
);
// traineeObj.put("percent", traineePer);
// traineeObj.put("y", traineeC);
billableCount
.
add
(
billableObj
);
billableCount
.
add
(
billableObj
);
nonBillableCount
.
add
(
nonbillableObj
);
nonBillableCount
.
add
(
nonbillableObj
);
traineeCount
.
add
(
traineeC
);
}
}
billableData
.
put
(
"data"
,
billableCount
);
billableData
.
put
(
"data"
,
billableCount
);
nonBillableData
.
put
(
"data"
,
nonBillableCount
);
nonBillableData
.
put
(
"data"
,
nonBillableCount
);
traineeData
.
put
(
"data"
,
traineeCount
);
reportVo
.
getSeriesDataList
().
add
(
billableData
);
reportVo
.
getSeriesDataList
().
add
(
billableData
);
reportVo
.
getSeriesDataList
().
add
(
nonBillableData
);
reportVo
.
getSeriesDataList
().
add
(
nonBillableData
);
reportVo
.
getSeriesDataList
().
add
(
traineeData
);
return
reportVo
;
return
reportVo
;
}
}
//Not Ok Response
//Not Ok Response
@RequestMapping
(
value
=
"/getBillabilityDetailsByAccount"
,
@RequestMapping
(
value
=
"/getBillabilityDetailsByAccount"
,
method
=
RequestMethod
.
GET
,
method
=
RequestMethod
.
GET
,
...
@@ -365,6 +387,7 @@ public class ReportsController {
...
@@ -365,6 +387,7 @@ public class ReportsController {
public
ResponseEntity
<
ColumnChartData
>
getBillabilityDetailsByAccount
()
public
ResponseEntity
<
ColumnChartData
>
getBillabilityDetailsByAccount
()
throws
MyTeamException
{
throws
MyTeamException
{
ProjectionOperation
projectToMatchModel
=
project
()
ProjectionOperation
projectToMatchModel
=
project
()
.
andExpression
(
"account"
).
as
(
"categories"
)
.
andExpression
(
"account"
).
as
(
"categories"
)
.
andExpression
(
"billableStatus"
).
as
(
"seriesName"
)
.
andExpression
(
"billableStatus"
).
as
(
"seriesName"
)
...
@@ -390,7 +413,12 @@ public class ReportsController {
...
@@ -390,7 +413,12 @@ public class ReportsController {
List
<
String
>
catagories
=
new
ArrayList
();
List
<
String
>
catagories
=
new
ArrayList
();
List
<
ReportSeriesRecord
>
seriesDetails
=
new
ArrayList
<
ReportSeriesRecord
>();
List
<
ReportSeriesRecord
>
seriesDetails
=
new
ArrayList
<
ReportSeriesRecord
>();
List
<
Account
>
accounts
=
accountService
.
getAllAccounts
();
//List<Account> accounts = employeeService.getAccounts();
List
<
Account
>
accounts
=
accountService
.
getAllAccounts
();
ColumnChartData
reportData
=
new
ColumnChartData
();
ColumnChartData
reportData
=
new
ColumnChartData
();
for
(
String
status
:
statusList
)
{
for
(
String
status
:
statusList
)
{
catagories
=
new
ArrayList
();
catagories
=
new
ArrayList
();
...
@@ -422,7 +450,6 @@ public class ReportsController {
...
@@ -422,7 +450,6 @@ public class ReportsController {
seriesDetails
.
add
(
reportSeriesRecord
);
seriesDetails
.
add
(
reportSeriesRecord
);
}
}
System
.
out
.
println
(
seriesDetails
);
reportData
.
setCategoriesList
(
catagories
);
reportData
.
setCategoriesList
(
catagories
);
reportData
.
setSeriesDataList
(
seriesDetails
);
reportData
.
setSeriesDataList
(
seriesDetails
);
return
new
ResponseEntity
<>(
reportData
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
reportData
,
HttpStatus
.
OK
);
...
@@ -430,4 +457,3 @@ public class ReportsController {
...
@@ -430,4 +457,3 @@ public class ReportsController {
}
}
src/main/java/com/nisum/myteam/model/BillableEmployee.java
0 → 100644
View file @
abd738af
package
com
.
nisum
.
myteam
.
model
;
import
java.io.Serializable
;
import
java.util.Date
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
@Setter
@Getter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public
class
BillableEmployee
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
employeeId
;
private
String
employeeName
;
private
String
emailId
;
private
String
projectName
;
private
String
billableStatus
;
private
Date
billingStartDate
;
private
Date
billingEndDate
;
private
String
functionalGroup
;
}
src/main/java/com/nisum/myteam/repository/ResourceRepo.java
View file @
abd738af
...
@@ -7,6 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository;
...
@@ -7,6 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
public
interface
ResourceRepo
public
interface
ResourceRepo
extends
MongoRepository
<
Resource
,
String
>
{
extends
MongoRepository
<
Resource
,
String
>
{
...
@@ -24,6 +25,12 @@ public interface ResourceRepo
...
@@ -24,6 +25,12 @@ public interface ResourceRepo
List
<
Resource
>
findByBillingStartDateGreaterThan
(
Date
billingStartDate
);
List
<
Resource
>
findByBillingStartDateGreaterThan
(
Date
billingStartDate
);
List
<
Resource
>
findByBillingStartDateBetween
(
Date
fromDate
,
Date
toDate
);
List
<
Resource
>
findByBillingStartDateBetween
(
Date
fromDate
,
Date
toDate
);
//Set<Resource> findByBillableStatus(String resourceAllocationStatus);
Resource
findOneByProjectIdAndEmployeeIdAndBillingEndDate
(
String
projectId
,
String
employeeId
,
Date
billingEndDate
);
Resource
findOneByEmployeeIdAndBillingEndDate
(
String
employeeId
,
Date
billingEndDate
);
// List<Resource> findByEmployeeIdAndActive(String employeeId, boolean status);
// List<Resource> findByEmployeeIdAndActive(String employeeId, boolean status);
...
...
src/main/java/com/nisum/myteam/service/IEmployeeService.java
View file @
abd738af
package
com
.
nisum
.
myteam
.
service
;
package
com
.
nisum
.
myteam
.
service
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.model.BillableEmployee
;
import
com.nisum.myteam.model.dao.Account
;
import
com.nisum.myteam.model.dao.Account
;
import
com.nisum.myteam.model.dao.Employee
;
import
com.nisum.myteam.model.dao.Employee
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -52,4 +53,6 @@ public interface IEmployeeService {
...
@@ -52,4 +53,6 @@ public interface IEmployeeService {
public
List
<
Employee
>
getEmployeesByEmpStatusAndShift
(
String
empStatus
,
String
shift
);
public
List
<
Employee
>
getEmployeesByEmpStatusAndShift
(
String
empStatus
,
String
shift
);
List
<
BillableEmployee
>
getEmployeeDetailsByFGAndBillability
(
String
fGroup
,
String
billableStatus
);
}
}
src/main/java/com/nisum/myteam/service/IResourceService.java
View file @
abd738af
...
@@ -10,6 +10,7 @@ import com.nisum.myteam.model.vo.ResourceVO;
...
@@ -10,6 +10,7 @@ import com.nisum.myteam.model.vo.ResourceVO;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
public
interface
IResourceService
{
public
interface
IResourceService
{
...
@@ -64,6 +65,8 @@ public interface IResourceService {
...
@@ -64,6 +65,8 @@ public interface IResourceService {
public
List
<
ReserveReportsVO
>
getResourceReportsByBillingStatus
(
String
resourceStatus
);
public
List
<
ReserveReportsVO
>
getResourceReportsByBillingStatus
(
String
resourceStatus
);
Set
<
Resource
>
findByBillableStatus
(
String
billableStatus
);
// List<Resource> getAllResourcesForProject(String projectId, String status);
// List<Resource> getAllResourcesForProject(String projectId, String status);
...
...
src/main/java/com/nisum/myteam/service/impl/EmployeeService.java
View file @
abd738af
package
com
.
nisum
.
myteam
.
service
.
impl
;
package
com
.
nisum
.
myteam
.
service
.
impl
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
java.util.ArrayList
;
import
com.nisum.myteam.model.dao.Account
;
import
java.util.Comparator
;
import
com.nisum.myteam.model.dao.Domain
;
import
java.util.Date
;
import
com.nisum.myteam.model.dao.Employee
;
import
java.util.HashMap
;
import
com.nisum.myteam.repository.EmployeeRepo
;
import
java.util.List
;
import
com.nisum.myteam.service.*
;
import
java.util.Map
;
import
com.nisum.myteam.utils.MyTeamUtils
;
import
java.util.Set
;
import
com.nisum.myteam.utils.constants.ApplicationRole
;
import
java.util.stream.Collectors
;
import
com.nisum.myteam.utils.constants.RoleConstant
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.domain.Sort
;
...
@@ -20,8 +19,27 @@ import org.springframework.data.mongodb.core.query.Query;
...
@@ -20,8 +19,27 @@ import org.springframework.data.mongodb.core.query.Query;
import
org.springframework.data.mongodb.core.query.Update
;
import
org.springframework.data.mongodb.core.query.Update
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.*
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
java.util.stream.Collectors
;
import
com.nisum.myteam.model.BillableEmployee
;
import
com.nisum.myteam.model.dao.Account
;
import
com.nisum.myteam.model.dao.Domain
;
import
com.nisum.myteam.model.dao.Employee
;
import
com.nisum.myteam.model.dao.Project
;
import
com.nisum.myteam.model.dao.Resource
;
import
com.nisum.myteam.repository.EmployeeRepo
;
import
com.nisum.myteam.service.IAccountService
;
import
com.nisum.myteam.service.IDomainService
;
import
com.nisum.myteam.service.IEmployeeLocationService
;
import
com.nisum.myteam.service.IEmployeeRoleService
;
import
com.nisum.myteam.service.IEmployeeService
;
import
com.nisum.myteam.service.IProjectService
;
import
com.nisum.myteam.service.IResourceService
;
import
com.nisum.myteam.statuscodes.ResourceStatus
;
import
com.nisum.myteam.utils.MyTeamUtils
;
import
com.nisum.myteam.utils.constants.ApplicationRole
;
import
com.nisum.myteam.utils.constants.RoleConstant
;
import
lombok.extern.slf4j.Slf4j
;
@Service
@Service
@Slf4j
@Slf4j
...
@@ -290,7 +308,10 @@ public class EmployeeService implements IEmployeeService {
...
@@ -290,7 +308,10 @@ public class EmployeeService implements IEmployeeService {
public
boolean
verifyEmployeeRole
(
String
empId
,
String
roleIdReq
)
{
public
boolean
verifyEmployeeRole
(
String
empId
,
String
roleIdReq
)
{
boolean
flag
=
false
;
boolean
flag
=
false
;
log
.
info
(
"The employeeId::"
+
empId
);
Employee
employee
=
getEmployeeById
(
empId
);
Employee
employee
=
getEmployeeById
(
empId
);
log
.
info
(
"Employee::::in EmployeeService::"
+
employee
);
String
roleName
=
employee
.
getRole
();
String
roleName
=
employee
.
getRole
();
log
.
info
(
"The employee role::"
+
roleName
);
log
.
info
(
"The employee role::"
+
roleName
);
...
@@ -299,7 +320,9 @@ public class EmployeeService implements IEmployeeService {
...
@@ -299,7 +320,9 @@ public class EmployeeService implements IEmployeeService {
if
(
ApplicationRole
.
FUNCTIONAL_MANAGER
.
getRoleName
().
equalsIgnoreCase
(
roleName
)
||
if
(
ApplicationRole
.
FUNCTIONAL_MANAGER
.
getRoleName
().
equalsIgnoreCase
(
roleName
)
||
ApplicationRole
.
DELIVERY_LEAD
.
getRoleName
().
equalsIgnoreCase
(
roleName
))
{
ApplicationRole
.
DELIVERY_LEAD
.
getRoleName
().
equalsIgnoreCase
(
roleName
))
{
flag
=
true
;
flag
=
true
;
log
.
info
(
"in if block"
);
}
else
{
}
else
{
log
.
info
(
"in else block"
);
Set
<
String
>
roleSet
=
employeeRoleService
.
empRolesMapInfoByEmpId
(
empId
);
Set
<
String
>
roleSet
=
employeeRoleService
.
empRolesMapInfoByEmpId
(
empId
);
if
(
null
!=
roleSet
&&
!
roleSet
.
isEmpty
()
&&
MyTeamUtils
.
INT_ZERO
<
roleSet
.
size
())
{
if
(
null
!=
roleSet
&&
!
roleSet
.
isEmpty
()
&&
MyTeamUtils
.
INT_ZERO
<
roleSet
.
size
())
{
if
(
roleSet
.
contains
(
roleIdReq
))
{
if
(
roleSet
.
contains
(
roleIdReq
))
{
...
@@ -311,6 +334,7 @@ public class EmployeeService implements IEmployeeService {
...
@@ -311,6 +334,7 @@ public class EmployeeService implements IEmployeeService {
}
}
log
.
info
(
"before return flag::"
+
flag
);
return
flag
;
return
flag
;
}
}
...
@@ -318,6 +342,16 @@ public class EmployeeService implements IEmployeeService {
...
@@ -318,6 +342,16 @@ public class EmployeeService implements IEmployeeService {
return
employeeRepo
.
findByEmployeeIdIn
(
empIdsSet
);
return
employeeRepo
.
findByEmployeeIdIn
(
empIdsSet
);
}
}
@Override
public
List
<
BillableEmployee
>
getEmployeeDetailsByFGAndBillability
(
String
fGroup
,
String
billableStatus
)
{
Map
<
String
,
Resource
>
resourceMap
=
resourceService
.
findByBillableStatus
(
billableStatus
).
stream
().
collect
(
Collectors
.
toMap
(
e
->
e
.
getEmployeeId
(),
e
->
e
));
return
employeeRepo
.
findByEmpStatusAndFunctionalGroup
(
ResourceStatus
.
ACTIVE
.
getStatus
(),
fGroup
).
stream
().
filter
(
e
->
resourceMap
.
keySet
().
contains
(
e
.
getEmployeeId
())).
map
(
e
->
mappingBillableEmployee
(
e
,
fGroup
,
resourceMap
)).
collect
(
Collectors
.
toList
());
}
private
BillableEmployee
mappingBillableEmployee
(
Employee
e
,
String
fGroup
,
Map
<
String
,
Resource
>
resourceMap
)
{
Resource
resource
=
resourceMap
.
get
(
e
.
getEmployeeId
());
Project
project
=
projectService
.
getProjectByProjectId
(
resource
.
getProjectId
());
return
new
BillableEmployee
(
e
.
getEmployeeId
(),
e
.
getEmployeeName
(),
e
.
getEmailId
(),
project
.
getProjectName
(),
resource
.
getBillableStatus
(),
resource
.
getBillingStartDate
(),
resource
.
getBillingEndDate
(),
fGroup
);
}
}
}
src/main/java/com/nisum/myteam/service/impl/ResourceService.java
View file @
abd738af
...
@@ -50,10 +50,9 @@ public class ResourceService implements IResourceService {
...
@@ -50,10 +50,9 @@ public class ResourceService implements IResourceService {
public
HashMap
<
String
,
Object
>
respMap
=
new
HashMap
<>();
public
HashMap
<
String
,
Object
>
respMap
=
new
HashMap
<>();
private
Resource
getLatestAllocation
(
List
<
Resource
>
resourceAllocList
)
{
private
Resource
getLatestAllocation
(
List
<
Resource
>
resourceAllocList
){
Resource
latestAlloc
=
null
;
Resource
latestAlloc
=
null
;
if
(!
resourceAllocList
.
isEmpty
())
{
if
(!
resourceAllocList
.
isEmpty
())
{
latestAlloc
=
resourceAllocList
.
get
(
0
);
latestAlloc
=
resourceAllocList
.
get
(
0
);
for
(
Resource
resource
:
resourceAllocList
)
{
for
(
Resource
resource
:
resourceAllocList
)
{
if
(
latestAlloc
.
getBillingEndDate
().
before
(
resource
.
getBillingEndDate
()))
if
(
latestAlloc
.
getBillingEndDate
().
before
(
resource
.
getBillingEndDate
()))
...
@@ -62,10 +61,12 @@ public class ResourceService implements IResourceService {
...
@@ -62,10 +61,12 @@ public class ResourceService implements IResourceService {
}
}
return
latestAlloc
;
return
latestAlloc
;
}
}
public
List
<
Resource
>
getResourcesByEmployeeId
(
String
employeeId
){
public
List
<
Resource
>
getResourcesByEmployeeId
(
String
employeeId
)
{
return
resourceRepo
.
findByEmployeeId
(
employeeId
);
return
resourceRepo
.
findByEmployeeId
(
employeeId
);
}
}
public
Resource
addResource
(
Resource
resourceReq
,
String
loginEmpId
)
throws
MyTeamException
{
public
Resource
addResource
(
Resource
resourceReq
,
String
loginEmpId
)
throws
MyTeamException
{
List
<
Resource
>
resourceAllocList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
resourceReq
.
getProjectId
());
List
<
Resource
>
resourceAllocList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
resourceReq
.
getProjectId
());
...
@@ -79,9 +80,9 @@ public class ResourceService implements IResourceService {
...
@@ -79,9 +80,9 @@ public class ResourceService implements IResourceService {
}
}
this
.
updateExistedResource
(
prevAllocation
);
this
.
updateExistedResource
(
prevAllocation
);
}
}
if
(
resourceAllocList
.
isEmpty
())
{
if
(
resourceAllocList
.
isEmpty
())
{
List
<
Resource
>
resourceBenchList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
MyTeamUtils
.
BENCH_PROJECT_ID
);
List
<
Resource
>
resourceBenchList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
MyTeamUtils
.
BENCH_PROJECT_ID
);
if
(!
resourceBenchList
.
isEmpty
())
{
if
(!
resourceBenchList
.
isEmpty
())
{
Resource
resourceBench
=
resourceBenchList
.
get
(
0
);
Resource
resourceBench
=
resourceBenchList
.
get
(
0
);
resourceBench
.
setBillingEndDate
(
MyTeamDateUtils
.
getDayLessThanDate
(
resourceReq
.
getBillingStartDate
()));
resourceBench
.
setBillingEndDate
(
MyTeamDateUtils
.
getDayLessThanDate
(
resourceReq
.
getBillingStartDate
()));
resourceRepo
.
save
(
resourceBench
);
resourceRepo
.
save
(
resourceBench
);
...
@@ -105,8 +106,6 @@ public class ResourceService implements IResourceService {
...
@@ -105,8 +106,6 @@ public class ResourceService implements IResourceService {
}
}
public
void
updateResourceDetails
(
Resource
resourceReq
,
String
loginEmpId
)
throws
MyTeamException
{
public
void
updateResourceDetails
(
Resource
resourceReq
,
String
loginEmpId
)
throws
MyTeamException
{
// List<Resource> resourceAllocList = resourceRepo.findByEmployeeIdAndProjectId(resourceReq.getEmployeeId(), resourceReq.getProjectId());
// List<Resource> resourceAllocList = resourceRepo.findByEmployeeIdAndProjectId(resourceReq.getEmployeeId(), resourceReq.getProjectId());
...
@@ -135,9 +134,9 @@ public class ResourceService implements IResourceService {
...
@@ -135,9 +134,9 @@ public class ResourceService implements IResourceService {
// this.updateExistedResource(resourcePrev);
// this.updateExistedResource(resourcePrev);
// }
// }
Resource
resource
=
resourceRepo
.
findById
(
resourceReq
.
getId
());
Resource
resource
=
resourceRepo
.
findById
(
resourceReq
.
getId
());
if
(
resource
!=
null
)
{
if
(
resource
!=
null
)
{
this
.
updateExistedResource
(
resourceReq
);
this
.
updateExistedResource
(
resourceReq
);
}
else
{
}
else
{
respMap
.
put
(
"statusCode"
,
801
);
respMap
.
put
(
"statusCode"
,
801
);
respMap
.
put
(
"message"
,
"Record Not Found"
);
respMap
.
put
(
"message"
,
"Record Not Found"
);
}
}
...
@@ -165,24 +164,26 @@ public class ResourceService implements IResourceService {
...
@@ -165,24 +164,26 @@ public class ResourceService implements IResourceService {
respMap
.
put
(
"resourceObj"
,
resourcePers
);
respMap
.
put
(
"resourceObj"
,
resourcePers
);
}
}
public
boolean
validateAllocationAgainstPrevAllocation
(
Resource
resourceReq
){
public
boolean
validateAllocationAgainstPrevAllocation
(
Resource
resourceReq
)
{
boolean
isValid
=
true
;
boolean
isValid
=
true
;
List
<
Resource
>
resourceAllocList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
resourceReq
.
getProjectId
());
List
<
Resource
>
resourceAllocList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
resourceReq
.
getProjectId
());
Resource
prevAllocation
=
this
.
getLatestAllocation
(
resourceAllocList
);
Resource
prevAllocation
=
this
.
getLatestAllocation
(
resourceAllocList
);
if
(
prevAllocation
!=
null
)
{
if
(
prevAllocation
!=
null
)
{
if
(!
prevAllocation
.
getBillingStartDate
().
before
(
resourceReq
.
getBillingStartDate
()))
{
if
(!
prevAllocation
.
getBillingStartDate
().
before
(
resourceReq
.
getBillingStartDate
()))
{
respMap
.
put
(
"statusCode"
,
811
);
respMap
.
put
(
"statusCode"
,
811
);
respMap
.
put
(
"message"
,
"Billing start date should be after previous allocation start date"
);
respMap
.
put
(
"message"
,
"Billing start date should be after previous allocation start date"
);
isValid
=
false
;
isValid
=
false
;
}
}
if
(
prevAllocation
.
getBillableStatus
().
equalsIgnoreCase
(
resourceReq
.
getBillableStatus
()))
{
if
(
prevAllocation
.
getBillableStatus
().
equalsIgnoreCase
(
resourceReq
.
getBillableStatus
()))
{
respMap
.
put
(
"statusCode"
,
811
);
respMap
.
put
(
"statusCode"
,
811
);
respMap
.
put
(
"message"
,
"Resource is already in "
+
prevAllocation
.
getBillableStatus
()+
" status only"
);
respMap
.
put
(
"message"
,
"Resource is already in "
+
prevAllocation
.
getBillableStatus
()
+
" status only"
);
isValid
=
false
;
isValid
=
false
;
}
}
}
}
return
isValid
;
return
isValid
;
}
}
public
boolean
validateBillingStartEndDateAgainstProjectStartEndDate
(
Resource
resource
,
String
loginEmpId
)
throws
MyTeamException
{
public
boolean
validateBillingStartEndDateAgainstProjectStartEndDate
(
Resource
resource
,
String
loginEmpId
)
throws
MyTeamException
{
boolean
isValid
=
true
;
boolean
isValid
=
true
;
...
@@ -207,7 +208,7 @@ public class ResourceService implements IResourceService {
...
@@ -207,7 +208,7 @@ public class ResourceService implements IResourceService {
log
.
info
(
""
+
project
.
getProjectEndDate
().
toString
());
log
.
info
(
""
+
project
.
getProjectEndDate
().
toString
());
//if (!resourceAllocation.getBillingEndDate().before(project.getProjectEndDate())|| !resourceAllocation.getBillingEndDate().equals(project.getProjectEndDate())) {
//if (!resourceAllocation.getBillingEndDate().before(project.getProjectEndDate())|| !resourceAllocation.getBillingEndDate().equals(project.getProjectEndDate())) {
if
(!(
resource
.
getBillingEndDate
().
compareTo
(
project
.
getProjectEndDate
())<=
0
))
{
if
(!(
resource
.
getBillingEndDate
().
compareTo
(
project
.
getProjectEndDate
())
<=
0
))
{
log
.
info
(
"Billing end date should be on or before Project End Date."
);
log
.
info
(
"Billing end date should be on or before Project End Date."
);
respMap
.
put
(
"statusCode"
,
813
);
respMap
.
put
(
"statusCode"
,
813
);
respMap
.
put
(
"message"
,
"Billing end date should be before Project End Date."
);
respMap
.
put
(
"message"
,
"Billing end date should be before Project End Date."
);
...
@@ -264,8 +265,6 @@ public class ResourceService implements IResourceService {
...
@@ -264,8 +265,6 @@ public class ResourceService implements IResourceService {
}
}
public
void
deleteResource
(
Resource
resourceReq
,
String
loginEmpId
)
{
public
void
deleteResource
(
Resource
resourceReq
,
String
loginEmpId
)
{
List
<
Resource
>
resourcesList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
resourceReq
.
getProjectId
());
List
<
Resource
>
resourcesList
=
resourceRepo
.
findByEmployeeIdAndProjectId
(
resourceReq
.
getEmployeeId
(),
resourceReq
.
getProjectId
());
resourcesList
.
forEach
(
resource
->
resourceRepo
.
delete
(
resource
));
resourcesList
.
forEach
(
resource
->
resourceRepo
.
delete
(
resource
));
...
@@ -373,11 +372,9 @@ public class ResourceService implements IResourceService {
...
@@ -373,11 +372,9 @@ public class ResourceService implements IResourceService {
resourceVO
.
setBillingStartDate
(
resource
.
getBillingStartDate
());
resourceVO
.
setBillingStartDate
(
resource
.
getBillingStartDate
());
resourceVO
.
setBillingEndDate
(
resource
.
getBillingEndDate
());
resourceVO
.
setBillingEndDate
(
resource
.
getBillingEndDate
());
resourceVO
.
setResourceRole
(
resource
.
getResourceRole
());
resourceVO
.
setResourceRole
(
resource
.
getResourceRole
());
if
(
resource
.
getBillingEndDate
().
compareTo
(
new
Date
())>
0
)
if
(
resource
.
getBillingEndDate
().
compareTo
(
new
Date
())
>
0
)
{
{
resourceVO
.
setResourceStatus
(
ResourceStatus
.
ACTIVE
.
getStatus
());
resourceVO
.
setResourceStatus
(
ResourceStatus
.
ACTIVE
.
getStatus
());
}
else
}
else
{
{
resourceVO
.
setResourceStatus
(
ResourceStatus
.
IN_ACTIVE
.
getStatus
());
resourceVO
.
setResourceStatus
(
ResourceStatus
.
IN_ACTIVE
.
getStatus
());
}
}
...
@@ -514,14 +511,14 @@ public class ResourceService implements IResourceService {
...
@@ -514,14 +511,14 @@ public class ResourceService implements IResourceService {
@Override
@Override
public
List
<
ResourceVO
>
getBillingsForEmployee
(
String
empId
)
{
public
List
<
ResourceVO
>
getBillingsForEmployee
(
String
empId
)
{
List
<
ResourceVO
>
finalList
=
new
ArrayList
<>();
List
<
ResourceVO
>
finalList
=
new
ArrayList
<>();
List
<
Resource
>
resourcesList
=
resourceRepo
.
findByEmployeeId
(
empId
);
List
<
Resource
>
resourcesList
=
resourceRepo
.
findByEmployeeId
(
empId
);
if
(
resourcesList
!=
null
&&
resourcesList
.
size
()
>
0
)
{
if
(
resourcesList
!=
null
&&
resourcesList
.
size
()
>
0
)
{
log
.
info
(
"The resources billing list before sorting::"
+
resourcesList
);
log
.
info
(
"The resources billing list before sorting::"
+
resourcesList
);
//return billingsList.stream().sorted(Comparator.comparing(Billing::getCreatedOn).reversed()).collect(Collectors.toList());
//return billingsList.stream().sorted(Comparator.comparing(Billing::getCreatedOn).reversed()).collect(Collectors.toList());
List
<
Resource
>
sortedList
=
resourcesList
.
stream
().
sorted
(
Comparator
.
comparing
(
Resource:
:
getBillingStartDate
).
reversed
()).
collect
(
Collectors
.
toList
());
List
<
Resource
>
sortedList
=
resourcesList
.
stream
().
sorted
(
Comparator
.
comparing
(
Resource:
:
getBillingStartDate
).
reversed
()).
collect
(
Collectors
.
toList
());
finalList
=
convertResourcesToResourcesVO
(
sortedList
);
finalList
=
convertResourcesToResourcesVO
(
sortedList
);
}
}
return
finalList
;
return
finalList
;
}
}
...
@@ -689,11 +686,12 @@ public class ResourceService implements IResourceService {
...
@@ -689,11 +686,12 @@ public class ResourceService implements IResourceService {
return
resourcesList
;
return
resourcesList
;
}
}
@Override
@Override
public
Resource
getLatestResourceByEmpId
(
String
employeeId
){
public
Resource
getLatestResourceByEmpId
(
String
employeeId
)
{
List
<
Resource
>
resourceList
=
resourceRepo
.
findByEmployeeId
(
employeeId
).
stream
().
List
<
Resource
>
resourceList
=
resourceRepo
.
findByEmployeeId
(
employeeId
).
stream
().
filter
(
r
->
r
.
getBillingEndDate
().
after
(
new
Date
())).
collect
(
Collectors
.
toList
());
filter
(
r
->
r
.
getBillingEndDate
().
after
(
new
Date
())).
collect
(
Collectors
.
toList
());
if
(!
resourceList
.
isEmpty
())
if
(!
resourceList
.
isEmpty
())
return
resourceList
.
get
(
0
);
return
resourceList
.
get
(
0
);
else
else
return
null
;
return
null
;
...
@@ -709,6 +707,7 @@ public class ResourceService implements IResourceService {
...
@@ -709,6 +707,7 @@ public class ResourceService implements IResourceService {
public
List
<
ReserveReportsVO
>
getResourceReportsByBillingStatus
(
String
resourceStatus
)
{
public
List
<
ReserveReportsVO
>
getResourceReportsByBillingStatus
(
String
resourceStatus
)
{
return
prepareReserveReports
(
getResourcesByBillingStatus
(
resourceStatus
));
return
prepareReserveReports
(
getResourcesByBillingStatus
(
resourceStatus
));
}
}
@Override
@Override
public
List
<
ReserveReportsVO
>
prepareReserveReports
(
List
<
Resource
>
resourcesList
)
{
public
List
<
ReserveReportsVO
>
prepareReserveReports
(
List
<
Resource
>
resourcesList
)
{
...
@@ -739,7 +738,7 @@ public class ResourceService implements IResourceService {
...
@@ -739,7 +738,7 @@ public class ResourceService implements IResourceService {
}
}
public
List
<
ChangedResourceVO
>
getChangedResourceByDate
(
String
fromDatestr
,
String
toDatestr
){
public
List
<
ChangedResourceVO
>
getChangedResourceByDate
(
String
fromDatestr
,
String
toDatestr
)
{
// List<ChangedResourceVO> changedResourceVOList = new ArrayList();
// List<ChangedResourceVO> changedResourceVOList = new ArrayList();
// SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
// SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
//
//
...
@@ -809,7 +808,46 @@ public class ResourceService implements IResourceService {
...
@@ -809,7 +808,46 @@ public class ResourceService implements IResourceService {
}
}
public
List
<
AllocationChangeVO
>
getAllocationReports
(
Date
fromDate
,
Date
toDate
)
{
public
List
<
AllocationChangeVO
>
getAllocationReports
(
Date
fromDate
,
Date
toDate
)
{
return
prepareAllocationResources
(
getResourcesBetweenBillingStartDates
(
fromDate
,
toDate
));
return
getResourcesBetweenBillingStartDates
(
fromDate
,
toDate
).
stream
()
.
filter
(
resource
->
resource
.
getBillingEndDate
().
compareTo
(
new
Date
())
>=
0
).
map
(
resource
->
{
Project
project
=
null
;
//Setting Current Billing details.
AllocationChangeVO
allocationVO
=
new
AllocationChangeVO
();
allocationVO
.
setEmployeeId
(
resource
.
getEmployeeId
());
allocationVO
.
setEmployeeName
(
employeeService
.
getEmployeeById
(
resource
.
getEmployeeId
()).
getEmployeeName
());
if
(
StringUtils
.
isNotBlank
(
resource
.
getProjectId
()))
{
project
=
projectService
.
getProjectByProjectId
(
resource
.
getProjectId
());
if
(
project
!=
null
)
{
allocationVO
.
setCurrentProjectName
(
project
.
getProjectName
());
allocationVO
.
setCurrentAccountName
(
accountService
.
getAccountById
(
project
.
getAccountId
()).
getAccountName
());
}
}
allocationVO
.
setCurrentBillingStatus
(
resource
.
getBillableStatus
());
allocationVO
.
setCurrentBillingStartDate
(
resource
.
getBillingStartDate
());
allocationVO
.
setCurrentBillingEndDate
(
resource
.
getBillingEndDate
());
Resource
prevBilling
=
resourceRepo
.
findOneByEmployeeIdAndBillingEndDate
(
resource
.
getEmployeeId
(),
MyTeamDateUtils
.
getDayLessThanDate
(
resource
.
getBillingStartDate
()));
log
.
info
(
"\n\n\n The prev billing info is::"
+
prevBilling
);
if
(
prevBilling
!=
null
)
{
if
(
StringUtils
.
isNotBlank
(
prevBilling
.
getProjectId
()))
{
project
=
projectService
.
getProjectByProjectId
(
prevBilling
.
getProjectId
());
if
(
project
!=
null
)
{
allocationVO
.
setPrevProjectName
(
project
.
getProjectName
());
allocationVO
.
setPrevAccountName
(
accountService
.
getAccountById
(
project
.
getAccountId
()).
getAccountName
());
}
}
allocationVO
.
setPrevBillingStatus
(
prevBilling
.
getBillableStatus
());
allocationVO
.
setPrevBilingStartDate
(
prevBilling
.
getBillingStartDate
());
allocationVO
.
setPrevBillingEndDate
(
prevBilling
.
getBillingEndDate
());
}
return
allocationVO
;
}).
collect
(
Collectors
.
toList
());
}
}
public
List
<
AllocationChangeVO
>
prepareAllocationResources
(
List
<
Resource
>
resourcesList
)
{
public
List
<
AllocationChangeVO
>
prepareAllocationResources
(
List
<
Resource
>
resourcesList
)
{
...
@@ -843,59 +881,67 @@ public class ResourceService implements IResourceService {
...
@@ -843,59 +881,67 @@ public class ResourceService implements IResourceService {
return
allocationList
;
return
allocationList
;
}
}
@Override
public
Set
<
Resource
>
findByBillableStatus
(
String
billableStatus
)
{
return
resourceRepo
.
findByBillableStatus
(
billableStatus
).
stream
().
filter
(
r
->
r
.
getBillingEndDate
().
after
(
new
Date
())).
collect
(
Collectors
.
toSet
());
}
}
//class
}
//class
// @Override
// public List<ResourceVO> getActiveResources(String empId) {
// List<ResourceVO> finalResourcesList = new ArrayList<>();
//
// List<Resource> resourceList = resourceRepo.findByEmployeeId(empId);
// if (resourceList != null && resourceList.size() > 0) {
//
// Resource resourceAlloc=resourceList.get(0);
//
//
//
//
// }
//
// for (Resource resource : resourceRepo.findByEmployeeId(empId)) {
//
// ResourceVO resourceVO=new ResourceVO();
// resourceVO.setEmployeeId(resource.getEmployeeId());
//
// Employee employee=employeeService.getEmployeeById(resource.getEmployeeId());
// resourceVO.setEmployeeName(employee.getEmployeeName());
// resourceVO.setDesignation(employee.getDesignation());
// resourceVO.setEmailId(employee.getEmailId());
// resourceVO.setMobileNo(employee.getMobileNumber());
//
// resourceVO.setProjectName(projectService.getProjectByProjectId(resource.getProjectId()).getProjectName());
//
//
// if (resource.getBillingEndDate().compareTo(new Date()) > 0) {
// finalResourcesList.addAll(getAllResourcesForProject(resource.getProjectId()));
// }
//
//
// }
// return finalResourcesList;
// }
/*
@Override
public List<ResourceVO> getActiveResources(String empId) {
List<ResourceVO> finalResourcesList = new ArrayList<>();
List<Resource> resourceList = resourceRepo.findByEmployeeId(empId);
if (resourceList != null && resourceList.size() > 0) {
// @Override
Resource resourceAlloc=resourceList.get(0);
// public List<ResourceVO> getActiveResources(String empId) {
}
// List<ResourceVO> finalResourcesList = new ArrayList<>();
// Employee employee = null;
for (Resource resource : resourceRepo.findByEmployeeId(empId)) {
//
// List<Resource> resourceList = resourceRepo.findByEmployeeId(empId);
ResourceVO resourceVO=new ResourceVO();
// Optional<Resource> optionalResource = resourceList.stream().filter(resource -> resource.getBillingEndDate().compareTo(new Date()) > 0).findAny();
resourceVO.setEmployeeId(resource.getEmployeeId());
// if (optionalResource.isPresent()) {
// finalResourcesList = prepareProjectTeamMembersList(optionalResource.get().getProjectId());
Employee employee=employeeService.getEmployeeById(resource.getEmployeeId());
// }
resourceVO.setEmployeeName(employee.getEmployeeName());
// return finalResourcesList;
resourceVO.setDesignation(employee.getDesignation());
// }
resourceVO.setEmailId(employee.getEmailId());
\ No newline at end of file
resourceVO.setMobileNo(employee.getMobileNumber());
resourceVO.setProjectName(projectService.getProjectByProjectId(resource.getProjectId()).getProjectName());
if (resource.getBillingEndDate().compareTo(new Date()) > 0) {
finalResourcesList.addAll(getAllResourcesForProject(resource.getProjectId()));
}
}
return finalResourcesList;
}
*/
/*
@Override
public List<ResourceVO> getActiveResources(String empId) {
List<ResourceVO> finalResourcesList = new ArrayList<>();
Employee employee = null;
List<Resource> resourceList = resourceRepo.findByEmployeeId(empId);
Optional<Resource> optionalResource = resourceList.stream().filter(resource -> resource.getBillingEndDate().compareTo(new Date()) > 0).findAny();
if (optionalResource.isPresent()) {
finalResourcesList = prepareProjectTeamMembersList(optionalResource.get().getProjectId());
}
return finalResourcesList;
}
*/
\ No newline at end of file
src/main/resources/application.properties
View file @
abd738af
...
@@ -2,16 +2,16 @@ server.port=8080
...
@@ -2,16 +2,16 @@ server.port=8080
server.context-path
=
/myTeam/
server.context-path
=
/myTeam/
#Production configuration
#Production configuration
#
spring.data.mongodb.host=10.3.45.11
spring.data.mongodb.host
=
10.3.45.11
#
spring.data.mongodb.port=27017
spring.data.mongodb.port
=
27017
#
spring.data.mongodb.database=mytimedb
spring.data.mongodb.database
=
mytimedb
#
spring.data.mongodb.username=mytime
spring.data.mongodb.username
=
mytime
#
spring.data.mongodb.password=nisum@123
spring.data.mongodb.password
=
nisum@123
#Local Database configuration
#Local Database configuration
spring.data.mongodb.host
=
localhost
#
spring.data.mongodb.host=localhost
spring.data.mongodb.port
=
27017
#
spring.data.mongodb.port=27017
spring.data.mongodb.database
=
myTeamDB
#
spring.data.mongodb.database=myTeamDB
quartz.enabled
=
true
quartz.enabled
=
true
cron.expression
=
0 45 10/3 1/1 * ? *
cron.expression
=
0 45 10/3 1/1 * ? *
...
...
src/main/webapp/WEB-INF/controllers/AllocationChangeController.js
View file @
abd738af
...
@@ -18,13 +18,13 @@ myApp.controller("allocationChangeReportController",function($scope,exportUiGrid
...
@@ -18,13 +18,13 @@ myApp.controller("allocationChangeReportController",function($scope,exportUiGrid
enableFiltering
:
true
,
enableFiltering
:
true
,
enableHorizontalScrollbar
:
1
,
enableHorizontalScrollbar
:
1
,
columnDefs
:
[
columnDefs
:
[
{
field
:
'employeeId'
,
displayName
:
'Emp
loyee
Id'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
true
,
width
:
100
},
{
field
:
'employeeId'
,
displayName
:
'Emp Id'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
true
,
width
:
100
},
{
field
:
'employeeName'
,
displayName
:
'Emp
loyee Name'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
200
},
{
field
:
'employeeName'
,
displayName
:
'Emp
Name'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
200
},
{
name
:
' prevAccountName'
,
displayName
:
'Previous Client'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
fals
e
,
width
:
100
},
{
name
:
'prevAccountName'
,
displayName
:
'Prev Client'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
tru
e
,
width
:
100
},
{
field
:
'prevProjectName'
,
displayName
:
'Prev
ious Project'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
150
},
{
field
:
'prevProjectName'
,
displayName
:
'Prev
Project'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
150
},
{
name
:
'prevBillableStatus'
,
displayName
:
'Prev
ious
Billability'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
100
},
{
name
:
'prevBillableStatus'
,
displayName
:
'Prev Billability'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
100
},
{
name
:
'prevBillingStartDate'
,
displayName
:
'Prev
ious
Billing Start Date'
,
cellFilter
:
'date:"dd-MMM-yyyy"'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
150
},
{
name
:
'prevBillingStartDate'
,
displayName
:
'Prev Billing Start Date'
,
cellFilter
:
'date:"dd-MMM-yyyy"'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
150
},
{
name
:
'prevBillingEndDate'
,
displayName
:
'Prev
ious
Billing Start Date'
,
cellFilter
:
'date:"dd-MMM-yyyy"'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
150
},
{
name
:
'prevBillingEndDate'
,
displayName
:
'Prev Billing Start Date'
,
cellFilter
:
'date:"dd-MMM-yyyy"'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
150
},
{
name
:
'currentAccountName'
,
displayName
:
'Current Client'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
100
},
{
name
:
'currentAccountName'
,
displayName
:
'Current Client'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
100
},
{
name
:
'currentBillableStatus'
,
displayName
:
'Current Billability'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
100
},
{
name
:
'currentBillableStatus'
,
displayName
:
'Current Billability'
,
enableColumnMenu
:
false
,
enableSorting
:
false
,
enableFiltering
:
false
,
width
:
100
},
{
field
:
'currentProjectName'
,
displayName
:
'Current Project'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
150
},
{
field
:
'currentProjectName'
,
displayName
:
'Current Project'
,
enableColumnMenu
:
false
,
enableSorting
:
true
,
enableFiltering
:
true
,
width
:
150
},
...
@@ -36,12 +36,12 @@ myApp.controller("allocationChangeReportController",function($scope,exportUiGrid
...
@@ -36,12 +36,12 @@ myApp.controller("allocationChangeReportController",function($scope,exportUiGrid
enableSelectAll
:
true
,
enableSelectAll
:
true
,
exporterMenuExcel
:
false
,
exporterMenuExcel
:
false
,
exporterMenuCsv
:
false
,
exporterMenuCsv
:
false
,
exporterCsvFilename
:
'
EmployeeEfforts
.csv'
,
exporterCsvFilename
:
'
AllocationChange
.csv'
,
exporterExcelFilename
:
'
EmployeeEfforts
'
,
exporterExcelFilename
:
'
Allocation Change
'
,
exporterPdfDefaultStyle
:
{
fontSize
:
9
},
exporterPdfDefaultStyle
:
{
fontSize
:
9
},
exporterPdfTableStyle
:
{
margin
:
[
15
,
15
,
15
,
15
]},
exporterPdfTableStyle
:
{
margin
:
[
15
,
15
,
15
,
15
]},
exporterPdfTableHeaderStyle
:
{
fontSize
:
10
,
bold
:
true
,
italics
:
true
,
color
:
'red'
},
exporterPdfTableHeaderStyle
:
{
fontSize
:
10
,
bold
:
true
,
italics
:
true
,
color
:
'red'
},
exporterPdfHeader
:
{
text
:
"
Employee Efforts
"
,
style
:
'headerStyle'
},
exporterPdfHeader
:
{
text
:
"
Allocation Change Report
"
,
style
:
'headerStyle'
},
exporterPdfFooter
:
function
(
currentPage
,
pageCount
)
{
exporterPdfFooter
:
function
(
currentPage
,
pageCount
)
{
return
{
text
:
currentPage
.
toString
()
+
' of '
+
pageCount
.
toString
(),
style
:
'footerStyle'
};
return
{
text
:
currentPage
.
toString
()
+
' of '
+
pageCount
.
toString
(),
style
:
'footerStyle'
};
},
},
...
...
src/main/webapp/WEB-INF/controllers/ChartsController.js
View file @
abd738af
...
@@ -91,10 +91,13 @@ myApp.directive('hcPieChart', function () {
...
@@ -91,10 +91,13 @@ myApp.directive('hcPieChart', function () {
$scope
.
getMyTeamDetails
=
function
(
seriesName
,
category
,
optionName
,
title
){
$scope
.
getMyTeamDetails
=
function
(
seriesName
,
category
,
optionName
,
title
){
if
(
title
.
trim
()
==
'Employees Overview Report'
){
if
(
title
.
trim
()
==
'Billability By Functional Group'
){
if
(
category
==
'I&A'
){
category
=
'I%26A'
;
}
$http
({
$http
({
method
:
"GET"
,
method
:
"GET"
,
url
:
appConfig
.
appUri
+
"
/reports/fetchEmployeeDetailsByFG?fGroup="
+
option
Name
url
:
appConfig
.
appUri
+
"
reports/fetchEmployeeDetailsByFGAndBillability?fGroup="
+
category
+
"&billableStatus="
+
series
Name
}).
then
(
function
mySuccess
(
response
)
{
}).
then
(
function
mySuccess
(
response
)
{
$scope
.
gridOptions
.
data
=
response
.
data
;
$scope
.
gridOptions
.
data
=
response
.
data
;
if
(
response
.
data
.
length
>
10
){
if
(
response
.
data
.
length
>
10
){
...
...
src/main/webapp/WEB-INF/css/custom-theme.css
View file @
abd738af
...
@@ -512,6 +512,9 @@ i.fa.fa-refresh:hover {
...
@@ -512,6 +512,9 @@ i.fa.fa-refresh:hover {
height: auto !important;
height: auto !important;
max-height: calc(350px - 20px);
max-height: calc(350px - 20px);
} */
} */
.ui-grid-icon-cancel
{
color
:
black
;
}
md-toolbar
._md-toolbar-transitions
{
md-toolbar
._md-toolbar-transitions
{
min-height
:
50px
!important
;
min-height
:
50px
!important
;
}
}
...
...
src/main/webapp/WEB-INF/js/app.js
View file @
abd738af
...
@@ -17,7 +17,7 @@ function($mdDateLocaleProvider) {
...
@@ -17,7 +17,7 @@ function($mdDateLocaleProvider) {
myApp
.
constant
(
'appConfig'
,
{
myApp
.
constant
(
'appConfig'
,
{
appName
:
"MyTime"
,
appName
:
"MyTime"
,
//
appUri: "http://10.3.45.11:8080/myTeam/",
//
appUri: "http://10.3.45.11:8080/myTeam/",
appUri
:
"http://localhost:8080/myTeam/"
,
appUri
:
"http://localhost:8080/myTeam/"
,
version
:
"1.0"
,
version
:
"1.0"
,
empStartId
:
16001
,
empStartId
:
16001
,
...
...
src/main/webapp/WEB-INF/templates/login.html
View file @
abd738af
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
function
renderButton
()
{
function
renderButton
()
{
gapi
.
load
(
'auth2'
,
function
()
{
gapi
.
load
(
'auth2'
,
function
()
{
gapi
.
auth2
.
init
({
gapi
.
auth2
.
init
({
//client_id: "951338644595-32q4i4n2rv4jevvteq77m7jpcq9sbrec.apps.googleusercontent.com",
client_id
:
"685521475239-ujm7l2hkgrltk7loi8efl0ed702asm2r.apps.googleusercontent.com"
,
client_id
:
"685521475239-ujm7l2hkgrltk7loi8efl0ed702asm2r.apps.googleusercontent.com"
,
//client_id: "951338644595-32q4i4n2rv4jevvteq77m7jpcq9sbrec.apps.googleusercontent.com",
hosted_domain
:
'nisum.com'
hosted_domain
:
'nisum.com'
});
});
});
});
...
@@ -33,7 +33,6 @@
...
@@ -33,7 +33,6 @@
}
}
</script>
</script>
<script
src=
"https://apis.google.com/js/platform.js?onload=renderButton"
></script>
<script
src=
"https://apis.google.com/js/platform.js?onload=renderButton"
></script>
<!--<meta name="google-signin-client_id" content="10230597574-gv1bg8nehm0a63n9hh5mu9um563uqaq1.apps.googleusercontent.com">-->
<meta
name=
"google-signin-client_id"
content=
"685521475239-ujm7l2hkgrltk7loi8efl0ed702asm2r.apps.googleusercontent.com"
>
<meta
name=
"google-signin-client_id"
content=
"685521475239-ujm7l2hkgrltk7loi8efl0ed702asm2r.apps.googleusercontent.com"
>
<!--<meta name="google-signin-client_id" content="951338644595-32q4i4n2rv4jevvteq77m7jpcq9sbrec.apps.googleusercontent.com">-->
<!--<meta name="google-signin-client_id" content="951338644595-32q4i4n2rv4jevvteq77m7jpcq9sbrec.apps.googleusercontent.com">-->
...
...
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @
abd738af
...
@@ -152,7 +152,7 @@
...
@@ -152,7 +152,7 @@
<tr
ng-show=
"empBillableStatus"
>
<tr
ng-show=
"empBillableStatus"
>
<td
class=
"Employee"
>
{{empBillableStatus}} Start Date
</td>
<td
class=
"Employee"
>
{{empBillableStatus}} Start Date
</td>
<td>
<td>
<md-datepicker
ng-model=
"newBillingStartDate"
md-placeholder=
"Plase select Date "
id=
"newBillingStartDate "
md-min-date=
"minDate "
<md-datepicker
ng-model=
"newBillingStartDate"
md-placeholder=
"Pl
e
ase select Date "
id=
"newBillingStartDate "
md-min-date=
"minDate "
md-max-date=
"maxDate "
onkeydown=
"return false "
ng-change=
"currentBillabilityDateChange()"
name=
"newBillingStartDate"
></md-datepicker>
md-max-date=
"maxDate "
onkeydown=
"return false "
ng-change=
"currentBillabilityDateChange()"
name=
"newBillingStartDate"
></md-datepicker>
</td>
</td>
</tr>
</tr>
...
...
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