From d5b122b6126f4056f68eabd5df0fa0657117c424 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 14:55:35 +0200 Subject: [PATCH 01/13] added SG IH & KV to Change Items --- .../com/nttdata/calender/changes/Change.java | 5 ++++- .../nttdata/calender/changes/ChangeItem.java | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) 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 618d7c8..8e5db23 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -63,6 +63,8 @@ public class Change { .addFieldId("ChangeImplementerPersonId", 610023232) .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) + .addFieldId("SupportGroupIH", 1000003229) + .addFieldId("SupportGroupKV", 1000000015) .build(); } @@ -129,13 +131,14 @@ public class Change { change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); change.setSupportGroupId(getValueStringByID(entry, "SupportGroupId")); + change.setSupportGroupKV(getValueStringByID(entry, "SupportGroupKV")); + change.setSupportGroupIH(getValueStringByID(entry, "SupportGroupIH")); change.setProviderCluster(getValueStringByID(entry, "ProviderCluster")); change.setChangeImplementer(getValueStringByID(entry, "ChangeImplementer")); change.setChangeImplementerLogin(getValueStringByID(entry, "ChangeImplementerLogin")); change.setChangeImplementerPersonId(getValueStringByID(entry, "ChangeImplementerPersonId")); change.setPackageType(getValueStringByID(entry, "PackageType")); change.setContract(getValueStringByID(entry, "Contract")); - change.setImplementerEdit( Optional.ofNullable(entry.get(queryChange.getFieldId("ChangeCoordinator"))) .map(Object::toString) 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 f9214fd..4aed6a0 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -16,6 +16,8 @@ public class ChangeItem { private int state; private String contract; private String supportGroup; + private String supportGroupIH; + private String supportGroupKV; private String coordinatorSgId; private String coordinatorSg; private String supportGroupId; @@ -156,6 +158,22 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } + public String getSupportGroupKV() { + return this.supportGroupKV; + } + + public void setSupportGroupKV(String supportGroupKV) { + this.supportGroupKV = supportGroupKV; + } + + public String getSupportGroupIH() { + return this.supportGroupIH; + } + + public void setSupportGroupIH(String supportGroupIH) { + this.supportGroupIH = supportGroupIH; + } + /** * * Gets the status reason of the change item. From c72fd1b04646689e81c33c80aaf37eb083876841 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 14:58:56 +0200 Subject: [PATCH 02/13] removed KV because it exists as SupportGroup --- .../main/java/com/nttdata/calender/changes/Change.java | 2 -- .../java/com/nttdata/calender/changes/ChangeItem.java | 9 --------- 2 files changed, 11 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 8e5db23..d138a7d 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -64,7 +64,6 @@ public class Change { .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) .addFieldId("SupportGroupIH", 1000003229) - .addFieldId("SupportGroupKV", 1000000015) .build(); } @@ -131,7 +130,6 @@ public class Change { change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); change.setSupportGroupId(getValueStringByID(entry, "SupportGroupId")); - change.setSupportGroupKV(getValueStringByID(entry, "SupportGroupKV")); change.setSupportGroupIH(getValueStringByID(entry, "SupportGroupIH")); change.setProviderCluster(getValueStringByID(entry, "ProviderCluster")); change.setChangeImplementer(getValueStringByID(entry, "ChangeImplementer")); 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 4aed6a0..4a99894 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -17,7 +17,6 @@ public class ChangeItem { private String contract; private String supportGroup; private String supportGroupIH; - private String supportGroupKV; private String coordinatorSgId; private String coordinatorSg; private String supportGroupId; @@ -158,14 +157,6 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } - public String getSupportGroupKV() { - return this.supportGroupKV; - } - - public void setSupportGroupKV(String supportGroupKV) { - this.supportGroupKV = supportGroupKV; - } - public String getSupportGroupIH() { return this.supportGroupIH; } From 784f689498baa9e645c9ae5b1c40e4886a9e631c Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 15:08:59 +0200 Subject: [PATCH 03/13] no --- .../main/java/com/nttdata/calender/changes/Change.java | 2 -- .../java/com/nttdata/calender/changes/ChangeItem.java | 9 --------- 2 files changed, 11 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 d138a7d..16ee06a 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -63,7 +63,6 @@ public class Change { .addFieldId("ChangeImplementerPersonId", 610023232) .addFieldId("PackageType", 670031016) .addFieldId("Contract", 670031002) - .addFieldId("SupportGroupIH", 1000003229) .build(); } @@ -130,7 +129,6 @@ public class Change { change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); change.setSupportGroupId(getValueStringByID(entry, "SupportGroupId")); - change.setSupportGroupIH(getValueStringByID(entry, "SupportGroupIH")); change.setProviderCluster(getValueStringByID(entry, "ProviderCluster")); change.setChangeImplementer(getValueStringByID(entry, "ChangeImplementer")); change.setChangeImplementerLogin(getValueStringByID(entry, "ChangeImplementerLogin")); 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 4a99894..f9214fd 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -16,7 +16,6 @@ public class ChangeItem { private int state; private String contract; private String supportGroup; - private String supportGroupIH; private String coordinatorSgId; private String coordinatorSg; private String supportGroupId; @@ -157,14 +156,6 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } - public String getSupportGroupIH() { - return this.supportGroupIH; - } - - public void setSupportGroupIH(String supportGroupIH) { - this.supportGroupIH = supportGroupIH; - } - /** * * Gets the status reason of the change item. From e66c39fe402d0890862144c82e09bb7667574a38 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 16:51:26 +0200 Subject: [PATCH 04/13] added packagename to change items --- .../calender/api/KalenderRestController.java | 16 ++++++++++++++++ .../com/nttdata/calender/changes/Change.java | 13 +++++++++++++ .../com/nttdata/calender/changes/ChangeItem.java | 10 ++++++++++ 3 files changed, 39 insertions(+) diff --git a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java index 7255f4b..8f72cc1 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.checkerframework.common.util.report.qual.ReportCall; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -96,6 +97,21 @@ public class KalenderRestController { } } + + @CrossOrigin("*") + @GetMapping("/api/getKV") + @ResponseBody + public Object getSupportGroupKV() { + return null; + } + + @CrossOrigin("*") + @GetMapping("/api/getIH") + @ResponseBody + public Object getSupportGroupIH() { + return null; + } + /** * Handles GET request to retrieve all support groups. * 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 16ee06a..fdb48ee 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -140,6 +140,13 @@ public class Change { .map(Object::toString) .filter(peopleFullName::equals) .isPresent()); + + + try { + change.setPackageName(queryPackageName(getValueStringByID(entry, "PackageType").toString())); + } catch (ARException e) { + e.printStackTrace(); + } changes.add(change); }); @@ -148,6 +155,12 @@ public class Change { return new ChangeResponse(entriesSize, changes); } + private String queryPackageName(String packageType) throws ARException{ + var queryPackage = new Query.QueryBuilder("CTR:GenericContractJoinCFG_Package").addFieldId("PackageName", 200000020).build(); + var packageName = api.queryFieldsById("\'InstanceId_Package\' = \"" + packageType + "\"", queryPackage.getFieldIds(), queryPackage.getFormName(), null, 0, 0).get(0); + return packageName.toString(); + } + /** * Returns the {@link Value} of an entry based on the provided description. * 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 f9214fd..8c77c3a 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -27,6 +27,7 @@ public class ChangeItem { private String changeImplementerPersonId; private boolean implementerEdit; private String packageType; + private String packageName; private Date D1; private Date D2; private Date D3; @@ -156,6 +157,15 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } + + public String getPackageName() { + return this.packageName; + } + + public void setPackageName(String packageName) { + this.packageName = packageName; + } + /** * * Gets the status reason of the change item. From bed4771b2dcaa833fc45334f8097dd1610c59093 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 30 May 2023 17:07:27 +0200 Subject: [PATCH 05/13] packagename done --- backend/src/main/java/com/nttdata/calender/changes/Change.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fdb48ee..346f3b5 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -158,7 +158,7 @@ public class Change { private String queryPackageName(String packageType) throws ARException{ var queryPackage = new Query.QueryBuilder("CTR:GenericContractJoinCFG_Package").addFieldId("PackageName", 200000020).build(); var packageName = api.queryFieldsById("\'InstanceId_Package\' = \"" + packageType + "\"", queryPackage.getFieldIds(), queryPackage.getFormName(), null, 0, 0).get(0); - return packageName.toString(); + return packageName.get(queryPackage.getFieldId("PackageName")).toString(); } /** From f3b753f2d3db2143f07d40f1bc1d1e329804025a Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 31 May 2023 11:26:14 +0200 Subject: [PATCH 06/13] get list of KVs --- .../com/nttdata/calender/api/KalenderRestController.java | 8 +++++--- .../com/nttdata/calender/supportgroup/SupportGroup.java | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java index 8f72cc1..e969c5f 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -99,14 +99,16 @@ public class KalenderRestController { @CrossOrigin("*") - @GetMapping("/api/getKV") + @GetMapping("/api/getSupportGroupKV") @ResponseBody - public Object getSupportGroupKV() { + public Object getSupportGroupKV() throws ARException { + var kv = SupportGroup.getInstance(); + kv.getSupportGroupKVs(javaAPI); return null; } @CrossOrigin("*") - @GetMapping("/api/getIH") + @GetMapping("/api/getSupportGroupIH") @ResponseBody public Object getSupportGroupIH() { return null; diff --git a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java index 326359c..86681ef 100644 --- a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java +++ b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java @@ -93,6 +93,13 @@ public class SupportGroup { } } + public ArrayList getSupportGroupKVs(RemedyJavaAPI api) throws ARException { + var queryKVs = new Query.QueryBuilder("ASF:WI_TAS_Paket").addFieldId("SupportGroupKV", 1000000015).build(); + var kv = api.queryFieldsById("", queryKVs.getFieldIds(), queryKVs.getFormName(), null, 0, 0); + for (var k : kv) System.out.println("--------------------- " + k); + return null; + } + /** * Returns the list of support groups. * From 53473e0fe6f129825da5cfdbb117f3ea5a3d9ff2 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 31 May 2023 13:32:23 +0200 Subject: [PATCH 07/13] deleted kv and ih (not needed) --- .../calender/api/KalenderRestController.java | 17 ----------------- .../calender/supportgroup/SupportGroup.java | 7 ------- 2 files changed, 24 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java index e969c5f..da16b85 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -97,23 +97,6 @@ public class KalenderRestController { } } - - @CrossOrigin("*") - @GetMapping("/api/getSupportGroupKV") - @ResponseBody - public Object getSupportGroupKV() throws ARException { - var kv = SupportGroup.getInstance(); - kv.getSupportGroupKVs(javaAPI); - return null; - } - - @CrossOrigin("*") - @GetMapping("/api/getSupportGroupIH") - @ResponseBody - public Object getSupportGroupIH() { - return null; - } - /** * Handles GET request to retrieve all support groups. * diff --git a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java index 86681ef..326359c 100644 --- a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java +++ b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java @@ -93,13 +93,6 @@ public class SupportGroup { } } - public ArrayList getSupportGroupKVs(RemedyJavaAPI api) throws ARException { - var queryKVs = new Query.QueryBuilder("ASF:WI_TAS_Paket").addFieldId("SupportGroupKV", 1000000015).build(); - var kv = api.queryFieldsById("", queryKVs.getFieldIds(), queryKVs.getFormName(), null, 0, 0); - for (var k : kv) System.out.println("--------------------- " + k); - return null; - } - /** * Returns the list of support groups. * From b126681f370866de53b32aca3e49495b2641e9a2 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 1 Jun 2023 11:21:26 +0200 Subject: [PATCH 08/13] flags auskommentiert --- .../com/nttdata/calender/changes/Change.java | 130 +++++++-------- .../nttdata/calender/changes/ChangeItem.java | 152 +++++++++--------- 2 files changed, 141 insertions(+), 141 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 d0fd1bc..b54494d 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -142,13 +142,13 @@ public class Change { .filter(peopleFullName::equals) .isPresent()); - var state = getValue(entry, "State").getIntValue(); - var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr")); + // 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)); + // change.setFlagPermit(flagPermit(state)); + // change.setFlagApprove(flagApproval(inApproval, state)); + // change.setFlagReject(flagApproval(inApproval, state)); + // change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), state)); changes.add(change); } @@ -157,70 +157,70 @@ public class Change { return new ChangeResponse(entriesSize, changes); } - /** - * Determines if the change item can be approved based on the approval status - * and the current state. - * - * @param approval The flag indicating whether the change item has been - * approved. - * @param state The current state of the change item. - * @return {@code true} if the change item can be approved, {@code false} - * otherwise. - */ - public boolean flagApproval(boolean approval, int state) { - boolean approvableState = (state == 1 || state == 10); - return approval && approvableState; - } + // /** + // * Determines if the change item can be approved based on the approval status + // * and the current state. + // * + // * @param approval The flag indicating whether the change item has been + // * approved. + // * @param state The current state of the change item. + // * @return {@code true} if the change item can be approved, {@code false} + // * otherwise. + // */ + // public boolean flagApproval(boolean approval, int state) { + // boolean approvableState = (state == 1 || state == 10); + // return approval && approvableState; + // } - /** - * Determines if the change item can be canceled based on the support group ID - * and the current state. - * - * @param supportGroupId The ID of the support group associated with the change item - * @param state The current state of the change item - * @return {@code true} if the change item can be canceled, {@code false} otherwise. - * @throws ARException if an error occurs during the operation - */ - public boolean flagCancel(String supportGroupId, int state) throws ARException { - var queryRoles = new Query.QueryBuilder("CTM:SupportGroupFuncRoleLookUp").addFieldId("Role", 1000000014) - .build(); - var role = api.queryFieldsById("\'Support Group ID\' = \"" + supportGroupId + "\"", - queryRoles.getFieldIds(), queryRoles.getFormName(), null, 0, 0) - .get(0).get(queryRoles.getFieldId("Role")).toString(); + // /** + // * Determines if the change item can be canceled based on the support group ID + // * and the current state. + // * + // * @param supportGroupId The ID of the support group associated with the change item + // * @param state The current state of the change item + // * @return {@code true} if the change item can be canceled, {@code false} otherwise. + // * @throws ARException if an error occurs during the operation + // */ + // public boolean flagCancel(String supportGroupId, int state) throws ARException { + // var queryRoles = new Query.QueryBuilder("CTM:SupportGroupFuncRoleLookUp").addFieldId("Role", 1000000014) + // .build(); + // var role = api.queryFieldsById("\'Support Group ID\' = \"" + supportGroupId + "\"", + // queryRoles.getFieldIds(), queryRoles.getFormName(), null, 0, 0) + // .get(0).get(queryRoles.getFieldId("Role")).toString(); - boolean approvableState = state == 1; - boolean isChangeManager = role.equals("Change Manager"); + // boolean approvableState = state == 1; + // boolean isChangeManager = role.equals("Change Manager"); - return approvableState && isChangeManager; - } + // return approvableState && isChangeManager; + // } - /** - * Determines if the change item has a permit based on the current state. - * - * @param state The current state of the change item. - * @return {@code true} if the change item has a permit, {@code false} otherwise. - */ - public boolean flagPermit(int state) { - return state == 0; - } + // /** + // * Determines if the change item has a permit based on the current state. + // * + // * @param state The current state of the change item. + // * @return {@code true} if the change item has a permit, {@code false} otherwise. + // */ + // public boolean flagPermit(int state) { + // return state == 0; + // } - /** - * Checks if the logged in user is in the approval list for the specified change item. - * - * @param user The username of the user to check - * @param changeNr The change number of the change item - * @return {@code true} if the user is in the approval list, {@code false} otherwise. - * @throws ARException if an error occurs during the operation - */ - public boolean inApprovalList(String user, String changeNr) throws ARException { - var queryApprovalList = new Query.QueryBuilder("ASF:OverviewConsole_TicketsJoinAPDetailSignature") - .addFieldId("Approvers", 13207).build(); - var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"", - queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0); - var approvers = approversOI.isEmpty() ? null - : approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString(); - return approvers != null ? approvers.contains(user) : false; - } + // /** + // * Checks if the logged in user is in the approval list for the specified change item. + // * + // * @param user The username of the user to check + // * @param changeNr The change number of the change item + // * @return {@code true} if the user is in the approval list, {@code false} otherwise. + // * @throws ARException if an error occurs during the operation + // */ + // public boolean inApprovalList(String user, String changeNr) throws ARException { + // var queryApprovalList = new Query.QueryBuilder("ASF:OverviewConsole_TicketsJoinAPDetailSignature") + // .addFieldId("Approvers", 13207).build(); + // var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"", + // queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0); + // var approvers = approversOI.isEmpty() ? null + // : approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString(); + // return approvers != null ? approvers.contains(user) : false; + // } /** * Returns the {@link Value} of an entry based on the provided description. 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 2c35558..f30e2dd 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -31,10 +31,10 @@ public class ChangeItem { private Date D2; private Date D3; private Date D4; - private boolean flagPermit; - private boolean flagApprove; - private boolean flagReject; - private boolean flagCancel; + // private boolean flagPermit; + // private boolean flagApprove; + // private boolean flagReject; + // private boolean flagCancel; /** * @@ -160,85 +160,85 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } - /** - * Retrieves the flag indicating whether the change item has a permit. - * - * @return {@code true} if the change item has a permit, {@code false} - * otherwise. - */ - public boolean getFlagPermit() { - return this.flagPermit; - } + // /** + // * Retrieves the flag indicating whether the change item has a permit. + // * + // * @return {@code true} if the change item has a permit, {@code false} + // * otherwise. + // */ + // public boolean getFlagPermit() { + // return this.flagPermit; + // } - /** - * Sets the flag indicating whether the change item has a permit. - * - * @param flagPermit {@code true} if the change item has a permit, {@code false} - * otherwise. - */ - public void setFlagPermit(boolean flagPermit) { - this.flagPermit = flagPermit; - } + // /** + // * Sets the flag indicating whether the change item has a permit. + // * + // * @param flagPermit {@code true} if the change item has a permit, {@code false} + // * otherwise. + // */ + // public void setFlagPermit(boolean flagPermit) { + // this.flagPermit = flagPermit; + // } - /** - * Retrieves the flag indicating whether the change item has been approved. - * - * @return {@code true} if the change item has been approved, {@code false} - * otherwise. - */ - public boolean getFlagApprove() { - return this.flagApprove; - } + // /** + // * Retrieves the flag indicating whether the change item has been approved. + // * + // * @return {@code true} if the change item has been approved, {@code false} + // * otherwise. + // */ + // public boolean getFlagApprove() { + // return this.flagApprove; + // } - /** - * Sets the flag indicating whether the change item has been approved. - * - * @param flagApprove {@code true} if the change item has been approved, - * {@code false} otherwise. - */ - public void setFlagApprove(boolean flagApprove) { - this.flagApprove = flagApprove; - } + // /** + // * Sets the flag indicating whether the change item has been approved. + // * + // * @param flagApprove {@code true} if the change item has been approved, + // * {@code false} otherwise. + // */ + // public void setFlagApprove(boolean flagApprove) { + // this.flagApprove = flagApprove; + // } - /** - * Retrieves the flag indicating whether the change item has been rejected. - * - * @return {@code true} if the change item has been rejected, {@code false} - * otherwise. - */ - public boolean getFlagReject() { - return this.flagReject; - } + // /** + // * Retrieves the flag indicating whether the change item has been rejected. + // * + // * @return {@code true} if the change item has been rejected, {@code false} + // * otherwise. + // */ + // public boolean getFlagReject() { + // return this.flagReject; + // } - /** - * Sets the flag indicating whether the change item has been rejected. - * - * @param flagReject {@code true} if the change item has been rejected, - * {@code false} otherwise. - */ - public void setFlagReject(boolean flagReject) { - this.flagReject = flagReject; - } + // /** + // * Sets the flag indicating whether the change item has been rejected. + // * + // * @param flagReject {@code true} if the change item has been rejected, + // * {@code false} otherwise. + // */ + // public void setFlagReject(boolean flagReject) { + // this.flagReject = flagReject; + // } - /** - * Retrieves the flag indicating whether the change item has been canceled. - * - * @return {@code true} if the change item has been canceled, {@code false} - * otherwise. - */ - public boolean getFlagCancel() { - return this.flagCancel; - } + // /** + // * Retrieves the flag indicating whether the change item has been canceled. + // * + // * @return {@code true} if the change item has been canceled, {@code false} + // * otherwise. + // */ + // public boolean getFlagCancel() { + // return this.flagCancel; + // } - /** - * Sets the flag indicating whether the change item has been canceled. - * - * @param flagCancel {@code true} if the change item has been canceled, - * {@code false} otherwise. - */ - public void setFlagCancel(boolean flagCancel) { - this.flagCancel = flagCancel; - } + // /** + // * Sets the flag indicating whether the change item has been canceled. + // * + // * @param flagCancel {@code true} if the change item has been canceled, + // * {@code false} otherwise. + // */ + // public void setFlagCancel(boolean flagCancel) { + // this.flagCancel = flagCancel; + // } /** * Gets the status reason of the change item. From 6a9dd38280d674a6be6e22a4af083121f9860dde Mon Sep 17 00:00:00 2001 From: manueltauber Date: Thu, 1 Jun 2023 11:41:54 +0200 Subject: [PATCH 09/13] Datenstruktur --- frontend/src/app/data.service.ts | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index 1df4796..d854e6c 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -275,12 +275,27 @@ export class DataService { ); } - res.push({resourceId: resp.resourceId, approvalStatus: this.validateApproval(resp.approvalStatus), statusReason: resp.statusReason, - changeNr: resp.changeNr, resourceName: resp.resourceName, - vertrag: resp.contract, vertragName: this.getContractName(resp.contract), isExpand: false, - isRes: true, state: resp.state, stateName: this.getStateNameById(resp.state), - supportGroup: resp.supportGroup, tasks: tasks, supportGroupId: resp.supportGroupId, - implementerEdit: resp.implementerEdit, flagApprove: resp.flagApprove, flagCancel: resp.flagChancel, flagPermit: resp.flagPermit, flagReject: resp.flagReject + res.push({ + resourceId: resp.resourceId, + approvalStatus: this.validateApproval(resp.approvalStatus), + statusReason: resp.statusReason, + changeNr: resp.changeNr, + resourceName: resp.resourceName, + vertrag: resp.contract, + vertragName: this.getContractName(resp.contract), + isExpand: false, + isRes: true, + state: resp.state, + stateName: this.getStateNameById(resp.state), + supportGroup: resp.supportGroup, + tasks: tasks, + supportGroupId: resp.supportGroupId, + implementerEdit: resp.implementerEdit, + flagApprove: resp.flagApprove, + flagCancel: resp.flagChancel, + flagPermit: resp.flagPermit, + flagReject: resp.flagReject, + changeImplementerLogin: resp.changeImplementerLogin }); From f14b82921ce329756a7be3c0b600a797820b0a97 Mon Sep 17 00:00:00 2001 From: manueltauber Date: Thu, 1 Jun 2023 11:42:14 +0200 Subject: [PATCH 10/13] DatenStruktur --- frontend/src/ntt-gantt/ntt-gantt.component.ts | 139 +++++++++++++----- 1 file changed, 106 insertions(+), 33 deletions(-) diff --git a/frontend/src/ntt-gantt/ntt-gantt.component.ts b/frontend/src/ntt-gantt/ntt-gantt.component.ts index 40e86e2..2883625 100644 --- a/frontend/src/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/ntt-gantt/ntt-gantt.component.ts @@ -167,6 +167,8 @@ export class NttGanttComponent implements OnInit { this.deMap.set('tooltipDate', 'Geplantes Start Datum'); this.enMap.set('tooltipDate', 'Planned Start Date'); + this.deMap.set('permit', 'Zur Genehmigung'); + this.enMap.set('permit', 'Permit'); this.deMap.set('genehmigen', 'Genehmigen'); this.enMap.set('genehmigen', 'Approve'); this.deMap.set('ablehnen', 'Ablehnen'); @@ -222,14 +224,11 @@ export class NttGanttComponent implements OnInit { } - - public logg(args){ console.log(args); } - /** * The function ngOnInit sets values which are required for rendering the gantt Chart. Furthermore it trims the resources (Changes Array) and sets the paginator to the first page. */ @@ -609,6 +608,11 @@ public logg(args){ this.selRecs = this.selectedrecords; } let allStates: boolean = true; + let allPermit: boolean = true; + let allApprove: boolean = true; + let allReject: boolean = true; + let allCancel: boolean = true; + let allImplementer: boolean = true; this.selectedRescourceIds = []; for (const change of this.selRecs) { if(change.taskData.approvalStatus == 1){ @@ -622,23 +626,54 @@ public logg(args){ }else{ allStates = false; } + + if(change.taskData.flagPermit == true && allPermit == true){ + allPermit = true; + }else{ + allPermit = false; + } + if(change.taskData.flagApproval == true && allApprove == true){ + allApprove = true; + }else{ + allApprove = false; + } + if(change.taskData.flagReject == true && allCancel == true){ + allReject = true; + }else{ + allReject = false; + } + if(change.taskData.flagCancel == true && allCancel == true){ + allCancel = true; + }else{ + allCancel = false; + } + if(change.taskData.implementerEdit == true && allImplementer == true){ + allImplementer = true; + }else{ + allImplementer = false; + } } if(allStates){ - if(this.approvalPending == true){ - this.toolbar = ['Cancel',{text: this.lMap.get("genehmigen"), id: "7"},{text:this.lMap.get("ablehnen"), id: "8"}]; + this.toolbar = []; + this.toolbar.push({text:this.lMap.get("stateChange"), id: "6"}); + if(allPermit){ + this.toolbar.push({text: this.lMap.get("permit"), id: "5"}); } - else{ - if(this.selRecs[0].taskData.state > 0 &&this.selRecs[0].taskData.state < 4){ - this.toolbar = ['Cancel',{text: this.lMap.get("stateChange"), id: "6"} ,{text: this.lMap.get("implementer"), id: "10"}]; - }else{ - this.toolbar = ['Cancel',{text: this.lMap.get("stateChange"), id: "6"}]; - if(this.selRecs[0].taskData.state == 0){ - this.toolbar = [{text: this.lMap.get("stornieren"), id: "11"},{text:this.lMap.get("stateChange"), id: "6"} ,{text: this.lMap.get("implementer"), id: "10"}]; - } - } + if(allApprove){ + this.toolbar.push({text: this.lMap.get("genehmigen"), id: "7"}); } + if(allReject){ + this.toolbar.push({text: this.lMap.get("ablehnen"), id: "8"}); + } + if(allCancel){ + this.toolbar.push({text: this.lMap.get("stornieren"), id: "11"}); + } + if(allImplementer){ + this.toolbar.push({text: this.lMap.get("implementer"), id: "10"}); + } + }else{ - this.toolbar = ['Cancel']; + this.toolbar = []; } @@ -672,6 +707,11 @@ public logg(args){ this.selRecs = this.selectedrecords; } let allStates: boolean = true; + let allPermit: boolean = true; + let allApprove: boolean = true; + let allReject: boolean = true; + let allCancel: boolean = true; + let allImplementer: boolean = true; this.selectedRescourceIds = []; for (const change of this.selRecs) { if(change.taskData.state == this.selRecs[0].taskData.state){ @@ -685,24 +725,57 @@ public logg(args){ }else{ allStates = false; } - } - if(allStates){ - if(this.approvalPending == true){ - this.toolbar = ['Cancel',{text: this.lMap.get("genehmigen"), id: "7"},{text: this.lMap.get("ablehnen"), id: "8"}]; - } - else{ - if(this.selRecs[0].taskData.state > 0 &&this.selRecs[0].taskData.state < 4){ - this.toolbar = ['Cancel',{text: this.lMap.get("stateChange"), id: "6"} ,{text: this.lMap.get("implementer"), id: "10"}]; - }else{ - this.toolbar = ['Cancel',{text: this.lMap.get("stateChange"), id: "6"}]; - if(this.selRecs[0].taskData.state == 0){ - this.toolbar = [{text: this.lMap.get("stornieren"), id: "11"},{text: this.lMap.get("stateChange"), id: "6"} ,{text: this.lMap.get("implementer"), id: "10"}]; - } - } - } - }else{ - this.toolbar = ['Cancel']; - } + + + if(change.taskData.flagPermit == true && allPermit == true){ + allPermit = true; + }else{ + allPermit = false; + } + if(change.taskData.flagApproval == true && allApprove == true){ + allApprove = true; + }else{ + allApprove = false; + } + if(change.taskData.flagReject == true && allReject == true){ + allReject = true; + }else{ + allReject = false; + } + if(change.taskData.flagCancel == true && allCancel == true){ + allCancel = true; + }else{ + allCancel = false; + } + if(change.taskData.implementerEdit == true && allImplementer == true){ + allImplementer = true; + }else{ + allImplementer = false; + } + + } + if(allStates){ + this.toolbar = []; + this.toolbar.push({text:this.lMap.get("stateChange"), id: "6"}); + if(allPermit){ + this.toolbar.push({text: this.lMap.get("permit"), id: "5"}); + } + if(allApprove){ + this.toolbar.push({text: this.lMap.get("genehmigen"), id: "7"}); + } + if(allReject){ + this.toolbar.push({text: this.lMap.get("ablehnen"), id: "8"}); + } + if(allCancel){ + this.toolbar.push({text: this.lMap.get("stornieren"), id: "11"}); + } + if(allImplementer){ + this.toolbar.push({text: this.lMap.get("implementer"), id: "10"}); + } + + }else{ + this.toolbar = []; + } this.selRecs = []; this.selectedrecords = []; this.selectedrowindex = []; From 5745558f4873b671f1c8a5a252c9be7e73d1af57 Mon Sep 17 00:00:00 2001 From: manueltauber Date: Thu, 1 Jun 2023 12:13:23 +0200 Subject: [PATCH 11/13] mergeConflicts --- .../src/main/java/com/nttdata/calender/changes/ChangeItem.java | 3 --- frontend/src/app/data.service.ts | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) 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 8b59598..d1b05d8 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -161,7 +161,6 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } -<<<<<<< HEAD // /** // * Retrieves the flag indicating whether the change item has a permit. // * @@ -241,7 +240,6 @@ public class ChangeItem { // public void setFlagCancel(boolean flagCancel) { // this.flagCancel = flagCancel; // } -======= public String getPackageName() { return this.packageName; @@ -250,7 +248,6 @@ public class ChangeItem { public void setPackageName(String packageName) { this.packageName = packageName; } ->>>>>>> KV_and_IH /** * Gets the status reason of the change item. diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index d854e6c..28873fe 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -295,7 +295,8 @@ export class DataService { flagCancel: resp.flagChancel, flagPermit: resp.flagPermit, flagReject: resp.flagReject, - changeImplementerLogin: resp.changeImplementerLogin + changeImplementerLogin: resp.changeImplementerLogin, + packageName: resp.packageName }); From 19872e389dd0c593036397df1e5daa41fbba1a67 Mon Sep 17 00:00:00 2001 From: manueltauber Date: Thu, 1 Jun 2023 12:35:44 +0200 Subject: [PATCH 12/13] tooltip/Done --- frontend/src/app/data.service.ts | 3 ++- frontend/src/ntt-gantt/ntt-gantt.component.html | 9 ++++++--- frontend/src/ntt-gantt/ntt-gantt.component.ts | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index 28873fe..1c52c3c 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -296,7 +296,8 @@ export class DataService { flagPermit: resp.flagPermit, flagReject: resp.flagReject, changeImplementerLogin: resp.changeImplementerLogin, - packageName: resp.packageName + packageName: resp.packageName, + coordinatorSg: resp.coordinatorSg }); diff --git a/frontend/src/ntt-gantt/ntt-gantt.component.html b/frontend/src/ntt-gantt/ntt-gantt.component.html index 616003c..34ca64a 100644 --- a/frontend/src/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/ntt-gantt/ntt-gantt.component.html @@ -115,16 +115,19 @@ {{lMap.get('tooltipState')}}: {{dataService.getStateNameById(data.taskData.resources[0].state)}} - {{lMap.get('tooltipPaketType')}}: {{data.taskData.resources[0].paketType}} + {{lMap.get('tooltipPaketType')}}: {{data.taskData.resources[0].packageName}} {{lMap.get('tooltipContract')}}: {{data.taskData.resources[0].vertragName}} - {{lMap.get('tooltipSupportGroup')}}: {{data.taskData.resources[0].supportGroup}} + {{lMap.get('tooltipSupportGroupKv')}}: {{data.taskData.resources[0].supportGroup}} - {{lMap.get('tooltipDate')}}: {{data.taskData.resources[0].tasks[1].StartDate | date:'dd.MM.yyyy'}} + {{lMap.get('tooltipSupportGroupIh')}}: {{data.taskData.resources[0].coordinatorSg}} + + + {{lMap.get('tooltipDate')}}: {{data.taskData.resources[0].tasks[1].StartDate | date:'dd.MM.yyyy'}}