diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index 044a310..c333551 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -7,40 +7,42 @@ import { useHistory } from "react-router-dom"; import RelativeTime from "react-relative-time"; import ItemTableFilter from "../ItemTableFilter/" import { ArrowDownward, ArrowUpward } from "@material-ui/icons"; +import ItemTableCell from "../ItemTableCell"; +import LastUpdatedCell from "../LastUpdatedCell.js/LastUpdatedCell"; export default function ItemTable({ data }) { const [selectedRow, setSelecetedRow] = useState({ queue: null, number: null }); - const LastUpdatedCell = ({ time, reactTableCellProps, classes }) => { - const lastUpdated = new Date(time).getTime(); - const now = new Date().getTime(); - const timeDelta = now - lastUpdated; - const day = 24 * 60 * 60 * 1000; - const week = day * 7; - const month = week * 4; + // const LastUpdatedCell = ({ time, reactTableCellProps, classes }) => { + // const lastUpdated = new Date(time).getTime(); + // const now = new Date().getTime(); + // const timeDelta = now - lastUpdated; + // const day = 24 * 60 * 60 * 1000; + // const week = day * 7; + // const month = week * 4; - let backgroundColor = "white"; - if (timeDelta > day && timeDelta <= week) { - backgroundColor = red[100] - } - else if (timeDelta > week && timeDelta <= month) { - backgroundColor = red[300] - } - else if (timeDelta > month) { - backgroundColor = red[500] - } + // let backgroundColor = "white"; + // if (timeDelta > day && timeDelta <= week) { + // backgroundColor = red[100] + // } + // else if (timeDelta > week && timeDelta <= month) { + // backgroundColor = red[300] + // } + // else if (timeDelta > month) { + // backgroundColor = red[500] + // } - return ( - - - - ); - }; + // return ( + // + // + // + // ); + // }; const theme = useTheme(); const useStyles = makeStyles({ @@ -71,7 +73,6 @@ export default function ItemTable({ data }) { const classes = useStyles(); const history = useHistory(); - const columns = React.useMemo( () => [ { Header: 'Queue', accessor: 'queue', }, @@ -179,22 +180,20 @@ export default function ItemTable({ data }) { ? () : + + />) : cell.column.id === "dateReceived" - ? ( - ) + ) : - {cell.value} - + ) ))} diff --git a/src/components/ItemTableCell/ItemTableCell.js b/src/components/ItemTableCell/ItemTableCell.js new file mode 100644 index 0000000..7f93273 --- /dev/null +++ b/src/components/ItemTableCell/ItemTableCell.js @@ -0,0 +1,22 @@ +import { makeStyles, TableCell, useTheme } from '@material-ui/core' +import React from 'react' + +export default function ItemTableCell({ reactTableCellProps, children, style }) { + + const theme = useTheme(); + + const useStyles = makeStyles({ + columnBorders: { + borderLeftWidth: "1px", + borderLeftStyle: "solid", + borderColor: theme.palette.type === "light" ? theme.palette.grey[300] : theme.palette.grey[500] + }, + }) + + const classes = useStyles(); + return ( + + {children} + + ); +} diff --git a/src/components/ItemTableCell/ItemTableCell.md b/src/components/ItemTableCell/ItemTableCell.md new file mode 100644 index 0000000..e69de29 diff --git a/src/components/ItemTableCell/index.js b/src/components/ItemTableCell/index.js new file mode 100644 index 0000000..a358a7b --- /dev/null +++ b/src/components/ItemTableCell/index.js @@ -0,0 +1,3 @@ +import ItemTableCell from "./ItemTableCell"; + +export default ItemTableCell; \ No newline at end of file diff --git a/src/components/LastUpdatedCell.js/LastUpdatedCell.js b/src/components/LastUpdatedCell.js/LastUpdatedCell.js new file mode 100644 index 0000000..27effae --- /dev/null +++ b/src/components/LastUpdatedCell.js/LastUpdatedCell.js @@ -0,0 +1,36 @@ +import React from 'react' +import { red } from '@material-ui/core/colors'; +import RelativeTime from 'react-relative-time'; +import ItemTableCell from '../ItemTableCell'; + +export default function LastUpdatedCell ({ time, reactTableCellProps, classes }){ + const lastUpdated = new Date(time).getTime(); + const now = new Date().getTime(); + const timeDelta = now - lastUpdated; + const day = 24 * 60 * 60 * 1000; + const week = day * 7; + const month = week * 4; + + let backgroundColor = "white"; + if (timeDelta > day && timeDelta <= week) { + backgroundColor = red[100] + } + else if (timeDelta > week && timeDelta <= month) { + backgroundColor = red[300] + } + else if (timeDelta > month) { + backgroundColor = red[500] + } + + return ( + + + + ); +} diff --git a/src/components/LastUpdatedCell.js/LastUpdatedCell.md b/src/components/LastUpdatedCell.js/LastUpdatedCell.md new file mode 100644 index 0000000..e69de29 diff --git a/src/components/LastUpdatedCell.js/index.js b/src/components/LastUpdatedCell.js/index.js new file mode 100644 index 0000000..42d1ac9 --- /dev/null +++ b/src/components/LastUpdatedCell.js/index.js @@ -0,0 +1,3 @@ +import LastUpdatedCell from "./ItemTableCell"; + +export default LastUpdatedCell; \ No newline at end of file