From bfd6f04c6351848b63c3eac3b5a12e9b4dbf887e Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 28 Feb 2024 15:40:50 +0100 Subject: [PATCH] plantimes --- .../com/nttdata/calender/changes/query/Filter.java | 3 +++ .../java/com/nttdata/calender/planTimes/PlanTimes.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java b/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java index 1f590fb..0d12c72 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java +++ b/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java @@ -22,6 +22,7 @@ public class Filter { this.queryChange = new Query.QueryBuilder("ASF:WI_TAS_Paket") .addFieldId("ChangeNr", 1000000182) .addFieldId("SupportGroup", 1000000015) + .addFieldId("ManagerGroup", 1000003229) .addFieldId("State", 7) .addFieldId("ResourceName", 1000000000) .addFieldId("D1", 1000000349) @@ -131,6 +132,8 @@ public class Filter { }else if(column.equals("SupportGroup")){ String supportGroupColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId("SupportGroup")); String coordGroupColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId("ManagerGroup")); + System.out.println(coordGroupColumn); + for (int j = 0; j < criterias.length; j++) { var criteria = criterias[j]; if (j > 0) { 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 2612107..32f8144 100644 --- a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java +++ b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java @@ -41,7 +41,8 @@ public class PlanTimes { * @throws ValidationError if there is a validation error */ public void setPlanTimes(PlanTimesRequest req) throws ARException, ValidationError { - var dateConverter = new DateConverter(); + try { + var dateConverter = new DateConverter(); var startDate = dateConverter.convertDateTime(req.getRenderStartDate()); var endDate = dateConverter.convertDateTime(req.getRenderEndDate()); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy"); @@ -60,6 +61,8 @@ public class PlanTimes { LocalDate startOfWeek = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); LocalDate endOfWeek = startDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); + + calendarWeek.setWeek(year + "w" + formattedStartWeek); calendarWeek.setPlanTime(0); calendarWeek.setStartDate(startOfWeek.format(formatter)); @@ -87,8 +90,13 @@ public class PlanTimes { planTimePerWeek += plantime; } } + System.out.println(planTimePerWeek); week.setPlanTime((int) Math.ceil(planTimePerWeek)); } + } catch (Exception e) { + e.printStackTrace(); + } + } /**