From facfc1e360c1dadbf9bf145b8a571de8af7021f1 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 15 Jun 2023 14:19:31 +0200 Subject: [PATCH] plantimes finished --- .../nttdata/calender/planTimes/PlanTimes.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) 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 ff7cdf9..77aa53d 100644 --- a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java +++ b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java @@ -45,7 +45,7 @@ public class PlanTimes { calendarWeek.setPlanTime(0); calendarWeek.setStartDate(startDate.format(formatter)); - LocalDate endOfWeek = startDate.with(TemporalAdjusters.next(DayOfWeek.SUNDAY)); + LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); if (endOfWeek.isAfter(endDate)) endOfWeek = endDate; calendarWeek.setEndDate(endOfWeek.format(formatter)); @@ -60,7 +60,6 @@ public class PlanTimes { queryChanges.getFieldIds(), formName, null, 0, 0); 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()); @@ -68,27 +67,14 @@ public class PlanTimes { LocalDate dateEnd = LocalDate.parse(week.getEndDate(), formatter); if (d2.isAfter(dateStart) && (d2.isEqual(dateEnd) || d2.isBefore(dateEnd))) { - var minutes = change.get(queryChanges.getFieldId("PlanTimeMinutes")).toString(); var hours = change.get(queryChanges.getFieldId("PlanTimeHours")).toString(); - double plantime = convertPlanTime(hours, minutes); - - System.out.println(change.get(queryChanges.getFieldId("ChangeNr")).toString() + " - " - + d2 + " | " + minutes + ":" + hours + " (" + plantime + ")"); - planTimePerWeek += plantime; - } } week.setPlanTime((int) Math.ceil(planTimePerWeek)); - System.out.println("Total Plantime : " + (int) Math.ceil(planTimePerWeek) + "\n"); } - - System.out.println("Calendar Weeks:\n"); - for (var v : calenderWeeks) - System.out.println(v.getWeek() + " - " + v.getPlanTime() + " - " + v.getStartDate() + " - " + v.getEndDate()); - } public double convertPlanTime(String hours, String minutes) throws ARException {