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

new Link

main
Manuel Tauber 2024-04-08 16:21:01 +02:00
parent 44183a7985
commit d92389833a
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ public class Change {
.addFieldId("SupportGroup", 1000000015) .addFieldId("SupportGroup", 1000000015)
.addFieldId("ManagerGroup", 1000003229) .addFieldId("ManagerGroup", 1000003229)
.addFieldId("State", 7) .addFieldId("State", 7)
.addFieldId("PackageInstanceId", 179)
.addFieldId("ResourceName", 1000000000) .addFieldId("ResourceName", 1000000000)
.addFieldId("D1", 1000000349) .addFieldId("D1", 1000000349)
.addFieldId("D2", 1000000350) .addFieldId("D2", 1000000350)
@ -139,6 +140,8 @@ public class Change {
change.setState(Optional.ofNullable(getValue(entry, "State")) change.setState(Optional.ofNullable(getValue(entry, "State"))
.map(Value::getIntValue) .map(Value::getIntValue)
.orElse(-1)); .orElse(-1));
change.setPackageInstanceId(getValueStringByID(entry, "PackageInstanceId"));
change.setResourceName(getValueStringByID(entry, "ResourceName")); change.setResourceName(getValueStringByID(entry, "ResourceName"));
change.setD1(timestampToDateById(entry, "D1")); change.setD1(timestampToDateById(entry, "D1"));
change.setD2(timestampToDateById(entry, "D2")); change.setD2(timestampToDateById(entry, "D2"));

19
backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
View File

@ -34,6 +34,7 @@ public class ChangeItem {
private Date D4; private Date D4;
private double planTime; private double planTime;
private boolean approval; private boolean approval;
private String packageInstanceId;
// private boolean flagPermit; // private boolean flagPermit;
// private boolean flagApprove; // private boolean flagApprove;
// private boolean flagReject; // private boolean flagReject;
@ -609,4 +610,22 @@ public class ChangeItem {
this.packageType = packageType; 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;
}
} }

1
frontend/src/app/data.service.ts
View File

@ -692,6 +692,7 @@ export class DataService {
packageName: resp.packageName, packageName: resp.packageName,
coordinatorSg: resp.coordinatorSg, coordinatorSg: resp.coordinatorSg,
plantime: resp.planTime, plantime: resp.planTime,
packageInstanceId: resp.packageInstanceId
}); });

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

@ -266,7 +266,8 @@ export class NttGanttComponent implements OnInit {
supportGroup: 'supportGroup', supportGroup: 'supportGroup',
supportGroupId: 'supportGroupId', supportGroupId: 'supportGroupId',
implementerEdit: 'implementerEdit', implementerEdit: 'implementerEdit',
plantime : 'plantime' plantime : 'plantime',
packageInstanceId: 'packageInstanceId'
}; };
this.columns = [ this.columns = [
@ -1095,9 +1096,9 @@ export class NttGanttComponent implements OnInit {
if(args.dialogModel){ if(args.dialogModel){
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-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{ }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{ }else{
if(args.requestType=='sorting'){ if(args.requestType=='sorting'){