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 eb316a1..9d3dc08 100644 --- a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java +++ b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java @@ -32,7 +32,7 @@ public class PlanTimes { LocalDate endDate = LocalDate.parse(req.getRenderEndDate(), formatter); var queryChanges = new Query.QueryBuilder(formName).addFieldId("D2", 1000000350) - .addFieldId("ChangeNr", 1000000182).build(); + .addFieldId("ChangeNr", 1000000182).addFieldId("PlanTimeHours", 666000009).addFieldId("PlanTimeMinutes", 666000010).build(); while (!startDate.isAfter(endDate)) { CalendarWeek calendarWeek = new CalendarWeek(); @@ -70,9 +70,18 @@ public class PlanTimes { System.out.println(change.get(queryChanges.getFieldId("ChangeNr")).toString() + " _ " + new SimpleDateFormat("dd.MM.yyyy").format(d2)); - planTimePerWeek += change.get(endDate) + var minutes = change.get(queryChanges.getFieldId("PlanTimeMinutes")).toString(); + var hours = change.get(queryChanges.getFieldId("PlanTimeHours")).toString(); + var ptMinutes = minutes.isEmpty() ? "00" : minutes; + var ptHours = hours.isEmpty() ? "00" : hours; + + double planTime = convertPlanTime(ptHours, ptMinutes); + + planTimePerWeek += planTime; } } + System.out.println(planTimePerWeek); + week.setPlanTime((int) Math.ceil(planTimePerWeek)); } for (var v : calenderWeeks) @@ -81,6 +90,11 @@ public class PlanTimes { } + public double convertPlanTime(String hours, String minutes) throws ARException { + double totalHours = Integer.valueOf(hours) + (Integer.valueOf(minutes) / 60.0); + return totalHours; + } + public LocalDate timestampToDate(String timestamp) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy"); SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");