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 295f54a..eb2810e 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -69,6 +69,7 @@ public class Change { .addFieldId("PlanTimeMinutes", 666000010) .addFieldId("Approval", 1000003278) .addFieldId("ApprovalProcessName", 301322300) + .addFieldId("CurrentStageNumber", 301541700) .build(); } @@ -136,12 +137,34 @@ public class Change { change.setApproval(false); } - change.setChangeNr(getValueStringByID(entry, "ChangeNr")); change.setSupportGroup(getValueStringByID(entry, "SupportGroup")); - change.setState(Optional.ofNullable(getValue(entry, "State")) - .map(Value::getIntValue) - .orElse(-1)); + 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")){ + change.setState(10); + }else{ + change.setState(101); + } + } + if(Optional.ofNullable(getValue(entry, "State")).map(Value::getIntValue).orElse(-1)== 9){ + System.out.println("\n++++++++"+getValueStringByID(entry, "CurrentStageNumber")); + if(getValueStringByID(entry, "CurrentStageNumber").equals("1")){ + change.setState(9); + }else{ + change.setState(91); + } + } + + }else{ + change.setState(Optional.ofNullable(getValue(entry, "State")) + .map(Value::getIntValue) + .orElse(-1)); + } + + + System.out.println("\nStatus: "+change.getState()); change.setPackageInstanceId(getValueStringByID(entry, "PackageInstanceId")); change.setResourceName(getValueStringByID(entry, "ResourceName")); @@ -149,7 +172,6 @@ public class Change { change.setD2(timestampToDateById(entry, "D2")); change.setD3(timestampToDateById(entry, "D3")); change.setD4(timestampToDateById(entry, "D4")); - change.setStatusReason(getValueStringByID(entry, "StatusReason")); change.setApprovalStatus(getValueStringByID(entry, "ApprovalStatus")); change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index d08ae03..9787498 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -281,7 +281,7 @@ export class NttGanttComponent implements OnInit { this.columns = [ { field: 'TaskName', headerText: 'Kurzbeschreibung', width: 350 }, - { field: 'stateName', headerText: 'Status', width: 250}, + { field: 'stateName', headerText: 'Status', width: 350}, { field: 'vertragName', headerText: 'Vertrag / Provider Cluster', width: 150 }, { field: 'supportGroup', headerText: 'Gewählte Support Gruppe' }, { field: 'StartDate', headerText: 'Geplantes Start-Datum', format : {type:'date', format:'dd.MM.yyyy'}}, @@ -1139,12 +1139,11 @@ export class NttGanttComponent implements OnInit { } } if(args.dialogModel){ - args = null; args.cancel = true; if(args.rowData.taskData.resources[0].state == 0){ - window.open("https://itsm-test-neu-smartit.asfinag.at/smartit/app/#/paketPV/"+args.rowData.taskData.resources[0].packageInstanceId+"\"", "_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-test-neu-smartit.asfinag.at/smartit/app/#/changePV/"+args.rowData.taskData.resources[0].packageInstanceId+"\"", "_blank"); + window.open("https://itsm-dev-neu-smartit.asfinag.at/smartit/app/#/changePV/"+args.rowData.taskData.resources[0].packageInstanceId, "_blank"); } this.ganttDefault.hideSpinner(); }else{