Skip to content

Commit 0ddd15c

Browse files
authored
Merge pull request #3468 from Northeastern-Electric-Racing/#3467-status-calculation-bug-fix
#3467 fixed date sorting on rr status
2 parents 375ae6d + b3cfbab commit 0ddd15c

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/frontend/src/hooks/finance.hooks.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import {
4747
ReimbursementStatusType
4848
} from 'shared';
4949
import { fullNamePipe } from '../utils/pipes';
50+
import { getCurrentReimbursementStatus } from '../utils/reimbursement-request.utils';
5051

5152
export interface CreateReimbursementRequestPayload {
5253
vendorId: string;
@@ -405,7 +406,7 @@ export const useDownloadCSVFileOfReimbursementRequests = () => {
405406
.map(
406407
(rr) =>
407408
`${rr.saboId},${rr.identifier},${fullNamePipe(rr.recipient)},${rr.totalCost},${
408-
rr.reimbursementStatuses[rr.reimbursementStatuses.length - 1].type
409+
getCurrentReimbursementStatus(rr.reimbursementStatuses).type
409410
},${rr.account},${rr.accountCode.code},${rr.dateCreated},${rr.dateDelivered ?? ''},${
410411
rr.reimbursementStatuses.find((rs) => rs.type === ReimbursementStatusType.SABO_SUBMITTED)?.dateCreated ?? ''
411412
},${rr.vendor.name}`

src/frontend/src/pages/FinancePage/ReimbursementRequestDetailPage/ReimbursementRequestDetailsView.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ import {
4646
isReimbursementRequestSaboSubmitted,
4747
isReimbursementRequestDenied,
4848
isReimbursementRequestLeadershipApproved,
49-
isReimbursementRequestPendingFinance
49+
isReimbursementRequestPendingFinance,
50+
getCurrentReimbursementStatus
5051
} from '../../../utils/reimbursement-request.utils';
5152
import { routes } from '../../../utils/routes';
5253
import AddSABONumberModal from './AddSABONumberModal';
@@ -469,15 +470,16 @@ const ReimbursementRequestDetailsView: React.FC<ReimbursementRequestDetailsViewP
469470
}
470471
];
471472

472-
const sortedStatus = reimbursementRequest.reimbursementStatuses.sort((a) => a.dateCreated.getDate());
473-
const statusTypes = sortedStatus.map((status) => status.type);
474-
const recentStatus = statusTypes[statusTypes.length - 1];
475473
return (
476474
<PageLayout
477475
title={`Reimbursement Request #${reimbursementRequest.identifier} (${fullNamePipe(reimbursementRequest.recipient)})`}
478476
chips={
479477
<Box id="status" display="flex">
480-
{statusTypes.length > 0 && <ReimbursementRequestStatusPill status={recentStatus} />}
478+
{reimbursementRequest.reimbursementStatuses.length > 0 && (
479+
<ReimbursementRequestStatusPill
480+
status={getCurrentReimbursementStatus(reimbursementRequest.reimbursementStatuses).type}
481+
/>
482+
)}
481483
</Box>
482484
}
483485
previousPages={[

0 commit comments

Comments
 (0)