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
d816c07d
Commit
d816c07d
authored
May 15, 2019
by
Vijay Akula
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the date issue of updating the resource in Resource update page
parent
f04bcb2a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
12 deletions
+41
-12
ProjectEndDateScheduler.java
...a/com/nisum/myteam/schedular/ProjectEndDateScheduler.java
+2
-1
PdfReportGenerator.java
...ain/java/com/nisum/myteam/service/PdfReportGenerator.java
+2
-1
AttendanceService.java
...java/com/nisum/myteam/service/impl/AttendanceService.java
+1
-1
ProjectService.java
...in/java/com/nisum/myteam/service/impl/ProjectService.java
+1
-1
ResourceAllocationService.java
.../nisum/myteam/service/impl/ResourceAllocationService.java
+3
-3
DateUtils.java
src/main/java/com/nisum/myteam/utils/DateUtils.java
+5
-5
MyTeamDateUtils.java
src/main/java/com/nisum/myteam/utils/MyTeamDateUtils.java
+27
-0
No files found.
src/main/java/com/nisum/myteam/schedular/ProjectEndDateScheduler.java
View file @
d816c07d
...
...
@@ -8,6 +8,7 @@ import com.nisum.myteam.service.IEmployeeService;
import
com.nisum.myteam.service.IMailService
;
import
com.nisum.myteam.service.IProjectService
;
import
com.nisum.myteam.utils.DateUtils
;
import
com.nisum.myteam.utils.MyTeamDateUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -56,7 +57,7 @@ public class ProjectEndDateScheduler {
if
(
activeProjects
!=
null
&&
activeProjects
.
size
()
>
0
)
{
LocalDate
currentDate
=
LocalDate
.
now
();
for
(
Project
activeProject
:
activeProjects
)
{
LocalDate
projectEndDate
=
DateUtils
.
convertUtilDateToLocalDate
(
activeProject
.
getProjectEndDate
());
LocalDate
projectEndDate
=
MyTeam
DateUtils
.
convertUtilDateToLocalDate
(
activeProject
.
getProjectEndDate
());
logger
.
info
(
"Project End Date::"
+
projectEndDate
);
long
noOfDaysBetween
=
ChronoUnit
.
DAYS
.
between
(
currentDate
,
projectEndDate
);
logger
.
info
(
"Days Difference between EndDate of project and Current Date::"
+
noOfDaysBetween
);
...
...
src/main/java/com/nisum/myteam/
utils
/PdfReportGenerator.java
→
src/main/java/com/nisum/myteam/
service
/PdfReportGenerator.java
View file @
d816c07d
package
com
.
nisum
.
myteam
.
utils
;
package
com
.
nisum
.
myteam
.
service
;
import
java.io.File
;
import
java.io.FileOutputStream
;
...
...
@@ -6,6 +6,7 @@ import java.text.ParseException;
import
java.util.ArrayList
;
import
java.util.List
;
import
com.nisum.myteam.utils.MyTeamLogger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.core.io.ResourceLoader
;
import
org.springframework.stereotype.Component
;
...
...
src/main/java/com/nisum/myteam/service/impl/AttendanceService.java
View file @
d816c07d
...
...
@@ -11,7 +11,7 @@ import com.nisum.myteam.service.IEmployeeService;
import
com.nisum.myteam.utils.CommomUtil
;
import
com.nisum.myteam.utils.MyTeamLogger
;
import
com.nisum.myteam.utils.MyTeamUtils
;
import
com.nisum.myteam.
utils
.PdfReportGenerator
;
import
com.nisum.myteam.
service
.PdfReportGenerator
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
src/main/java/com/nisum/myteam/service/impl/ProjectService.java
View file @
d816c07d
...
...
@@ -8,7 +8,7 @@ import com.nisum.myteam.service.IDomainService;
import
com.nisum.myteam.service.IEmployeeService
;
import
com.nisum.myteam.service.IProjectService
;
import
com.nisum.myteam.utils.MyTeamUtils
;
import
com.nisum.myteam.
utils
.PdfReportGenerator
;
import
com.nisum.myteam.
service
.PdfReportGenerator
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
src/main/java/com/nisum/myteam/service/impl/ResourceAllocationService.java
View file @
d816c07d
...
...
@@ -79,9 +79,9 @@ public class ResourceAllocationService implements IResourceAllocationService {
if
(
resourceListWithLatestRecord
!=
null
&&
resourceListWithLatestRecord
.
size
()
>
0
)
{
ResourceAllocation
resourceAllocPrev
=
resourceListWithLatestRecord
.
get
(
0
);
//latest resource record.
log
.
info
(
"The before date is::"
+
MyTeamDateUtils
.
get
YesterdayDate
(
));
resourceAllocPrev
.
setBillingEndDate
(
MyTeamDateUtils
.
get
YesterdayDate
(
));
//adding resource.
log
.
info
(
"Requsting Resource Allocation BillingStart Date::::"
+
resourceAllocReq
.
getBillingStartDate
());
log
.
info
(
"The before date is::"
+
MyTeamDateUtils
.
get
DayLessThanDate
(
resourceAllocReq
.
getBillingStartDate
()
));
resourceAllocPrev
.
setBillingEndDate
(
MyTeamDateUtils
.
get
DayLessThanDate
(
resourceAllocReq
.
getBillingStartDate
()
));
//adding resource.
//resourceAllocPrev.setBillingEndDate(); //adding resource.
log
.
info
(
"After setting the date:::before saving the Resource::"
+
resourceAllocPrev
);
...
...
src/main/java/com/nisum/myteam/utils/DateUtils.java
View file @
d816c07d
package
com
.
nisum
.
myteam
.
utils
;
import
lombok.extern.slf4j.Slf4j
;
import
java.time.LocalDate
;
import
java.time.ZoneId
;
import
java.util.Calendar
;
import
java.util.Date
;
@Slf4j
public
class
DateUtils
{
public
static
LocalDate
convertUtilDateToLocalDate
(
Date
dateToConvert
)
{
return
dateToConvert
.
toInstant
()
.
atZone
(
ZoneId
.
systemDefault
())
.
toLocalDate
();
}
}
src/main/java/com/nisum/myteam/utils/MyTeamDateUtils.java
View file @
d816c07d
package
com
.
nisum
.
myteam
.
utils
;
import
lombok.extern.slf4j.Slf4j
;
import
java.time.LocalDate
;
import
java.time.ZoneId
;
import
java.util.Calendar
;
import
java.util.Date
;
@Slf4j
public
class
MyTeamDateUtils
{
public
static
Date
getYesterdayDate
()
{
...
...
@@ -10,4 +15,26 @@ public class MyTeamDateUtils {
cal
.
add
(
Calendar
.
DATE
,
-
1
);
return
cal
.
getTime
();
}
public
static
LocalDate
convertUtilDateToLocalDate
(
Date
dateToConvert
)
{
return
dateToConvert
.
toInstant
()
.
atZone
(
ZoneId
.
systemDefault
())
.
toLocalDate
();
}
public
static
Date
getDayLessThanDate
(
Date
date
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
date
);
calendar
.
add
(
Calendar
.
DATE
,
-
1
);
Date
yesterday
=
calendar
.
getTime
();
log
.
info
(
"Day before Date is::"
+
yesterday
);
return
yesterday
;
}
public
static
void
main
(
String
[]
args
)
{
MyTeamDateUtils
.
getDayLessThanDate
(
new
Date
());
}
}
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