taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prozess optimierung

main
Manuel Tauber 2024-05-07 11:22:47 +02:00
parent 7b78b93449
commit 9d07b3f19b
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend/src/main/java/com/nttdata/calender/changes/Change.java
View File

@ -69,6 +69,7 @@ public class Change {
.addFieldId("PlanTimeMinutes", 666000010) .addFieldId("PlanTimeMinutes", 666000010)
.addFieldId("Approval", 1000003278) .addFieldId("Approval", 1000003278)
.addFieldId("ApprovalProcessName", 301322300) .addFieldId("ApprovalProcessName", 301322300)
.addFieldId("CurrentStageNumber", 301541700)
.build(); .build();
} }
@ -136,12 +137,34 @@ public class Change {
change.setApproval(false); change.setApproval(false);
} }
change.setChangeNr(getValueStringByID(entry, "ChangeNr")); change.setChangeNr(getValueStringByID(entry, "ChangeNr"));
change.setSupportGroup(getValueStringByID(entry, "SupportGroup")); change.setSupportGroup(getValueStringByID(entry, "SupportGroup"));
change.setState(Optional.ofNullable(getValue(entry, "State")) change.setStatusReason(getValueStringByID(entry, "StatusReason"));
.map(Value::getIntValue) if(Optional.ofNullable(getValue(entry, "State")).map(Value::getIntValue).orElse(-1)== 10 || Optional.ofNullable(getValue(entry, "State")).map(Value::getIntValue).orElse(-1)== 9){
.orElse(-1)); 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.setPackageInstanceId(getValueStringByID(entry, "PackageInstanceId"));
change.setResourceName(getValueStringByID(entry, "ResourceName")); change.setResourceName(getValueStringByID(entry, "ResourceName"));
@ -149,7 +172,6 @@ public class Change {
change.setD2(timestampToDateById(entry, "D2")); change.setD2(timestampToDateById(entry, "D2"));
change.setD3(timestampToDateById(entry, "D3")); change.setD3(timestampToDateById(entry, "D3"));
change.setD4(timestampToDateById(entry, "D4")); change.setD4(timestampToDateById(entry, "D4"));
change.setStatusReason(getValueStringByID(entry, "StatusReason"));
change.setApprovalStatus(getValueStringByID(entry, "ApprovalStatus")); change.setApprovalStatus(getValueStringByID(entry, "ApprovalStatus"));
change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg")); change.setCoordinatorSg(getValueStringByID(entry, "CoordinatorSg"));
change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId")); change.setCoordinatorSgId(getValueStringByID(entry, "CoordinatorSgId"));

7
frontend/src/app/ntt-gantt/ntt-gantt.component.ts
View File

@ -281,7 +281,7 @@ export class NttGanttComponent implements OnInit {
this.columns = [ this.columns = [
{ field: 'TaskName', headerText: 'Kurzbeschreibung', width: 350 }, { 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: 'vertragName', headerText: 'Vertrag / Provider Cluster', width: 150 },
{ field: 'supportGroup', headerText: 'Gewählte Support Gruppe' }, { field: 'supportGroup', headerText: 'Gewählte Support Gruppe' },
{ field: 'StartDate', headerText: 'Geplantes Start-Datum', format : {type:'date', format:'dd.MM.yyyy'}}, { 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){ if(args.dialogModel){
args = null;
args.cancel = true; args.cancel = true;
if(args.rowData.taskData.resources[0].state == 0){ 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{ }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(); this.ganttDefault.hideSpinner();
}else{ }else{