Skip to content

Commit 2943caf

Browse files
authored
Merge pull request #1671 from Northeastern-Electric-Racing/#1580-Add-Date-submitted-to-Sabo-column
#1580: added "Date Submitted to sabo" to reimbursement section
2 parents 26959ca + d42a95e commit 2943caf

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

src/frontend/src/pages/FinancePage/ReimbursementRequestsSection.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const ReimbursementRequestTable = ({
4343
<ColumnHeader title="Sabo ID" />
4444
<ColumnHeader title="Amount ($)" />
4545
<ColumnHeader title="Date Submitted" />
46-
<ColumnHeader title="Date Item Delivered" />
46+
<ColumnHeader title="Date Submitted To Sabo" />
4747
<ColumnHeader title="Status" />
4848
</TableRow>
4949
</TableHead>
@@ -59,7 +59,7 @@ const ReimbursementRequestTable = ({
5959
<TableCell align="center">{undefinedPipe(row.saboId)}</TableCell>
6060
<TableCell align="center">{centsToDollar(row.amount)}</TableCell>
6161
<TableCell align="center">{datePipe(row.dateSubmitted)}</TableCell>
62-
<TableCell align="center">{dateUndefinedPipe(row.dateDelivered)}</TableCell>
62+
<TableCell align="center">{dateUndefinedPipe(row.dateSubmittedToSabo)}</TableCell>
6363
<TableCell align="center">{cleanReimbursementRequestStatus(row.status)}</TableCell>
6464
</TableRow>
6565
))}

src/frontend/src/utils/reimbursement-request.utils.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ export const isReimbursementRequestSaboSubmitted = (reimbursementRequest: Reimbu
7878
.includes(ReimbursementStatusType.SABO_SUBMITTED);
7979
};
8080

81+
export const getReimbursementRequestDateSubmittedToSabo = (reimbursementRequest: ReimbursementRequest) => {
82+
const saboStatus = reimbursementRequest.reimbursementStatuses.find(
83+
(status) => status.type === ReimbursementStatusType.SABO_SUBMITTED
84+
);
85+
return saboStatus?.dateCreated;
86+
};
87+
8188
export const imagePreviewUrl = (googleFileId: string) => `https://drive.google.com/file/d/${googleFileId}/preview`;
8289

8390
export const getRefundRowData = (refund: Reimbursement) => {
@@ -91,7 +98,7 @@ export const createReimbursementRequestRowData = (reimbursementRequest: Reimburs
9198
amount: reimbursementRequest.totalCost,
9299
dateSubmitted: reimbursementRequest.dateCreated,
93100
status: getCurrentReimbursementStatus(reimbursementRequest.reimbursementStatuses).type,
94-
dateDelivered: reimbursementRequest.dateDelivered,
101+
dateSubmittedToSabo: getReimbursementRequestDateSubmittedToSabo(reimbursementRequest),
95102
submitter: reimbursementRequest.recipient
96103
};
97104
};

0 commit comments

Comments
 (0)