diff --git a/submit-web/src/components/Projects/ProjectTable/LayoutTableHead.tsx b/submit-web/src/components/Projects/ProjectTable/LayoutTableHead.tsx new file mode 100644 index 00000000..d3be9786 --- /dev/null +++ b/submit-web/src/components/Projects/ProjectTable/LayoutTableHead.tsx @@ -0,0 +1,19 @@ +import { useAccount } from "@/store/accountStore"; +import { Case, Switch } from "react-if"; +import { USER_TYPE } from "@/models/User"; +import ProponentLayoutHead from "./ProponentLayoutHead"; +import StaffLayoutHead from "./StaffLayoutHead"; + +export default function LayoutTableHead() { + const { userType } = useAccount(); + return ( + + + + + + + + + ); +} diff --git a/submit-web/src/components/Projects/ProjectTable/ProponentLayoutHead.tsx b/submit-web/src/components/Projects/ProjectTable/ProponentLayoutHead.tsx new file mode 100644 index 00000000..e51d3149 --- /dev/null +++ b/submit-web/src/components/Projects/ProjectTable/ProponentLayoutHead.tsx @@ -0,0 +1,42 @@ +import { TableHead, TableRow } from "@mui/material"; +import { BCDesignTokens } from "epic.theme"; +import { SubmitTableHeadCell } from "@/components/Shared/Table/common"; + +export default function ProponentLayoutHead() { + return ( + + + + + + + + + ); +} diff --git a/submit-web/src/components/Projects/ProjectTable/ProponentTableHead.tsx b/submit-web/src/components/Projects/ProjectTable/ProponentTableHead.tsx index a4fc319c..35fdaea0 100644 --- a/submit-web/src/components/Projects/ProjectTable/ProponentTableHead.tsx +++ b/submit-web/src/components/Projects/ProjectTable/ProponentTableHead.tsx @@ -15,7 +15,7 @@ export default function ProponentTableHead() { Submission Name diff --git a/submit-web/src/components/Projects/ProjectTable/ProponentTableRow.tsx b/submit-web/src/components/Projects/ProjectTable/ProponentTableRow.tsx index 5fc54672..37fafbb2 100644 --- a/submit-web/src/components/Projects/ProjectTable/ProponentTableRow.tsx +++ b/submit-web/src/components/Projects/ProjectTable/ProponentTableRow.tsx @@ -25,7 +25,7 @@ export default function ProponentTableRow({ subPackage }: ProjectRowProps) { return ( <> - + - + {dateUtils.formatDate(subPackage.submitted_on)} - + {subPackage.submitted_by ?? ""} + + + + + + + + + + + ); +} diff --git a/submit-web/src/components/Projects/ProjectTable/StaffTableHead.tsx b/submit-web/src/components/Projects/ProjectTable/StaffTableHead.tsx index 7901c940..99e87743 100644 --- a/submit-web/src/components/Projects/ProjectTable/StaffTableHead.tsx +++ b/submit-web/src/components/Projects/ProjectTable/StaffTableHead.tsx @@ -16,7 +16,7 @@ export default function StaffTableHead() { Submission Name @@ -40,7 +40,7 @@ export default function StaffTableHead() { CC Completed On @@ -58,7 +58,7 @@ export default function StaffTableHead() { MP Review @@ -66,7 +66,7 @@ export default function StaffTableHead() { Status diff --git a/submit-web/src/components/Projects/ProjectTable/StaffTableRow.tsx b/submit-web/src/components/Projects/ProjectTable/StaffTableRow.tsx index 7ecf4d7c..8d13d3ba 100644 --- a/submit-web/src/components/Projects/ProjectTable/StaffTableRow.tsx +++ b/submit-web/src/components/Projects/ProjectTable/StaffTableRow.tsx @@ -54,8 +54,7 @@ export default function StaffTableRow({ submissionPackage }: ProjectRowProps) { @@ -86,10 +85,10 @@ export default function StaffTableRow({ submissionPackage }: ProjectRowProps) { {type} @@ -100,34 +99,35 @@ export default function StaffTableRow({ submissionPackage }: ProjectRowProps) { lineHeight: 1.2, wordWrap: "break-word", color: BCDesignTokens.typographyFontSizeBody, + width: "12%", }} > {dateutils.formatDate(submitted_on)} 4 ? BCDesignTokens.typographyColorDanger : BCDesignTokens.supportBorderColorSuccess, - maxWidth: "75px", + width: "5%", }} > {Boolean(days_since_submission) && `+ ${days_since_submission} Days`} {dateutils.formatDate(cc_completed_on)} @@ -137,6 +137,7 @@ export default function StaffTableRow({ submissionPackage }: ProjectRowProps) { align="right" sx={{ pr: BCDesignTokens.layoutPaddingSmall, + width: "15%", }} > diff --git a/submit-web/src/components/Projects/ProjectTable/index.tsx b/submit-web/src/components/Projects/ProjectTable/index.tsx index a766fae2..2e3ead9b 100644 --- a/submit-web/src/components/Projects/ProjectTable/index.tsx +++ b/submit-web/src/components/Projects/ProjectTable/index.tsx @@ -2,6 +2,7 @@ import { Box, Table, TableBody, TableContainer } from "@mui/material"; import { SubmissionPackage } from "@/models/Package"; import ProjectTableHead from "./TableHead"; import ProjectTableRow from "./ProjectTableRow"; +import LayoutTableHead from "./LayoutTableHead"; type ProjectTableProps = Readonly<{ submissionPackages: Array; @@ -14,7 +15,7 @@ export default function ProjectTable({ return ( - {!headless && } + {!headless ? : } {submissionPackages?.map((subPackage) => (