From d92389833a15b14fcb46f6e362d1258aadbffa2d Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Mon, 8 Apr 2024 16:21:01 +0200 Subject: [PATCH] new Link --- .../com/nttdata/calender/changes/Change.java | 3 +++ .../nttdata/calender/changes/ChangeItem.java | 19 +++++++++++++++++++ frontend/src/app/data.service.ts | 1 + .../src/app/ntt-gantt/ntt-gantt.component.ts | 7 ++++--- 4 files changed, 27 insertions(+), 3 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 caf0ec2..c15a277 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -47,6 +47,7 @@ public class Change { .addFieldId("SupportGroup", 1000000015) .addFieldId("ManagerGroup", 1000003229) .addFieldId("State", 7) + .addFieldId("PackageInstanceId", 179) .addFieldId("ResourceName", 1000000000) .addFieldId("D1", 1000000349) .addFieldId("D2", 1000000350) @@ -139,6 +140,8 @@ public class Change { change.setState(Optional.ofNullable(getValue(entry, "State")) .map(Value::getIntValue) .orElse(-1)); + change.setPackageInstanceId(getValueStringByID(entry, "PackageInstanceId")); + change.setResourceName(getValueStringByID(entry, "ResourceName")); change.setD1(timestampToDateById(entry, "D1")); change.setD2(timestampToDateById(entry, "D2")); 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 238cb01..2088413 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -34,6 +34,7 @@ public class ChangeItem { private Date D4; private double planTime; private boolean approval; + private String packageInstanceId; // private boolean flagPermit; // private boolean flagApprove; // private boolean flagReject; @@ -609,4 +610,22 @@ public class ChangeItem { this.packageType = packageType; } + /** + * Returns the packageInstanceIde. + * + * @return String representing the packageInstanceId. + */ + public String getPackageInstanceId() { + return this.packageInstanceId; + } + + /** + * Sets the packageInstanceId. + * + * @param packageInstanceId String representing the packageInstanceId. + */ + public void setPackageInstanceId(String packageInstanceId) { + this.packageInstanceId = packageInstanceId; + } + } diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index cc8af7e..9c63059 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -692,6 +692,7 @@ export class DataService { packageName: resp.packageName, coordinatorSg: resp.coordinatorSg, plantime: resp.planTime, + packageInstanceId: resp.packageInstanceId }); diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index ce5afa6..3fdcc9b 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -266,7 +266,8 @@ export class NttGanttComponent implements OnInit { supportGroup: 'supportGroup', supportGroupId: 'supportGroupId', implementerEdit: 'implementerEdit', - plantime : 'plantime' + plantime : 'plantime', + packageInstanceId: 'packageInstanceId' }; this.columns = [ @@ -1095,9 +1096,9 @@ export class NttGanttComponent implements OnInit { if(args.dialogModel){ args.cancel = true; if(args.rowData.taskData.resources[0].state == 0){ - window.open("https://itsm-dev.asfinag.at/arsys/forms/itsm-app-dev/SHR%3ALandingConsole/Default+Administrator+View/?mode=search&F304255500=ASF:WI_TAS_Paket&F1000000076=FormOpenNoAppList&F303647600=SearchTicketWithQual&F304255610='1000000182' =\""+args.rowData.taskData.resources[0].changeNr+"\"", "_blank"); + window.open("https://itsm-test-neu-smartit.asfinag.at/smartit/app/#/paketPV/"+args.rowData.taskData.resources[0].packageInstanceId+"\"", "_blank"); }else{ - window.open("https://itsm-dev.asfinag.at/arsys/forms/itsm-app-dev/SHR%3ALandingConsole/Default+Administrator+View/?mode=search&F304255500=CHG:Infrastructure Change&F1000000076=FormOpenNoAppList&F303647600=SearchTicketWithQual&F304255610='1000000182' =\""+args.rowData.taskData.resources[0].changeNr+"\"", "_blank"); + window.open("https://itsm-test-neu-smartit.asfinag.at/smartit/app/#/changePV/"+args.rowData.taskData.resources[0].packageInstanceId+"\"", "_blank"); } }else{ if(args.requestType=='sorting'){