Commit d816c07d authored by Vijay Akula's avatar Vijay Akula

Fix the date issue of updating the resource in Resource update page

parent f04bcb2a
...@@ -8,6 +8,7 @@ import com.nisum.myteam.service.IEmployeeService; ...@@ -8,6 +8,7 @@ import com.nisum.myteam.service.IEmployeeService;
import com.nisum.myteam.service.IMailService; import com.nisum.myteam.service.IMailService;
import com.nisum.myteam.service.IProjectService; import com.nisum.myteam.service.IProjectService;
import com.nisum.myteam.utils.DateUtils; import com.nisum.myteam.utils.DateUtils;
import com.nisum.myteam.utils.MyTeamDateUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -56,7 +57,7 @@ public class ProjectEndDateScheduler { ...@@ -56,7 +57,7 @@ public class ProjectEndDateScheduler {
if (activeProjects != null && activeProjects.size() > 0) { if (activeProjects != null && activeProjects.size() > 0) {
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = LocalDate.now();
for (Project activeProject : activeProjects) { for (Project activeProject : activeProjects) {
LocalDate projectEndDate = DateUtils.convertUtilDateToLocalDate(activeProject.getProjectEndDate()); LocalDate projectEndDate = MyTeamDateUtils.convertUtilDateToLocalDate(activeProject.getProjectEndDate());
logger.info("Project End Date::" + projectEndDate); logger.info("Project End Date::" + projectEndDate);
long noOfDaysBetween = ChronoUnit.DAYS.between(currentDate, projectEndDate); long noOfDaysBetween = ChronoUnit.DAYS.between(currentDate, projectEndDate);
logger.info("Days Difference between EndDate of project and Current Date::" + noOfDaysBetween); logger.info("Days Difference between EndDate of project and Current Date::" + noOfDaysBetween);
......
package com.nisum.myteam.utils; package com.nisum.myteam.service;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
...@@ -6,6 +6,7 @@ import java.text.ParseException; ...@@ -6,6 +6,7 @@ import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.nisum.myteam.utils.MyTeamLogger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
...@@ -11,7 +11,7 @@ import com.nisum.myteam.service.IEmployeeService; ...@@ -11,7 +11,7 @@ import com.nisum.myteam.service.IEmployeeService;
import com.nisum.myteam.utils.CommomUtil; import com.nisum.myteam.utils.CommomUtil;
import com.nisum.myteam.utils.MyTeamLogger; import com.nisum.myteam.utils.MyTeamLogger;
import com.nisum.myteam.utils.MyTeamUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -8,7 +8,7 @@ import com.nisum.myteam.service.IDomainService; ...@@ -8,7 +8,7 @@ import com.nisum.myteam.service.IDomainService;
import com.nisum.myteam.service.IEmployeeService; import com.nisum.myteam.service.IEmployeeService;
import com.nisum.myteam.service.IProjectService; import com.nisum.myteam.service.IProjectService;
import com.nisum.myteam.utils.MyTeamUtils; import com.nisum.myteam.utils.MyTeamUtils;
import com.nisum.myteam.utils.PdfReportGenerator; import com.nisum.myteam.service.PdfReportGenerator;
import lombok.extern.slf4j.Slf4j; 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;
......
...@@ -79,9 +79,9 @@ public class ResourceAllocationService implements IResourceAllocationService { ...@@ -79,9 +79,9 @@ public class ResourceAllocationService implements IResourceAllocationService {
if (resourceListWithLatestRecord != null && resourceListWithLatestRecord.size() > 0) { if (resourceListWithLatestRecord != null && resourceListWithLatestRecord.size() > 0) {
ResourceAllocation resourceAllocPrev = resourceListWithLatestRecord.get(0);//latest resource record. ResourceAllocation resourceAllocPrev = resourceListWithLatestRecord.get(0);//latest resource record.
log.info("Requsting Resource Allocation BillingStart Date::::"+resourceAllocReq.getBillingStartDate());
log.info("The before date is::" + MyTeamDateUtils.getYesterdayDate()); log.info("The before date is::" + MyTeamDateUtils.getDayLessThanDate(resourceAllocReq.getBillingStartDate()));
resourceAllocPrev.setBillingEndDate(MyTeamDateUtils.getYesterdayDate()); //adding resource. resourceAllocPrev.setBillingEndDate(MyTeamDateUtils.getDayLessThanDate(resourceAllocReq.getBillingStartDate())); //adding resource.
//resourceAllocPrev.setBillingEndDate(); //adding resource. //resourceAllocPrev.setBillingEndDate(); //adding resource.
log.info("After setting the date:::before saving the Resource::" + resourceAllocPrev); log.info("After setting the date:::before saving the Resource::" + resourceAllocPrev);
......
package com.nisum.myteam.utils; package com.nisum.myteam.utils;
import lombok.extern.slf4j.Slf4j;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
@Slf4j
public class DateUtils { public class DateUtils {
public static LocalDate convertUtilDateToLocalDate(Date dateToConvert) {
return dateToConvert.toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate();
}
} }
package com.nisum.myteam.utils; 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.Calendar;
import java.util.Date; import java.util.Date;
@Slf4j
public class MyTeamDateUtils { public class MyTeamDateUtils {
public static Date getYesterdayDate() { public static Date getYesterdayDate() {
...@@ -10,4 +15,26 @@ public class MyTeamDateUtils { ...@@ -10,4 +15,26 @@ public class MyTeamDateUtils {
cal.add(Calendar.DATE, -1); cal.add(Calendar.DATE, -1);
return cal.getTime(); 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());
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment