Skip to content

Commit 48c684b

Browse files
authored
Merge pull request #3865 from Northeastern-Electric-Racing/#3864-product-reason-deleted-filtering
filter by date deleted for rr products
2 parents d7e0e9d + 105c5da commit 48c684b

5 files changed

Lines changed: 7 additions & 4 deletions

File tree

src/backend/src/services/finance.services.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ export default class FinanceServices {
437437
totalCost: true,
438438
reimbursementProducts: {
439439
where: {
440+
dateDeleted: null,
440441
reimbursementProductReason: {
441442
wbsElement: {
442443
project: {
@@ -528,6 +529,7 @@ export default class FinanceServices {
528529
totalCost: true,
529530
reimbursementProducts: {
530531
where: {
532+
dateDeleted: null,
531533
reimbursementProductReason: {
532534
wbsElement: {
533535
project: {
@@ -953,6 +955,7 @@ export default class FinanceServices {
953955
totalCost: true,
954956
reimbursementProducts: {
955957
where: {
958+
dateDeleted: null,
956959
reimbursementProductReason: {
957960
otherReasonId
958961
}

src/frontend/src/pages/AdminToolsPage/OnboardingConfig/Checklists/AdminSubtaskSection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ const AdminSubtaskSection: React.FC<AdminSubtaskSectionProps> = ({ parentTask })
202202
open={!!itemToDelete}
203203
onHide={() => setItemToDelete(null)}
204204
formId="delete-item-form"
205-
dataType={itemToDelete.itemType === "INFO" ? 'Information Block' : 'Task'}
205+
dataType={itemToDelete.itemType === 'INFO' ? 'Information Block' : 'Task'}
206206
onFormSubmit={() => handleDelete(itemToDelete.checklistId)}
207207
/>
208208
)}

src/frontend/src/pages/AdminToolsPage/OnboardingConfig/Checklists/InfoBlockFormModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const InfoBlockFormModal: React.FC<InfoBlockFormModalProps> = ({
5656
parentChecklistId: parentChecklist.checklistId,
5757
teamId: parentChecklist.team?.teamId,
5858
teamTypeId: parentChecklist.teamType?.teamTypeId,
59-
itemType: "INFO" as ChecklistItemType
59+
itemType: 'INFO' as ChecklistItemType
6060
};
6161

6262
await onSubmit(formattedData);

src/frontend/src/pages/AdminToolsPage/OnboardingConfig/Checklists/SubtaskFormModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const SubtaskFormModal = ({ open, handleClose, onSubmit, parentChecklist, defaul
4545
parentChecklistId: parentChecklist.checklistId,
4646
teamId: parentChecklist.team?.teamId,
4747
teamTypeId: parentChecklist.teamType?.teamTypeId,
48-
itemType: "TASK" as ChecklistItemType
48+
itemType: 'TASK' as ChecklistItemType
4949
};
5050

5151
await onSubmit(formattedData);

src/frontend/src/pages/HomePage/components/SubtaskSection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const SubtaskSection: React.FC<SubtaskSectionProps> = ({ parentTask, checkedChec
5757
>
5858
<Box display="flex" flexDirection="column" gap={2} sx={{ width: '100%' }}>
5959
{allItems.map((item) => {
60-
if (item.itemType === "TASK") {
60+
if (item.itemType === 'TASK') {
6161
return (
6262
<Box key={item.checklistId} display="flex" alignItems="center" gap={1}>
6363
{isAdmin ? (

0 commit comments

Comments
 (0)