From 27748ca126cd7f94600ead36560b5283fc2e5260 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 13 Jun 2023 15:26:56 +0200 Subject: [PATCH 1/7] initial commit --- .../src/main/java/com/nttdata/calender/changes/ChangeItem.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java index 990d061..6af0c89 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -32,6 +32,7 @@ public class ChangeItem { private Date D2; private Date D3; private Date D4; + private double planTime; // private boolean flagPermit; // private boolean flagApprove; // private boolean flagReject; From bc4da02226d4c2e15b183257c538340009f4e771 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 13 Jun 2023 15:30:31 +0200 Subject: [PATCH 2/7] getter / setter --- .../java/com/nttdata/calender/changes/ChangeItem.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java index 6af0c89..bfb0006 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -243,6 +243,14 @@ public class ChangeItem { // this.flagCancel = flagCancel; // } + public double getPlanTime() { + return this.planTime; + } + + public void setPlanTime(double planTime) { + this.planTime = planTime; + } + /** * Retrieves the package name. * From d2b10670c1dafff7eb8ed72a0f516cc1261fa2ee Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 13 Jun 2023 15:44:55 +0200 Subject: [PATCH 3/7] created planTime method for converting --- .../main/java/com/nttdata/calender/changes/Change.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java index 8404f15..b11531d 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -59,6 +59,7 @@ public class Change { .addFieldId("ChangeImplementerPersonId", 610023232) .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) + .addFieldId("PlanTime", 666000009) .build(); } @@ -128,6 +129,8 @@ public class Change { // change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), // state)); + convertPlanTime(getValueStringByID(entry, "PlanTime")); + try { change.setPackageName( queryPackageName(getValueStringByID(entry, "PackageType").toString())); @@ -178,6 +181,11 @@ public class Change { return peopleInfos.get(0).get(queryPerson.getFieldId("FullName")).toString(); } + public double convertPlanTime(String planTime) { + System.out.println(planTime); + return 0.0; + } + // /** // * Determines if the change item can be approved based on the approval status // * and the current state. From d18768951810c9c1e981db88804cc87ef27856d4 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 13 Jun 2023 16:36:32 +0200 Subject: [PATCH 4/7] added hours and minutes fields --- .../java/com/nttdata/calender/changes/Change.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java index b11531d..6afa036 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -59,7 +59,8 @@ public class Change { .addFieldId("ChangeImplementerPersonId", 610023232) .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) - .addFieldId("PlanTime", 666000009) + .addFieldId("PlanTimeHours", 666000009) + .addFieldId("PlanTimeMinutes", 666000010) .build(); } @@ -129,7 +130,10 @@ public class Change { // change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), // state)); - convertPlanTime(getValueStringByID(entry, "PlanTime")); + var ptMinutes = getValueStringByID(entry, "PlanTimeMinutes"); + var ptHours = getValueStringByID(entry, "PlanTimeHours"); + + convertPlanTime(getValueStringByID(entry, "ChangeNr"), ptHours, ptMinutes); try { change.setPackageName( @@ -181,8 +185,8 @@ public class Change { return peopleInfos.get(0).get(queryPerson.getFieldId("FullName")).toString(); } - public double convertPlanTime(String planTime) { - System.out.println(planTime); + public double convertPlanTime(String nr, String hours, String minutes) throws ARException { + System.out.println(nr + " -> " + hours +":" + minutes); return 0.0; } From 2053955354b3d316c1cd67e25979b692a385d0d1 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 13 Jun 2023 17:02:55 +0200 Subject: [PATCH 5/7] finished convertion method --- .../java/com/nttdata/calender/changes/Change.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java index 6afa036..344fede 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -130,10 +130,9 @@ public class Change { // change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), // state)); - var ptMinutes = getValueStringByID(entry, "PlanTimeMinutes"); - var ptHours = getValueStringByID(entry, "PlanTimeHours"); - - convertPlanTime(getValueStringByID(entry, "ChangeNr"), ptHours, ptMinutes); + var ptMinutes = getValueStringByID(entry, "PlanTimeMinutes").isEmpty() ? "00" : getValueStringByID(entry, "PlanTimeMinutes"); + var ptHours = getValueStringByID(entry, "PlanTimeHours").isEmpty() ? "00" : getValueStringByID(entry, "PlanTimeHours"); + change.setPlanTime(convertPlanTime(ptHours, ptMinutes)); try { change.setPackageName( @@ -185,9 +184,9 @@ public class Change { return peopleInfos.get(0).get(queryPerson.getFieldId("FullName")).toString(); } - public double convertPlanTime(String nr, String hours, String minutes) throws ARException { - System.out.println(nr + " -> " + hours +":" + minutes); - return 0.0; + public double convertPlanTime(String hours, String minutes) throws ARException { + double totalHours = Integer.valueOf(hours) + (Integer.valueOf(minutes)/60.0); + return totalHours; } // /** From 62a12ee29e8f5ff75cda3e4f0d1bf66872581258 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 13 Jun 2023 17:11:40 +0200 Subject: [PATCH 6/7] added region to commented out flags --- backend/src/main/java/com/nttdata/calender/changes/Change.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java index 344fede..1f1b805 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -189,6 +189,7 @@ public class Change { return totalHours; } + //#region approval flags // /** // * Determines if the change item can be approved based on the approval status // * and the current state. @@ -267,6 +268,7 @@ public class Change { // approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString(); // return approvers != null ? approvers.contains(user) : false; // } + //#endregion /** * Queries and retrieves the package name based on the provided package type. From 71b44d09b29969239890abb7577f04737b70c738 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 13 Jun 2023 17:19:33 +0200 Subject: [PATCH 7/7] added documentation --- .../com/nttdata/calender/changes/Change.java | 41 +++++++++++-------- .../nttdata/calender/changes/ChangeItem.java | 10 +++++ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java index 1f1b805..64f10b1 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -120,26 +120,23 @@ public class Change { .filter(peopleFullName::equals) .isPresent()); - // var state = getValue(entry, "State").getIntValue(); - // var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, - // "ChangeNr")); - - // change.setFlagPermit(flagPermit(state)); - // change.setFlagApprove(flagApproval(inApproval, state)); - // change.setFlagReject(flagApproval(inApproval, state)); - // change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), - // state)); + /* + * var state = getValue(entry, "State").getIntValue(); + * var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, + * "ChangeNr")); + * + * change.setFlagPermit(flagPermit(state)); + * change.setFlagApprove(flagApproval(inApproval, state)); + * change.setFlagReject(flagApproval(inApproval, state)); + * change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), + * state)); + */ var ptMinutes = getValueStringByID(entry, "PlanTimeMinutes").isEmpty() ? "00" : getValueStringByID(entry, "PlanTimeMinutes"); var ptHours = getValueStringByID(entry, "PlanTimeHours").isEmpty() ? "00" : getValueStringByID(entry, "PlanTimeHours"); change.setPlanTime(convertPlanTime(ptHours, ptMinutes)); - try { - change.setPackageName( - queryPackageName(getValueStringByID(entry, "PackageType").toString())); - } catch (ARException e) { - e.printStackTrace(); - } + change.setPackageName(queryPackageName(getValueStringByID(entry, "PackageType").toString())); changes.add(change); } @@ -184,12 +181,20 @@ public class Change { return peopleInfos.get(0).get(queryPerson.getFieldId("FullName")).toString(); } + /** + * Converts the planned time which is passed in hours and minutes to total hours + * + * @param hours the hours as a String + * @param minutes the minutes as a String + * @return the hours and minutes as total hours + * @throws ARException + */ public double convertPlanTime(String hours, String minutes) throws ARException { - double totalHours = Integer.valueOf(hours) + (Integer.valueOf(minutes)/60.0); + double totalHours = Integer.valueOf(hours) + (Integer.valueOf(minutes) / 60.0); return totalHours; } - //#region approval flags + // #region approval flags // /** // * Determines if the change item can be approved based on the approval status // * and the current state. @@ -268,7 +273,7 @@ public class Change { // approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString(); // return approvers != null ? approvers.contains(user) : false; // } - //#endregion + // #endregion /** * Queries and retrieves the package name based on the provided package type. diff --git a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java index bfb0006..c562e44 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -243,10 +243,20 @@ public class ChangeItem { // this.flagCancel = flagCancel; // } + /** + * Retrieves the planned time. + * + * @return the planned time + */ public double getPlanTime() { return this.planTime; } + /** + * Sets the planned time. + * + * @param planTime the planned time to set + */ public void setPlanTime(double planTime) { this.planTime = planTime; }