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 9c0677f..b09389c 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/Change.java +++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java @@ -143,7 +143,8 @@ public class Change { try { var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr")); var flag = Flag(inApproval, getValue(entry, "State").getIntValue()); - change.setApprovalFlag(flag); + change.setFlagApprove(flag); + change.setFlagReject(flag); } catch (ARException e) { e.printStackTrace(); } 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 83fd1fe..50b7bf5 100644 --- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java +++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java @@ -31,7 +31,9 @@ public class ChangeItem { private Date D2; private Date D3; private Date D4; - private boolean approvalFlag; + private boolean flagApprove; + private boolean flagReject; + private boolean flagCancel; /** * @@ -157,12 +159,28 @@ public class ChangeItem { this.changeImplementerPersonId = changeImplementerPersonId; } - public boolean getApprovalFlag() { - return this.approvalFlag; + public boolean getFlagApprove() { + return this.flagApprove; } - public void setApprovalFlag(boolean approvalFlag) { - this.approvalFlag = approvalFlag; + public void setFlagApprove(boolean flagApprove) { + this.flagApprove = flagApprove; + } + + public boolean getFlagReject() { + return this.flagReject; + } + + public void setFlagReject(boolean flagReject) { + this.flagReject = flagReject; + } + + public boolean getFlagCancel() { + return this.flagCancel; + } + + public void setFlagCancel(boolean flagCancel) { + this.flagCancel = flagCancel; } /**