From d61190f74201b7b0885242aa84897c5f9ff69323 Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Fri, 17 May 2024 15:20:36 +0200 Subject: [PATCH 1/2] t --- .../com/nttdata/calender/changes/Change.java | 46 +++++++++++-------- .../app/ntt-gantt/ntt-gantt.component.html | 4 +- .../src/app/ntt-gantt/ntt-gantt.component.ts | 2 +- 3 files changed, 30 insertions(+), 22 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 1e793eb..0036185 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -111,36 +111,43 @@ public class Change { var entriesSize = api.getFormSize(qualifier, this.queryChange.getFormName()); var changes = new ArrayList(); - + System.out.println("###ABGERUFEN"); for (var entry : entries) { var change = new ChangeItem(entry.getEntryId()); boolean approval = getValueStringByID(entry, "Approval").equals("0") ? true : false; - if (approval) { - var queryApproval = new Query.QueryBuilder("CHG:ChangeAPDetailSignature") - .addFieldId("Approvers", 13207).build(); + // if (approval) { + // var queryApproval = new Query.QueryBuilder("CHG:ChangeAPDetailSignature") + // .addFieldId("Approvers", 13207).build(); - String qual = "(\'1000000182\' = \"" + getValueStringByID(entry, "ChangeNr") - + "\") AND (\'10000\' = \"" - + getValueStringByID(entry, "ApprovalProcessName") - + "\") AND (\'13207\' LIKE \"%" + api.getUser() + "%\")"; + // String qual = "(\'1000000182\' = \"" + getValueStringByID(entry, "ChangeNr") + // + "\") AND (\'10000\' = \"" + // + getValueStringByID(entry, "ApprovalProcessName") + // + "\") AND (\'13207\' LIKE \"%" + api.getUser() + "%\")"; - var queryApprovalProcessName = api.queryFieldsById(qual, - queryApproval.getFieldIds(), queryApproval.getFormName(), sort, 0, 0); + // var queryApprovalProcessName = api.queryFieldsById(qual, + // queryApproval.getFieldIds(), queryApproval.getFormName(), sort, 0, 0); - log.qualifierLog(queryApproval.getFormName(), qual); + // log.qualifierLog(queryApproval.getFormName(), qual); - if (!queryApprovalProcessName.isEmpty() && queryApprovalProcessName != null - && queryApprovalProcessName.size() > 0) - change.setApproval(true); - else - change.setApproval(false); + // if (!queryApprovalProcessName.isEmpty() && queryApprovalProcessName != null + // && queryApprovalProcessName.size() > 0) + // change.setApproval(true); + // else + // change.setApproval(false); + // } + if(approval){ + change.setApproval(true); + }else{ + change.setApproval(false); } + change.setChangeNr(getValueStringByID(entry, "ChangeNr")); change.setSupportGroup(getValueStringByID(entry, "SupportGroup")); change.setStatusReason(getValueStringByID(entry, "StatusReason")); + if(Optional.ofNullable(getValue(entry, "State")).map(Value::getIntValue).orElse(-1)== 10 || Optional.ofNullable(getValue(entry, "State")).map(Value::getIntValue).orElse(-1)== 9){ if(Optional.ofNullable(getValue(entry, "State")).map(Value::getIntValue).orElse(-1)== 10){ if(change.getStatusReason().equals("9000")){ @@ -150,7 +157,7 @@ public class Change { } } if(Optional.ofNullable(getValue(entry, "State")).map(Value::getIntValue).orElse(-1)== 9){ - System.out.println("\n++++++++"+getValueStringByID(entry, "CurrentStageNumber")); + // System.out.println("\n++++++++"+getValueStringByID(entry, "CurrentStageNumber")); if(getValueStringByID(entry, "CurrentStageNumber").equals("1")){ change.setState(9); }else{ @@ -164,8 +171,9 @@ public class Change { .orElse(-1)); } + - System.out.println("\nStatus: "+change.getState()); + // System.out.println("\nStatus: "+change.getState()); change.setPackageInstanceId(getValueStringByID(entry, "PackageInstanceId")); change.setResourceName(getValueStringByID(entry, "ResourceName")); @@ -199,7 +207,7 @@ public class Change { change.setPackageName(queryPackageName(getValueStringByID(entry, "PackageType").toString())); changes.add(change); } - + System.out.println("###FERTIG"); System.out.println(entries.size()); api.freeImpersonatedUser(); diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 083fdc6..49e1cb4 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -216,7 +216,7 @@ @@ -253,4 +253,4 @@

{{errorService.getLastError('error').message}}

 - \ No newline at end of file + diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index 88fc336..375fd6b 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -208,7 +208,7 @@ export class NttGanttComponent implements OnInit { this.renderGantt = false; this.firstLoad = true; this.sliceStart = 0; - this.sliceEnd = 20; + this.sliceEnd = 200; this.dataService.getUser().then((res: any) => { console.log(res); From 8e7acebe79f89fe6207ebea80876e6d84b0e05fe Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Fri, 17 May 2024 15:29:32 +0200 Subject: [PATCH 2/2] t --- 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 0036185..ebd1c25 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -204,7 +204,7 @@ public class Change { : getValueStringByID(entry, "PlanTimeHours"); change.setPlanTime(convertPlanTime(ptHours, ptMinutes)); - change.setPackageName(queryPackageName(getValueStringByID(entry, "PackageType").toString())); + // change.setPackageName(queryPackageName(getValueStringByID(entry, "PackageType").toString())); changes.add(change); } System.out.println("###FERTIG");