taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed start and end to whole week

main
Said Gedik 2023-06-19 16:32:03 +02:00
parent ef1f5bf401
commit d0c88f2f0c
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java
View File

@ -44,13 +44,12 @@ public class PlanTimes {
int year = startDate.get(IsoFields.WEEK_BASED_YEAR); int year = startDate.get(IsoFields.WEEK_BASED_YEAR);
String formattedStartWeek = String.format("%02d", startWeek); String formattedStartWeek = String.format("%02d", startWeek);
LocalDate startOfWeek = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
calendarWeek.setWeek(year + "w" + formattedStartWeek); calendarWeek.setWeek(year + "w" + formattedStartWeek);
calendarWeek.setPlanTime(0); calendarWeek.setPlanTime(0);
calendarWeek.setStartDate(startDate.format(formatter)); calendarWeek.setStartDate(startOfWeek.format(formatter));
LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
if (endOfWeek.isAfter(endDate))
endOfWeek = endDate;
calendarWeek.setEndDate(endOfWeek.format(formatter)); calendarWeek.setEndDate(endOfWeek.format(formatter));
calenderWeeks.add(calendarWeek); calenderWeeks.add(calendarWeek);
@ -59,9 +58,7 @@ public class PlanTimes {
var filter = req.getFilter(); var filter = req.getFilter();
var qual = filter.constructQualifier(null, remedyJavaAPI); var qual = filter.constructQualifier(null, remedyJavaAPI);
var changesInDateRange = remedyJavaAPI.queryFieldsById( var changesInDateRange = remedyJavaAPI.queryFieldsById(qual, queryChanges.getFieldIds(), formName, null, 0, 0);
qual,
queryChanges.getFieldIds(), formName, null, 0, 0);
for (var week : calenderWeeks) { for (var week : calenderWeeks) {
double planTimePerWeek = 0.0; double planTimePerWeek = 0.0;