Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9.4.5 changes to dev #699

Merged
merged 16 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/reviewer_api/resources/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def get(requestid):
"requesttype": jsonobj["requestType"]
}
result = documentservice().getdocuments(requestid, requestinfo["bcgovcode"])
return json.dumps({"requeststatusid": jsonobj["requeststatusid"], "documents": result, "requestnumber":jsonobj["axisRequestId"], "requestinfo":requestinfo}), 200
return json.dumps({"requeststatuslabel": jsonobj["requeststatuslabel"], "documents": result, "requestnumber":jsonobj["axisRequestId"], "requestinfo":requestinfo}), 200
except KeyError as error:
return {'status': False, 'message': CUSTOM_KEYERROR_MESSAGE + str(error)}, 400
except BusinessException as exception:
Expand Down
2 changes: 1 addition & 1 deletion web/src/apiManager/services/docReviewerService.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const fetchDocuments = (
const __files = res.data.documents.filter((d: any) => !d.attributes.incompatible);
store.dispatch(setDocumentList(__files) as any);
store.dispatch(setRequestNumber(res.data.requestnumber) as any);
store.dispatch(setRequestStatus(res.data.requeststatusid) as any);
store.dispatch(setRequestStatus(res.data.requeststatuslabel) as any);
store.dispatch(setRequestInfo(res.data.requestinfo) as any);
callback(res.data.documents);
} else {
Expand Down
36 changes: 18 additions & 18 deletions web/src/constants/enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,27 @@ const pageFlagTypes:pageFlagType = {
};

type RequestStatesType = {
[key: string]: number
[key: string]: string
}

const RequestStates:RequestStatesType = {
"Open": 1,
"Call For Records": 2,
"Closed": 3,
"Redirect": 4,
"Unopened": 5,
"Intake in Progress": 6,
"Records Review": 7,
"Fee Estimate": 8,
"Consult": 9,
"Ministry Sign Off": 10,
"On Hold": 11,
"Deduplication": 12,
"Harms Assessment": 13,
"Response": 14,
"Archived": 15,
"Peer Review": 16,
"Call For Records Overdue": 17
"Open": "open",
"Call For Records": "callforrecords",
"Closed": "closed",
"Redirect": "redirect",
"Unopened": "unopened",
"Intake in Progress": "intakeinprogress",
"Records Review": "recordsreview",
"Fee Estimate": "feeestimate",
"Consult": "consult",
"Ministry Sign Off": "ministrysignoff",
"On Hold": "onhold",
"Deduplication": "deduplication",
"Harms Assessment": "harmsassessment",
"Response": "response",
"Archived": "archived",
"Peer Review": "peerreview",
"Call For Records Overdue": "callforrecordsoverdue"
};

export {
Expand Down
Loading