Skip to content

IEEE 217: Improve Order fufillment for Admin Side #482

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.

Sign up for GitHub

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

Open
Mustaballer wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

IEEE 217: Improve Order fufillment for Admin Side #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b06bfe6
Added note alerting admins that modifying orders triggers emails
Mustaballer May 28, 2023
72c99e1
Merge branch 'develop' into ieee-217-improve-admin-order-fufillment
Mustaballer Jun 10, 2023
076a0cf
Add rejected status for PartReturnedHealth, add quantityGrantedBySyst…
Mustaballer Jun 10, 2023
228aa00
Add Rejected status and update function, and Qty granted field in pen…
Mustaballer Jun 10, 2023
45934f2
Add limit for order searching and allow orders to exceed 1000
Mustaballer Jun 10, 2023
65c4208
Merge branch 'develop' into ieee-217-improve-admin-order-fufillment
Mustaballer Jun 18, 2023
b212e05
fix image missing issue
Mustaballer Jun 19, 2023
1db8d14
Merge branch 'develop' into ieee-217-improve-admin-order-fufillment
Mustaballer Sep 10, 2023
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
30 changes: 21 additions & 9 deletions hackathon_site/dashboard/frontend/src/api/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const teamOrderListSerialization = (
(hardwareRequested[hardware.id] = hardware.requested_quantity)
);
order.items.forEach(({ id, hardware_id, part_returned_health }) => {
if (part_returned_health) {
if (part_returned_health && part_returned_health !== "Rejected") {
const returnItemKey = `${hardware_id}-${part_returned_health}`;
if (returnedItems[returnItemKey])
returnedItems[returnItemKey].quantity += 1;
Expand All @@ -55,14 +55,26 @@ export const teamOrderListSerialization = (
};
}
} else {
if (hardwareItems[hardware_id])
hardwareItems[hardware_id].quantityGranted += 1;
else
hardwareItems[hardware_id] = {
id: hardware_id,
quantityGranted: 1,
quantityRequested: hardwareRequested[hardware_id],
};
if (
!(
part_returned_health === "Rejected" &&
order.status === "Picked Up"
)
) {
if (hardwareItems[hardware_id]) {
if (part_returned_health !== "Rejected")
hardwareItems[hardware_id].quantityGranted += 1;
hardwareItems[hardware_id].quantityGrantedBySystem += 1;
} else {
hardwareItems[hardware_id] = {
id: hardware_id,
quantityGranted:
part_returned_health === "Rejected" ? 0 : 1,
quantityRequested: hardwareRequested[hardware_id],
quantityGrantedBySystem: 1,
};
}
}
}
hardwareIdsToFetch[hardware_id] = hardware_id;
});
Expand Down
9 changes: 8 additions & 1 deletion hackathon_site/dashboard/frontend/src/api/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ export type OrderStatus =
| "Picked Up"
| "Cancelled"
| "Returned";
export type PartReturnedHealth = "Healthy" | "Heavily Used" | "Broken" | "Lost";
export type PartReturnedHealth =
| "Healthy"
| "Heavily Used"
| "Broken"
| "Lost"
| "Rejected";

export type ItemsInOrder = Omit<OrderItem, "order" | "time_occurred">;

Expand All @@ -127,13 +132,15 @@ export interface OrderFilters {
ordering?: OrderOrdering;
status?: OrderStatus[];
search?: string;
limit?: number;
}

/** Sanitized Orders */
export interface OrderItemTableRow {
id: number;
quantityRequested: number;
quantityGranted: number;
quantityGrantedBySystem: number;
}

export interface OrderInTable {
Expand Down
3 changes: 3 additions & 0 deletions hackathon_site/dashboard/frontend/src/components/orders/OrdersFilter/OrderFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,11 @@ export const EnhancedOrderFilter = () => {
const dispatch = useDispatch();

const handleSubmit = ({ ordering, status }: OrderFilters) => {
const limit = 1000;
const filters: OrderFilters = {
ordering,
status,
limit,
};
dispatch(setFilters(filters));
dispatch(getOrdersWithFilters());
Expand All @@ -185,6 +187,7 @@ export const EnhancedOrderFilter = () => {
initialValues={{
ordering: "",
status: [],
limit: 1000,
}}
onSubmit={handleSubmit}
onReset={handleReset}
Expand Down
2 changes: 1 addition & 1 deletion ...hon_site/dashboard/frontend/src/components/teamDetail/TeamActionTable/TeamActionTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const TeamActionTable = () => {
];

return (
<Grid container direction="column" spacing={1} item md={6} xs={12}>
<Grid container direction="column" spacing={1} item md={4} xs={12}>
<Grid item>
<Typography variant="h2">Actions</Typography>
</Grid>
Expand Down
8 changes: 8 additions & 0 deletions .../frontend/src/components/teamDetail/TeamCheckedOutOrderTable/TeamCheckedOutOrderTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
TableContainer,
TableHead,
TableRow,
Typography,
} from "@material-ui/core";
import React, { useState } from "react";
import Container from "@material-ui/core/Container";
Expand Down Expand Up @@ -398,6 +399,13 @@ export const TeamCheckedOutOrderTable = () => {
spacing={1}
style={{ marginTop: "10px" }}
>
<Grid item style={{ marginTop: "5px" }}>
<Typography variant="body2">
Note: participants will receive an
email every time you change the
status of their order.
</Typography>
</Grid>
<Grid item>
<Button
color="primary"
Expand Down
2 changes: 1 addition & 1 deletion hackathon_site/dashboard/frontend/src/components/teamDetail/TeamInfoTable/TeamInfoTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const TeamInfoTable = () => {
};

return (
<Grid container direction="column" spacing={1} item md={6} xs={12}>
<Grid container direction="column" spacing={1} item md={8} xs={12}>
<Grid item>
<Typography variant="h2">Team info</Typography>
</Grid>
Expand Down
Loading