-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #426 from Twenty-Three-Fifty-Nine/75-a-page-to-sho…
…w-upcoming-handins-or-assignments-missing-grades Upcoming assessments page
- Loading branch information
Showing
7 changed files
with
177 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /** | ||
| * Twenty Three Fifty Nine - Grade tracking tool | ||
| * Copyright (C) 2023 Abdulrahman Asfari and Christopher E Sa | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/> | ||
| */ | ||
|
|
||
| import React, { useCallback } from "react"; | ||
| import { | ||
| AppBar, | ||
| Box, | ||
| Button, | ||
| Card, | ||
| CardContent, | ||
| Fab, | ||
| IconButton, | ||
| Stack, | ||
| Toolbar, | ||
| Tooltip, | ||
| Typography, | ||
| } from "@mui/material"; | ||
|
|
||
| import dayjs from "dayjs"; | ||
| import { isMobile } from "react-device-detect"; | ||
|
|
||
| import CloseRoundedIcon from '@mui/icons-material/CloseRounded'; | ||
| import KeyboardArrowLeftIcon from "@mui/icons-material/KeyboardArrowLeft"; | ||
|
|
||
| const AssessmentsOverview = (props) => { | ||
| const { | ||
| setViewedCourse, | ||
| setViewAssessments, | ||
| viewAssessments, | ||
| } = props; | ||
|
|
||
| const { triInfo, courses } = viewAssessments; | ||
|
|
||
| /** The assessments to display */ | ||
| const [assessments, setAssessments] = React.useState([]); | ||
|
|
||
| /** Alternative to clicking the return button. */ | ||
| const handleKeyDown = useCallback((event) => { | ||
| if (event.key === "Escape") { | ||
| setViewAssessments(null) | ||
| } | ||
| }, [setViewAssessments]); | ||
|
|
||
| React.useEffect(() => { | ||
| const asses = courses.map((course) => course.assessments.map((assessment) => { | ||
| assessment.course = course.code; | ||
| return assessment; | ||
| })).flat().filter((assessment) => { | ||
| return isNaN(assessment.grade); | ||
| }).sort((a, b) => { | ||
| return new dayjs(a.deadline).isBefore(new dayjs(b.deadline)) ? -1 : 1; | ||
| }) | ||
| setAssessments(asses); | ||
| }, [courses, handleKeyDown]) | ||
|
|
||
| /** Adds and removes keylistener when the component mounts or unmounts */ | ||
| React.useEffect(() => { | ||
| document.addEventListener("keydown", handleKeyDown, false); | ||
| return () => { | ||
| document.removeEventListener("keydown", handleKeyDown, false); | ||
| }; | ||
| }, [handleKeyDown]); | ||
|
|
||
| return ( | ||
| <Box> | ||
| { isMobile && ( | ||
| <AppBar position="fixed" component="nav"> | ||
| <Toolbar> | ||
| <IconButton color="inherit" onClick={() => setViewAssessments(null)}> | ||
| <CloseRoundedIcon /> | ||
| </IconButton> | ||
| <Typography variant="body1" sx={{ mx: .5, textAlign: "center" }}> | ||
| Assessments for Trimester {triInfo.tri}, {triInfo.year} | ||
| </Typography> | ||
| </Toolbar> | ||
| </AppBar> | ||
| )} | ||
|
|
||
| <Box sx={{ | ||
| display: "flex", | ||
| flexDirection: "column", | ||
| alignItems: "center", | ||
| justifyContent: "center", | ||
| }}> | ||
|
|
||
| {!isMobile && <Typography variant="h4" sx={{ my: 3, textAlign: "center" }}> | ||
| Assessments for Trimester {triInfo.tri}, {triInfo.year} | ||
| </Typography>} | ||
|
|
||
| <Stack spacing={2} sx={{ mb: 5 }}> | ||
| {assessments.map((assessment) => ( | ||
| <Card key={assessment.deadline + assessment.name + assessment.course} sx={{ width: isMobile ? 300 : 500}}> | ||
| <CardContent sx={{ "&:last-child": { pb: 2 }, py: 2 }}> | ||
| <Box sx={{ display: "flex", flexDirection: "row", justifyContent: "space-between", alignItems: "center" }}> | ||
| <Typography variant="h6" sx={[{ flexGrow: 1, width: isMobile ? 200 : 275, mr: 1, overflow: "hidden", whiteSpace: "nowrap", textOverflow: "ellipsis" }]}> | ||
| {assessment.name} | ||
| </Typography> | ||
| <Typography variant="body1" color="text.secondary">{assessment.course}</Typography> | ||
| </Box> | ||
|
|
||
| <Box> | ||
| <Typography variant={"body1"} component="div" > | ||
| Due: {new dayjs(assessment.deadline).format("DD/MM/YYYY")} | ||
| {new dayjs(assessment.deadline).isBefore(new dayjs()) && <Typography color="error">Overdue</Typography>} | ||
| </Typography> | ||
| <Box sx={{ display: "flex", flexDirection: "row", justifyContent: "space-between", alignItems: "center" }}> | ||
| <Typography variant={"body1"} component="div"> | ||
| Worth: {assessment.weight}% | ||
| </Typography> | ||
| <Button variant="text" onClick={() => { | ||
| setViewedCourse(courses.find((course) => course.code === assessment.course)); | ||
| }}>Update</Button> | ||
| </Box> | ||
| </Box> | ||
| </CardContent> | ||
| </Card> | ||
| )) | ||
| } | ||
| </Stack> | ||
|
|
||
| { !isMobile && ( | ||
| <Tooltip title={<h3> Return to overview </h3>} placement="right" arrow> | ||
| <Fab color="primary" sx={{ position: "fixed", bottom: 32, left: 32 }} onClick={() => {setViewAssessments(null)}}> | ||
| <KeyboardArrowLeftIcon fontSize="large" /> | ||
| </Fab> | ||
| </Tooltip> | ||
| )} | ||
| </Box> | ||
| </Box> | ||
| ) | ||
| } | ||
|
|
||
| export default AssessmentsOverview; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters