From 259e4ec9c99dc532d1781805e16c8dce5374a7c9 Mon Sep 17 00:00:00 2001
From: Ben De Meurichy <ben.demeurichy@ugent.be>
Date: Mon, 20 May 2024 21:52:46 +0200
Subject: [PATCH 1/3] voeg jezelf toe bij nieuw vak, geen spookvakken meer

---
 frontend/frontend/src/components/Header.tsx            |  2 +-
 .../src/pages/subjectsPage/AddChangeSubjectPage.tsx    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/frontend/src/components/Header.tsx b/frontend/frontend/src/components/Header.tsx
index 0a21c2b3..f8a83cd3 100644
--- a/frontend/frontend/src/components/Header.tsx
+++ b/frontend/frontend/src/components/Header.tsx
@@ -147,7 +147,7 @@ export const Header = ({ variant, title }: Props) => {
                         >
                             {variant === 'main' && (
                                 <Box
-                                    id='logo'
+                                    id="logo"
                                     component="img"
                                     src={'assets/logo_duif_top_wit.png'}
                                     alt="logo_app"
diff --git a/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx b/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx
index 2d33ca2a..b070d9c0 100644
--- a/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx
+++ b/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx
@@ -79,7 +79,12 @@ function UserList(
                             return (
                                 <>
                                     <Divider />
-                                    <ListItem>
+                                    <ListItem
+                                        disabled={
+                                            users.length == 1 &&
+                                            users[0].is_lesgever
+                                        }
+                                    >
                                         <EvenlySpacedRow
                                             items={[
                                                 <ListItemText
@@ -469,6 +474,9 @@ export function AddChangeSubjectPage() {
         async function fetchUser() {
             setUserLoading(true)
             const userResponse = await instance.get('/gebruikers/me/')
+            if (vakID == undefined) {
+                setTeachers([userResponse.data])
+            }
             setUser(userResponse.data)
             setUserLoading(false)
         }

From f5727c674ea0fe2b89da629c12313acfaedb033a Mon Sep 17 00:00:00 2001
From: elias <Elias.Meynckens@UGent.be>
Date: Mon, 20 May 2024 21:59:20 +0200
Subject: [PATCH 2/3] cleanup restrictions box in addchangeAssigmentPage

---
 .../src/components/RestrictionCard.tsx        | 17 ++---
 .../AddChangeAssignmentPage.tsx               | 74 ++++++++++---------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/frontend/frontend/src/components/RestrictionCard.tsx b/frontend/frontend/src/components/RestrictionCard.tsx
index cdfa256b..75ad36ee 100644
--- a/frontend/frontend/src/components/RestrictionCard.tsx
+++ b/frontend/frontend/src/components/RestrictionCard.tsx
@@ -2,6 +2,7 @@ import { restriction } from '../pages/addChangeAssignmentPage/AddChangeAssignmen
 import { Box, IconButton, Switch, Typography } from '@mui/material'
 import CloseIcon from '@mui/icons-material/Close'
 import React from 'react'
+import {EvenlySpacedRow} from "./CustomComponents.tsx";
 
 interface RestrictionCardProps {
     restriction: restriction
@@ -28,26 +29,20 @@ export function RestrictionCard({
 
     return (
         <>
-            <Box
-                display={'flex'}
-                flexDirection={'row'}
-                width={'100%'}
-                justifyContent={'space-between'}
-            >
+            <EvenlySpacedRow items={[
                 <Typography id="script" variant={'body2'}>
                     {restriction.script.replace(/^.*[\\/]/, '')}
-                </Typography>
+                </Typography>,
                 <Switch
                     id="mustPassSwitch"
                     value={mustPass}
                     checked={mustPass}
                     onChange={() => handleMustPassChange()}
-                />
-
+                />,
                 <IconButton id="closeButton" onClick={handleRemove}>
                     <CloseIcon />
-                </IconButton>
-            </Box>
+                </IconButton>]}
+            />
         </>
     )
 }
diff --git a/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx b/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx
index 65eef916..ac17ca1a 100644
--- a/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx
+++ b/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx
@@ -1,4 +1,4 @@
-import { Card } from '../../components/CustomComponents.tsx'
+import {Card, Divider, EvenlySpacedRow} from '../../components/CustomComponents.tsx'
 import {
     Box,
     CircularProgress,
@@ -538,7 +538,7 @@ export function AddChangeAssignmentPage() {
                                             ) : (
                                                 <TextField
                                                     type="text"
-                                                    placeholder={'Title'}
+                                                    placeholder={t('name')}
                                                     error={
                                                         assignmentErrors.title
                                                     }
@@ -808,37 +808,40 @@ export function AddChangeAssignmentPage() {
                                     >
                                         <Card
                                             sx={{
-                                                padding: 1,
                                                 backgroundColor:
                                                     'background.default',
                                                 width: '70%',
                                                 height: '28svh',
                                             }}
                                         >
+                                            <Box
+                                                sx={{
+                                                    backgroundColor: 'secondary.main',
+                                                    height: 48,
+                                                    padding: 1,
+                                                }}
+                                            >
                                             <Typography
                                                 variant={'h5'}
                                                 fontWeight={'bold'}
                                             >
                                                 {t('restrictions')}
                                             </Typography>
-                                            <Box sx={{ padding: 1 }}>
-                                                <Box
-                                                    display="flex"
-                                                    flexDirection="row"
-                                                    justifyContent="space-between"
-                                                    sx={{ padding: 1 }}
-                                                >
-                                                    <Typography variant="body1">
+                                            <EvenlySpacedRow items={[
+                                                    <Typography variant="body1" fontWeight={'bold'}>
                                                         {t('name')}
-                                                    </Typography>
-                                                    <Typography variant="body1">
+                                                    </Typography>,
+                                                    <Typography variant="body1" fontWeight={'bold'}>
                                                         {t('must_pass')}
-                                                    </Typography>
-                                                    <Typography variant="body1">
+                                                    </Typography>,
+                                                    <Typography variant="body1" fontWeight={'bold'}>
                                                         {t('remove')}
-                                                    </Typography>
-                                                </Box>
-                                                {/*This list will render the restrictions that are added to the assignment.*/}
+                                                    </Typography>]}
+                                            />
+                                            </Box>
+                                            <Divider/>
+                                            {/*This list will render the restrictions that are added to the assignment.*/}
+                                            <Box sx={{marginTop: -1.1}}>
                                                 <List
                                                     sx={{
                                                         maxHeight: '18vh',
@@ -857,23 +860,26 @@ export function AddChangeAssignmentPage() {
                                                                     index
                                                                 ) => {
                                                                     return (
-                                                                        <ListItem
-                                                                            key={
-                                                                                index
-                                                                            }
-                                                                        >
-                                                                            <RestrictionCard
-                                                                                restriction={
-                                                                                    restriction
-                                                                                }
-                                                                                restrictions={
-                                                                                    restrictions
-                                                                                }
-                                                                                setRestrictions={
-                                                                                    setRestrictions
+                                                                        <>
+                                                                            <Divider/>
+                                                                            <ListItem sx={{ maxHeight: '45px'}}
+                                                                                key={
+                                                                                    index
                                                                                 }
-                                                                            />
-                                                                        </ListItem>
+                                                                            >
+                                                                                <RestrictionCard
+                                                                                    restriction={
+                                                                                        restriction
+                                                                                    }
+                                                                                    restrictions={
+                                                                                        restrictions
+                                                                                    }
+                                                                                    setRestrictions={
+                                                                                        setRestrictions
+                                                                                    }
+                                                                                />
+                                                                            </ListItem>
+                                                                        </>
                                                                     )
                                                                 }
                                                             )}

From 68dc6dd50374ef8b089f368bc8354a9d18812b3e Mon Sep 17 00:00:00 2001
From: Alexandre Paice <alexandre.paice@ugent.be>
Date: Mon, 20 May 2024 22:04:10 +0200
Subject: [PATCH 3/3] vakken renderen op jaartal

---
 .../frontend/src/components/CourseCard.tsx    |  1 +
 .../frontend/src/pages/mainPage/MainPage.tsx  | 29 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/frontend/frontend/src/components/CourseCard.tsx b/frontend/frontend/src/components/CourseCard.tsx
index fe65304f..e8ab1a07 100644
--- a/frontend/frontend/src/components/CourseCard.tsx
+++ b/frontend/frontend/src/components/CourseCard.tsx
@@ -54,6 +54,7 @@ export function CourseCard({
     const [course, setCourse] = useState<Course>({
         vak_id: 0,
         naam: '',
+        jaartal: 0,
         studenten: [],
         lesgevers: [],
         gearchiveerd: false,
diff --git a/frontend/frontend/src/pages/mainPage/MainPage.tsx b/frontend/frontend/src/pages/mainPage/MainPage.tsx
index 6f99df8e..961fab27 100644
--- a/frontend/frontend/src/pages/mainPage/MainPage.tsx
+++ b/frontend/frontend/src/pages/mainPage/MainPage.tsx
@@ -1,6 +1,6 @@
 import { Header } from '../../components/Header.tsx'
 import { Button } from '../../components/CustomComponents.tsx'
-import { Box, Stack } from '@mui/material'
+import { Box, Stack, MenuItem, Select } from '@mui/material'
 import TabSwitcher from '../../components/TabSwitcher.tsx'
 import { ArchivedView } from './ArchivedView.tsx'
 import { CoursesView } from './CoursesView.tsx'
@@ -17,6 +17,7 @@ import WarningPopup from '../../components/WarningPopup.tsx'
 export interface Course {
     vak_id: number
     naam: string
+    jaartal: number
     studenten: number[]
     lesgevers: number[]
     gearchiveerd: boolean
@@ -50,15 +51,13 @@ export default function MainPage() {
     const [courseOrder, setCourseOrder] = useState<number[]>([])
     const [deadlines, setDeadlines] = useState<Dayjs[]>([])
     const [loading, setLoading] = useState<boolean>(true)
+    const [selectedYear, setSelectedYear] = useState<number>(dayjs().year())
 
     //navigator for routing
     const [assignments, setAssignments] = useState<project[]>([])
     const navigator = useNavigate()
 
     useEffect(() => {
-        console.log('requesting api')
-        //set loading to true every time the data is requested
-
         // Get the courses, their projects, and their respective deadlines + the role of the user
         async function fetchData() {
             //set loading to true every time the data is requested
@@ -233,7 +232,7 @@ export default function MainPage() {
                                           activecourses={courses
                                               .filter(
                                                   (course) =>
-                                                      !course.gearchiveerd
+                                                      !course.gearchiveerd && course.jaartal === selectedYear
                                               )
                                               .sort((a: Course, b: Course) => {
                                                   if (
@@ -321,7 +320,25 @@ export default function MainPage() {
                                   ]
                         }
                     />
-
+                    <Box
+                    display={'flex'}
+                    justifyContent={'center'}
+                    alignItems={'center'}
+                    mb={2}
+                >
+                    <Select
+                        value={selectedYear}
+                        onChange={(e) => setSelectedYear(e.target.value as number)}
+                        label="Select Academic Year"
+                        sx={{ minWidth: 150 }}
+                    >
+                        {[2022, 2023, 2024, 2025].map((year) => (
+                            <MenuItem key={year} value={year}>
+                                {year}
+                            </MenuItem>
+                        ))}
+                    </Select>
+                    </Box>
                     {/* Add a calendar to the right of the mainpage. */}
                     <Box
                         aria-label={'calendarView'}