diff --git a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java index 93e114e..eb316a1 100644 --- a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java +++ b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java @@ -60,20 +60,25 @@ public class PlanTimes { for (var week : calenderWeeks) { System.out.println(week.getStartDate() + " ---> " + week.getEndDate()); + double planTimePerWeek = 0.0; for (var change : changesInDateRange) { LocalDate d2 = timestampToDate(change.get(queryChanges.getFieldId("D2")).toString()); LocalDate dateStart = LocalDate.parse(week.getStartDate(), formatter); LocalDate dateEnd = LocalDate.parse(week.getEndDate(), formatter); if (d2.isAfter(dateStart) && (d2.isEqual(dateEnd) || d2.isBefore(dateEnd))) { - System.out.println(d2); + System.out.println(change.get(queryChanges.getFieldId("ChangeNr")).toString() + " _ " + + new SimpleDateFormat("dd.MM.yyyy").format(d2)); + + planTimePerWeek += change.get(endDate) } } } - for (var v : calenderWeeks) - System.out.println(v.getWeek() + " - " + v.getPlanTime() + " - " + v.getStartDate() + " - " + v.getEndDate()); - + for (var v : calenderWeeks) + System.out + .println(v.getWeek() + " - " + v.getPlanTime() + " - " + v.getStartDate() + " - " + v.getEndDate()); + } public LocalDate timestampToDate(String timestamp) {