Add overview button to admin page of projects (#384)

* changes bekijken * beaucoup * edit title and description functionality * linter :nerd: * frontend linter --------- Co-authored-by: Siebe Vlietinck <71773032+Vucis@users.noreply.github.com>
SELab-2 · May 23, 2024 · 37606d4 · 37606d4
1 parent fe979f5
commit 37606d4
Show file tree

Hide file tree

Showing 6 changed files with 303 additions and 64 deletions.
diff --git a/backend/project/endpoints/projects/endpoint_parser.py b/backend/project/endpoints/projects/endpoint_parser.py
@@ -28,7 +28,7 @@
     help='Projects visibility for students',
     location="form"
 )
-parser.add_argument("archived", type=bool, help='Projects', location="form")
+parser.add_argument("archived", type=str, help='Projects', location="form")
 parser.add_argument(
     "regex_expressions",
     type=str,
@@ -61,6 +61,8 @@ def parse_project_params():
                         )
                     )
                 result_dict[key] = new_deadlines
+            elif "archived" == key:
+                result_dict[key] = value == "true"
             else:
                 result_dict[key] = value
 

diff --git a/frontend/public/locales/en/translation.json b/frontend/public/locales/en/translation.json
@@ -52,7 +52,7 @@
     "cancel": "Cancel",
     "create": "Create",
     "activeCourses": "Active Courses",
-    "archivedCourses":"Archived Courses"    
+    "archivedCourses":"Archived Courses"
   },
   "courseForm": {
     "courseName": "Course Name",
@@ -72,7 +72,9 @@
       "running": "Running",
       "submitTime": "Time submitted",
       "status": "Status"
-    }
+    },
+    "projectOverview": "Overview",
+    "archive": "Archive"
   },
   "time": {
     "yearsAgo": "years ago",
@@ -149,4 +151,4 @@
     "no_projects": "There are no projects here.",
     "new_project": "New Project"
   }
-}
+}
diff --git a/frontend/public/locales/nl/translation.json b/frontend/public/locales/nl/translation.json
@@ -109,7 +109,9 @@
       "running": "Aan het uitvoeren",
       "submitTime": "Indientijd",
       "status": "Status"
-    }
+    },
+    "projectOverview": "Overzicht",
+    "archive": "Archiveer"
   },
   "time": {
     "yearsAgo": "jaren geleden",

diff --git a/frontend/src/components/DeadlineView/DeadlineGrid.tsx b/frontend/src/components/DeadlineView/DeadlineGrid.tsx
@@ -0,0 +1,43 @@
+import {Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow} from "@mui/material";
+import {Deadline} from "../../types/deadline.ts";
+import {useTranslation} from "react-i18next";
+
+interface Props {
+  deadlines: Deadline[];
+  minWidth: number
+}
+
+/**
+ * @returns grid that displays deadlines in a grid
+ */
+export default function DeadlineGrid({deadlines, minWidth}: Props) {
+
+  const { t } = useTranslation('translation', { keyPrefix: 'projectForm' });
+
+  return (
+    <TableContainer component={Paper}>
+      <Table sx={{ minWidth: minWidth }}>
+        <TableHead>
+          <TableRow>
+            <TableCell sx={{ fontWeight: 'bold' }}>{t("deadline")}</TableCell>
+            <TableCell sx={{ fontWeight: 'bold' }} align="right">{t("description")}</TableCell>
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {deadlines.length === 0 ? ( // Check if deadlines is empty
+            <TableRow>
+              <TableCell colSpan={2} align="center">{t("noDeadlinesPlaceholder")}</TableCell>
+            </TableRow>
+          ) : (
+            deadlines.map((deadline, index) => (
+              <TableRow key={index} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
+                <TableCell component="th" scope="row">{deadline.deadline}</TableCell>
+                <TableCell align="right">{deadline.description}</TableCell>
+              </TableRow>
+            ))
+          )}
+        </TableBody>
+      </Table>
+    </TableContainer>
+  )
+}
diff --git a/frontend/src/components/ProjectForm/ProjectForm.tsx b/frontend/src/components/ProjectForm/ProjectForm.tsx
@@ -31,6 +31,7 @@ import AdvancedRegex from "./AdvancedRegex.tsx";
 import RunnerSelecter from "./RunnerSelecter.tsx";
 import { authenticatedFetch } from "../../utils/authenticated-fetch.ts";
 import i18next from "i18next";
+import DeadlineGrid from "../DeadlineView/DeadlineGrid.tsx";
 
 interface Course {
   course_id: string;
@@ -332,30 +333,7 @@ export default function ProjectForm() {
               deadlines={[]}
               onChange={(deadlines: Deadline[]) => handleDeadlineChange(deadlines)}
               editable={true} />
-            <TableContainer component={Paper}>
-              <Table sx={{ minWidth: 650 }}>
-                <TableHead>
-                  <TableRow>
-                    <TableCell sx={{ fontWeight: 'bold' }}>{t("deadline")}</TableCell>
-                    <TableCell sx={{ fontWeight: 'bold' }} align="right">{t("description")}</TableCell>
-                  </TableRow>
-                </TableHead>
-                <TableBody>
-                  {deadlines.length === 0 ? ( // Check if deadlines is empty
-                    <TableRow>
-                      <TableCell colSpan={2} align="center">{t("noDeadlinesPlaceholder")}</TableCell>
-                    </TableRow>
-                  ) : (
-                    deadlines.map((deadline, index) => (
-                      <TableRow key={index} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
-                        <TableCell component="th" scope="row">{deadline.deadline}</TableCell>
-                        <TableCell align="right">{deadline.description}</TableCell>
-                      </TableRow>
-                    ))
-                  )}
-                </TableBody>
-              </Table>
-            </TableContainer>
+            <DeadlineGrid deadlines={deadlines} minWidth={650} />
           </Grid>
           <Grid item>
             <Stack direction="row" style={{display: "flex", alignItems:"center"}}>