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

changed flagToApproval -> flagPermit

main
Said Gedik 2023-05-25 15:06:56 +02:00
parent a4a153ec6b
commit ae34329e00
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,16 +142,13 @@ public class Change {
.filter(peopleFullName::equals) .filter(peopleFullName::equals)
.isPresent()); .isPresent());
var currentState = getValue(entry, "State").getIntValue(); var state = getValue(entry, "State").getIntValue();
var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr")); var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr"));
var cancel = flagCancel(getValueStringByID(entry, "SupportGroupId"), currentState);
var approve_reject = flagApproval(inApproval, currentState);
change.setFlagApprove(approve_reject); change.setFlagPermit(flagPermit(state));
change.setFlagReject(approve_reject); change.setFlagApprove(flagApproval(inApproval, state));
change.setFlagCancel(cancel); change.setFlagReject(flagApproval(inApproval, state));
change.setFlagToApproval(flagToApproval(currentState)); change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), state));
changes.add(change); changes.add(change);
} }
@ -160,18 +157,6 @@ public class Change {
return new ChangeResponse(entriesSize, changes); return new ChangeResponse(entriesSize, changes);
} }
public boolean inApprovalList(String user, String changeNr) throws ARException {
var queryApprovalList = new Query.QueryBuilder("ASF:OverviewConsole_TicketsJoinAPDetailSignature")
.addFieldId("Approvers", 13207).build();
var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"",
queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
var approvers = approversOI.isEmpty() ? null
: approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
return approvers != null ? approvers.contains(user) : false;
}
public boolean flagApproval(boolean approval, int status) { public boolean flagApproval(boolean approval, int status) {
boolean approvableStatus = (status == 1 || status == 10); boolean approvableStatus = (status == 1 || status == 10);
return approval && approvableStatus; return approval && approvableStatus;
@ -186,13 +171,24 @@ public class Change {
boolean approvableStatus = status == 1; boolean approvableStatus = status == 1;
boolean isChangeManager = role.equals("Change Manager"); boolean isChangeManager = role.equals("Change Manager");
return approvableStatus && isChangeManager; return approvableStatus && isChangeManager;
} }
public boolean flagToApproval(int status) { public boolean flagPermit(int status) {
return status == 0; return status == 0;
} }
public boolean inApprovalList(String user, String changeNr) throws ARException {
var queryApprovalList = new Query.QueryBuilder("ASF:OverviewConsole_TicketsJoinAPDetailSignature")
.addFieldId("Approvers", 13207).build();
var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"",
queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
var approvers = approversOI.isEmpty() ? null
: approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
return approvers != null ? approvers.contains(user) : false;
}
/** /**
* Returns the {@link Value} of an entry based on the provided description. * Returns the {@link Value} of an entry based on the provided description.
* *

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

@ -31,7 +31,7 @@ public class ChangeItem {
private Date D2; private Date D2;
private Date D3; private Date D3;
private Date D4; private Date D4;
private boolean flagToApproval; private boolean flagPermit;
private boolean flagApprove; private boolean flagApprove;
private boolean flagReject; private boolean flagReject;
private boolean flagCancel; private boolean flagCancel;
@ -160,12 +160,12 @@ public class ChangeItem {
this.changeImplementerPersonId = changeImplementerPersonId; this.changeImplementerPersonId = changeImplementerPersonId;
} }
public boolean getFlagToApproval() { public boolean getFlagPermit() {
return this.flagToApproval; return this.flagPermit;
} }
public void setFlagToApproval(boolean flagToApproval) { public void setFlagPermit(boolean flagPermit) {
this.flagToApproval = flagToApproval; this.flagPermit = flagPermit;
} }
public boolean getFlagApprove() { public boolean getFlagApprove() {