From ce0b768e4fcc2019df144881d71b8658ed8b0dee Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Tue, 27 Aug 2024 01:47:32 +0200
Subject: [PATCH 01/13] Add MyTasksSection component

---
 client/src/pages/DashboardPage/DashboardPage.tsx             | 2 ++
 .../components/MyTasksSection/MyTasksSection.tsx             | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx

diff --git a/client/src/pages/DashboardPage/DashboardPage.tsx b/client/src/pages/DashboardPage/DashboardPage.tsx
index a6018bb0..5f73cab3 100644
--- a/client/src/pages/DashboardPage/DashboardPage.tsx
+++ b/client/src/pages/DashboardPage/DashboardPage.tsx
@@ -11,6 +11,7 @@ import ThesesGanttChart from '../../components/ThesesGanttChart/ThesesGanttChart
 import { useHasGroupAccess } from '../../hooks/authentication'
 import { Link } from 'react-router-dom'
 import ApplicationModal from '../../components/ApplicationModal/ApplicationModal'
+import MyTasksSection from './components/MyTasksSection/MyTasksSection'
 
 const DashboardPage = () => {
   usePageTitle('Dashboard')
@@ -24,6 +25,7 @@ const DashboardPage = () => {
       <Title order={1} mb='md'>
         Dashboard
       </Title>
+      <MyTasksSection />
       <ThesesProvider hideIfEmpty={!managementAccess}>
         <Title order={2}>My Theses</Title>
         {managementAccess && (
diff --git a/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx b/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx
new file mode 100644
index 00000000..63878979
--- /dev/null
+++ b/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx
@@ -0,0 +1,5 @@
+const MyTasksSection = () => {
+  return null
+}
+
+export default MyTasksSection

From 3d451e2313f9309a6cd4c7d0516080323151cc75 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Wed, 28 Aug 2024 01:07:45 +0200
Subject: [PATCH 02/13] Implement Feedback

---
 .../AuthenticatedArea/AuthenticatedArea.tsx   | 44 ++++++------
 .../ApplicationReviewForm.tsx                 |  2 +-
 .../AuthenticatedFilePreview.tsx              | 30 ++++++---
 .../DocumentEditor/DocumentEditor.tsx         |  1 +
 .../src/components/GanttChart/GanttChart.tsx  |  1 +
 client/src/components/TopicData/TopicData.tsx | 10 ++-
 .../PublishedTheses/PublishedTheses.tsx       |  1 +
 .../LegacySubmitApplicationPage.tsx           | 67 +++++++++++++------
 .../LegacySuccessfulSubmission.tsx            | 22 ------
 .../ReplaceTopicModal/ReplaceTopicModal.tsx   | 29 ++++----
 .../MotivationStep/MotivationStep.tsx         | 18 ++++-
 .../SubmitAssessmentModal.tsx                 | 45 ++++++-------
 .../ThesisCommentsList/ThesisCommentsList.tsx |  8 ++-
 .../ThesisConfigSection.tsx                   |  8 +--
 .../ThesisFinalGradeSection.tsx               |  2 +-
 .../SubmitFinalGradeModal.tsx                 | 25 ++++---
 .../ThesisInfoSection/ThesisInfoSection.tsx   | 11 ++-
 .../ThesisProposalSection.tsx                 |  7 +-
 .../ThesisVisibilitySelect.tsx                | 35 ++++++++++
 .../ThesisWritingSection.tsx                  | 14 ++--
 client/src/requests/payloads/application.ts   |  1 +
 client/src/requests/responses/application.ts  |  3 +-
 client/src/requests/responses/topic.ts        |  2 +-
 .../ls1/constants/ThesisVisibility.java       |  1 +
 .../ls1/controller/ApplicationController.java |  1 +
 .../ls1/controller/DashboardController.java   | 45 +++++++++++--
 .../controller/PublishedThesisController.java |  2 +-
 .../ls1/controller/ThesisController.java      | 14 ++--
 .../ls1/controller/TopicController.java       |  4 +-
 .../ls1/controller/UserController.java        |  6 +-
 .../payload/CreateApplicationPayload.java     |  1 +
 .../LegacyCreateApplicationPayload.java       |  1 +
 .../payload/ReplaceTopicPayload.java          |  2 +-
 .../thesistrack/ls1/dto/ApplicationDto.java   |  2 +
 .../thesistrack/ls1/dto/DashboardDto.java     |  4 --
 .../ls1/dto/PublishedPresentationDto.java     | 31 +++++++++
 .../java/thesistrack/ls1/dto/TaskDto.java     | 10 +++
 .../java/thesistrack/ls1/dto/TopicDto.java    |  5 +-
 .../thesistrack/ls1/entity/Application.java   |  3 +
 .../java/thesistrack/ls1/entity/Thesis.java   |  6 +-
 .../java/thesistrack/ls1/entity/Topic.java    |  7 +-
 .../ThesisPresentationRepository.java         |  8 ++-
 .../ls1/service/ApplicationService.java       |  4 +-
 .../ls1/service/DashboardService.java         | 44 ++++++++++++
 .../ls1/service/MailingService.java           |  1 +
 .../ls1/service/ThesisService.java            |  2 +-
 .../thesistrack/ls1/service/TopicService.java |  8 +--
 .../ls1/utility/RequestValidator.java         | 22 ++++++
 .../db/changelog/changes/06_topics.sql        |  5 ++
 49 files changed, 440 insertions(+), 185 deletions(-)
 delete mode 100644 client/src/pages/LegacySubmitApplicationPage/components/LegacySuccessfulSubmission/LegacySuccessfulSubmission.tsx
 create mode 100644 client/src/pages/ThesisPage/components/ThesisVisibilitySelect/ThesisVisibilitySelect.tsx
 delete mode 100644 server/src/main/java/thesistrack/ls1/dto/DashboardDto.java
 create mode 100644 server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
 create mode 100644 server/src/main/java/thesistrack/ls1/dto/TaskDto.java

diff --git a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
index 74ce8343..309e6474 100644
--- a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
+++ b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
@@ -89,14 +89,17 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
   const [minimizedState, setMinimized] = useLocalStorage<boolean>('navigation_minimized', {
     usingJson: true,
   })
-  const [debouncedMinimized] = useDebouncedValue(minimizedState, minimizeAnimationDuration)
+  const [debouncedMinimized] = useDebouncedValue(
+    collapseNavigation || minimizedState,
+    minimizeAnimationDuration,
+  )
   // only use debounced State if value is false because otherwise the text is formatted weirdly if you expand the navigation
-  const minimized = minimizedState || debouncedMinimized
+  const minimized = opened ? false : minimizedState || !!debouncedMinimized
 
   const location = useLocation()
   const navigationType = useNavigationType()
 
-  const showHeader = useIsSmallerBreakpoint('md') || collapseNavigation
+  const showHeader = useIsSmallerBreakpoint('md')
   const auth = useAuthenticationContext()
 
   useEffect(() => {
@@ -126,9 +129,9 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
     <AppShell
       header={{ collapsed: !showHeader, height: 60 }}
       navbar={{
-        width: minimizedState ? 70 : 300,
+        width: collapseNavigation || minimizedState ? 70 : 300,
         breakpoint: 'md',
-        collapsed: { mobile: !opened, desktop: !opened && collapseNavigation },
+        collapsed: { mobile: !opened, desktop: false },
       }}
       styles={{
         navbar: {
@@ -139,12 +142,7 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
     >
       <AppShell.Header>
         <Group h='100%' px='md'>
-          <Burger
-            opened={opened}
-            onClick={toggle}
-            hiddenFrom={collapseNavigation ? undefined : 'md'}
-            size='md'
-          />
+          <Burger opened={opened} onClick={toggle} hiddenFrom='md' size='md' />
         </Group>
       </AppShell.Header>
 
@@ -204,17 +202,19 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
             </Tooltip>
             {!minimized && <span>Logout</span>}
           </Link>
-          <Group>
-            <ActionIcon
-              visibleFrom='md'
-              ml='auto'
-              mr={minimized ? 'auto' : undefined}
-              variant='transparent'
-              onClick={() => setMinimized((prev) => !prev)}
-            >
-              {minimized ? <CaretDoubleRight /> : <CaretDoubleLeft />}
-            </ActionIcon>
-          </Group>
+          {!collapseNavigation && (
+            <Group>
+              <ActionIcon
+                visibleFrom='md'
+                ml='auto'
+                mr={minimized ? 'auto' : undefined}
+                variant='transparent'
+                onClick={() => setMinimized((prev) => !prev)}
+              >
+                {minimized ? <CaretDoubleRight /> : <CaretDoubleLeft />}
+              </ActionIcon>
+            </Group>
+          )}
         </AppShell.Section>
       </AppShell.Navbar>
 
diff --git a/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx b/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
index 5887fb7d..379b5371 100644
--- a/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
+++ b/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
@@ -61,7 +61,7 @@ const ApplicationReviewForm = (props: IApplicationReviewFormProps) => {
         title: application.topic?.title || application.thesisTitle || '',
         comment: application.comment || '',
         type:
-          application.topic?.type || GLOBAL_CONFIG.thesis_types[application.user.studyDegree || '']
+          application.thesisType || GLOBAL_CONFIG.thesis_types[application.user.studyDegree || '']
             ? application.user.studyDegree
             : null,
         advisors: application.topic?.advisors.map((advisor) => advisor.userId) ?? [],
diff --git a/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx b/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
index 2c88c558..62d6c0b8 100644
--- a/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
+++ b/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
@@ -1,7 +1,9 @@
 import { useMemo, useState } from 'react'
-import { Button, Space, Stack, Text } from '@mantine/core'
+import { Button, Center, Group, Space, Stack, Text } from '@mantine/core'
 import { downloadFile } from '../../utils/blob'
 import { useApiFile } from '../../hooks/fetcher'
+import { Link } from 'react-router-dom'
+import { GLOBAL_CONFIG } from '../../config/global'
 
 interface IAuthenticatedIframeProps {
   url: string
@@ -9,10 +11,11 @@ interface IAuthenticatedIframeProps {
   title?: string
   height?: number
   allowDownload?: boolean
+  includeLink?: boolean
 }
 
 const AuthenticatedFilePreview = (props: IAuthenticatedIframeProps) => {
-  const { url, filename, allowDownload = true, title, height } = props
+  const { url, filename, allowDownload = true, includeLink = false, title, height } = props
 
   const [file, setFile] = useState<File>()
 
@@ -27,12 +30,23 @@ const AuthenticatedFilePreview = (props: IAuthenticatedIframeProps) => {
       {title && <Text ta='center'>{title}</Text>}
       <iframe style={{ border: 0 }} height={height} src={iframeUrl} />
       {allowDownload && (
-        <>
-          <Space mb='md' />
-          <Button variant='outline' mx='auto' onClick={() => file && downloadFile(file)}>
-            Download
-          </Button>
-        </>
+        <Center>
+          <Group mt='md'>
+            <Button variant='outline' onClick={() => file && downloadFile(file)}>
+              Download
+            </Button>
+            {includeLink && (
+              <Button
+                component={Link}
+                to={`${GLOBAL_CONFIG.server_host}/api${url}`}
+                variant='outline'
+                target='_blank'
+              >
+                View File
+              </Button>
+            )}
+          </Group>
+        </Center>
       )}
     </Stack>
   )
diff --git a/client/src/components/DocumentEditor/DocumentEditor.tsx b/client/src/components/DocumentEditor/DocumentEditor.tsx
index 7854df1b..2ee9e83a 100644
--- a/client/src/components/DocumentEditor/DocumentEditor.tsx
+++ b/client/src/components/DocumentEditor/DocumentEditor.tsx
@@ -105,6 +105,7 @@ const DocumentEditor = (props: IDocumentEditorProps) => {
         style={{
           minHeight: editMode ? '170px' : undefined,
           borderColor: wrapperProps.error ? 'var(--mantine-color-error)' : undefined,
+          borderStyle: editMode ? 'solid' : 'dashed',
         }}
       >
         {editMode && (
diff --git a/client/src/components/GanttChart/GanttChart.tsx b/client/src/components/GanttChart/GanttChart.tsx
index 30ef6280..7f8cd219 100644
--- a/client/src/components/GanttChart/GanttChart.tsx
+++ b/client/src/components/GanttChart/GanttChart.tsx
@@ -306,6 +306,7 @@ const GanttChart = (props: IGanttChartProps) => {
           onTouchStart={handleTouchStart}
           onTouchMove={handleTouchMove}
           onWheel={handleWheel}
+          style={{ touchAction: 'none' }}
         >
           {groups.map((group) => (
             <div key={group.groupId} className={classes.groupRow}>
diff --git a/client/src/components/TopicData/TopicData.tsx b/client/src/components/TopicData/TopicData.tsx
index d30e5e66..c899dde5 100644
--- a/client/src/components/TopicData/TopicData.tsx
+++ b/client/src/components/TopicData/TopicData.tsx
@@ -34,8 +34,14 @@ const TopicData = (props: ITopicDataProps) => {
         </Grid.Col>
         <Grid.Col span={{ md: 3 }}>
           <LabeledItem
-            label='Type'
-            value={topic.type ? (GLOBAL_CONFIG.thesis_types[topic.type] ?? topic.type) : 'Any'}
+            label='Thesis Types'
+            value={
+              topic.thesisTypes
+                ? topic.thesisTypes.map(
+                    (thesisType) => GLOBAL_CONFIG.thesis_types[thesisType] ?? thesisType,
+                  )
+                : 'Any'
+            }
           />
         </Grid.Col>
         <Grid.Col span={{ md: 3 }}>
diff --git a/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx b/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
index e7cbd86a..788749ed 100644
--- a/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
+++ b/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
@@ -114,6 +114,7 @@ const PublishedTheses = () => {
             <ThesisData thesis={openedThesis} additionalInformation={['abstract']} />
             <AuthenticatedFilePreview
               url={`/v2/published-theses/${openedThesis.thesisId}/thesis`}
+              includeLink
               height={500}
               filename={`${openedThesis.title.replaceAll(' ', '-')}.pdf`}
             />
diff --git a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
index bfab5814..e8b53ea4 100644
--- a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
+++ b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
@@ -13,6 +13,7 @@ import {
   Title,
   TextInput,
   Grid,
+  Card,
 } from '@mantine/core'
 import { DeclarationOfDataConsent } from '../../components/DeclarationOfDataConsent/DeclarationOfDataConsent'
 import LS1Logo from '../../static/ls1logo.png'
@@ -27,7 +28,6 @@ import UploadArea from '../../components/UploadArea/UploadArea'
 import ContentContainer from '../../app/layout/ContentContainer/ContentContainer'
 import { AVAILABLE_COUNTRIES } from '../../config/countries'
 import { showSimpleError, showSimpleSuccess } from '../../utils/notification'
-import { LegacySuccessfulSubmission } from './components/LegacySuccessfulSubmission/LegacySuccessfulSubmission'
 import { getApiResponseErrorMessage } from '../../requests/handler'
 import DocumentEditor from '../../components/DocumentEditor/DocumentEditor'
 import { getHtmlTextLength } from '../../utils/validation'
@@ -63,6 +63,7 @@ const LegacySubmitApplicationPage = () => {
       projects: '',
       interests: '',
       thesisTitle: '',
+      thesisType: null,
       declarationOfConsentAccepted: false,
       examinationReport: undefined,
       cv: undefined,
@@ -118,6 +119,7 @@ const LegacySubmitApplicationPage = () => {
           return 'The maximum allowed number of characters is 200.'
         }
       },
+      thesisType: isNotEmpty('Please state your thesis type.'),
       studyDegree: isNotEmpty('Please state your study degree.'),
       studyProgram: isNotEmpty('Please state your study program.'),
       enrolledAt: isNotEmpty('Please state your enrollment date.'),
@@ -150,10 +152,21 @@ const LegacySubmitApplicationPage = () => {
       <Box mx='auto' pos='relative'>
         <LoadingOverlay visible={loadingOverlayVisible} overlayProps={{ blur: 2 }} />
         {applicationSuccessfullySubmitted ? (
-          <LegacySuccessfulSubmission
-            title='Your application was successfully submitted!'
-            text='We will contact you as soon as we have reviewed your application.'
-          />
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center',
+              height: '100vh',
+            }}
+          >
+            <Card withBorder p='xl'>
+              <Title order={5}>Your application was successfully submitted!</Title>
+              <Text c='dimmed'>
+                We will contact you as soon as we have reviewed your application.
+              </Text>
+            </Card>
+          </div>
         ) : (
           <Stack>
             <Center>
@@ -187,6 +200,7 @@ const LegacySubmitApplicationPage = () => {
                     interests: values.interests!,
                     projects: values.projects!,
                     thesisTitle: values.thesisTitle!,
+                    thesisType: values.thesisType!,
                     desiredStartDate: values.desiredStartDate!,
                   }
 
@@ -366,20 +380,35 @@ const LegacySubmitApplicationPage = () => {
                     />
                   </Grid.Col>
                 </Grid>
-                <Stack gap='0'>
-                  <TextInput
-                    label='Thesis Title Suggestion'
-                    placeholder='Thesis Title Suggestion'
-                    required={true}
-                    {...form.getInputProps('thesisTitle')}
-                  />
-                  {!form.errors.thesisTitle && (
-                    <Text
-                      fz='xs'
-                      ta='right'
-                    >{`${form.values.thesisTitle?.length ?? 0} / 200`}</Text>
-                  )}
-                </Stack>
+                <Grid>
+                  <Grid.Col span={{ md: 8 }}>
+                    <Stack gap='0'>
+                      <TextInput
+                        label='Thesis Title Suggestion'
+                        placeholder='Thesis Title Suggestion'
+                        required={true}
+                        {...form.getInputProps('thesisTitle')}
+                      />
+                      {!form.errors.thesisTitle && (
+                        <Text
+                          fz='xs'
+                          ta='right'
+                        >{`${form.values.thesisTitle?.length ?? 0} / 200`}</Text>
+                      )}
+                    </Stack>
+                  </Grid.Col>
+                  <Grid.Col span={{ md: 4 }}>
+                    <Select
+                      label='Thesis Type'
+                      required={true}
+                      data={Object.keys(GLOBAL_CONFIG.thesis_types).map((thesisType) => ({
+                        label: GLOBAL_CONFIG.thesis_types[thesisType],
+                        value: thesisType,
+                      }))}
+                      {...form.getInputProps('thesisType')}
+                    />
+                  </Grid.Col>
+                </Grid>
                 <DatePickerInput
                   leftSection={<Calendar />}
                   label='Desired Thesis Start Date'
diff --git a/client/src/pages/LegacySubmitApplicationPage/components/LegacySuccessfulSubmission/LegacySuccessfulSubmission.tsx b/client/src/pages/LegacySubmitApplicationPage/components/LegacySuccessfulSubmission/LegacySuccessfulSubmission.tsx
deleted file mode 100644
index 169f105e..00000000
--- a/client/src/pages/LegacySubmitApplicationPage/components/LegacySuccessfulSubmission/LegacySuccessfulSubmission.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Card, Text, Title } from '@mantine/core'
-
-interface ApplicationSuccessfulSubmissionProps {
-  title: string
-  text: string
-}
-
-export const LegacySuccessfulSubmission = ({
-  title,
-  text,
-}: ApplicationSuccessfulSubmissionProps) => {
-  return (
-    <div
-      style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}
-    >
-      <Card withBorder p='xl'>
-        <Title order={5}>{title}</Title>
-        <Text c='dimmed'>{text}</Text>
-      </Card>
-    </div>
-  )
-}
diff --git a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
index 082fcae6..16c95e00 100644
--- a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
+++ b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
@@ -1,4 +1,4 @@
-import { Button, Modal, Select, Stack, TextInput } from '@mantine/core'
+import { Button, Modal, MultiSelect, Select, Stack, TextInput } from '@mantine/core'
 import { ITopic } from '../../../../requests/responses/topic'
 import { isNotEmpty, useForm } from '@mantine/form'
 import { isNotEmptyUserList } from '../../../../utils/validation'
@@ -27,14 +27,14 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
     problemStatement: string
     goals: string
     references: string
-    type: string | null
+    thesisTypes: string[]
     supervisorIds: string[]
     advisorIds: string[]
   }>({
     mode: 'controlled',
     initialValues: {
       title: '',
-      type: '',
+      thesisTypes: [],
       problemStatement: '',
       goals: '',
       references: '',
@@ -56,7 +56,7 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
     if (opened && topic) {
       form.setInitialValues({
         title: topic.title,
-        type: topic.type || '',
+        thesisTypes: topic.thesisTypes || [],
         problemStatement: topic.problemStatement,
         goals: topic.goals,
         references: topic.references,
@@ -77,7 +77,7 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
         requiresAuth: true,
         data: {
           title: form.values.title,
-          type: form.values.type || null,
+          thesisTypes: form.values.thesisTypes.length > 0 ? form.values.thesisTypes : null,
           problemStatement: form.values.problemStatement,
           goals: form.values.goals,
           references: form.values.references,
@@ -114,17 +114,14 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
       <form onSubmit={form.onSubmit(onSubmit)}>
         <Stack gap='md'>
           <TextInput label='Title' required {...form.getInputProps('title')} />
-          <Select
-            label='Type'
-            required
-            data={[
-              { value: '', label: 'Any' },
-              ...Object.entries(GLOBAL_CONFIG.thesis_types).map(([key, value]) => ({
-                value: key,
-                label: value,
-              })),
-            ]}
-            {...form.getInputProps('type')}
+          <MultiSelect
+            label='Thesis Types'
+            placeholder={form.values.thesisTypes.length > 0 ? undefined : 'All Thesis Types'}
+            data={Object.entries(GLOBAL_CONFIG.thesis_types).map(([key, value]) => ({
+              value: key,
+              label: value,
+            }))}
+            {...form.getInputProps('thesisTypes')}
           />
           <UserMultiSelect
             label='Supervisor'
diff --git a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx b/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
index d86c6af6..7716a347 100644
--- a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
+++ b/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
@@ -1,6 +1,6 @@
 import { ITopic } from '../../../../requests/responses/topic'
 import { isNotEmpty, useForm } from '@mantine/form'
-import { Accordion, Button, Stack, TextInput } from '@mantine/core'
+import { Accordion, Button, MultiSelect, Select, Stack, TextInput } from '@mantine/core'
 import DocumentEditor from '../../../../components/DocumentEditor/DocumentEditor'
 import TopicData from '../../../../components/TopicData/TopicData'
 import { useState } from 'react'
@@ -9,6 +9,7 @@ import { showSimpleError } from '../../../../utils/notification'
 import { getApiResponseErrorMessage } from '../../../../requests/handler'
 import { DateInput, DateValue } from '@mantine/dates'
 import { getHtmlTextLength } from '../../../../utils/validation'
+import { GLOBAL_CONFIG } from '../../../../config/global'
 
 interface IMotivationStepProps {
   topic: ITopic | undefined
@@ -17,6 +18,7 @@ interface IMotivationStepProps {
 
 interface IMotivationStepForm {
   thesisTitle: string
+  thesisType: string | null
   desiredStartDate: DateValue
   motivation: string
 }
@@ -31,6 +33,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
     mode: 'controlled',
     initialValues: {
       thesisTitle: '',
+      thesisType: null,
       desiredStartDate: new Date(),
       motivation: '',
     },
@@ -41,6 +44,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
           return 'Please state your suggested thesis title'
         }
       },
+      thesisType: isNotEmpty('Please state your thesis type'),
       desiredStartDate: isNotEmpty('Please state your desired start date'),
       motivation: (value) => {
         if (!value) {
@@ -62,6 +66,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
         data: {
           topicId: topic?.topicId,
           thesisTitle: values.thesisTitle || null,
+          thesisType: values.thesisType,
           desiredStartDate: values.desiredStartDate,
           motivation: values.motivation,
         },
@@ -100,6 +105,17 @@ const MotivationStep = (props: IMotivationStepProps) => {
             {...form.getInputProps('thesisTitle')}
           />
         )}
+        <Select
+          label='Thesis Type'
+          required={true}
+          data={(topic?.thesisTypes || Object.keys(GLOBAL_CONFIG.thesis_types)).map(
+            (thesisType) => ({
+              label: GLOBAL_CONFIG.thesis_types[thesisType] ?? thesisType,
+              value: thesisType,
+            }),
+          )}
+          {...form.getInputProps('thesisType')}
+        />
         <DateInput
           label='Desired Start Date'
           required={true}
diff --git a/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx b/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
index 87f0b9e7..dacadf1f 100644
--- a/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
@@ -50,30 +50,27 @@ const SubmitAssessmentModal = (props: ISubmitAssessmentModalProps) => {
   return (
     <Modal opened={opened} onClose={onClose} size='xl' title='Submit Assessment'>
       <Stack gap='md'>
-        <Stack gap={0}>
-          <InputLabel required>Summary</InputLabel>
-          <DocumentEditor
-            value={summary}
-            editMode={true}
-            onChange={(e) => setSummary(e.target.value)}
-          />
-        </Stack>
-        <Stack gap={0}>
-          <InputLabel required>Positives</InputLabel>
-          <DocumentEditor
-            value={positives}
-            editMode={true}
-            onChange={(e) => setPositives(e.target.value)}
-          />
-        </Stack>
-        <Stack gap={0}>
-          <InputLabel required>Negatives</InputLabel>
-          <DocumentEditor
-            value={negatives}
-            editMode={true}
-            onChange={(e) => setNegatives(e.target.value)}
-          />
-        </Stack>
+        <DocumentEditor
+          required
+          label='Summary'
+          value={summary}
+          editMode={true}
+          onChange={(e) => setSummary(e.target.value)}
+        />
+        <DocumentEditor
+          required
+          label='Positives'
+          value={positives}
+          editMode={true}
+          onChange={(e) => setPositives(e.target.value)}
+        />
+        <DocumentEditor
+          required
+          label='Negatives'
+          value={negatives}
+          editMode={true}
+          onChange={(e) => setNegatives(e.target.value)}
+        />
         <TextInput
           label='Grade Suggestion'
           required
diff --git a/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx b/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
index eda61be1..e19a92ad 100644
--- a/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
@@ -6,6 +6,7 @@ import {
   Group,
   Modal,
   Pagination,
+  Paper,
   Skeleton,
   Stack,
   Text,
@@ -16,6 +17,7 @@ import AuthenticatedFilePreview from '../../../../components/AuthenticatedFilePr
 import { useLoggedInUser } from '../../../../hooks/authentication'
 import { formatDate, formatUser } from '../../../../utils/format'
 import { Download } from 'phosphor-react'
+import { useHighlightedBackgroundColor } from '../../../../hooks/theme'
 
 const ThesisCommentsList = () => {
   const { thesis, comments, deleteComment, limit, page, setPage } = useThesisCommentsContext()
@@ -24,6 +26,8 @@ const ThesisCommentsList = () => {
 
   const [openedComment, setOpenedComment] = useState<IThesisComment>()
 
+  const commentBackgroundColor = useHighlightedBackgroundColor(false)
+
   return (
     <Stack>
       <Modal opened={!!openedComment} onClose={() => setOpenedComment(undefined)} size='xl'>
@@ -41,7 +45,7 @@ const ThesisCommentsList = () => {
       {comments &&
         comments.content.map((comment) => (
           <Stack gap={0} key={comment.commentId}>
-            <Card p='md' radius='sm'>
+            <Paper p='md' radius='sm' style={{ backgroundColor: commentBackgroundColor }}>
               <Group style={{ width: '100%' }}>
                 <Text>{comment.message}</Text>
                 {comment.hasFile && (
@@ -50,7 +54,7 @@ const ThesisCommentsList = () => {
                   </Button>
                 )}
               </Group>
-            </Card>
+            </Paper>
             <Group ml='auto'>
               <Text size='xs' c='dimmed'>
                 {formatDate(comment.createdAt)}
diff --git a/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx b/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx
index 4628bf41..4bbb28e2 100644
--- a/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx
@@ -15,6 +15,7 @@ import {
 import { GLOBAL_CONFIG } from '../../../../config/global'
 import { ApiError } from '../../../../requests/handler'
 import ThesisStateBadge from '../../../../components/ThesisStateBadge/ThesisStateBadge'
+import ThesisVisibilitySelect from '../ThesisVisibilitySelect/ThesisVisibilitySelect'
 
 interface IThesisConfigSectionFormValues {
   title: string
@@ -193,15 +194,10 @@ const ThesisConfigSection = () => {
                 }))}
                 {...form.getInputProps('type')}
               />
-              <Select
+              <ThesisVisibilitySelect
                 label='Visibility'
                 required={true}
                 disabled={!access.advisor}
-                data={[
-                  { value: 'PUBLIC', label: 'Public' },
-                  { value: 'INTERNAL', label: 'Internal' },
-                  { value: 'PRIVATE', label: 'Private' },
-                ]}
                 {...form.getInputProps('visibility')}
               />
               <TagsInput
diff --git a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx
index 1836039c..210d37c6 100644
--- a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx
@@ -48,7 +48,7 @@ const ThesisFinalGradeSection = () => {
               <Stack>
                 <Title order={3}>Final Grade</Title>
                 <Text>{thesis.grade.finalGrade}</Text>
-                <Title order={3}>Feedback</Title>
+                <Title order={3}>Feedback (Visible to Student)</Title>
                 <DocumentEditor value={thesis.grade.feedback} />
               </Stack>
             ) : (
diff --git a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
index 4092bcf6..3c52068a 100644
--- a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
@@ -1,13 +1,14 @@
 import { IThesis } from '../../../../../../requests/responses/thesis'
 import { Button, Checkbox, InputLabel, Modal, Stack, TextInput } from '@mantine/core'
 import { doRequest } from '../../../../../../requests/request'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import DocumentEditor from '../../../../../../components/DocumentEditor/DocumentEditor'
 import {
   useLoadedThesisContext,
   useThesisUpdateAction,
 } from '../../../../../../contexts/ThesisProvider/hooks'
 import { ApiError } from '../../../../../../requests/handler'
+import ThesisVisibilitySelect from '../../../ThesisVisibilitySelect/ThesisVisibilitySelect'
 
 interface ISubmitFinalGradeModalProps {
   opened: boolean
@@ -21,7 +22,11 @@ const SubmitFinalGradeModal = (props: ISubmitFinalGradeModalProps) => {
 
   const [finalGrade, setFinalGrade] = useState('')
   const [feedback, setFeedback] = useState('')
-  const [publishThesis, setPublishThesis] = useState(false)
+  const [visibility, setVisibility] = useState(thesis.visibility)
+
+  useEffect(() => {
+    setVisibility(visibility)
+  }, [thesis.visibility])
 
   const isEmpty = !finalGrade || !feedback
 
@@ -32,7 +37,7 @@ const SubmitFinalGradeModal = (props: ISubmitFinalGradeModalProps) => {
       data: {
         finalGrade,
         finalFeedback: feedback,
-        visibility: publishThesis ? 'PUBLIC' : thesis.visibility,
+        visibility: visibility,
       },
     })
 
@@ -48,23 +53,25 @@ const SubmitFinalGradeModal = (props: ISubmitFinalGradeModalProps) => {
   return (
     <Modal opened={opened} onClose={onClose} size='xl' title='Submit Final Grade'>
       <Stack gap='md'>
+        <ThesisVisibilitySelect
+          required
+          label='Thesis Visibility'
+          value={visibility}
+          onChange={(e) => e && setVisibility(e)}
+        />
         <TextInput
           required
           label='Final Grade'
           value={finalGrade}
           onChange={(e) => setFinalGrade(e.target.value)}
         />
-        <InputLabel required>Feedback</InputLabel>
         <DocumentEditor
+          required
+          label='Feedback (Visible to student)'
           value={feedback}
           onChange={(e) => setFeedback(e.target.value)}
           editMode={true}
         />
-        <Checkbox
-          label='Publish Thesis'
-          checked={publishThesis}
-          onChange={(e) => setPublishThesis(e.target.checked)}
-        />
         <Button loading={submitting} onClick={onGradeSubmit} disabled={isEmpty}>
           Submit Grade
         </Button>
diff --git a/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx b/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
index 818da8b4..f87e4da7 100644
--- a/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
@@ -7,7 +7,7 @@ import {
   useLoadedThesisContext,
   useThesisUpdateAction,
 } from '../../../../contexts/ThesisProvider/hooks'
-import { useNavigate } from 'react-router-dom'
+import { Link, useNavigate } from 'react-router-dom'
 import { ApiError } from '../../../../requests/handler'
 
 const ThesisInfoSection = () => {
@@ -68,19 +68,18 @@ const ThesisInfoSection = () => {
               onChange={(e) => setInfoText(e.target.value)}
             />
             <Grid>
-              <Grid.Col>
+              <Grid.Col span={{ md: 6 }}>
                 {access.advisor && thesis.applicationId && (
                   <Button
+                    component={Link}
                     variant='outline'
-                    onClick={() =>
-                      navigate(`/management/thesis-applications/${thesis.applicationId}`)
-                    }
+                    to={`/applications/${thesis.applicationId}`}
                   >
                     View Student Application
                   </Button>
                 )}
               </Grid.Col>
-              <Grid.Col>
+              <Grid.Col span={{ md: 6 }}>
                 <Flex justify='flex-end'>
                   {access.student && !editMode && (
                     <Button ml='auto' onClick={() => setEditMode(true)}>
diff --git a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
index 85c5b32c..5d77a416 100644
--- a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
@@ -1,6 +1,6 @@
 import { IThesis, ThesisState } from '../../../../requests/responses/thesis'
 import { useState } from 'react'
-import { Accordion, Button, Grid, Group, Stack, Text } from '@mantine/core'
+import { Accordion, Button, Divider, Grid, Group, Stack, Text } from '@mantine/core'
 import UploadFileModal from '../../../../components/UploadFileModal/UploadFileModal'
 import { doRequest } from '../../../../requests/request'
 import { showSimpleError, showSimpleSuccess } from '../../../../utils/notification'
@@ -105,6 +105,9 @@ const ThesisProposalSection = () => {
                         }
                       />
                     </Grid.Col>
+                    <Grid.Col span={12}>
+                      <Divider />
+                    </Grid.Col>
                   </Grid>
                 ))}
               </Stack>
@@ -147,7 +150,7 @@ const ThesisProposalSection = () => {
               )}
               {access.student && thesis.state === ThesisState.WRITING && (
                 <Button ml='auto' onClick={() => setUploadModal(true)}>
-                  Upload New Proposal (Needs Approval)
+                  Upload New Proposal (Needs Re-Approval)
                 </Button>
               )}
             </Group>
diff --git a/client/src/pages/ThesisPage/components/ThesisVisibilitySelect/ThesisVisibilitySelect.tsx b/client/src/pages/ThesisPage/components/ThesisVisibilitySelect/ThesisVisibilitySelect.tsx
new file mode 100644
index 00000000..6e9e43d3
--- /dev/null
+++ b/client/src/pages/ThesisPage/components/ThesisVisibilitySelect/ThesisVisibilitySelect.tsx
@@ -0,0 +1,35 @@
+import { Select, SelectProps, Text } from '@mantine/core'
+
+const ThesisVisibilitySelect = (props: SelectProps) => {
+  const { ...others } = props
+
+  const descriptions: Record<string, string> = {
+    PUBLIC:
+      'Everyone can see the thesis. If thesis is completed, it will be publicly available on the landing page',
+    STUDENT: 'All students that are currently writing a thesis can see the thesis',
+    INTERNAL: 'All advisors and supervisors of the chair can see the thesis',
+    PRIVATE: 'Only assigned users can see the thesis',
+  }
+
+  return (
+    <Select
+      {...others}
+      renderOption={({ option }) => (
+        <div>
+          <Text size='sm'>{option.label || option.value}</Text>
+          <Text size='xs' c='dimmed'>
+            {descriptions[option.value]}
+          </Text>
+        </div>
+      )}
+      data={[
+        { value: 'PUBLIC', label: 'Public' },
+        { value: 'STUDENT', label: 'Thesis Students' },
+        { value: 'INTERNAL', label: 'Internal' },
+        { value: 'PRIVATE', label: 'Private' },
+      ]}
+    />
+  )
+}
+
+export default ThesisVisibilitySelect
diff --git a/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx b/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
index 28ed6ddf..224c4968 100644
--- a/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
@@ -155,13 +155,6 @@ const ThesisWritingSection = () => {
                 )}
               </Grid.Col>
             </Grid>
-            <Divider />
-            <Stack>
-              <ThesisCommentsProvider thesis={thesis} commentType='THESIS'>
-                <ThesisCommentsList />
-                {access.student && <ThesisCommentsForm />}
-              </ThesisCommentsProvider>
-            </Stack>
             <Group grow>
               {access.student &&
                 thesis.state === ThesisState.WRITING &&
@@ -181,6 +174,13 @@ const ThesisWritingSection = () => {
                   </Stack>
                 )}
             </Group>
+            <Divider />
+            <Stack>
+              <ThesisCommentsProvider thesis={thesis} commentType='THESIS'>
+                <ThesisCommentsList />
+                {access.student && <ThesisCommentsForm />}
+              </ThesisCommentsProvider>
+            </Stack>
             <Stack>
               <Divider />
               <CreatePresentationModal
diff --git a/client/src/requests/payloads/application.ts b/client/src/requests/payloads/application.ts
index c3ffd193..9f3547db 100644
--- a/client/src/requests/payloads/application.ts
+++ b/client/src/requests/payloads/application.ts
@@ -4,5 +4,6 @@ export interface ILegacyCreateApplicationPayload extends IUpdateUserInformationP
   universityId: string
   motivation: string
   thesisTitle: string
+  thesisType: string | null
   desiredStartDate: Date
 }
diff --git a/client/src/requests/responses/application.ts b/client/src/requests/responses/application.ts
index bf57840d..23b672e3 100644
--- a/client/src/requests/responses/application.ts
+++ b/client/src/requests/responses/application.ts
@@ -12,10 +12,11 @@ export interface IApplication {
   user: IUser
   topic: ITopic | null
   thesisTitle: string | null
+  thesisType: string | null
   motivation: string
   state: ApplicationState
   desiredStartDate: string
-  comment: string | null
+  comment: string
   createdAt: string
   reviewedBy: ILightUser | null
   reviewedAt: string
diff --git a/client/src/requests/responses/topic.ts b/client/src/requests/responses/topic.ts
index c490f459..5f421273 100644
--- a/client/src/requests/responses/topic.ts
+++ b/client/src/requests/responses/topic.ts
@@ -3,7 +3,7 @@ import { ILightUser } from './user'
 export interface ITopic {
   topicId: string
   title: string
-  type: string | null
+  thesisTypes: string[] | null
   problemStatement: string
   goals: string
   references: string
diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java b/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java
index 75b2c0b3..6e39b9be 100644
--- a/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java
+++ b/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java
@@ -8,6 +8,7 @@
 public enum ThesisVisibility {
     PRIVATE("PRIVATE"),
     INTERNAL("INTERNAL"),
+    STUDENT("STUDENT"),
     PUBLIC("PUBLIC");
 
     private final String value;
diff --git a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
index e89bb550..e8f75cf9 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
@@ -55,6 +55,7 @@ public ResponseEntity<ApplicationDto> createApplication(
                 authenticatedUser,
                 payload.topicId(),
                 RequestValidator.validateStringMaxLengthAllowNull(payload.thesisTitle(), StringLimits.THESIS_TITLE.getLimit()),
+                RequestValidator.validateStringMaxLength(payload.thesisType(), StringLimits.THESIS_TITLE.getLimit()),
                 RequestValidator.validateNotNull(payload.desiredStartDate()),
                 RequestValidator.validateStringMaxLength(payload.motivation(), StringLimits.LONGTEXT.getLimit())
         );
diff --git a/server/src/main/java/thesistrack/ls1/controller/DashboardController.java b/server/src/main/java/thesistrack/ls1/controller/DashboardController.java
index 992c45fd..b7406882 100644
--- a/server/src/main/java/thesistrack/ls1/controller/DashboardController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/DashboardController.java
@@ -2,28 +2,59 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
-import thesistrack.ls1.dto.DashboardDto;
+import thesistrack.ls1.dto.PaginationDto;
+import thesistrack.ls1.dto.PublishedPresentationDto;
+import thesistrack.ls1.dto.TaskDto;
+import thesistrack.ls1.entity.ThesisPresentation;
+import thesistrack.ls1.entity.User;
+import thesistrack.ls1.service.AuthenticationService;
 import thesistrack.ls1.service.DashboardService;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequestMapping("/v2/dashboard")
 public class DashboardController {
     private final DashboardService dashboardService;
+    private final AuthenticationService authenticationService;
 
     @Autowired
-    public DashboardController(DashboardService dashboardService) {
+    public DashboardController(DashboardService dashboardService, AuthenticationService authenticationService) {
         this.dashboardService = dashboardService;
+        this.authenticationService = authenticationService;
     }
 
-    @GetMapping
-    public ResponseEntity<DashboardDto> getDashboard() {
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "This feature is not implemented yet");
+    @GetMapping("/tasks")
+    public ResponseEntity<List<TaskDto>> getTasks(JwtAuthenticationToken jwt) {
+        User authenticatedUser = authenticationService.getAuthenticatedUser(jwt);
+
+        return ResponseEntity.ok(dashboardService.getTasks(authenticatedUser));
+    }
+
+    @GetMapping("/presentations")
+    public ResponseEntity<PaginationDto<PublishedPresentationDto>> getPresentations(
+            @RequestParam(required = false, defaultValue = "0") Integer page,
+            @RequestParam(required = false, defaultValue = "50") Integer limit,
+            @RequestParam(required = false, defaultValue = "scheduledAt") String sortBy,
+            @RequestParam(required = false, defaultValue = "asc") String sortOrder
+    ) {
+        Page<ThesisPresentation> presentations = dashboardService.getPresentations(
+                page,
+                limit,
+                sortBy,
+                sortOrder
+        );
+
+        return ResponseEntity.ok(PaginationDto.fromSpringPage(
+                presentations.map(PublishedPresentationDto::fromPresentationEntity)
+        ));
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java b/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
index 6039ff39..addec347 100644
--- a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
@@ -63,7 +63,7 @@ public ResponseEntity<Resource> getThesisFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=thesis_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=thesis_%s.pdf", thesisId))
                 .body(thesisService.getThesisFile(thesis));
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
index 3d7012b5..44a5a5e5 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
@@ -65,6 +65,7 @@ public ResponseEntity<PaginationDto<ThesisDto>> getTheses(
         UUID userId = authenticatedUser.getId();
         Set<ThesisVisibility> visibilities = Set.of(
                 ThesisVisibility.PUBLIC,
+                ThesisVisibility.STUDENT,
                 ThesisVisibility.INTERNAL,
                 ThesisVisibility.PRIVATE
         );
@@ -75,7 +76,10 @@ public ResponseEntity<PaginationDto<ThesisDto>> getTheses(
                 visibilities = null;
             } else if (authenticatedUser.hasAnyGroup("advisor", "supervisor")) {
                 userId = null;
-                visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.INTERNAL);
+                visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.STUDENT, ThesisVisibility.INTERNAL);
+            } else if (authenticatedUser.hasAnyGroup("student")) {
+                userId = null;
+                visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.STUDENT);
             }
         }
 
@@ -213,7 +217,7 @@ public ResponseEntity<Resource> getProposalFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=proposal_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=proposal_%s.pdf", thesisId))
                 .body(thesisService.getProposalFile(thesis));
     }
 
@@ -285,7 +289,7 @@ public ResponseEntity<Resource> getPresentationFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=presentation_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=presentation_%s.pdf", thesisId))
                 .body(thesisService.getPresentationFile(thesis));
     }
 
@@ -321,7 +325,7 @@ public ResponseEntity<Resource> getThesisFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=thesis_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=thesis_%s.pdf", thesisId))
                 .body(thesisService.getThesisFile(thesis));
     }
 
@@ -459,7 +463,7 @@ public ResponseEntity<Resource> getCommentFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=comment_%s.pdf", commentId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=comment_%s.pdf", commentId))
                 .body(thesisCommentService.getCommentFile(comment));
     }
 
diff --git a/server/src/main/java/thesistrack/ls1/controller/TopicController.java b/server/src/main/java/thesistrack/ls1/controller/TopicController.java
index e9426852..181342a6 100644
--- a/server/src/main/java/thesistrack/ls1/controller/TopicController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/TopicController.java
@@ -74,7 +74,7 @@ public ResponseEntity<TopicDto> createTopic(
         Topic topic = topicService.createTopic(
                 authenticatedUser,
                 RequestValidator.validateStringMaxLength(payload.title(), StringLimits.THESIS_TITLE.getLimit()),
-                RequestValidator.validateStringMaxLengthAllowNull(payload.type(), StringLimits.SHORTTEXT.getLimit()),
+                RequestValidator.validateStringSetItemMaxLengthAllowNull(payload.thesisTypes(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.problemStatement(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.goals(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.references(), StringLimits.LONGTEXT.getLimit()),
@@ -99,7 +99,7 @@ public ResponseEntity<TopicDto> updateTopic(
                 authenticatedUser,
                 topic,
                 RequestValidator.validateStringMaxLength(payload.title(), StringLimits.THESIS_TITLE.getLimit()),
-                RequestValidator.validateStringMaxLengthAllowNull(payload.type(), StringLimits.SHORTTEXT.getLimit()),
+                RequestValidator.validateStringSetItemMaxLengthAllowNull(payload.thesisTypes(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.problemStatement(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.goals(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.references(), StringLimits.LONGTEXT.getLimit()),
diff --git a/server/src/main/java/thesistrack/ls1/controller/UserController.java b/server/src/main/java/thesistrack/ls1/controller/UserController.java
index 0c25dd19..264270c0 100644
--- a/server/src/main/java/thesistrack/ls1/controller/UserController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/UserController.java
@@ -58,7 +58,7 @@ public ResponseEntity<Resource> getExaminationReport(@PathVariable UUID userId,
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=examination_report_%s.pdf", userId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=examination_report_%s.pdf", userId))
                 .body(userService.getExaminationReport(user));
     }
 
@@ -73,7 +73,7 @@ public ResponseEntity<Resource> getCV(@PathVariable UUID userId, JwtAuthenticati
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=cv_%s.pdf", userId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=cv_%s.pdf", userId))
                 .body(userService.getCV(user));
     }
 
@@ -88,7 +88,7 @@ public ResponseEntity<Resource> getDegreeReport(@PathVariable UUID userId, JwtAu
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=degree_report_%s.pdf", userId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=degree_report_%s.pdf", userId))
                 .body(userService.getDegreeReport(user));
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java
index 77a27591..08db452d 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java
@@ -6,6 +6,7 @@
 public record CreateApplicationPayload (
         UUID topicId,
         String thesisTitle,
+        String thesisType,
         Instant desiredStartDate,
         String motivation
 ) {
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
index 0b7cdf8c..419b5fc9 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
@@ -20,6 +20,7 @@ public record LegacyCreateApplicationPayload (
         String interests,
         String projects,
         String thesisTitle,
+        String thesisType,
         Instant desiredStartDate
 ) {
 
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
index 9dc436dd..1781d367 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
@@ -5,7 +5,7 @@
 
 public record ReplaceTopicPayload(
         String title,
-        String type,
+        Set<String> thesisTypes,
         String problemStatement,
         String goals,
         String references,
diff --git a/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java b/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java
index 5327929d..d9ad37b1 100644
--- a/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java
@@ -11,6 +11,7 @@ public record ApplicationDto (
     UserDto user,
     TopicDto topic,
     String thesisTitle,
+    String thesisType,
     String motivation,
     ApplicationState state,
     Instant desiredStartDate,
@@ -29,6 +30,7 @@ public static ApplicationDto fromApplicationEntity(Application application, bool
                 UserDto.fromUserEntity(application.getUser()),
                 TopicDto.fromTopicEntity(application.getTopic()),
                 application.getThesisTitle(),
+                application.getThesisType(),
                 application.getMotivation(),
                 application.getState(),
                 application.getDesiredStartDate(), protectedData ? application.getComment() : null,
diff --git a/server/src/main/java/thesistrack/ls1/dto/DashboardDto.java b/server/src/main/java/thesistrack/ls1/dto/DashboardDto.java
deleted file mode 100644
index 0dda73a8..00000000
--- a/server/src/main/java/thesistrack/ls1/dto/DashboardDto.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package thesistrack.ls1.dto;
-
-public record DashboardDto () {
-}
diff --git a/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java b/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
new file mode 100644
index 00000000..88b5517e
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
@@ -0,0 +1,31 @@
+package thesistrack.ls1.dto;
+
+import thesistrack.ls1.constants.ThesisPresentationType;
+import thesistrack.ls1.entity.ThesisPresentation;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public record PublishedPresentationDto (
+        UUID presentationId,
+        ThesisPresentationType type,
+        String location,
+        String streamUrl,
+        Instant scheduledAt,
+        PublishedThesisDto thesis
+) {
+    public static PublishedPresentationDto fromPresentationEntity(ThesisPresentation presentation) {
+        if (presentation == null) {
+            return null;
+        }
+
+        return new PublishedPresentationDto(
+                presentation.getId(),
+                presentation.getType(),
+                presentation.getLocation(),
+                presentation.getStreamUrl(),
+                presentation.getScheduledAt(),
+                PublishedThesisDto.fromThesisEntity(presentation.getThesis())
+        );
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
new file mode 100644
index 00000000..84ad3f52
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
@@ -0,0 +1,10 @@
+package thesistrack.ls1.dto;
+
+import java.time.Instant;
+
+public record TaskDto(
+        String message,
+        Instant startDate,
+        Instant endDate,
+        Number priority
+) { }
diff --git a/server/src/main/java/thesistrack/ls1/dto/TopicDto.java b/server/src/main/java/thesistrack/ls1/dto/TopicDto.java
index 3e3e4d4d..d934eb8e 100644
--- a/server/src/main/java/thesistrack/ls1/dto/TopicDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/TopicDto.java
@@ -7,12 +7,13 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 public record TopicDto (
         UUID topicId,
         String title,
-        String type,
+        Set<String> thesisTypes,
         String problemStatement,
         String goals,
         String references,
@@ -43,7 +44,7 @@ public static TopicDto fromTopicEntity(Topic topic) {
         return new TopicDto(
                 topic.getId(),
                 topic.getTitle(),
-                topic.getType(),
+                topic.getThesisTypes() == null || topic.getThesisTypes().isEmpty() ? null : topic.getThesisTypes(),
                 topic.getProblemStatement(),
                 topic.getGoals(),
                 topic.getReferences(),
diff --git a/server/src/main/java/thesistrack/ls1/entity/Application.java b/server/src/main/java/thesistrack/ls1/entity/Application.java
index 4fc38751..70f2b3f6 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Application.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Application.java
@@ -32,6 +32,9 @@ public class Application {
     @Column(name = "thesis_title")
     private String thesisTitle;
 
+    @Column(name = "thesis_type")
+    private String thesisType;
+
     @NotNull
     @Column(name = "motivation", nullable = false)
     private String motivation;
diff --git a/server/src/main/java/thesistrack/ls1/entity/Thesis.java b/server/src/main/java/thesistrack/ls1/entity/Thesis.java
index 308898c7..669143a3 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Thesis.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Thesis.java
@@ -199,7 +199,7 @@ public boolean hasStudentAccess(User user) {
     }
 
     public boolean hasReadAccess(User user) {
-        if (user == null && visibility == ThesisVisibility.PUBLIC && state == ThesisState.FINISHED) {
+        if (visibility == ThesisVisibility.PUBLIC && state == ThesisState.FINISHED) {
             return true;
         }
 
@@ -219,6 +219,10 @@ public boolean hasReadAccess(User user) {
             return true;
         }
 
+        if (visibility.equals(ThesisVisibility.STUDENT) && user.hasAnyGroup("student", "advisor", "supervisor")) {
+            return true;
+        }
+
         return false;
     }
 }
\ No newline at end of file
diff --git a/server/src/main/java/thesistrack/ls1/entity/Topic.java b/server/src/main/java/thesistrack/ls1/entity/Topic.java
index 974a7f3d..965eb1c3 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Topic.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Topic.java
@@ -5,7 +5,9 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.type.SqlTypes;
 
 import java.time.Instant;
 import java.util.HashSet;
@@ -26,8 +28,9 @@ public class Topic {
     @Column(name = "title", nullable = false)
     private String title;
 
-    @Column(name = "type")
-    private String type;
+    @JdbcTypeCode(SqlTypes.ARRAY)
+    @Column(name = "thesis_types", columnDefinition = "text[]")
+    private Set<String> thesisTypes = new HashSet<>();
 
     @NotNull
     @Column(name = "problem_statement", nullable = false)
diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java b/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
index e792167e..23c8fa8e 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
@@ -1,12 +1,18 @@
 package thesistrack.ls1.repository;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import thesistrack.ls1.entity.ThesisPresentation;
 
+import java.time.Instant;
 import java.util.UUID;
 
 @Repository
 public interface ThesisPresentationRepository extends JpaRepository<ThesisPresentation, UUID> {
-
+    @Query("SELECT p FROM ThesisPresentation p WHERE p.scheduledAt >= :time")
+    Page<ThesisPresentation> findFuturePresentations(@Param("time") Instant time, Pageable page);
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
index 437ee277..da023425 100644
--- a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
@@ -120,6 +120,7 @@ public Application createLegacyApplication(
         application.setUser(userRepository.save(student));
 
         application.setThesisTitle(RequestValidator.validateStringMaxLength(payload.thesisTitle(), 500));
+        application.setThesisType(RequestValidator.validateStringMaxLength(payload.thesisType(), 500));
         application.setMotivation(RequestValidator.validateStringMaxLength(payload.motivation(), 1000));
         application.setComment("");
         application.setState(ApplicationState.NOT_ASSESSED);
@@ -134,12 +135,13 @@ public Application createLegacyApplication(
     }
 
     @Transactional
-    public Application createApplication(User user, UUID topicId, String thesisTitle, Instant desiredStartDate, String motivation) {
+    public Application createApplication(User user, UUID topicId, String thesisTitle, String thesisType, Instant desiredStartDate, String motivation) {
         Application application = new Application();
         application.setUser(user);
 
         application.setTopic(topicId == null ? null : topicService.findById(topicId));
         application.setThesisTitle(thesisTitle);
+        application.setThesisType(thesisType);
         application.setMotivation(motivation);
         application.setComment("");
         application.setState(ApplicationState.NOT_ASSESSED);
diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
index 90a35fac..dc31a542 100644
--- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java
+++ b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -1,7 +1,51 @@
 package thesistrack.ls1.service;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import thesistrack.ls1.dto.TaskDto;
+import thesistrack.ls1.entity.ThesisPresentation;
+import thesistrack.ls1.entity.User;
+import thesistrack.ls1.repository.ThesisPresentationRepository;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class DashboardService {
+    private final ThesisPresentationRepository thesisPresentationRepository;
+
+    public DashboardService(ThesisPresentationRepository thesisPresentationRepository) {
+        this.thesisPresentationRepository = thesisPresentationRepository;
+    }
+
+    public Page<ThesisPresentation> getPresentations(Integer page, Integer limit, String sortBy, String sortOrder) {
+        Sort.Order order = new Sort.Order(sortOrder.equals("asc") ? Sort.Direction.ASC : Sort.Direction.DESC, sortBy);
+
+        return thesisPresentationRepository.findFuturePresentations(Instant.now(), PageRequest.of(page, limit, Sort.by(order)));
+    }
+
+    public List<TaskDto> getTasks(User user) {
+        List<TaskDto> tasks = new ArrayList<>();
+
+        // proposal task
+
+        // thesis submission task
+
+        // presentation tasks
+
+        // thesis assessment task
+
+        // grade thesis task
+
+        // close thesis task
+
+        // review application task
+
+        // no open topic task
+
+        return tasks;
+    }
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/MailingService.java b/server/src/main/java/thesistrack/ls1/service/MailingService.java
index 07876b37..8f32acb7 100644
--- a/server/src/main/java/thesistrack/ls1/service/MailingService.java
+++ b/server/src/main/java/thesistrack/ls1/service/MailingService.java
@@ -107,6 +107,7 @@ public void sendProposalAcceptedEmail(ThesisProposal proposal) {
                 .addPrimarySender(proposal.getApprovedBy())
                 .sendToThesisStudents(proposal.getThesis())
                 .fillThesisPlaceholders(proposal.getThesis())
+                .fillThesisProposalPlaceholders(proposal)
                 .send(javaMailSender, uploadService);
     }
 
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
index 92e1ea77..4ff4f5cb 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
@@ -91,7 +91,7 @@ public Thesis createThesis(
 
         thesis.setTitle(thesisTitle);
         thesis.setType(thesisType);
-        thesis.setVisibility(ThesisVisibility.PRIVATE);
+        thesis.setVisibility(ThesisVisibility.INTERNAL);
         thesis.setKeywords(new HashSet<>());
         thesis.setInfo("");
         thesis.setAbstractField("");
diff --git a/server/src/main/java/thesistrack/ls1/service/TopicService.java b/server/src/main/java/thesistrack/ls1/service/TopicService.java
index b545da7f..6346cfb4 100644
--- a/server/src/main/java/thesistrack/ls1/service/TopicService.java
+++ b/server/src/main/java/thesistrack/ls1/service/TopicService.java
@@ -54,7 +54,7 @@ public Page<Topic> getAll(
     public Topic createTopic(
             User creator,
             String title,
-            String type,
+            Set<String> thesisTypes,
             String problemStatement,
             String goals,
             String references,
@@ -64,7 +64,7 @@ public Topic createTopic(
         Topic topic = new Topic();
 
         topic.setTitle(title);
-        topic.setType(type);
+        topic.setThesisTypes(thesisTypes);
         topic.setProblemStatement(problemStatement);
         topic.setGoals(goals);
         topic.setReferences(references);
@@ -84,7 +84,7 @@ public Topic updateTopic(
             User updater,
             Topic topic,
             String title,
-            String type,
+            Set<String> thesisTypes,
             String problemStatement,
             String goals,
             String references,
@@ -92,7 +92,7 @@ public Topic updateTopic(
             Set<UUID> advisorIds
     ) {
         topic.setTitle(title);
-        topic.setType(type);
+        topic.setThesisTypes(thesisTypes);
         topic.setProblemStatement(problemStatement);
         topic.setGoals(goals);
         topic.setReferences(references);
diff --git a/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java b/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java
index e5a18d6a..514ab3b6 100644
--- a/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java
+++ b/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java
@@ -27,6 +27,28 @@ public static String validateStringMaxLengthAllowNull(String value, int maxLengt
         return validateStringMaxLength(value, maxLength);
     }
 
+    public static Set<String> validateStringSetItemMaxLength(Set<String> value, int maxLength) {
+        if (value == null) {
+            throw new ResourceInvalidParametersException("Required set is null");
+        }
+
+        for (String s : value) {
+            if (s.length() > maxLength) {
+                throw new ResourceInvalidParametersException("String exceeds maximum length of " + maxLength + " characters");
+            }
+        }
+
+        return value;
+    }
+
+    public static Set<String> validateStringSetItemMaxLengthAllowNull(Set<String> value, int maxLength) {
+        if (value == null) {
+            return null;
+        }
+
+        return validateStringSetItemMaxLength(value, maxLength);
+    }
+
     public static String validateEmail(String value) {
         if (value == null || value.length() > 200) {
             throw new ResourceInvalidParametersException("Required email is missing");
diff --git a/server/src/main/resources/db/changelog/changes/06_topics.sql b/server/src/main/resources/db/changelog/changes/06_topics.sql
index bd595b45..6119a1b4 100644
--- a/server/src/main/resources/db/changelog/changes/06_topics.sql
+++ b/server/src/main/resources/db/changelog/changes/06_topics.sql
@@ -31,3 +31,8 @@ UPDATE applications SET comment = '' WHERE comment IS NULL;
 ALTER TABLE applications
     ALTER COLUMN comment SET DEFAULT '',
     ALTER COLUMN comment SET NOT NULL;
+
+--changeset emilius:06-topics-6
+ALTER TABLE topics ADD COLUMN thesis_types TEXT[];
+ALTER TABLE topics DROP COLUMN "type";
+ALTER TABLE applications ADD COLUMN thesis_type TEXT;

From d6099573d7374a16a24d9cb296783b9b38f94c22 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Wed, 28 Aug 2024 17:32:53 +0200
Subject: [PATCH 03/13] Implement keycloak assign roles

---
 .../AuthenticatedArea/AuthenticatedArea.tsx   |   4 +-
 .../components/ThesesTable/ThesesTable.tsx    |   2 +-
 client/src/config/global.ts                   |   2 -
 client/src/config/types.ts                    |   1 -
 .../AuthenticationProvider.tsx                |   4 +-
 .../CreateThesisModal/CreateThesisModal.tsx   |   2 +-
 server/build.gradle                           |   1 +
 .../ls1/controller/ThesisController.java      |   7 +-
 .../ls1/entity/ThesisPresentation.java        |   3 +
 .../ls1/exception/CalendarException.java      |   9 +
 .../ls1/security/JwtAuthConfig.java           |   3 -
 .../ls1/security/JwtAuthConverter.java        |   3 +-
 .../ls1/service/AccessManagementService.java  | 185 ++++++++++++++++++
 .../ls1/service/CalendarService.java          |  19 ++
 .../ls1/service/ThesisService.java            |  58 +++++-
 server/src/main/resources/application.yml     |  22 ++-
 .../changes/05_thesis_presentations.sql       |   5 +-
 17 files changed, 302 insertions(+), 28 deletions(-)
 create mode 100644 server/src/main/java/thesistrack/ls1/exception/CalendarException.java
 create mode 100644 server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
 create mode 100644 server/src/main/java/thesistrack/ls1/service/CalendarService.java

diff --git a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
index 309e6474..e859884a 100644
--- a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
+++ b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
@@ -68,9 +68,9 @@ const links: Array<{
   },
   {
     link: '/theses',
-    label: 'Theses Overview',
+    label: 'Theses',
     icon: Kanban,
-    groups: ['admin', 'advisor', 'supervisor'],
+    groups: ['admin', 'student', 'advisor', 'supervisor'],
   },
 ]
 
diff --git a/client/src/components/ThesesTable/ThesesTable.tsx b/client/src/components/ThesesTable/ThesesTable.tsx
index 9aeeb829..6591d25b 100644
--- a/client/src/components/ThesesTable/ThesesTable.tsx
+++ b/client/src/components/ThesesTable/ThesesTable.tsx
@@ -43,7 +43,7 @@ const ThesesTable = (props: IThesesTableProps) => {
       accessor: 'state',
       title: 'State',
       textAlign: 'center',
-      width: 100,
+      width: 120,
       render: (thesis: IThesis) => {
         return (
           <Center>
diff --git a/client/src/config/global.ts b/client/src/config/global.ts
index de407d51..1c0824c3 100644
--- a/client/src/config/global.ts
+++ b/client/src/config/global.ts
@@ -52,7 +52,5 @@ export const GLOBAL_CONFIG: IGlobalConfig = {
     host: getEnvironmentVariable('KEYCLOAK_HOST') || 'http://localhost:8081',
     realm: getEnvironmentVariable('KEYCLOAK_REALM_NAME') || 'thesis-track',
     client_id: getEnvironmentVariable('KEYCLOAK_CLIENT_ID') || 'thesis-track-app',
-    university_id_jwt_attribute:
-      getEnvironmentVariable('UNIVERSITY_ID_JWT_ATTRIBUTE') || 'preferred_username',
   },
 }
diff --git a/client/src/config/types.ts b/client/src/config/types.ts
index 6be30755..4615277f 100644
--- a/client/src/config/types.ts
+++ b/client/src/config/types.ts
@@ -14,6 +14,5 @@ export interface IGlobalConfig {
     client_id: string
     realm: string
     host: string
-    university_id_jwt_attribute: string
   }
 }
diff --git a/client/src/contexts/AuthenticationContext/AuthenticationProvider.tsx b/client/src/contexts/AuthenticationContext/AuthenticationProvider.tsx
index 0192d76d..559bde88 100644
--- a/client/src/contexts/AuthenticationContext/AuthenticationProvider.tsx
+++ b/client/src/contexts/AuthenticationContext/AuthenticationProvider.tsx
@@ -138,9 +138,7 @@ const AuthenticationProvider = (props: PropsWithChildren) => {
     if (authenticationTokens?.access_token) {
       const decodedAccessToken = jwtDecode<IDecodedAccessToken>(authenticationTokens.access_token)
 
-      setUniversityId(
-        decodedAccessToken[GLOBAL_CONFIG.keycloak.university_id_jwt_attribute] || undefined,
-      )
+      setUniversityId(decodedAccessToken['preferred_username'] || undefined)
     } else {
       setUniversityId(undefined)
     }
diff --git a/client/src/pages/ThesisOverviewPage/components/CreateThesisModal/CreateThesisModal.tsx b/client/src/pages/ThesisOverviewPage/components/CreateThesisModal/CreateThesisModal.tsx
index 556c4bba..e0a0fe9d 100644
--- a/client/src/pages/ThesisOverviewPage/components/CreateThesisModal/CreateThesisModal.tsx
+++ b/client/src/pages/ThesisOverviewPage/components/CreateThesisModal/CreateThesisModal.tsx
@@ -112,7 +112,7 @@ const CreateThesisModal = (props: ICreateThesisModalProps) => {
             maxValues={1}
             {...form.getInputProps('supervisors')}
           />
-          <Button type='submit' loading={loading}>
+          <Button type='submit' loading={loading} disabled={!form.isValid()}>
             Create Thesis
           </Button>
         </Stack>
diff --git a/server/build.gradle b/server/build.gradle
index 0591cab8..683be6d0 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -24,6 +24,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	implementation 'org.postgresql:postgresql'
 	implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:8.0.1'
 
diff --git a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
index 44a5a5e5..56c3e90b 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
@@ -71,15 +71,16 @@ public ResponseEntity<PaginationDto<ThesisDto>> getTheses(
         );
 
         if (fetchAll) {
+            userId = null;
+
             if (authenticatedUser.hasAnyGroup("admin")) {
-                userId = null;
                 visibilities = null;
             } else if (authenticatedUser.hasAnyGroup("advisor", "supervisor")) {
-                userId = null;
                 visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.STUDENT, ThesisVisibility.INTERNAL);
             } else if (authenticatedUser.hasAnyGroup("student")) {
-                userId = null;
                 visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.STUDENT);
+            } else {
+                visibilities = Set.of(ThesisVisibility.PUBLIC);
             }
         }
 
diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java b/server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java
index c7abeca9..daed3cb9 100644
--- a/server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java
+++ b/server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java
@@ -42,6 +42,9 @@ public class ThesisPresentation {
     @Column(name = "stream_url")
     private String streamUrl;
 
+    @Column(name = "calendar_event")
+    private String calendarEvent;
+
     @NotNull
     @Column(name = "scheduled_at", nullable = false)
     private Instant scheduledAt;
diff --git a/server/src/main/java/thesistrack/ls1/exception/CalendarException.java b/server/src/main/java/thesistrack/ls1/exception/CalendarException.java
new file mode 100644
index 00000000..f371b8a0
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/exception/CalendarException.java
@@ -0,0 +1,9 @@
+package thesistrack.ls1.exception;
+
+public class CalendarException extends RuntimeException {
+    public CalendarException(String message) {
+        super(message);
+    }
+
+    public CalendarException(String message, Throwable cause) { super(message, cause); }
+}
diff --git a/server/src/main/java/thesistrack/ls1/security/JwtAuthConfig.java b/server/src/main/java/thesistrack/ls1/security/JwtAuthConfig.java
index b5499976..c682d0d8 100644
--- a/server/src/main/java/thesistrack/ls1/security/JwtAuthConfig.java
+++ b/server/src/main/java/thesistrack/ls1/security/JwtAuthConfig.java
@@ -13,7 +13,4 @@
 public class JwtAuthConfig {
     @NotBlank
     private String clientId;
-
-    @NotBlank
-    private String universityIdJwtAttribute;
 }
\ No newline at end of file
diff --git a/server/src/main/java/thesistrack/ls1/security/JwtAuthConverter.java b/server/src/main/java/thesistrack/ls1/security/JwtAuthConverter.java
index 2b90e0ff..3a248867 100644
--- a/server/src/main/java/thesistrack/ls1/security/JwtAuthConverter.java
+++ b/server/src/main/java/thesistrack/ls1/security/JwtAuthConverter.java
@@ -31,8 +31,7 @@ public AbstractAuthenticationToken convert(Jwt jwt) {
                 jwtGrantedAuthoritiesConverter.convert(jwt).stream(),
                 extractResourceRoles(jwt).stream()).collect(Collectors.toSet());
 
-        // Using the universityId as JWT's name attribute
-        return new JwtAuthenticationToken(jwt, authorities, jwt.getClaim(config.getUniversityIdJwtAttribute()));
+        return new JwtAuthenticationToken(jwt, authorities, jwt.getClaim("preferred_username"));
     }
 
     private Collection<? extends GrantedAuthority> extractResourceRoles(Jwt jwt) {
diff --git a/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java b/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
new file mode 100644
index 00000000..0c62a9e6
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
@@ -0,0 +1,185 @@
+package thesistrack.ls1.service;
+
+import io.netty.handler.logging.LogLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.client.reactive.ClientHttpConnector;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.netty.http.client.HttpClient;
+import reactor.netty.transport.logging.AdvancedByteBufFormat;
+import thesistrack.ls1.entity.User;
+
+import org.springframework.http.HttpHeaders;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class AccessManagementService {
+    private static final Logger logger = LoggerFactory.getLogger(AccessManagementService.class);
+    private final WebClient webClient;
+
+    private final String keycloakRealmName;
+    private final String serviceClientId;
+    private final String serviceClientSecret;
+    private final UUID studentGroupId;
+
+    private String accessToken;
+    private Instant tokenExpiration;
+
+    @Autowired
+    public AccessManagementService(
+            @Value("${thesis-track.keycloak.host}") String keycloakHost,
+            @Value("${thesis-track.keycloak.realm-name}") String keycloakRealmName,
+            @Value("${thesis-track.keycloak.service-client.id}") String serviceClientId,
+            @Value("${thesis-track.keycloak.service-client.secret}") String serviceClientSecret,
+            @Value("${thesis-track.keycloak.service-client.student-group-name}") String studentGroupName
+    ) {
+        this.keycloakRealmName = keycloakRealmName;
+        this.serviceClientId = serviceClientId;
+        this.serviceClientSecret = serviceClientSecret;
+
+        this.webClient = WebClient.builder()
+                .baseUrl(keycloakHost)
+                .build();
+
+        UUID studentGroupId = null;
+        try {
+            studentGroupId = studentGroupName.isBlank() ? null : getGroupId(studentGroupName);
+        } catch (RuntimeException exception) {
+            logger.warn("Could not fetch group id from configured student group", exception);
+        }
+        this.studentGroupId = studentGroupId;
+    }
+
+    public void addStudentGroup(User user) {
+        if (studentGroupId == null) {
+            return;
+        }
+
+        try {
+            assignKeycloakGroup(getUserId(user.getUniversityId()), studentGroupId);
+        } catch (RuntimeException exception) {
+            logger.warn("Could not assign keycloak group to user", exception);
+        }
+    }
+
+    public void removeStudentGroup(User user) {
+        if (studentGroupId == null) {
+            return;
+        }
+
+        try {
+            removeKeycloakGroup(getUserId(user.getUniversityId()), studentGroupId);
+        } catch (RuntimeException exception) {
+            logger.warn("Could not remove keycloak group from user", exception);
+        }
+    }
+
+    private void assignKeycloakGroup(UUID userId, UUID groupId) {
+        if (userId == null || groupId == null) {
+            throw new RuntimeException("User id or group id is null");
+        }
+
+        webClient.put()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/admin/realms/" + keycloakRealmName + "/users/" + userId +"/groups/" + groupId)
+                        .build())
+                .headers(headers -> headers.addAll(getAuthenticationHeaders()))
+                .retrieve()
+                .bodyToMono(Void.class)
+                .block();
+    }
+
+    private void removeKeycloakGroup(UUID userId, UUID groupId) {
+        if (userId == null || groupId == null) {
+            throw new RuntimeException("User id or group id is null");
+        }
+
+        webClient.delete()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/admin/realms/" + keycloakRealmName + "/users/" + userId +"/groups/" + groupId)
+                        .build())
+                .headers(headers -> headers.addAll(getAuthenticationHeaders()))
+                .retrieve()
+                .bodyToMono(Void.class)
+                .block();
+    }
+
+    private record TokensResponse(String access_token) { }
+
+    private HttpHeaders getAuthenticationHeaders() {
+        if (tokenExpiration == null || Instant.now().isAfter(tokenExpiration)) {
+            Object accessTokenResult = webClient.post()
+                    .uri("/realms/" + keycloakRealmName + "/protocol/openid-connect/token")
+                    .body(
+                            BodyInserters.fromFormData("grant_type", "client_credentials")
+                                    .with("client_id", serviceClientId)
+                                    .with("client_secret", serviceClientSecret)
+                    )
+                    .retrieve()
+                    .bodyToMono(TokensResponse.class)
+                    .block()
+                    .access_token();
+
+            if (accessTokenResult == null) {
+                throw new RuntimeException("Access token not returned");
+            }
+
+            accessToken = accessTokenResult.toString();
+            tokenExpiration = Instant.now().plus(30, ChronoUnit.SECONDS);
+        }
+
+        HttpHeaders authenticationHeaders = new HttpHeaders();
+        authenticationHeaders.set("Authorization", "Bearer " + accessToken);
+
+        return authenticationHeaders;
+    }
+
+    private record GroupElement(UUID id, String name) {}
+
+    private UUID getGroupId(String groupName) {
+        List<GroupElement> groups = webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/admin/realms/" + keycloakRealmName + "/groups")
+                        .build())
+                .headers(headers -> headers.addAll(getAuthenticationHeaders()))
+                .retrieve()
+                .bodyToFlux(GroupElement.class)
+                .collectList()
+                .block();
+
+        return groups.stream()
+                .filter(group -> group.name().equals(groupName))
+                .findFirst()
+                .map(GroupElement::id)
+                .orElseThrow(() -> new RuntimeException("Group not found: " + groupName));
+    }
+
+    private record UserElement(UUID id) {}
+
+    private UUID getUserId(String username) {
+        List<UserElement> users = webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/admin/realms/" + keycloakRealmName + "/users")
+                        .queryParam("username", username)
+                        .build())
+                .headers(headers -> headers.addAll(getAuthenticationHeaders()))
+                .retrieve()
+                .bodyToFlux(UserElement.class)
+                .collectList()
+                .block();
+
+        return users.stream()
+                .findFirst()
+                .map(UserElement::id)
+                .orElseThrow(() -> new RuntimeException("User not found: " + username));
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/service/CalendarService.java b/server/src/main/java/thesistrack/ls1/service/CalendarService.java
new file mode 100644
index 00000000..329b6f58
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/service/CalendarService.java
@@ -0,0 +1,19 @@
+package thesistrack.ls1.service;
+
+import org.springframework.stereotype.Service;
+
+import java.time.Instant;
+import java.util.UUID;
+
+@Service
+public class CalendarService {
+    public String createEvent(String title, String location, String description, Instant startDate, Number length) {
+        return null;
+    }
+
+    public void deleteEvent(String eventId) {
+        if (eventId == null) {
+            return;
+        }
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
index 4ff4f5cb..f3b15b5b 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
@@ -31,6 +31,8 @@ public class ThesisService {
     private final ThesisAssessmentRepository thesisAssessmentRepository;
     private final ThesisPresentationRepository thesisPresentationRepository;
     private final MailingService mailingService;
+    private final AccessManagementService accessManagementService;
+    private final CalendarService calendarService;
 
     @Autowired
     public ThesisService(
@@ -41,7 +43,7 @@ public ThesisService(
             ThesisProposalRepository thesisProposalRepository,
             ThesisAssessmentRepository thesisAssessmentRepository,
             UploadService uploadService,
-            ThesisPresentationRepository thesisPresentationRepository, MailingService mailingService) {
+            ThesisPresentationRepository thesisPresentationRepository, MailingService mailingService, AccessManagementService accessManagementService, CalendarService calendarService) {
         this.thesisRoleRepository = thesisRoleRepository;
         this.thesisRepository = thesisRepository;
         this.thesisStateChangeRepository = thesisStateChangeRepository;
@@ -51,6 +53,8 @@ public ThesisService(
         this.thesisAssessmentRepository = thesisAssessmentRepository;
         this.thesisPresentationRepository = thesisPresentationRepository;
         this.mailingService = mailingService;
+        this.accessManagementService = accessManagementService;
+        this.calendarService = calendarService;
     }
 
     public Page<Thesis> getAll(
@@ -106,6 +110,10 @@ public Thesis createThesis(
 
         mailingService.sendThesisCreatedEmail(creator, thesis);
 
+        for (User student : thesis.getStudents()) {
+            accessManagementService.addStudentGroup(student);
+        }
+
         return thesis;
     }
 
@@ -122,6 +130,12 @@ public Thesis closeThesis(User closingUser, Thesis thesis) {
 
         mailingService.sendThesisClosedEmail(closingUser, thesis);
 
+        for (User student : thesis.getStudents()) {
+            if (!existsPendingThesis(student)) {
+                accessManagementService.removeStudentGroup(student);
+            }
+        }
+
         return thesis;
     }
 
@@ -299,6 +313,15 @@ public Thesis createPresentation(
         presentation.setVisibility(visibility);
         presentation.setLocation(location);
         presentation.setStreamUrl(streamUrl);
+        presentation.setCalendarEvent(calendarService.createEvent(
+                "Thesis Presentation \"" + thesis.getTitle() + "\"",
+                location == null || location.isBlank() ? streamUrl : location,
+                "Title: " + thesis.getTitle() + "\n" +
+                        (streamUrl != null && !streamUrl.isBlank() ? "Stream URL: " + streamUrl + "\n" : "") + "\n" +
+                        "Abstract:\n\n" + thesis.getAbstractField(),
+                date,
+                3600
+        ));
         presentation.setScheduledAt(date);
         presentation.setCreatedBy(creatingUser);
         presentation.setCreatedAt(Instant.now());
@@ -329,9 +352,12 @@ public Thesis deletePresentation(User deletingUser, ThesisPresentation presentat
 
         thesis.setPresentations(presentations);
 
+        thesis = thesisRepository.save(thesis);
+
+        calendarService.deleteEvent(presentation.getCalendarEvent());
         mailingService.sendPresentationDeletedEmail(deletingUser, presentation);
 
-        return thesisRepository.save(thesis);
+        return thesis;
     }
 
     /* ASSESSMENT */
@@ -390,11 +416,37 @@ public Thesis completeThesis(Thesis thesis) {
 
         saveStateChange(thesis, ThesisState.FINISHED, Instant.now());
 
-        return thesisRepository.save(thesis);
+        thesis = thesisRepository.save(thesis);
+
+        for (User student : thesis.getStudents()) {
+            if (!existsPendingThesis(student)) {
+                accessManagementService.removeStudentGroup(student);
+            }
+        }
+
+        return thesis;
     }
 
     /* UTILITY */
 
+    private boolean existsPendingThesis(User user) {
+        Page<Thesis> theses = thesisRepository.searchTheses(
+                user.getId(),
+                null,
+                null,
+                Set.of(
+                        ThesisState.PROPOSAL,
+                        ThesisState.WRITING,
+                        ThesisState.SUBMITTED,
+                        ThesisState.ASSESSED,
+                        ThesisState.GRADED
+                ),
+                PageRequest.ofSize(1)
+        );
+
+        return theses.getTotalElements() > 0;
+    }
+
     public Thesis findById(UUID thesisId) {
         return thesisRepository.findById(thesisId)
                 .orElseThrow(() -> new ResourceNotFoundException(String.format("Thesis with id %s not found.", thesisId)));
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index f70bbe50..df688cef 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -32,7 +32,7 @@ spring:
         provider:
           keycloak:
             issuer-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-track}
-            user-name-attribute: ${UNIVERSITY_ID_JWT_ATTRIBUTE:preferred_username}
+            user-name-attribute: preferred_username
       resourceserver:
         jwt:
           jwk-set-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-track}/protocol/openid-connect/certs
@@ -50,10 +50,24 @@ spring:
           starttls:
             enable: true
 
+server:
+  servlet:
+    context-path: /api
+
 thesis-track:
   keycloak:
+    host: ${KEYCLOAK_HOST:http://localhost:8081}
+    realm-name: ${KEYCLOAK_REALM_NAME:thesis-track}
     client-id: ${KEYCLOAK_CLIENT_ID:thesis-track-app}
-    university-id-jwt-attribute: ${UNIVERSITY_ID_JWT_ATTRIBUTE:preferred_username}
+    service-client:
+      id: ${KEYCLOAK_SERVICE_CLIENT_ID:service-client}
+      secret: ${KEYCLOAK_SERVICE_CLIENT_SECRET:}
+      student-group-name: ${KEYCLOAK_SERVICE_ACCOUNT_STUDENT_GROUP_ID:thesis-students}
+  calendar:
+    enabled: ${CALDAV_ENABLED:false}
+    host: ${CALDAV_HOST:}
+    username: ${CALDAV_USERNAME:}
+    password: ${CALDAV_PASSWORD:}
   client:
     host: ${CLIENT_HOST:http://localhost:3000}
   mail:
@@ -65,7 +79,3 @@ thesis-track:
     mail-template-location: ${MAIL_TEMPLATE_FOLDER:server/mail-templates}
   storage:
     upload-location: ${UPLOAD_FOLDER:uploads}
-
-server:
-  servlet:
-    context-path: /api
diff --git a/server/src/main/resources/db/changelog/changes/05_thesis_presentations.sql b/server/src/main/resources/db/changelog/changes/05_thesis_presentations.sql
index db990ce7..04dd9446 100644
--- a/server/src/main/resources/db/changelog/changes/05_thesis_presentations.sql
+++ b/server/src/main/resources/db/changelog/changes/05_thesis_presentations.sql
@@ -1,4 +1,7 @@
 --liquibase formatted sql
 
 --changeset emilius:05-thesis-presentations-1
-ALTER TABLE thesis_presentations ADD visibility TEXT NOT NULL DEFAULT 'PRIVATE';
\ No newline at end of file
+ALTER TABLE thesis_presentations ADD visibility TEXT NOT NULL DEFAULT 'PRIVATE';
+
+--changeset emilius:05-thesis-presentations-2
+ALTER TABLE thesis_presentations ADD calendar_event TEXT;

From dae4dcd47db4369be99d3b6fbc18b2383c1185eb Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Thu, 29 Aug 2024 01:08:30 +0200
Subject: [PATCH 04/13] Implement presentation schedule service

---
 .../CreatePresentationModal.tsx               |   2 +-
 docker-compose.yml                            |   6 +
 docs/CONFIGURATION.md                         |  62 ++++---
 server/build.gradle                           |   3 +
 .../ls1/service/AccessManagementService.java  |  14 +-
 .../ls1/service/CalendarService.java          | 166 +++++++++++++++++-
 .../ls1/service/ThesisService.java            |  51 ++++--
 .../thesistrack/ls1/utility/MailBuilder.java  |   7 +-
 server/src/main/resources/application.yml     |   7 +-
 server/src/main/resources/ical4j.properties   |   3 +
 10 files changed, 266 insertions(+), 55 deletions(-)
 create mode 100644 server/src/main/resources/ical4j.properties

diff --git a/client/src/pages/ThesisPage/components/ThesisWritingSection/components/CreatePresentationModal/CreatePresentationModal.tsx b/client/src/pages/ThesisPage/components/ThesisWritingSection/components/CreatePresentationModal/CreatePresentationModal.tsx
index ef62933e..fe59a0b1 100644
--- a/client/src/pages/ThesisPage/components/ThesisWritingSection/components/CreatePresentationModal/CreatePresentationModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisWritingSection/components/CreatePresentationModal/CreatePresentationModal.tsx
@@ -122,7 +122,7 @@ const CreatePresentationModal = (props: ICreatePresentationModalProps) => {
             <Button
               type='submit'
               onClick={onCreatePresentation}
-              disabled={!form.isValid}
+              disabled={!form.isValid()}
               loading={creating}
             >
               Schedule Presentation
diff --git a/docker-compose.yml b/docker-compose.yml
index ea9f2ecc..543c8bf1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,6 +53,12 @@ services:
     ports:
       - "25:25"
 
+  caldav:
+    image: tomsquest/docker-radicale:latest
+    container_name: thesis-track-caldav
+    ports:
+      - "5232:5232"
+
   keycloak:
     image: quay.io/keycloak/keycloak:25.0
     container_name: thesis-track-keycloak
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index f55ddc92..be76cbcc 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -2,31 +2,37 @@
 
 ## Environment variables
 
-| Variable Name               | Services       | Default Value                                                                                                                                                                                         | Description                                                                                                |
-|-----------------------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------|
-| SPRING_DATASOURCE_URL       | server         | jdbc:postgresql://localhost:5432/thesis-track                                                                                                                                                         | Postgres connection url                                                                                    |
-| SPRING_DATASOURCE_USERNAME  | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres username                                                                                          |
-| SPRING_DATASOURCE_PASSWORD  | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres password                                                                                          |
-| KEYCLOAK_HOST               | server, client | http://localhost:8081                                                                                                                                                                                 | Keycloak hostname                                                                                          |
-| KEYCLOAK_REALM_NAME         | server, client | thesis-track                                                                                                                                                                                          | Keycloak realm name                                                                                        |
-| KEYCLOAK_CLIENT_ID          | server, client | thesis-track-app                                                                                                                                                                                      | Keycloak client id                                                                                         |
-| UNIVERSITY_ID_JWT_ATTRIBUTE | server, client | preferred_username                                                                                                                                                                                    | Attribute name in keycloak JWT that represents university id. Each user is identified by its university id |
-| POSTFIX_HOST                | server         | localhost                                                                                                                                                                                             | Postfix host to send emails. Only required if emails are enabled.                                          |
-| POSTFIX_PORT                | server         | 25                                                                                                                                                                                                    | Postfix port                                                                                               |
-| POSTFIX_USERNAME            | server         |                                                                                                                                                                                                       | Postfix username                                                                                           |
-| POSTFIX_PASSWORD            | server         |                                                                                                                                                                                                       | Postfix password                                                                                           |
-| CLIENT_HOST                 | server, client | http://localhost:3000                                                                                                                                                                                 | Hosting url of client                                                                                      |
-| SERVER_HOST                 | client         | http://localhost:8080                                                                                                                                                                                 | Hosting url of server                                                                                      |
-| MAIL_ENABLED                | server         | false                                                                                                                                                                                                 | If set to true, the application will try to send emails via Postfix                                        |
-| MAIL_SENDER                 | server         | test@ios.ase.cit.tum.de                                                                                                                                                                               | Sender email address                                                                                       |
-| MAIL_SIGNATURE              | server         |                                                                                                                                                                                                       | Signature of the chair's supervisor / of the chair in general                                              |
-| MAIL_WORKSPACE_URL          | server         | https://slack.com                                                                                                                                                                                     | URL to the workspace where students can connect with advisors and supervisors                              |
-| MAIL_BCC_RECIPIENTS         | server         |                                                                                                                                                                                                       | Default BCC recipients for important emails                                                                |
-| MAIL_TEMPLATE_FOLDER        | server         | /default-mail-templates                                                                                                                                                                               | Folder where mail templates are stored. If not set, it will use the default emails of the repository       |
-| UPLOAD_FOLDER               | server         | uploads                                                                                                                                                                                               | Folder where uploaded files will be stored                                                                 |
-| APPLICATION_TITLE           | client         | Thesis Track                                                                                                                                                                                          | HTML title of the client                                                                                   |
-| GENDERS                     | client         | `{"MALE":"Male","FEMALE":"Female","OTHER":"Other","PREFER_NOT_TO_SAY":"Prefer not to say"}`                                                                                                           | Available genders that a user can configure                                                                |
-| STUDY_DEGREES               | client         | `{"BACHELOR":"Bachelor","MASTER":"Master"}`                                                                                                                                                           | Available study degrees                                                                                    |
-| STUDY_PROGRAMS              | client         | `{"COMPUTER_SCIENCE":"Computer Science","INFORMATION_SYSTEMS":"Information Systems","GAMES_ENGINEERING":"Games Engineering","MANAGEMENT_AND_TECHNOLOGY":"Management and Technology","OTHER":"Other"}` | Available study programs                                                                                   |
-| THESIS_TYPES                | client         | `{"BACHELOR":"Bachelor Thesis","MASTER":"Master Thesis","INTERDISCIPLINARY_PROJECT":"Interdisciplinary Project","GUIDED_RESEARCH":"Guided Research"}`                                                 | Available thesis types                                                                                     |
-| DEFAULT_SUPERVISOR_UUID     | client         |                                                                                                                                                                                                       | The user UUID from the database if a default supervisor should be selected when creating topics or theses  |
\ No newline at end of file
+| Variable Name                             | Services       | Default Value                                                                                                                                                                                         | Description                                                                                               |
+|-------------------------------------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
+| SPRING_DATASOURCE_URL                     | server         | jdbc:postgresql://localhost:5432/thesis-track                                                                                                                                                         | Postgres connection url                                                                                   |
+| SPRING_DATASOURCE_USERNAME                | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres username                                                                                         |
+| SPRING_DATASOURCE_PASSWORD                | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres password                                                                                         |
+| KEYCLOAK_HOST                             | server, client | http://localhost:8081                                                                                                                                                                                 | Keycloak hostname                                                                                         |
+| KEYCLOAK_REALM_NAME                       | server, client | thesis-track                                                                                                                                                                                          | Keycloak realm name                                                                                       |
+| KEYCLOAK_CLIENT_ID                        | server, client | thesis-track-app                                                                                                                                                                                      | Keycloak client id                                                                                        |
+| KEYCLOAK_SERVICE_CLIENT_ID                | server         |                                                                                                                                                                                                       | Keycloak service client id                                                                                |
+| KEYCLOAK_SERVICE_CLIENT_SECRET            | server         |                                                                                                                                                                                                       | Keycloak service client secret                                                                            |
+| KEYCLOAK_SERVICE_ACCOUNT_STUDENT_GROUP_ID | server         |                                                                                                                                                                                                       | Keycloak group name that should be assigned when a student starts writing a thesis                        |
+| CALDAV_ENABLED                            | server         | false                                                                                                                                                                                                 | Enable calendar integration. If enabled scheduled presentations will be added to the calendar             |
+| CALDAV_URL                                | server         |                                                                                                                                                                                                       | CalDav URL where the events should be added                                                               |
+| CALDAV_USERNAME                           | server         |                                                                                                                                                                                                       | CalDav username for authentication                                                                        |
+| CALDAV_PASSWORD                           | server         |                                                                                                                                                                                                       | CalDav password for authentication                                                                        |
+| POSTFIX_HOST                              | server         | localhost                                                                                                                                                                                             | Postfix host to send emails. Only required if emails are enabled.                                         |
+| POSTFIX_PORT                              | server         | 25                                                                                                                                                                                                    | Postfix port                                                                                              |
+| POSTFIX_USERNAME                          | server         |                                                                                                                                                                                                       | Postfix username                                                                                          |
+| POSTFIX_PASSWORD                          | server         |                                                                                                                                                                                                       | Postfix password                                                                                          |
+| CLIENT_HOST                               | server, client | http://localhost:3000                                                                                                                                                                                 | Hosting url of client                                                                                     |
+| SERVER_HOST                               | client         | http://localhost:8080                                                                                                                                                                                 | Hosting url of server                                                                                     |
+| MAIL_ENABLED                              | server         | false                                                                                                                                                                                                 | If set to true, the application will try to send emails via Postfix                                       |
+| MAIL_SENDER                               | server         | test@ios.ase.cit.tum.de                                                                                                                                                                               | Sender email address                                                                                      |
+| MAIL_SIGNATURE                            | server         |                                                                                                                                                                                                       | Signature of the chair's supervisor / of the chair in general                                             |
+| MAIL_WORKSPACE_URL                        | server         | https://slack.com                                                                                                                                                                                     | URL to the workspace where students can connect with advisors and supervisors                             |
+| MAIL_BCC_RECIPIENTS                       | server         |                                                                                                                                                                                                       | Default BCC recipients for important emails                                                               |
+| MAIL_TEMPLATE_FOLDER                      | server         | /default-mail-templates                                                                                                                                                                               | Folder where mail templates are stored. If not set, it will use the default emails of the repository      |
+| UPLOAD_FOLDER                             | server         | uploads                                                                                                                                                                                               | Folder where uploaded files will be stored                                                                |
+| APPLICATION_TITLE                         | client         | Thesis Track                                                                                                                                                                                          | HTML title of the client                                                                                  |
+| GENDERS                                   | client         | `{"MALE":"Male","FEMALE":"Female","OTHER":"Other","PREFER_NOT_TO_SAY":"Prefer not to say"}`                                                                                                           | Available genders that a user can configure                                                               |
+| STUDY_DEGREES                             | client         | `{"BACHELOR":"Bachelor","MASTER":"Master"}`                                                                                                                                                           | Available study degrees                                                                                   |
+| STUDY_PROGRAMS                            | client         | `{"COMPUTER_SCIENCE":"Computer Science","INFORMATION_SYSTEMS":"Information Systems","GAMES_ENGINEERING":"Games Engineering","MANAGEMENT_AND_TECHNOLOGY":"Management and Technology","OTHER":"Other"}` | Available study programs                                                                                  |
+| THESIS_TYPES                              | client         | `{"BACHELOR":"Bachelor Thesis","MASTER":"Master Thesis","INTERDISCIPLINARY_PROJECT":"Interdisciplinary Project","GUIDED_RESEARCH":"Guided Research"}`                                                 | Available thesis types                                                                                    |
+| DEFAULT_SUPERVISOR_UUID                   | client         |                                                                                                                                                                                                       | The user UUID from the database if a default supervisor should be selected when creating topics or theses |
\ No newline at end of file
diff --git a/server/build.gradle b/server/build.gradle
index 683be6d0..8ece7478 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -28,6 +28,9 @@ dependencies {
 	implementation 'org.postgresql:postgresql'
 	implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:8.0.1'
 
+	// Calendar
+	implementation 'org.mnode.ical4j:ical4j:4.0.3'
+
 	// Liquibase
 	implementation 'org.liquibase:liquibase-core:4.28.0'
 
diff --git a/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java b/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
index 0c62a9e6..13c8907b 100644
--- a/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
+++ b/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
@@ -1,17 +1,12 @@
 package thesistrack.ls1.service;
 
-import io.netty.handler.logging.LogLevel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.client.reactive.ClientHttpConnector;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
-import reactor.netty.http.client.HttpClient;
-import reactor.netty.transport.logging.AdvancedByteBufFormat;
 import thesistrack.ls1.entity.User;
 
 import org.springframework.http.HttpHeaders;
@@ -23,7 +18,8 @@
 
 @Service
 public class AccessManagementService {
-    private static final Logger logger = LoggerFactory.getLogger(AccessManagementService.class);
+    private static final Logger log = LoggerFactory.getLogger(AccessManagementService.class);
+
     private final WebClient webClient;
 
     private final String keycloakRealmName;
@@ -54,7 +50,7 @@ public AccessManagementService(
         try {
             studentGroupId = studentGroupName.isBlank() ? null : getGroupId(studentGroupName);
         } catch (RuntimeException exception) {
-            logger.warn("Could not fetch group id from configured student group", exception);
+            log.warn("Could not fetch group id from configured student group", exception);
         }
         this.studentGroupId = studentGroupId;
     }
@@ -67,7 +63,7 @@ public void addStudentGroup(User user) {
         try {
             assignKeycloakGroup(getUserId(user.getUniversityId()), studentGroupId);
         } catch (RuntimeException exception) {
-            logger.warn("Could not assign keycloak group to user", exception);
+            log.warn("Could not assign keycloak group to user", exception);
         }
     }
 
@@ -79,7 +75,7 @@ public void removeStudentGroup(User user) {
         try {
             removeKeycloakGroup(getUserId(user.getUniversityId()), studentGroupId);
         } catch (RuntimeException exception) {
-            logger.warn("Could not remove keycloak group from user", exception);
+            log.warn("Could not remove keycloak group from user", exception);
         }
     }
 
diff --git a/server/src/main/java/thesistrack/ls1/service/CalendarService.java b/server/src/main/java/thesistrack/ls1/service/CalendarService.java
index 329b6f58..42e9b92c 100644
--- a/server/src/main/java/thesistrack/ls1/service/CalendarService.java
+++ b/server/src/main/java/thesistrack/ls1/service/CalendarService.java
@@ -1,19 +1,183 @@
 package thesistrack.ls1.service;
 
+import jakarta.mail.internet.InternetAddress;
+import net.fortuna.ical4j.data.CalendarBuilder;
+import net.fortuna.ical4j.data.ParserException;
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Component;
+import net.fortuna.ical4j.model.component.VEvent;
+import net.fortuna.ical4j.model.property.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URI;
 import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 @Service
 public class CalendarService {
-    public String createEvent(String title, String location, String description, Instant startDate, Number length) {
+    private static final Logger log = LoggerFactory.getLogger(CalendarService.class);
+
+    private final WebClient webClient;
+    private final boolean enabled;
+
+    public CalendarService(
+            @Value("${thesis-track.calendar.enabled}") Boolean enabled,
+            @Value("${thesis-track.calendar.url}") String caldavUrl,
+            @Value("${thesis-track.calendar.username}") String caldavUsername,
+            @Value("${thesis-track.calendar.password}") String caldavPassword
+    ) {
+        this.enabled = enabled;
+
+        this.webClient = WebClient.builder()
+                .baseUrl(caldavUrl)
+                .defaultHeaders(headers -> headers.setBasicAuth(caldavUsername, caldavPassword))
+                .build();
+    }
+
+    public record CalendarEvent(
+            String title,
+            String location,
+            String description,
+            Instant start,
+            Instant end,
+            InternetAddress organizer,
+            List<InternetAddress> participants
+    ) {}
+
+    public String createEvent(CalendarEvent data) {
+        if (!enabled) {
+            return null;
+        }
+
+        try {
+            Calendar calendar = getCalendar();
+            String eventId = UUID.randomUUID().toString();
+
+            calendar.add(createVEvent(eventId, data));
+            updateCalendar(calendar);
+
+            return eventId;
+        } catch (Exception exception) {
+            log.warn("Failed to create calendar event", exception);
+        }
+
         return null;
     }
 
+    public void updateEvent(String eventId, CalendarEvent data) {
+        if (!enabled) {
+            return;
+        }
+
+        try {
+            Calendar calendar = getCalendar();
+            Optional<VEvent> event = findVEvent(calendar, eventId);
+
+            event.ifPresent(calendar::remove);
+            calendar.add(createVEvent(eventId, data));
+
+            updateCalendar(calendar);
+        } catch (Exception exception) {
+            log.warn("Failed to create calendar event", exception);
+        }
+    }
+
     public void deleteEvent(String eventId) {
+        if (!enabled) {
+            return;
+        }
+
         if (eventId == null) {
             return;
         }
+
+        try {
+            Calendar calendar = getCalendar();
+
+            VEvent event = findVEvent(calendar, eventId).orElseThrow();
+            calendar.remove(event);
+
+            updateCalendar(calendar);
+        } catch (RuntimeException exception) {
+            log.warn("Failed to delete calendar event", exception);
+        }
+    }
+
+    private Optional<VEvent> findVEvent(Calendar calendar, String eventId) {
+        for (Component component : calendar.getComponents(Component.VEVENT)) {
+            VEvent event = (VEvent) component;
+            Optional<Uid> uid = event.getUid();
+
+            if (uid.isPresent() && uid.get().getValue().equals(eventId)) {
+                return Optional.of(event);
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    private VEvent createVEvent(String eventId, CalendarEvent data) {
+        VEvent event = new VEvent(data.start, data.end, data.title);
+
+        event.add(new Uid(eventId));
+
+        if (data.location != null) {
+            event.add(new Location(data.location));
+        }
+
+        if (data.description != null) {
+            event.add(new Description(data.description));
+        }
+
+        if (data.organizer != null) {
+            event.add(new Organizer(URI.create("mailto:" + data.organizer.getAddress())));
+        }
+
+        if (data.participants != null) {
+            for (InternetAddress address : data.participants) {
+                event.add(new Attendee(URI.create("mailto:" + address.getAddress())));
+            }
+        }
+
+        return event;
+    }
+
+    private Calendar getCalendar() {
+        String response = webClient.method(HttpMethod.GET)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
+
+        if (response == null) {
+            return new Calendar();
+        }
+
+        CalendarBuilder builder = new CalendarBuilder();
+        StringReader stringReader = new StringReader(response);
+
+        try {
+            return builder.build(stringReader);
+        } catch (IOException | ParserException e) {
+            return new Calendar();
+        }
+    }
+
+    private void updateCalendar(Calendar calendar) {
+        webClient.method(HttpMethod.PUT)
+                .contentType(MediaType.parseMediaType("text/calendar"))
+                .bodyValue(calendar.toString())
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
index f3b15b5b..7cbb67a6 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
@@ -18,6 +18,7 @@
 import thesistrack.ls1.repository.*;
 
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 @Service
@@ -172,7 +173,11 @@ public Thesis updateThesis(
             saveStateChange(thesis, state.state(), state.changedAt());
         }
 
-        return thesisRepository.save(thesis);
+        thesis = thesisRepository.save(thesis);
+
+        updateThesisCalendarEvents(thesis);
+
+        return thesis;
     }
 
     @Transactional
@@ -184,7 +189,11 @@ public Thesis updateThesisInfo(
         thesis.setAbstractField(abstractText);
         thesis.setInfo(infoText);
 
-        return thesisRepository.save(thesis);
+        thesis = thesisRepository.save(thesis);
+
+        updateThesisCalendarEvents(thesis);
+
+        return thesis;
     }
 
     /* PROPOSAL */
@@ -313,19 +322,12 @@ public Thesis createPresentation(
         presentation.setVisibility(visibility);
         presentation.setLocation(location);
         presentation.setStreamUrl(streamUrl);
-        presentation.setCalendarEvent(calendarService.createEvent(
-                "Thesis Presentation \"" + thesis.getTitle() + "\"",
-                location == null || location.isBlank() ? streamUrl : location,
-                "Title: " + thesis.getTitle() + "\n" +
-                        (streamUrl != null && !streamUrl.isBlank() ? "Stream URL: " + streamUrl + "\n" : "") + "\n" +
-                        "Abstract:\n\n" + thesis.getAbstractField(),
-                date,
-                3600
-        ));
         presentation.setScheduledAt(date);
         presentation.setCreatedBy(creatingUser);
         presentation.setCreatedAt(Instant.now());
 
+        presentation = thesisPresentationRepository.save(presentation);
+        presentation.setCalendarEvent(calendarService.createEvent(createPresentationCalendarEvent(presentation)));
         presentation = thesisPresentationRepository.save(presentation);
 
         List<ThesisPresentation> presentations = thesis.getPresentations();
@@ -360,6 +362,33 @@ public Thesis deletePresentation(User deletingUser, ThesisPresentation presentat
         return thesis;
     }
 
+    private void updateThesisCalendarEvents(Thesis thesis) {
+        for (ThesisPresentation presentation : thesis.getPresentations()) {
+            String eventId = presentation.getCalendarEvent();
+
+            if (eventId != null) {
+                calendarService.updateEvent(eventId, createPresentationCalendarEvent(presentation));
+            }
+        }
+    }
+
+    private CalendarService.CalendarEvent createPresentationCalendarEvent(ThesisPresentation presentation) {
+        String location = presentation.getLocation();
+        String streamUrl = presentation.getStreamUrl();
+
+        return new CalendarService.CalendarEvent(
+                "Thesis Presentation \"" + presentation.getThesis().getTitle() + "\"",
+                location == null || location.isBlank() ? streamUrl : location,
+                "Title: " + presentation.getThesis().getTitle() + "\n" +
+                        (streamUrl != null && !streamUrl.isBlank() ? "Stream URL: " + streamUrl + "\n" : "") + "\n" +
+                        "Abstract:\n\n" + presentation.getThesis().getAbstractField(),
+                presentation.getScheduledAt(),
+                presentation.getScheduledAt().plus(60, ChronoUnit.MINUTES),
+                presentation.getThesis().getSupervisors().getFirst().getEmail(),
+                presentation.getThesis().getRoles().stream().map((role) -> role.getUser().getEmail()).toList()
+        );
+    }
+
     /* ASSESSMENT */
     @Transactional
     public Thesis submitAssessment(
diff --git a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java b/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
index e9e60b18..3aa595a6 100644
--- a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
+++ b/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
@@ -6,6 +6,8 @@
 import jakarta.mail.internet.MimeMessage;
 import jakarta.mail.internet.MimeMultipart;
 import lombok.Getter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.mail.javamail.JavaMailSender;
 import thesistrack.ls1.constants.ThesisRoleName;
 import thesistrack.ls1.dto.ApplicationDto;
@@ -23,6 +25,7 @@
 import java.util.function.Function;
 
 public class MailBuilder {
+    private static final Logger log = LoggerFactory.getLogger(MailBuilder.class);
     private final MailConfig config;
 
     private final List<User> primarySenders;
@@ -255,8 +258,8 @@ public void send(JavaMailSender mailSender, UploadService uploadService) throws
                 message.setContent(messageContent);
 
                 mailSender.send(message);
-            } catch (MessagingException | IOException e) {
-                throw new MailingException("Failed to send email", e);
+            } catch (MessagingException | IOException exception) {
+                log.warn("Failed to send email", exception);
             }
         }
     }
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index df688cef..3c75dd1e 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -1,6 +1,7 @@
 logging:
   level:
     liquibase: INFO
+    net.fortuna.ical4j.util.Configurator: INFO
 
 spring:
   datasource:
@@ -60,12 +61,12 @@ thesis-track:
     realm-name: ${KEYCLOAK_REALM_NAME:thesis-track}
     client-id: ${KEYCLOAK_CLIENT_ID:thesis-track-app}
     service-client:
-      id: ${KEYCLOAK_SERVICE_CLIENT_ID:service-client}
+      id: ${KEYCLOAK_SERVICE_CLIENT_ID:}
       secret: ${KEYCLOAK_SERVICE_CLIENT_SECRET:}
-      student-group-name: ${KEYCLOAK_SERVICE_ACCOUNT_STUDENT_GROUP_ID:thesis-students}
+      student-group-name: ${KEYCLOAK_SERVICE_ACCOUNT_STUDENT_GROUP_ID:}
   calendar:
     enabled: ${CALDAV_ENABLED:false}
-    host: ${CALDAV_HOST:}
+    url: ${CALDAV_URL:}
     username: ${CALDAV_USERNAME:}
     password: ${CALDAV_PASSWORD:}
   client:
diff --git a/server/src/main/resources/ical4j.properties b/server/src/main/resources/ical4j.properties
new file mode 100644
index 00000000..f262fd9a
--- /dev/null
+++ b/server/src/main/resources/ical4j.properties
@@ -0,0 +1,3 @@
+net.fortuna.ical4j.timezone.default=UTC
+net.fortuna.ical4j.encoding=UTF-8
+net.fortuna.ical4j.parser.maxAllowedSize=1048576
\ No newline at end of file

From 548694aa689518b98513d23b2cd5f460ff9bd577 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Thu, 29 Aug 2024 01:32:14 +0200
Subject: [PATCH 05/13] Add new configuration options

---
 .github/workflows/deploy_docker.yml           | 14 ++++
 client/public/generate-runtime-env.js         |  4 +-
 .../DeclarationOfDataConsent.tsx              | 32 ++-------
 client/src/config/global.ts                   |  2 +
 client/src/config/types.ts                    |  2 +
 docker-compose.prod.yml                       | 13 ++++
 docs/CONFIGURATION.md                         | 69 ++++++++++---------
 server/src/main/resources/application.yml     |  2 +-
 8 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/deploy_docker.yml b/.github/workflows/deploy_docker.yml
index cab9766a..ebe2235c 100644
--- a/.github/workflows/deploy_docker.yml
+++ b/.github/workflows/deploy_docker.yml
@@ -102,7 +102,13 @@ jobs:
             echo "SERVER_HOST=${{ vars.SERVER_HOST }}" >> .env.prod
             echo "CLIENT_HOST=${{ vars.CLIENT_HOST }}" >> .env.prod
             
+            echo "APPLICATION_TITLE=${{ vars.APPLICATION_TITLE }}" >> .env.prod
+            echo "PRIVACY_NOTICE=${{ vars.PRIVACY_NOTICE }}" >> .env.prod
             echo "DEFAULT_SUPERVISOR_UUID=${{ vars.DEFAULT_SUPERVISOR_UUID }}" >> .env.prod
+            echo "THESIS_TYPES=${{ vars.THESIS_TYPES }}" >> .env.prod
+            echo "STUDY_PROGRAMS=${{ vars.STUDY_PROGRAMS }}" >> .env.prod
+            echo "STUDY_DEGREES=${{ vars.STUDY_DEGREES }}" >> .env.prod
+            echo "GENDERS=${{ vars.GENDERS }}" >> .env.prod
 
             echo "MAIL_SENDER=${{ vars.MAIL_SENDER }}" >> .env.prod
             echo "MAIL_SIGNATURE=${{ vars.MAIL_SIGNATURE }}" >> .env.prod
@@ -113,6 +119,14 @@ jobs:
             echo "KEYCLOAK_HOST=${{ vars.KEYCLOAK_HOST }}" >> .env.prod
             echo "KEYCLOAK_REALM_NAME=${{ vars.KEYCLOAK_REALM_NAME }}" >> .env.prod
             echo "KEYCLOAK_CLIENT_ID=${{ vars.KEYCLOAK_CLIENT_ID }}" >> .env.prod
+            echo "KEYCLOAK_SERVICE_CLIENT_ID=${{ vars.KEYCLOAK_SERVICE_CLIENT_ID }}" >> .env.prod
+            echo "KEYCLOAK_SERVICE_CLIENT_SECRET=${{ secrets.KEYCLOAK_SERVICE_CLIENT_SECRET }}" >> .env.prod
+            echo "KEYCLOAK_SERVICE_STUDENT_GROUP_NAME=${{ vars.KEYCLOAK_SERVICE_STUDENT_GROUP_NAME }}" >> .env.prod
+            
+            echo "CALDAV_ENABLED=${{ vars.CALDAV_ENABLED }}" >> .env.prod
+            echo "CALDAV_URL=${{ vars.CALDAV_URL }}" >> .env.prod
+            echo "CALDAV_USERNAME=${{ vars.CALDAV_USERNAME }}" >> .env.prod
+            echo "CALDAV_PASSWORD=${{ secrets.CALDAV_PASSWORD }}" >> .env.prod
             
             echo "SERVER_IMAGE_TAG=${{ inputs.server_image_tag }}" >> .env.prod
             echo "CLIENT_IMAGE_TAG=${{ inputs.client_image_tag }}" >> .env.prod
diff --git a/client/public/generate-runtime-env.js b/client/public/generate-runtime-env.js
index 9f46306e..5a2219cd 100644
--- a/client/public/generate-runtime-env.js
+++ b/client/public/generate-runtime-env.js
@@ -9,12 +9,10 @@ const ALLOWED_ENVIRONMENT_VARIABLES = [
   'DEFAULT_SUPERVISOR_UUID',
   // optional
   'APPLICATION_TITLE',
-  'FOCUS_TOPICS',
-  'RESEARCH_AREAS',
   'GENDERS',
   'STUDY_DEGREES',
   'STUDY_PROGRAMS',
-  'UNIVERSITY_ID_JWT_ATTRIBUTE',
+  'PRIVACY_NOTICE',
 ];
 
 async function generateConfig() {
diff --git a/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx b/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx
index 13c3c021..2ab690ea 100644
--- a/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx
+++ b/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx
@@ -1,5 +1,7 @@
 import { Anchor, Modal, Text, Title } from '@mantine/core'
 import { useState } from 'react'
+import DocumentEditor from '../DocumentEditor/DocumentEditor'
+import { GLOBAL_CONFIG } from '../../config/global'
 
 interface IDeclarationOfDataConsentProps {
   text: string
@@ -13,34 +15,8 @@ export const DeclarationOfDataConsent = (props: IDeclarationOfDataConsentProps)
   return (
     <>
       <Anchor onClick={() => setOpened(true)}>{text}</Anchor>
-      <Modal opened={opened} onClose={() => setOpened(false)}>
-        <Title ta='center'>Data Consent</Title>
-        <Text c='dimmed' fz='sm'>
-          The data collected here will only be used for the developer application process of the
-          iPraktikum practical course. Only the lecturers have access to the personal data. <br />
-          <br />
-          Consequences in the absence of consent: <br />
-          <br /> You have the right not to agree to this declaration of consent - however, since the
-          data marked as mandatory fields are required to apply as a developer, we cannot complete
-          your registration without your consent. <br />
-          <br />
-          Your rights: <br />- a right to information <br />- a right to correction or deletion or
-          restriction of processing or a right to object to processing <br />- a right to data
-          portability <br />- there is also a right of appeal to the Bavarian State Commissioner for
-          Data Protection <br />
-          <br />
-          Consequences of withdrawing consent:
-          <br />
-          <br /> As soon as the cancellation notice is received, your data may not be processed
-          further and will be deleted immediately. Withdrawing your consent does not affect the
-          legality of the processing carried out up to that point. Please send your cancellation to
-          the address below.
-          <br />
-          <br />
-          Krusche, Stephan, Technische Universität München, Institut für Informatik I1,
-          Boltzmannstraße 3, 85748 Garching b. München, +49 (89) 289-18212, ios@in.tum.de <br />
-          For further questions concerning data protection, please contact: www.datenschutz.tum.de
-        </Text>
+      <Modal title='Data Consent' opened={opened} onClose={() => setOpened(false)}>
+        <DocumentEditor value={GLOBAL_CONFIG.privacy_notice} />
       </Modal>
     </>
   )
diff --git a/client/src/config/global.ts b/client/src/config/global.ts
index 1c0824c3..2f2705cc 100644
--- a/client/src/config/global.ts
+++ b/client/src/config/global.ts
@@ -44,6 +44,8 @@ export const GLOBAL_CONFIG: IGlobalConfig = {
     GUIDED_RESEARCH: 'Guided Research',
   },
 
+  privacy_notice: getEnvironmentVariable('PRIVACY_NOTICE') || '',
+
   default_supervisors: getEnvironmentVariable('DEFAULT_SUPERVISOR_UUID')?.split(';') || [],
 
   server_host: getEnvironmentVariable('SERVER_HOST') || 'http://localhost:8080',
diff --git a/client/src/config/types.ts b/client/src/config/types.ts
index 4615277f..5387333a 100644
--- a/client/src/config/types.ts
+++ b/client/src/config/types.ts
@@ -8,6 +8,8 @@ export interface IGlobalConfig {
   study_degrees: Record<string, string>
   thesis_types: Record<string, string>
 
+  privacy_notice: string
+
   default_supervisors: string[]
 
   keycloak: {
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 62282081..877e28e8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -64,10 +64,17 @@ services:
       - KEYCLOAK_HOST
       - KEYCLOAK_REALM_NAME
       - KEYCLOAK_CLIENT_ID
+      - KEYCLOAK_SERVICE_CLIENT_ID
+      - KEYCLOAK_SERVICE_CLIENT_SECRET
+      - KEYCLOAK_SERVICE_STUDENT_GROUP_NAME
       - MAIL_WORKSPACE_URL
       - MAIL_SENDER
       - MAIL_SIGNATURE
       - MAIL_BCC_RECIPIENTS
+      - CALDAV_ENABLED
+      - CALDAV_URL
+      - CALDAV_USERNAME
+      - CALDAV_PASSWORD
     networks:
       - thesis-track-network
 
@@ -90,6 +97,12 @@ services:
       - KEYCLOAK_REALM_NAME
       - KEYCLOAK_CLIENT_ID
       - DEFAULT_SUPERVISOR_UUID
+      - PRIVACY_NOTICE
+      - THESIS_TYPES
+      - STUDY_PROGRAMS
+      - STUDY_DEGREES
+      - GENDERS
+      - APPLICATION_TITLE
     depends_on:
       - server
     networks:
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index be76cbcc..3576d7b5 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -2,37 +2,38 @@
 
 ## Environment variables
 
-| Variable Name                             | Services       | Default Value                                                                                                                                                                                         | Description                                                                                               |
-|-------------------------------------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
-| SPRING_DATASOURCE_URL                     | server         | jdbc:postgresql://localhost:5432/thesis-track                                                                                                                                                         | Postgres connection url                                                                                   |
-| SPRING_DATASOURCE_USERNAME                | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres username                                                                                         |
-| SPRING_DATASOURCE_PASSWORD                | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres password                                                                                         |
-| KEYCLOAK_HOST                             | server, client | http://localhost:8081                                                                                                                                                                                 | Keycloak hostname                                                                                         |
-| KEYCLOAK_REALM_NAME                       | server, client | thesis-track                                                                                                                                                                                          | Keycloak realm name                                                                                       |
-| KEYCLOAK_CLIENT_ID                        | server, client | thesis-track-app                                                                                                                                                                                      | Keycloak client id                                                                                        |
-| KEYCLOAK_SERVICE_CLIENT_ID                | server         |                                                                                                                                                                                                       | Keycloak service client id                                                                                |
-| KEYCLOAK_SERVICE_CLIENT_SECRET            | server         |                                                                                                                                                                                                       | Keycloak service client secret                                                                            |
-| KEYCLOAK_SERVICE_ACCOUNT_STUDENT_GROUP_ID | server         |                                                                                                                                                                                                       | Keycloak group name that should be assigned when a student starts writing a thesis                        |
-| CALDAV_ENABLED                            | server         | false                                                                                                                                                                                                 | Enable calendar integration. If enabled scheduled presentations will be added to the calendar             |
-| CALDAV_URL                                | server         |                                                                                                                                                                                                       | CalDav URL where the events should be added                                                               |
-| CALDAV_USERNAME                           | server         |                                                                                                                                                                                                       | CalDav username for authentication                                                                        |
-| CALDAV_PASSWORD                           | server         |                                                                                                                                                                                                       | CalDav password for authentication                                                                        |
-| POSTFIX_HOST                              | server         | localhost                                                                                                                                                                                             | Postfix host to send emails. Only required if emails are enabled.                                         |
-| POSTFIX_PORT                              | server         | 25                                                                                                                                                                                                    | Postfix port                                                                                              |
-| POSTFIX_USERNAME                          | server         |                                                                                                                                                                                                       | Postfix username                                                                                          |
-| POSTFIX_PASSWORD                          | server         |                                                                                                                                                                                                       | Postfix password                                                                                          |
-| CLIENT_HOST                               | server, client | http://localhost:3000                                                                                                                                                                                 | Hosting url of client                                                                                     |
-| SERVER_HOST                               | client         | http://localhost:8080                                                                                                                                                                                 | Hosting url of server                                                                                     |
-| MAIL_ENABLED                              | server         | false                                                                                                                                                                                                 | If set to true, the application will try to send emails via Postfix                                       |
-| MAIL_SENDER                               | server         | test@ios.ase.cit.tum.de                                                                                                                                                                               | Sender email address                                                                                      |
-| MAIL_SIGNATURE                            | server         |                                                                                                                                                                                                       | Signature of the chair's supervisor / of the chair in general                                             |
-| MAIL_WORKSPACE_URL                        | server         | https://slack.com                                                                                                                                                                                     | URL to the workspace where students can connect with advisors and supervisors                             |
-| MAIL_BCC_RECIPIENTS                       | server         |                                                                                                                                                                                                       | Default BCC recipients for important emails                                                               |
-| MAIL_TEMPLATE_FOLDER                      | server         | /default-mail-templates                                                                                                                                                                               | Folder where mail templates are stored. If not set, it will use the default emails of the repository      |
-| UPLOAD_FOLDER                             | server         | uploads                                                                                                                                                                                               | Folder where uploaded files will be stored                                                                |
-| APPLICATION_TITLE                         | client         | Thesis Track                                                                                                                                                                                          | HTML title of the client                                                                                  |
-| GENDERS                                   | client         | `{"MALE":"Male","FEMALE":"Female","OTHER":"Other","PREFER_NOT_TO_SAY":"Prefer not to say"}`                                                                                                           | Available genders that a user can configure                                                               |
-| STUDY_DEGREES                             | client         | `{"BACHELOR":"Bachelor","MASTER":"Master"}`                                                                                                                                                           | Available study degrees                                                                                   |
-| STUDY_PROGRAMS                            | client         | `{"COMPUTER_SCIENCE":"Computer Science","INFORMATION_SYSTEMS":"Information Systems","GAMES_ENGINEERING":"Games Engineering","MANAGEMENT_AND_TECHNOLOGY":"Management and Technology","OTHER":"Other"}` | Available study programs                                                                                  |
-| THESIS_TYPES                              | client         | `{"BACHELOR":"Bachelor Thesis","MASTER":"Master Thesis","INTERDISCIPLINARY_PROJECT":"Interdisciplinary Project","GUIDED_RESEARCH":"Guided Research"}`                                                 | Available thesis types                                                                                    |
-| DEFAULT_SUPERVISOR_UUID                   | client         |                                                                                                                                                                                                       | The user UUID from the database if a default supervisor should be selected when creating topics or theses |
\ No newline at end of file
+| Variable Name                       | Services       | Default Value                                                                                                                                                                                         | Description                                                                                               |
+|-------------------------------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
+| SPRING_DATASOURCE_URL               | server         | jdbc:postgresql://localhost:5432/thesis-track                                                                                                                                                         | Postgres connection url                                                                                   |
+| SPRING_DATASOURCE_USERNAME          | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres username                                                                                         |
+| SPRING_DATASOURCE_PASSWORD          | server         | thesis-track-postgres                                                                                                                                                                                 | Postgres password                                                                                         |
+| KEYCLOAK_HOST                       | server, client | http://localhost:8081                                                                                                                                                                                 | Keycloak hostname                                                                                         |
+| KEYCLOAK_REALM_NAME                 | server, client | thesis-track                                                                                                                                                                                          | Keycloak realm name                                                                                       |
+| KEYCLOAK_CLIENT_ID                  | server, client | thesis-track-app                                                                                                                                                                                      | Keycloak client id                                                                                        |
+| KEYCLOAK_SERVICE_CLIENT_ID          | server         |                                                                                                                                                                                                       | Keycloak service client id                                                                                |
+| KEYCLOAK_SERVICE_CLIENT_SECRET      | server         |                                                                                                                                                                                                       | Keycloak service client secret                                                                            |
+| KEYCLOAK_SERVICE_STUDENT_GROUP_NAME | server         |                                                                                                                                                                                                       | Keycloak group name that should be assigned when a student starts writing a thesis                        |
+| CALDAV_ENABLED                      | server         | false                                                                                                                                                                                                 | Enable calendar integration. If enabled scheduled presentations will be added to the calendar             |
+| CALDAV_URL                          | server         |                                                                                                                                                                                                       | CalDav URL where the events should be added                                                               |
+| CALDAV_USERNAME                     | server         |                                                                                                                                                                                                       | CalDav username for authentication                                                                        |
+| CALDAV_PASSWORD                     | server         |                                                                                                                                                                                                       | CalDav password for authentication                                                                        |
+| POSTFIX_HOST                        | server         | localhost                                                                                                                                                                                             | Postfix host to send emails. Only required if emails are enabled.                                         |
+| POSTFIX_PORT                        | server         | 25                                                                                                                                                                                                    | Postfix port                                                                                              |
+| POSTFIX_USERNAME                    | server         |                                                                                                                                                                                                       | Postfix username                                                                                          |
+| POSTFIX_PASSWORD                    | server         |                                                                                                                                                                                                       | Postfix password                                                                                          |
+| CLIENT_HOST                         | server, client | http://localhost:3000                                                                                                                                                                                 | Hosting url of client                                                                                     |
+| SERVER_HOST                         | client         | http://localhost:8080                                                                                                                                                                                 | Hosting url of server                                                                                     |
+| MAIL_ENABLED                        | server         | false                                                                                                                                                                                                 | If set to true, the application will try to send emails via Postfix                                       |
+| MAIL_SENDER                         | server         | test@ios.ase.cit.tum.de                                                                                                                                                                               | Sender email address                                                                                      |
+| MAIL_SIGNATURE                      | server         |                                                                                                                                                                                                       | Signature of the chair's supervisor / of the chair in general                                             |
+| MAIL_WORKSPACE_URL                  | server         | https://slack.com                                                                                                                                                                                     | URL to the workspace where students can connect with advisors and supervisors                             |
+| MAIL_BCC_RECIPIENTS                 | server         |                                                                                                                                                                                                       | Default BCC recipients for important emails                                                               |
+| MAIL_TEMPLATE_FOLDER                | server         | /default-mail-templates                                                                                                                                                                               | Folder where mail templates are stored. If not set, it will use the default emails of the repository      |
+| UPLOAD_FOLDER                       | server         | uploads                                                                                                                                                                                               | Folder where uploaded files will be stored                                                                |
+| APPLICATION_TITLE                   | client         | Thesis Track                                                                                                                                                                                          | HTML title of the client                                                                                  |
+| GENDERS                             | client         | `{"MALE":"Male","FEMALE":"Female","OTHER":"Other","PREFER_NOT_TO_SAY":"Prefer not to say"}`                                                                                                           | Available genders that a user can configure                                                               |
+| STUDY_DEGREES                       | client         | `{"BACHELOR":"Bachelor","MASTER":"Master"}`                                                                                                                                                           | Available study degrees                                                                                   |
+| STUDY_PROGRAMS                      | client         | `{"COMPUTER_SCIENCE":"Computer Science","INFORMATION_SYSTEMS":"Information Systems","GAMES_ENGINEERING":"Games Engineering","MANAGEMENT_AND_TECHNOLOGY":"Management and Technology","OTHER":"Other"}` | Available study programs                                                                                  |
+| THESIS_TYPES                        | client         | `{"BACHELOR":"Bachelor Thesis","MASTER":"Master Thesis","INTERDISCIPLINARY_PROJECT":"Interdisciplinary Project","GUIDED_RESEARCH":"Guided Research"}`                                                 | Available thesis types                                                                                    |
+| DEFAULT_SUPERVISOR_UUID             | client         |                                                                                                                                                                                                       | The user UUID from the database if a default supervisor should be selected when creating topics or theses |
+| PRIVACY_NOTICE                      | client         |                                                                                                                                                                                                       | Privacy notice the student has to accept before submitting data                                           |
\ No newline at end of file
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 3c75dd1e..d164720b 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -63,7 +63,7 @@ thesis-track:
     service-client:
       id: ${KEYCLOAK_SERVICE_CLIENT_ID:}
       secret: ${KEYCLOAK_SERVICE_CLIENT_SECRET:}
-      student-group-name: ${KEYCLOAK_SERVICE_ACCOUNT_STUDENT_GROUP_ID:}
+      student-group-name: ${KEYCLOAK_SERVICE_STUDENT_GROUP_NAME:}
   calendar:
     enabled: ${CALDAV_ENABLED:false}
     url: ${CALDAV_URL:}

From cbfd6dcf9b68c69ff7387d545946c6feeac75834 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Thu, 29 Aug 2024 01:48:32 +0200
Subject: [PATCH 06/13] Add nocache to client runtime environment

---
 client/public/generate-runtime-env.js | 16 ++++++++++------
 client/src/index.html                 |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/client/public/generate-runtime-env.js b/client/public/generate-runtime-env.js
index 5a2219cd..cc7272b8 100644
--- a/client/public/generate-runtime-env.js
+++ b/client/public/generate-runtime-env.js
@@ -1,4 +1,4 @@
-const { promises: fsp } = require('fs');
+const { promises: fsp } = require('fs')
 
 const ALLOWED_ENVIRONMENT_VARIABLES = [
   'SERVER_HOST',
@@ -13,18 +13,22 @@ const ALLOWED_ENVIRONMENT_VARIABLES = [
   'STUDY_DEGREES',
   'STUDY_PROGRAMS',
   'PRIVACY_NOTICE',
-];
+]
 
 async function generateConfig() {
-  const runtimeEnvironment = {};
+  const runtimeEnvironment = {}
 
   for (const key of ALLOWED_ENVIRONMENT_VARIABLES) {
     if (process.env[key]) {
-      runtimeEnvironment[key] = process.env[key];
+      runtimeEnvironment[key] = process.env[key]
     }
   }
 
-  await fsp.writeFile('runtime-env.js', `window.RUNTIME_ENVIRONMENT_VARIABLES=${JSON.stringify(runtimeEnvironment)};\n`, 'utf-8');
+  await fsp.writeFile(
+    'runtime-env.js',
+    `window.RUNTIME_ENVIRONMENT_VARIABLES=${JSON.stringify(runtimeEnvironment)};\n`,
+    'utf-8',
+  )
 }
 
-void generateConfig();
\ No newline at end of file
+void generateConfig()
diff --git a/client/src/index.html b/client/src/index.html
index 1ab38cd0..30d49152 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>ThesisTrack</title>
-    <script src="/runtime-env.js"></script>
+    <script src="/runtime-env.js?nocache=<%= new Date().getTime() %>"></script>
   </head>
   <body>
     <div id="root"></div>

From 2b759b03f2319b4cfff4662f4a30e06f27eb4d34 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Thu, 29 Aug 2024 16:05:54 +0200
Subject: [PATCH 07/13] Add tasks endpoint and improve topic filtering

---
 client/package-lock.json                      |  93 ++++------
 client/package.json                           |  12 +-
 client/public/generate-runtime-env.js         |   3 +-
 .../ApplicationsFilters.tsx                   |  19 +-
 .../src/components/GanttChart/GanttChart.tsx  |   2 +-
 client/src/config/global.ts                   |   2 +-
 client/src/config/types.ts                    |   2 +-
 .../ApplicationsProvider.tsx                  |  58 +++++-
 .../contexts/ApplicationsProvider/context.ts  |   2 +
 docs/CONFIGURATION.md                         |   2 +-
 .../ls1/controller/ApplicationController.java |   2 +
 .../ls1/controller/CalendarController.java    |  29 +++
 .../ls1/controller/ThesisController.java      |  13 +-
 .../java/thesistrack/ls1/dto/TaskDto.java     |   1 +
 .../ls1/repository/ApplicationRepository.java |  18 +-
 .../repository/ThesisCommentRepository.java   |   3 +-
 .../ThesisPresentationRepository.java         |  16 +-
 .../ls1/repository/ThesisRepository.java      |  21 ++-
 .../ls1/repository/TopicRepository.java       |   9 +-
 .../ls1/repository/UserRepository.java        |   6 +-
 .../ls1/security/WebSecurityConfig.java       |   1 +
 .../ls1/service/AccessManagementService.java  |  41 +++--
 .../ls1/service/ApplicationService.java       |   2 +
 .../ls1/service/CalendarService.java          |  24 +--
 .../ls1/service/DashboardService.java         | 169 +++++++++++++++++-
 .../service/ThesisPresentationService.java    | 153 ++++++++++++++++
 .../ls1/service/ThesisService.java            | 110 +-----------
 27 files changed, 576 insertions(+), 237 deletions(-)
 create mode 100644 server/src/main/java/thesistrack/ls1/controller/CalendarController.java
 create mode 100644 server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java

diff --git a/client/package-lock.json b/client/package-lock.json
index b8be9fd7..05f32bbf 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -25,7 +25,7 @@
         "@tiptap/starter-kit": "2.6.6",
         "i18n-iso-countries": "7.11.3",
         "jwt-decode": "4.0.0",
-        "keycloak-js": "25.0.2",
+        "keycloak-js": "25.0.4",
         "mantine-datatable": "7.11.3",
         "phosphor-react": "1.4.1",
         "react": "18.3.1",
@@ -35,8 +35,8 @@
       "devDependencies": {
         "@eslint/compat": "1.1.1",
         "@eslint/eslintrc": "3.1.0",
-        "@eslint/js": "9.9.0",
-        "@types/react": "18.3.3",
+        "@eslint/js": "9.9.1",
+        "@types/react": "18.3.4",
         "@types/react-dom": "18.3.0",
         "@typescript-eslint/eslint-plugin": "8.3.0",
         "@typescript-eslint/parser": "8.3.0",
@@ -45,14 +45,14 @@
         "copy-webpack-plugin": "12.0.2",
         "css-loader": "7.1.2",
         "css-minimizer-webpack-plugin": "7.0.0",
-        "eslint": "9.9.0",
+        "eslint": "9.9.1",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-prettier": "5.2.1",
         "eslint-plugin-react": "7.35.0",
         "fork-ts-checker-webpack-plugin": "9.0.2",
         "globals": "15.9.0",
         "html-webpack-plugin": "5.6.0",
-        "mini-css-extract-plugin": "2.9.0",
+        "mini-css-extract-plugin": "2.9.1",
         "postcss": "8.4.41",
         "postcss-loader": "8.1.1",
         "postcss-preset-mantine": "1.17.0",
@@ -64,7 +64,7 @@
         "ts-node": "10.9.2",
         "typescript": "5.5.4",
         "typescript-plugin-css-modules": "5.1.0",
-        "webpack": "5.93.0",
+        "webpack": "5.94.0",
         "webpack-bundle-analyzer": "4.10.2",
         "webpack-cli": "5.1.4",
         "webpack-dev-server": "5.0.4",
@@ -261,9 +261,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz",
-      "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
+      "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
       "dev": true,
       "dependencies": {
         "@eslint/object-schema": "^2.1.4",
@@ -310,9 +310,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.9.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.0.tgz",
-      "integrity": "sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
+      "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1353,26 +1353,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -1477,9 +1457,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.5.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.0.tgz",
-      "integrity": "sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==",
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz",
+      "integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -1531,9 +1511,9 @@
       "dev": true
     },
     "node_modules/@types/react": {
-      "version": "18.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
-      "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
+      "version": "18.3.4",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.4.tgz",
+      "integrity": "sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw==",
       "devOptional": true,
       "dependencies": {
         "@types/prop-types": "*",
@@ -4012,16 +3992,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.9.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.0.tgz",
-      "integrity": "sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
+      "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",
-        "@eslint/config-array": "^0.17.1",
+        "@eslint/config-array": "^0.18.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.9.0",
+        "@eslint/js": "9.9.1",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
@@ -6177,9 +6157,9 @@
       }
     },
     "node_modules/keycloak-js": {
-      "version": "25.0.2",
-      "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-25.0.2.tgz",
-      "integrity": "sha512-ACLf5O5PqzfDJwGqvLpqM0kflYWmyl3+T7M2C23gztJYccDxdfNP54+B9OkXz2GnDpLUId0ceoA+lbHw9t4Wng==",
+      "version": "25.0.4",
+      "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-25.0.4.tgz",
+      "integrity": "sha512-LW7dVgqcBxMnnJTdmh7Zgd0NpStJnX2sCMrJGqcGtm4zmk4Rwlqk2o2uOvY7PaRHHYePXfbIwrqVhlN3GAnRCg==",
       "dependencies": {
         "js-sha256": "^0.11.0",
         "jwt-decode": "^4.0.0"
@@ -6564,9 +6544,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
-      "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz",
+      "integrity": "sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==",
       "dev": true,
       "dependencies": {
         "schema-utils": "^4.0.0",
@@ -10105,9 +10085,9 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.25.0.tgz",
-      "integrity": "sha512-bRkIGlXsnGBRBQRAY56UXBm//9qH4bmJfFvq83gSz41N282df+fjy8ofcEgc1sM8geNt5cl6mC2g9Fht1cs8Aw==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz",
+      "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==",
       "engines": {
         "node": ">=16"
       },
@@ -10496,12 +10476,11 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.93.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz",
-      "integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==",
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
       "dev": true,
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.5",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
@@ -10510,7 +10489,7 @@
         "acorn-import-attributes": "^1.9.5",
         "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
diff --git a/client/package.json b/client/package.json
index 2ba95932..9185999f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -30,7 +30,7 @@
     "@tiptap/starter-kit": "2.6.6",
     "i18n-iso-countries": "7.11.3",
     "jwt-decode": "4.0.0",
-    "keycloak-js": "25.0.2",
+    "keycloak-js": "25.0.4",
     "mantine-datatable": "7.11.3",
     "phosphor-react": "1.4.1",
     "react": "18.3.1",
@@ -40,8 +40,8 @@
   "devDependencies": {
     "@eslint/compat": "1.1.1",
     "@eslint/eslintrc": "3.1.0",
-    "@eslint/js": "9.9.0",
-    "@types/react": "18.3.3",
+    "@eslint/js": "9.9.1",
+    "@types/react": "18.3.4",
     "@types/react-dom": "18.3.0",
     "@typescript-eslint/eslint-plugin": "8.3.0",
     "@typescript-eslint/parser": "8.3.0",
@@ -50,14 +50,14 @@
     "copy-webpack-plugin": "12.0.2",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.9.0",
+    "eslint": "9.9.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-react": "7.35.0",
     "fork-ts-checker-webpack-plugin": "9.0.2",
     "globals": "15.9.0",
     "html-webpack-plugin": "5.6.0",
-    "mini-css-extract-plugin": "2.9.0",
+    "mini-css-extract-plugin": "2.9.1",
     "postcss": "8.4.41",
     "postcss-loader": "8.1.1",
     "postcss-preset-mantine": "1.17.0",
@@ -69,7 +69,7 @@
     "ts-node": "10.9.2",
     "typescript": "5.5.4",
     "typescript-plugin-css-modules": "5.1.0",
-    "webpack": "5.93.0",
+    "webpack": "5.94.0",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.0.4",
diff --git a/client/public/generate-runtime-env.js b/client/public/generate-runtime-env.js
index cc7272b8..b9b263b5 100644
--- a/client/public/generate-runtime-env.js
+++ b/client/public/generate-runtime-env.js
@@ -5,14 +5,13 @@ const ALLOWED_ENVIRONMENT_VARIABLES = [
   'KEYCLOAK_HOST',
   'KEYCLOAK_REALM_NAME',
   'KEYCLOAK_CLIENT_ID',
-  // no defaults
   'DEFAULT_SUPERVISOR_UUID',
-  // optional
   'APPLICATION_TITLE',
   'GENDERS',
   'STUDY_DEGREES',
   'STUDY_PROGRAMS',
   'PRIVACY_NOTICE',
+  'CALDAV_URL'
 ]
 
 async function generateConfig() {
diff --git a/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx b/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx
index 763e9e96..de8ee184 100644
--- a/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx
+++ b/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx
@@ -2,9 +2,10 @@ import { Grid, MultiSelect, Select, TextInput } from '@mantine/core'
 import { MagnifyingGlass } from 'phosphor-react'
 import { ApplicationState } from '../../requests/responses/application'
 import { useApplicationsContext } from '../../contexts/ApplicationsProvider/hooks'
-import React from 'react'
+import React, { useEffect } from 'react'
 import { formatApplicationState } from '../../utils/format'
 import { useAllTopics } from '../../hooks/fetcher'
+import { useLoggedInUser } from '../../hooks/authentication'
 
 interface IApplicationsFiltersProps {
   size?: 'xl' | 'sm'
@@ -13,9 +14,9 @@ interface IApplicationsFiltersProps {
 const ApplicationsFilters = (props: IApplicationsFiltersProps) => {
   const { size = 'xl' } = props
 
-  const { filters, setFilters, sort, setSort } = useApplicationsContext()
+  const { topics, filters, setFilters, sort, setSort } = useApplicationsContext()
 
-  const topics = useAllTopics()
+  const user = useLoggedInUser()
 
   return (
     <Grid gutter='sm'>
@@ -33,14 +34,18 @@ const ApplicationsFilters = (props: IApplicationsFiltersProps) => {
         <MultiSelect
           hidePickedOptions
           label='Topics'
-          data={
-            topics
+          data={[
+            {
+              value: 'NO_TOPIC',
+              label: 'Suggested Topic',
+            },
+            ...(topics
               ? Object.values(topics).map((topic) => ({
                   value: topic.topicId,
                   label: topic.title,
                 }))
-              : []
-          }
+              : []),
+          ]}
           value={filters.topics || []}
           onChange={(value) => {
             setFilters((prev) => ({
diff --git a/client/src/components/GanttChart/GanttChart.tsx b/client/src/components/GanttChart/GanttChart.tsx
index 7f8cd219..952a40e4 100644
--- a/client/src/components/GanttChart/GanttChart.tsx
+++ b/client/src/components/GanttChart/GanttChart.tsx
@@ -306,7 +306,7 @@ const GanttChart = (props: IGanttChartProps) => {
           onTouchStart={handleTouchStart}
           onTouchMove={handleTouchMove}
           onWheel={handleWheel}
-          style={{ touchAction: 'none' }}
+          style={{ touchAction: 'pan-x pan-y' }}
         >
           {groups.map((group) => (
             <div key={group.groupId} className={classes.groupRow}>
diff --git a/client/src/config/global.ts b/client/src/config/global.ts
index 2f2705cc..0dc28218 100644
--- a/client/src/config/global.ts
+++ b/client/src/config/global.ts
@@ -45,8 +45,8 @@ export const GLOBAL_CONFIG: IGlobalConfig = {
   },
 
   privacy_notice: getEnvironmentVariable('PRIVACY_NOTICE') || '',
-
   default_supervisors: getEnvironmentVariable('DEFAULT_SUPERVISOR_UUID')?.split(';') || [],
+  calendar_url: getEnvironmentVariable('CALDAV_URL') || '',
 
   server_host: getEnvironmentVariable('SERVER_HOST') || 'http://localhost:8080',
 
diff --git a/client/src/config/types.ts b/client/src/config/types.ts
index 5387333a..74531f11 100644
--- a/client/src/config/types.ts
+++ b/client/src/config/types.ts
@@ -9,8 +9,8 @@ export interface IGlobalConfig {
   thesis_types: Record<string, string>
 
   privacy_notice: string
-
   default_supervisors: string[]
+  calendar_url: string
 
   keycloak: {
     client_id: string
diff --git a/client/src/contexts/ApplicationsProvider/ApplicationsProvider.tsx b/client/src/contexts/ApplicationsProvider/ApplicationsProvider.tsx
index b0892356..15970713 100644
--- a/client/src/contexts/ApplicationsProvider/ApplicationsProvider.tsx
+++ b/client/src/contexts/ApplicationsProvider/ApplicationsProvider.tsx
@@ -11,6 +11,8 @@ import { ApplicationState, IApplication } from '../../requests/responses/applica
 import { useDebouncedValue } from '@mantine/hooks'
 import { showSimpleError } from '../../utils/notification'
 import { getApiResponseErrorMessage } from '../../requests/handler'
+import { useAllTopics } from '../../hooks/fetcher'
+import { useLoggedInUser } from '../../hooks/authentication'
 
 interface IApplicationsProviderProps {
   fetchAll?: boolean
@@ -30,6 +32,9 @@ const ApplicationsProvider = (props: PropsWithChildren<IApplicationsProviderProp
     emptyComponent,
   } = props
 
+  const user = useLoggedInUser()
+  const topics = useAllTopics()
+
   const [applications, setApplications] = useState<PaginationResponse<IApplication>>()
   const [page, setPage] = useState(0)
 
@@ -41,15 +46,38 @@ const ApplicationsProvider = (props: PropsWithChildren<IApplicationsProviderProp
     direction: 'desc',
   })
 
-  const [debouncedSearch] = useDebouncedValue(filters.search || '', 500)
+  const adjustedFilters = useMemo(() => {
+    const copiedFilters = { ...filters }
+
+    if (!user.groups.includes('admin') && !copiedFilters.topics?.length && topics) {
+      copiedFilters.topics = [
+        'NO_TOPIC',
+        ...topics
+          .filter(
+            (topic) =>
+              topic.supervisors.some((supervisor) => supervisor.userId === user.userId) ||
+              topic.advisors.some((advisor) => advisor.userId === user.userId),
+          )
+          .map((topic) => topic.topicId),
+      ]
+    }
+
+    return copiedFilters
+  }, [filters, topics, user.userId])
+
+  const [debouncedSearch] = useDebouncedValue(adjustedFilters.search || '', 500)
 
   useEffect(() => {
     setPage(0)
-  }, [sort, filters])
+  }, [sort, adjustedFilters])
 
   useEffect(() => {
     setApplications(undefined)
 
+    if (!topics) {
+      return
+    }
+
     return doRequest<PaginationResponse<IApplication>>(
       `/v2/applications`,
       {
@@ -58,8 +86,14 @@ const ApplicationsProvider = (props: PropsWithChildren<IApplicationsProviderProp
         params: {
           fetchAll: fetchAll ? 'true' : 'false',
           search: debouncedSearch,
-          state: filters.states?.join(',') ?? '',
-          topic: filters.topics?.join(',') ?? '',
+          state: adjustedFilters.states?.join(',') ?? '',
+          topic:
+            adjustedFilters.topics?.filter((topicId) => topicId !== 'NO_TOPIC').join(',') ?? '',
+          includeSuggestedTopics: !adjustedFilters.topics?.length
+            ? 'true'
+            : adjustedFilters.topics.includes('NO_TOPIC')
+              ? 'true'
+              : 'false',
           limit,
           page,
           sortBy: sort.column,
@@ -83,12 +117,22 @@ const ApplicationsProvider = (props: PropsWithChildren<IApplicationsProviderProp
         setApplications(res.data)
       },
     )
-  }, [fetchAll, page, limit, sort, filters.states?.join(','), filters.topics?.join(','), debouncedSearch])
+  }, [
+    fetchAll,
+    page,
+    limit,
+    sort,
+    adjustedFilters.states?.join(','),
+    adjustedFilters.topics?.join(','),
+    debouncedSearch,
+    !topics,
+  ])
 
   const contextState = useMemo<IApplicationsContext>(() => {
     return {
+      topics,
       applications,
-      filters,
+      filters: adjustedFilters,
       setFilters: (value) => {
         setPage(0)
         setFilters(value)
@@ -119,7 +163,7 @@ const ApplicationsProvider = (props: PropsWithChildren<IApplicationsProviderProp
         })
       },
     }
-  }, [applications, filters, sort, page, limit])
+  }, [user.userId, topics, applications, adjustedFilters, sort, page, limit])
 
   if (hideIfEmpty && page === 0 && (!applications || applications.content.length === 0)) {
     return <>{emptyComponent}</>
diff --git a/client/src/contexts/ApplicationsProvider/context.ts b/client/src/contexts/ApplicationsProvider/context.ts
index a2094a80..e84a42d8 100644
--- a/client/src/contexts/ApplicationsProvider/context.ts
+++ b/client/src/contexts/ApplicationsProvider/context.ts
@@ -1,6 +1,7 @@
 import React, { Dispatch, SetStateAction } from 'react'
 import { PaginationResponse } from '../../requests/responses/pagination'
 import { ApplicationState, IApplication } from '../../requests/responses/application'
+import { ITopic } from '../../requests/responses/topic'
 
 export interface IApplicationsFilters {
   search?: string
@@ -14,6 +15,7 @@ export interface IApplicationsSort {
 }
 
 export interface IApplicationsContext {
+  topics: ITopic[] | undefined
   applications: PaginationResponse<IApplication> | undefined
   filters: IApplicationsFilters
   setFilters: Dispatch<SetStateAction<IApplicationsFilters>>
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 3576d7b5..4e8a33d1 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -14,7 +14,7 @@
 | KEYCLOAK_SERVICE_CLIENT_SECRET      | server         |                                                                                                                                                                                                       | Keycloak service client secret                                                                            |
 | KEYCLOAK_SERVICE_STUDENT_GROUP_NAME | server         |                                                                                                                                                                                                       | Keycloak group name that should be assigned when a student starts writing a thesis                        |
 | CALDAV_ENABLED                      | server         | false                                                                                                                                                                                                 | Enable calendar integration. If enabled scheduled presentations will be added to the calendar             |
-| CALDAV_URL                          | server         |                                                                                                                                                                                                       | CalDav URL where the events should be added                                                               |
+| CALDAV_URL                          | server, client |                                                                                                                                                                                                       | CalDav URL where the events should be added                                                               |
 | CALDAV_USERNAME                     | server         |                                                                                                                                                                                                       | CalDav username for authentication                                                                        |
 | CALDAV_PASSWORD                     | server         |                                                                                                                                                                                                       | CalDav password for authentication                                                                        |
 | POSTFIX_HOST                        | server         | localhost                                                                                                                                                                                             | Postfix host to send emails. Only required if emails are enabled.                                         |
diff --git a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
index e8f75cf9..1467a90b 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
@@ -68,6 +68,7 @@ public ResponseEntity<PaginationDto<ApplicationDto>> getApplications(
             @RequestParam(required = false) String search,
             @RequestParam(required = false) ApplicationState[] state,
             @RequestParam(required = false) String[] topic,
+            @RequestParam(required = false, defaultValue = "true") Boolean includeSuggestedTopics,
             @RequestParam(required = false, defaultValue = "false") Boolean fetchAll,
             @RequestParam(required = false, defaultValue = "0") Integer page,
             @RequestParam(required = false, defaultValue = "50") Integer limit,
@@ -82,6 +83,7 @@ public ResponseEntity<PaginationDto<ApplicationDto>> getApplications(
                 search,
                 state,
                 topic,
+                includeSuggestedTopics,
                 page,
                 limit,
                 sortBy,
diff --git a/server/src/main/java/thesistrack/ls1/controller/CalendarController.java b/server/src/main/java/thesistrack/ls1/controller/CalendarController.java
new file mode 100644
index 00000000..34f780e5
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/controller/CalendarController.java
@@ -0,0 +1,29 @@
+package thesistrack.ls1.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import thesistrack.ls1.service.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/v2/calendar")
+public class CalendarController {
+    private final ThesisPresentationService thesisPresentationService;
+
+    @Autowired
+    public CalendarController(ThesisPresentationService thesisPresentationService) {
+        this.thesisPresentationService = thesisPresentationService;
+    }
+
+    @GetMapping("/presentations")
+    public ResponseEntity<String> getCalendar() {
+        return ResponseEntity.ok()
+                .contentType(MediaType.parseMediaType("text/calendar"))
+                .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=calendar.ics")
+                .body(thesisPresentationService.getPresentationCalendar().toString());
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
index 56c3e90b..c3d71f1d 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
@@ -5,7 +5,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.AccessDeniedException;
@@ -13,7 +12,6 @@
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.server.ResponseStatusException;
 import thesistrack.ls1.constants.StringLimits;
 import thesistrack.ls1.constants.ThesisCommentType;
 import thesistrack.ls1.constants.ThesisState;
@@ -28,6 +26,7 @@
 import thesistrack.ls1.entity.User;
 import thesistrack.ls1.service.AuthenticationService;
 import thesistrack.ls1.service.ThesisCommentService;
+import thesistrack.ls1.service.ThesisPresentationService;
 import thesistrack.ls1.service.ThesisService;
 import thesistrack.ls1.utility.RequestValidator;
 
@@ -41,12 +40,14 @@ public class ThesisController {
     private final ThesisService thesisService;
     private final AuthenticationService authenticationService;
     private final ThesisCommentService thesisCommentService;
+    private final ThesisPresentationService thesisPresentationService;
 
     @Autowired
-    public ThesisController(ThesisService thesisService, AuthenticationService authenticationService, ThesisCommentService thesisCommentService) {
+    public ThesisController(ThesisService thesisService, AuthenticationService authenticationService, ThesisCommentService thesisCommentService, ThesisPresentationService thesisPresentationService) {
         this.thesisService = thesisService;
         this.authenticationService = authenticationService;
         this.thesisCommentService = thesisCommentService;
+        this.thesisPresentationService = thesisPresentationService;
     }
 
     @GetMapping
@@ -361,7 +362,7 @@ public ResponseEntity<ThesisDto> createPresentation(
             throw new AccessDeniedException("You need to be a advisor of this thesis to perform this action");
         }
 
-        thesis = thesisService.createPresentation(
+        thesis = thesisPresentationService.createPresentation(
                 authenticatedUser,
                 thesis,
                 RequestValidator.validateNotNull(payload.type()),
@@ -381,13 +382,13 @@ public ResponseEntity<ThesisDto> deletePresentation(
             JwtAuthenticationToken jwt
     ) {
         User authenticatedUser = authenticationService.getAuthenticatedUser(jwt);
-        ThesisPresentation presentation = thesisService.findPresentationById(thesisId, presentationId);
+        ThesisPresentation presentation = thesisPresentationService.findById(thesisId, presentationId);
 
         if (!presentation.hasManagementAccess(authenticatedUser)) {
             throw new AccessDeniedException("You are not allowed to delete this presentation");
         }
 
-        Thesis thesis = thesisService.deletePresentation(authenticatedUser, presentation);
+        Thesis thesis = thesisPresentationService.deletePresentation(authenticatedUser, presentation);
 
         return ResponseEntity.ok(ThesisDto.fromThesisEntity(thesis, thesis.hasAdvisorAccess(authenticatedUser)));
     }
diff --git a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
index 84ad3f52..47dbefc0 100644
--- a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
@@ -4,6 +4,7 @@
 
 public record TaskDto(
         String message,
+        String link,
         Instant startDate,
         Instant endDate,
         Number priority
diff --git a/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java b/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java
index 6f636127..de7180dd 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java
@@ -16,22 +16,34 @@
 
 @Repository
 public interface ApplicationRepository extends JpaRepository<Application, UUID> {
-    @Query("SELECT DISTINCT a FROM Application a WHERE " +
+    @Query(
+            "SELECT DISTINCT a FROM Application a WHERE " +
             "(:userId IS NULL OR a.user.id = :userId) AND " +
             "(:states IS NULL OR a.state IN :states) AND " +
-            "(:topics IS NULL OR a.topic.id IN :topics) AND " +
+            "(:includeSuggestedTopics = true OR a.topic IS NOT NULL) AND " +
+            "(:topics IS NULL OR a.topic.id IN :topics OR (:includeSuggestedTopics = true AND a.topic IS NULL)) AND " +
             "(:searchQuery IS NULL OR LOWER(a.user.firstName) LIKE %:searchQuery% OR " +
             "LOWER(a.user.lastName) LIKE %:searchQuery% OR " +
             "LOWER(a.user.email) LIKE %:searchQuery% OR " +
             "LOWER(a.user.matriculationNumber) LIKE %:searchQuery% OR " +
-            "LOWER(a.user.universityId) LIKE %:searchQuery%)")
+            "LOWER(a.user.universityId) LIKE %:searchQuery%)"
+    )
     Page<Application> searchApplications(
             @Param("userId") UUID userId,
             @Param("searchQuery") String searchQuery,
             @Param("states") Set<ApplicationState> states,
             @Param("topics") Set<String> topics,
+            @Param("includeSuggestedTopics") boolean includeSuggestedTopics,
             Pageable page
     );
 
     List<Application> findAllByTopic(Topic topic);
+
+    @Query(
+            "SELECT COUNT(DISTINCT a) FROM Application a " +
+            "LEFT JOIN Topic t ON (a.topic.id = t.id) " +
+            "LEFT JOIN TopicRole r ON (t.id = r.topic.id) " +
+            "WHERE (a.topic IS NULL OR :userId IS NULL OR r.user.id = :userId) AND a.state = 'NOT_ASSESSED'"
+    )
+    long countUnreviewedApplications(@Param("userId") UUID userId);
 }
diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisCommentRepository.java b/server/src/main/java/thesistrack/ls1/repository/ThesisCommentRepository.java
index 8ec11a81..3c021e6f 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ThesisCommentRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ThesisCommentRepository.java
@@ -17,7 +17,8 @@
 
 @Repository
 public interface ThesisCommentRepository extends JpaRepository<ThesisComment, UUID> {
-    @Query("SELECT DISTINCT c FROM ThesisComment c WHERE " +
+    @Query(
+            "SELECT DISTINCT c FROM ThesisComment c WHERE " +
             "c.thesis.id = :thesisId AND c.type = :commentType " +
             "ORDER BY c.createdAt DESC"
     )
diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java b/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
index 23c8fa8e..4a18d302 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
@@ -6,13 +6,25 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import thesistrack.ls1.constants.ThesisPresentationVisibility;
 import thesistrack.ls1.entity.ThesisPresentation;
 
 import java.time.Instant;
+import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 @Repository
 public interface ThesisPresentationRepository extends JpaRepository<ThesisPresentation, UUID> {
-    @Query("SELECT p FROM ThesisPresentation p WHERE p.scheduledAt >= :time")
-    Page<ThesisPresentation> findFuturePresentations(@Param("time") Instant time, Pageable page);
+    @Query("SELECT p FROM ThesisPresentation p WHERE p.scheduledAt >= :time AND (:visibilities IS NULL OR p.visibility IN :visibilities)")
+    Page<ThesisPresentation> findFuturePresentations(
+            @Param("time") Instant time,
+            @Param("visibilities") Set<ThesisPresentationVisibility> visibilities,
+            Pageable page
+    );
+
+    @Query("SELECT p FROM ThesisPresentation p WHERE (:visibilities IS NULL OR p.visibility IN :visibilities)")
+    List<ThesisPresentation> findAllPresentations(
+            @Param("visibilities") Set<ThesisPresentationVisibility> visibilities
+    );
 }
diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java b/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java
index 95bdcc38..7d96a210 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java
@@ -6,16 +6,19 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import thesistrack.ls1.constants.ThesisRoleName;
 import thesistrack.ls1.constants.ThesisState;
 import thesistrack.ls1.constants.ThesisVisibility;
 import thesistrack.ls1.entity.Thesis;
 
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
 @Repository
 public interface ThesisRepository extends JpaRepository<Thesis, UUID> {
-    @Query("SELECT DISTINCT t FROM Thesis t LEFT JOIN ThesisRole r ON (t.id = r.thesis.id) WHERE " +
+    @Query(
+            "SELECT DISTINCT t FROM Thesis t LEFT JOIN ThesisRole r ON (t.id = r.thesis.id) WHERE " +
             "(:userId IS NULL OR r.user.id = :userId) AND " +
             "(:visibilities IS NULL OR t.visibility IN :visibilities OR r.user.id = :userId) AND " +
             "(:states IS NULL OR t.state IN :states) AND " +
@@ -24,7 +27,8 @@ public interface ThesisRepository extends JpaRepository<Thesis, UUID> {
             "LOWER(r.user.lastName) LIKE %:searchQuery% OR " +
             "LOWER(r.user.email) LIKE %:searchQuery% OR " +
             "LOWER(r.user.matriculationNumber) LIKE %:searchQuery% OR " +
-            "LOWER(r.user.universityId) LIKE %:searchQuery%)")
+            "LOWER(r.user.universityId) LIKE %:searchQuery%)"
+    )
     Page<Thesis> searchTheses(
             @Param("userId") UUID userId,
             @Param("visibilities") Set<ThesisVisibility> visibilities,
@@ -32,4 +36,17 @@ Page<Thesis> searchTheses(
             @Param("states") Set<ThesisState> states,
             Pageable page
     );
+
+    @Query(
+            "SELECT DISTINCT t FROM Thesis t LEFT JOIN ThesisRole r ON (t.id = r.thesis.id) WHERE " +
+            "(t.state != 'FINISHED' AND t.state != 'DROPPED_OUT') AND " +
+            "(:userId IS NULL OR r.user.id = :userId) AND " +
+            "(:roleNames IS NULL OR r.id.role IN :roleNames) AND " +
+            "(:states IS NULL OR t.state IN :states)"
+    )
+    List<Thesis> findActiveThesesForRole(
+            @Param("userId") UUID userId,
+            @Param("roleNames") Set<ThesisRoleName> roleNames,
+            @Param("states") Set<ThesisState> states
+    );
 }
diff --git a/server/src/main/java/thesistrack/ls1/repository/TopicRepository.java b/server/src/main/java/thesistrack/ls1/repository/TopicRepository.java
index 45ae498c..12e2846b 100644
--- a/server/src/main/java/thesistrack/ls1/repository/TopicRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/TopicRepository.java
@@ -16,12 +16,17 @@
 
 @Repository
 public interface TopicRepository  extends JpaRepository<Topic, UUID>  {
-    @Query("SELECT DISTINCT t FROM Topic t WHERE " +
+    @Query(
+            "SELECT DISTINCT t FROM Topic t WHERE " +
             "(:searchQuery IS NULL OR t.title LIKE %:searchQuery%) AND " +
-            "(:includeClosed = TRUE OR t.closedAt IS NULL)")
+            "(:includeClosed = TRUE OR t.closedAt IS NULL)"
+    )
     Page<Topic> searchTopics(
             @Param("includeClosed") boolean includeClosed,
             @Param("searchQuery") String searchQuery,
             Pageable page
     );
+
+    @Query("SELECT COUNT(*) FROM Topic t WHERE t.closedAt IS NULL")
+    long countOpenTopics();
 }
diff --git a/server/src/main/java/thesistrack/ls1/repository/UserRepository.java b/server/src/main/java/thesistrack/ls1/repository/UserRepository.java
index e329738e..19a86718 100644
--- a/server/src/main/java/thesistrack/ls1/repository/UserRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/UserRepository.java
@@ -17,13 +17,15 @@
 public interface UserRepository extends JpaRepository<User, UUID> {
     Optional<User> findByUniversityId(String universityId);
 
-    @Query("SELECT DISTINCT u FROM User u LEFT JOIN UserGroup g ON (u.id = g.id.userId) WHERE " +
+    @Query(
+            "SELECT DISTINCT u FROM User u LEFT JOIN UserGroup g ON (u.id = g.id.userId) WHERE " +
             "(:groups IS NULL OR g.id.group IN :groups) AND " +
             "(:searchQuery IS NULL OR LOWER(u.firstName) LIKE %:searchQuery% OR " +
             "LOWER(u.lastName) LIKE %:searchQuery% OR " +
             "LOWER(u.email) LIKE %:searchQuery% OR " +
             "LOWER(u.matriculationNumber) LIKE %:searchQuery% OR " +
-            "LOWER(u.universityId) LIKE %:searchQuery%)")
+            "LOWER(u.universityId) LIKE %:searchQuery%)"
+    )
     Page<User> searchUsers(@Param("searchQuery") String searchQuery, @Param("groups") Set<String> groups, Pageable page);
 
     @Query("SELECT DISTINCT u FROM User u LEFT JOIN UserGroup g ON (u.id = g.id.userId) WHERE g.id.group IN (\"supervisor\", \"advisor\", \"admin\")")
diff --git a/server/src/main/java/thesistrack/ls1/security/WebSecurityConfig.java b/server/src/main/java/thesistrack/ls1/security/WebSecurityConfig.java
index 0dae9cab..7daf23fa 100644
--- a/server/src/main/java/thesistrack/ls1/security/WebSecurityConfig.java
+++ b/server/src/main/java/thesistrack/ls1/security/WebSecurityConfig.java
@@ -46,6 +46,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 .requestMatchers(HttpMethod.POST, "/v1/applications").permitAll()
                                 .requestMatchers(HttpMethod.GET, "/v2/topics/**").permitAll()
                                 .requestMatchers(HttpMethod.GET, "/v2/published-theses/**").permitAll()
+                                .requestMatchers(HttpMethod.GET, "/v2/calendar/**").permitAll()
                                 .anyRequest().authenticated()
                 );
 
diff --git a/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java b/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
index 13c8907b..ebbeb7e6 100644
--- a/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
+++ b/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java
@@ -4,6 +4,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -84,10 +85,8 @@ private void assignKeycloakGroup(UUID userId, UUID groupId) {
             throw new RuntimeException("User id or group id is null");
         }
 
-        webClient.put()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/admin/realms/" + keycloakRealmName + "/users/" + userId +"/groups/" + groupId)
-                        .build())
+        webClient.method(HttpMethod.PUT)
+                .uri("/admin/realms/" + keycloakRealmName + "/users/" + userId +"/groups/" + groupId)
                 .headers(headers -> headers.addAll(getAuthenticationHeaders()))
                 .retrieve()
                 .bodyToMono(Void.class)
@@ -99,10 +98,8 @@ private void removeKeycloakGroup(UUID userId, UUID groupId) {
             throw new RuntimeException("User id or group id is null");
         }
 
-        webClient.delete()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/admin/realms/" + keycloakRealmName + "/users/" + userId +"/groups/" + groupId)
-                        .build())
+        webClient.method(HttpMethod.DELETE)
+                .uri("/admin/realms/" + keycloakRealmName + "/users/" + userId +"/groups/" + groupId)
                 .headers(headers -> headers.addAll(getAuthenticationHeaders()))
                 .retrieve()
                 .bodyToMono(Void.class)
@@ -113,7 +110,7 @@ private record TokensResponse(String access_token) { }
 
     private HttpHeaders getAuthenticationHeaders() {
         if (tokenExpiration == null || Instant.now().isAfter(tokenExpiration)) {
-            Object accessTokenResult = webClient.post()
+            TokensResponse response = webClient.post()
                     .uri("/realms/" + keycloakRealmName + "/protocol/openid-connect/token")
                     .body(
                             BodyInserters.fromFormData("grant_type", "client_credentials")
@@ -122,14 +119,13 @@ private HttpHeaders getAuthenticationHeaders() {
                     )
                     .retrieve()
                     .bodyToMono(TokensResponse.class)
-                    .block()
-                    .access_token();
+                    .block();
 
-            if (accessTokenResult == null) {
+            if (response == null) {
                 throw new RuntimeException("Access token not returned");
             }
 
-            accessToken = accessTokenResult.toString();
+            accessToken = response.access_token();
             tokenExpiration = Instant.now().plus(30, ChronoUnit.SECONDS);
         }
 
@@ -142,16 +138,18 @@ private HttpHeaders getAuthenticationHeaders() {
     private record GroupElement(UUID id, String name) {}
 
     private UUID getGroupId(String groupName) {
-        List<GroupElement> groups = webClient.get()
-                .uri(uriBuilder -> uriBuilder
-                        .path("/admin/realms/" + keycloakRealmName + "/groups")
-                        .build())
+        List<GroupElement> groups = webClient.method(HttpMethod.GET)
+                .uri("/admin/realms/" + keycloakRealmName + "/groups")
                 .headers(headers -> headers.addAll(getAuthenticationHeaders()))
                 .retrieve()
                 .bodyToFlux(GroupElement.class)
                 .collectList()
                 .block();
 
+        if (groups == null) {
+            throw new RuntimeException("Groups request was empty");
+        }
+
         return groups.stream()
                 .filter(group -> group.name().equals(groupName))
                 .findFirst()
@@ -162,17 +160,22 @@ private UUID getGroupId(String groupName) {
     private record UserElement(UUID id) {}
 
     private UUID getUserId(String username) {
-        List<UserElement> users = webClient.get()
+        List<UserElement> users = webClient.method(HttpMethod.GET)
                 .uri(uriBuilder -> uriBuilder
                         .path("/admin/realms/" + keycloakRealmName + "/users")
                         .queryParam("username", username)
-                        .build())
+                        .build()
+                )
                 .headers(headers -> headers.addAll(getAuthenticationHeaders()))
                 .retrieve()
                 .bodyToFlux(UserElement.class)
                 .collectList()
                 .block();
 
+        if (users == null) {
+            throw new RuntimeException("Users request was empty");
+        }
+
         return users.stream()
                 .findFirst()
                 .map(UserElement::id)
diff --git a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
index da023425..f7ec463f 100644
--- a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
@@ -54,6 +54,7 @@ public Page<Application> getAll(
             String searchQuery,
             ApplicationState[] states,
             String[] topics,
+            boolean includeSuggestedTopics,
             int page,
             int limit,
             String sortBy,
@@ -70,6 +71,7 @@ public Page<Application> getAll(
                 searchQueryFilter,
                 statesFilter,
                 topicsFilter,
+                includeSuggestedTopics,
                 PageRequest.of(page, limit, Sort.by(order))
         );
     }
diff --git a/server/src/main/java/thesistrack/ls1/service/CalendarService.java b/server/src/main/java/thesistrack/ls1/service/CalendarService.java
index 42e9b92c..5f943992 100644
--- a/server/src/main/java/thesistrack/ls1/service/CalendarService.java
+++ b/server/src/main/java/thesistrack/ls1/service/CalendarService.java
@@ -79,6 +79,10 @@ public void updateEvent(String eventId, CalendarEvent data) {
             return;
         }
 
+        if (eventId == null) {
+            return;
+        }
+
         try {
             Calendar calendar = getCalendar();
             Optional<VEvent> event = findVEvent(calendar, eventId);
@@ -113,7 +117,7 @@ public void deleteEvent(String eventId) {
         }
     }
 
-    private Optional<VEvent> findVEvent(Calendar calendar, String eventId) {
+    public Optional<VEvent> findVEvent(Calendar calendar, String eventId) {
         for (Component component : calendar.getComponents(Component.VEVENT)) {
             VEvent event = (VEvent) component;
             Optional<Uid> uid = event.getUid();
@@ -126,7 +130,7 @@ private Optional<VEvent> findVEvent(Calendar calendar, String eventId) {
         return Optional.empty();
     }
 
-    private VEvent createVEvent(String eventId, CalendarEvent data) {
+    public VEvent createVEvent(String eventId, CalendarEvent data) {
         VEvent event = new VEvent(data.start, data.end, data.title);
 
         event.add(new Uid(eventId));
@@ -159,16 +163,16 @@ private Calendar getCalendar() {
                 .block();
 
         if (response == null) {
-            return new Calendar();
+            throw new RuntimeException("Calendar response was empty");
         }
 
-        CalendarBuilder builder = new CalendarBuilder();
-        StringReader stringReader = new StringReader(response);
-
         try {
-            return builder.build(stringReader);
-        } catch (IOException | ParserException e) {
-            return new Calendar();
+            CalendarBuilder builder = new CalendarBuilder();
+            StringReader reader = new StringReader(response);
+
+            return builder.build(reader);
+        } catch (IOException | ParserException | RuntimeException e) {
+            throw new RuntimeException("Failed to parse calendar");
         }
     }
 
@@ -177,7 +181,7 @@ private void updateCalendar(Calendar calendar) {
                 .contentType(MediaType.parseMediaType("text/calendar"))
                 .bodyValue(calendar.toString())
                 .retrieve()
-                .bodyToMono(String.class)
+                .bodyToMono(Void.class)
                 .block();
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
index dc31a542..f8f61fcf 100644
--- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java
+++ b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -4,48 +4,207 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import thesistrack.ls1.constants.ThesisPresentationVisibility;
+import thesistrack.ls1.constants.ThesisRoleName;
+import thesistrack.ls1.constants.ThesisState;
 import thesistrack.ls1.dto.TaskDto;
+import thesistrack.ls1.entity.Thesis;
 import thesistrack.ls1.entity.ThesisPresentation;
 import thesistrack.ls1.entity.User;
+import thesistrack.ls1.repository.ApplicationRepository;
 import thesistrack.ls1.repository.ThesisPresentationRepository;
+import thesistrack.ls1.repository.ThesisRepository;
+import thesistrack.ls1.repository.TopicRepository;
 
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 @Service
 public class DashboardService {
     private final ThesisPresentationRepository thesisPresentationRepository;
+    private final ThesisRepository thesisRepository;
+    private final ApplicationRepository applicationRepository;
+    private final TopicRepository topicRepository;
 
-    public DashboardService(ThesisPresentationRepository thesisPresentationRepository) {
+    public DashboardService(ThesisPresentationRepository thesisPresentationRepository, ThesisRepository thesisRepository, ApplicationRepository applicationRepository, TopicRepository topicRepository) {
         this.thesisPresentationRepository = thesisPresentationRepository;
+        this.thesisRepository = thesisRepository;
+        this.applicationRepository = applicationRepository;
+        this.topicRepository = topicRepository;
     }
 
     public Page<ThesisPresentation> getPresentations(Integer page, Integer limit, String sortBy, String sortOrder) {
         Sort.Order order = new Sort.Order(sortOrder.equals("asc") ? Sort.Direction.ASC : Sort.Direction.DESC, sortBy);
 
-        return thesisPresentationRepository.findFuturePresentations(Instant.now(), PageRequest.of(page, limit, Sort.by(order)));
+        return thesisPresentationRepository.findFuturePresentations(
+                Instant.now(),
+                Set.of(ThesisPresentationVisibility.PUBLIC),
+                PageRequest.of(page, limit, Sort.by(order))
+        );
     }
 
     public List<TaskDto> getTasks(User user) {
         List<TaskDto> tasks = new ArrayList<>();
 
+        // general student tasks
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), null)) {
+            if (thesis.getAbstractField().isBlank()) {
+                tasks.add(new TaskDto(
+                        "Add the abstract to your thesis",
+                        getThesisLink(thesis),
+                        thesis.getCreatedAt(),
+                        null,
+                        100
+                ));
+            }
+
+            if (thesis.getInfo().isBlank()) {
+                tasks.add(new TaskDto(
+                        "Add \"Additional Information\" to your thesis",
+                        getThesisLink(thesis),
+                        thesis.getCreatedAt(),
+                        null,
+                        100
+                ));
+            }
+        }
+
+        // general advisor, supervisor tasks
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.ADVISOR, ThesisRoleName.SUPERVISOR), null)) {
+            if (thesis.getState().equals(ThesisState.PROPOSAL)) {
+                continue;
+            }
+
+            if (thesis.getStartDate() == null || thesis.getEndDate() == null) {
+                tasks.add(new TaskDto(
+                        "Add start and end date to thesis \"" + thesis.getTitle() + "\"",
+                        getThesisLink(thesis),
+                        thesis.getCreatedAt(),
+                        null,
+                        100
+                ));
+            }
+        }
+
         // proposal task
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), Set.of(ThesisState.PROPOSAL))) {
+            tasks.add(new TaskDto(
+                    "Add a proposal to your thesis",
+                    getThesisLink(thesis),
+                    thesis.getCreatedAt(),
+                    null,
+                    100
+            ));
+        }
+
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.ADVISOR, ThesisRoleName.SUPERVISOR), Set.of(ThesisState.PROPOSAL))) {
+            if (!thesis.getProposals().isEmpty()) {
+                continue;
+            }
+
+            tasks.add(new TaskDto(
+                    "Review the proposal of thesis \"" + thesis.getTitle() + "\"",
+                    getThesisLink(thesis),
+                    thesis.getProposals().getFirst().getCreatedAt(),
+                    null,
+                    100
+            ));
+        }
 
         // thesis submission task
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), Set.of(ThesisState.WRITING))) {
+            tasks.add(new TaskDto(
+                    "Submit your final thesis and presentation",
+                    getThesisLink(thesis),
+                    thesis.getStartDate(),
+                    thesis.getEndDate(),
+                    100
+            ));
+        }
 
         // presentation tasks
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), null, Set.of(ThesisState.WRITING, ThesisState.SUBMITTED))) {
+            if (!thesis.getPresentations().isEmpty()) {
+                continue;
+            }
+
+            tasks.add(new TaskDto(
+                    "Schedule a presentation date for thesis \"" + thesis.getTitle() + "\"",
+                    getThesisLink(thesis),
+                    thesis.getStartDate(),
+                    null,
+                    100
+            ));
+        }
 
         // thesis assessment task
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.ADVISOR, ThesisRoleName.SUPERVISOR), Set.of(ThesisState.SUBMITTED))) {
+            tasks.add(new TaskDto(
+                    "Add assessment to thesis \"" + thesis.getTitle() + "\"",
+                    getThesisLink(thesis),
+                    null,
+                    null,
+                    100
+            ));
+        }
 
         // grade thesis task
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.SUPERVISOR), Set.of(ThesisState.ASSESSED))) {
+            tasks.add(new TaskDto(
+                    "Add final grade to thesis \"" + thesis.getTitle() + "\"",
+                    getThesisLink(thesis),
+                    null,
+                    null,
+                    100
+            ));
+        }
 
         // close thesis task
+        for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.SUPERVISOR), Set.of(ThesisState.GRADED))) {
+            tasks.add(new TaskDto(
+                    "Complete thesis \"" + thesis.getTitle() + "\"",
+                    getThesisLink(thesis),
+                    null,
+                    null,
+                    100
+            ));
+        }
+
+        if (user.hasAnyGroup("admin", "supervisor", "advisor")) {
+            // review application task
+            long unreviewedApplications = applicationRepository.countUnreviewedApplications(user.getId());
+
+            if (unreviewedApplications > 10) {
+                tasks.add(new TaskDto(
+                        "You have " + unreviewedApplications + " unreviewed applications.",
+                        "/applications",
+                        null,
+                        null,
+                        100
+                ));
+            }
+
+            // no open topic task
+            long openTopics = topicRepository.countOpenTopics();
+
+            if (openTopics == 0) {
+                tasks.add(new TaskDto(
+                        "There are no open Topics. Please create a topic.",
+                        "/topics",
+                        null,
+                        null,
+                        100
+                ));
+            }
+        }
 
-        // review application task
-
-        // no open topic task
 
         return tasks;
     }
+
+    private String getThesisLink(Thesis thesis) {
+        return "/theses/" + thesis.getId();
+    }
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java b/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
new file mode 100644
index 00000000..0d8c8a62
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
@@ -0,0 +1,153 @@
+package thesistrack.ls1.service;
+
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.property.ProdId;
+import net.fortuna.ical4j.model.property.immutable.ImmutableCalScale;
+import net.fortuna.ical4j.model.property.immutable.ImmutableMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import thesistrack.ls1.constants.ThesisPresentationType;
+import thesistrack.ls1.constants.ThesisPresentationVisibility;
+import thesistrack.ls1.entity.Thesis;
+import thesistrack.ls1.entity.ThesisPresentation;
+import thesistrack.ls1.entity.User;
+import thesistrack.ls1.exception.request.ResourceNotFoundException;
+import thesistrack.ls1.repository.ThesisPresentationRepository;
+import thesistrack.ls1.repository.ThesisRepository;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+
+@Service
+public class ThesisPresentationService {
+    private final CalendarService calendarService;
+    private final ThesisRepository thesisRepository;
+    private final MailingService mailingService;
+    private final ThesisPresentationRepository thesisPresentationRepository;
+
+    @Autowired
+    public ThesisPresentationService(CalendarService calendarService, ThesisRepository thesisRepository, MailingService mailingService, ThesisPresentationRepository thesisPresentationRepository) {
+        this.calendarService = calendarService;
+        this.thesisRepository = thesisRepository;
+        this.mailingService = mailingService;
+        this.thesisPresentationRepository = thesisPresentationRepository;
+    }
+
+    public Calendar getPresentationCalendar() {
+        Calendar calendar = new Calendar();
+
+        calendar.add(new ProdId("-//Thesis Track//Thesis Presentations//EN"));
+        calendar.add(ImmutableCalScale.GREGORIAN);
+        calendar.getProperties().add(ImmutableMethod.PUBLISH);
+
+        List<ThesisPresentation> presentations = thesisPresentationRepository.findAllPresentations(
+                Set.of(ThesisPresentationVisibility.PUBLIC)
+        );
+
+        for (ThesisPresentation presentation : presentations) {
+            calendar.add(calendarService.createVEvent(presentation.getId().toString(), createPresentationCalendarEvent(presentation)));
+        }
+
+        return calendar;
+    }
+
+    @Transactional
+    public Thesis createPresentation(
+            User creatingUser,
+            Thesis thesis,
+            ThesisPresentationType type,
+            ThesisPresentationVisibility visibility,
+            String location,
+            String streamUrl,
+            Instant date
+    ) {
+        ThesisPresentation presentation = new ThesisPresentation();
+
+        presentation.setThesis(thesis);
+        presentation.setType(type);
+        presentation.setVisibility(visibility);
+        presentation.setLocation(location);
+        presentation.setStreamUrl(streamUrl);
+        presentation.setScheduledAt(date);
+        presentation.setCreatedBy(creatingUser);
+        presentation.setCreatedAt(Instant.now());
+
+        presentation = thesisPresentationRepository.save(presentation);
+
+        if (visibility.equals(ThesisPresentationVisibility.PUBLIC)) {
+            presentation.setCalendarEvent(calendarService.createEvent(createPresentationCalendarEvent(presentation)));
+            presentation = thesisPresentationRepository.save(presentation);
+        }
+
+        List<ThesisPresentation> presentations = thesis.getPresentations();
+        presentations.add(presentation);
+        presentations.sort(Comparator.comparing(ThesisPresentation::getScheduledAt));
+        thesis.setPresentations(presentations);
+
+        thesis = thesisRepository.save(thesis);
+
+        mailingService.sendNewScheduledPresentationEmail(presentation);
+
+        return thesis;
+    }
+
+    @Transactional
+    public Thesis deletePresentation(User deletingUser, ThesisPresentation presentation) {
+        Thesis thesis = presentation.getThesis();
+
+        thesisPresentationRepository.deleteById(presentation.getId());
+
+        List<ThesisPresentation> presentations = new ArrayList<>(thesis.getPresentations().stream()
+                .filter(x -> !presentation.getId().equals(x.getId()))
+                .toList());
+
+        thesis.setPresentations(presentations);
+
+        thesis = thesisRepository.save(thesis);
+
+        calendarService.deleteEvent(presentation.getCalendarEvent());
+        mailingService.sendPresentationDeletedEmail(deletingUser, presentation);
+
+        return thesis;
+    }
+
+    public void updateThesisCalendarEvents(Thesis thesis) {
+        for (ThesisPresentation presentation : thesis.getPresentations()) {
+            String eventId = presentation.getCalendarEvent();
+
+            if (eventId != null) {
+                calendarService.updateEvent(eventId, createPresentationCalendarEvent(presentation));
+            }
+        }
+    }
+
+    public ThesisPresentation findById(UUID thesisId, UUID presentationId) {
+        ThesisPresentation presentation = thesisPresentationRepository.findById(presentationId)
+                .orElseThrow(() -> new ResourceNotFoundException(String.format("Presentation with id %s not found.", presentationId)));
+
+        if (!presentation.getThesis().getId().equals(thesisId)) {
+            throw new ResourceNotFoundException(String.format("Presentation with id %s not found for thesis with id %s.", presentationId, thesisId));
+        }
+
+        return presentation;
+    }
+
+    private CalendarService.CalendarEvent createPresentationCalendarEvent(ThesisPresentation presentation) {
+        String location = presentation.getLocation();
+        String streamUrl = presentation.getStreamUrl();
+
+        return new CalendarService.CalendarEvent(
+                "Thesis Presentation \"" + presentation.getThesis().getTitle() + "\"",
+                location == null || location.isBlank() ? streamUrl : location,
+                "Title: " + presentation.getThesis().getTitle() + "\n" +
+                        (streamUrl != null && !streamUrl.isBlank() ? "Stream URL: " + streamUrl + "\n" : "") + "\n" +
+                        "Abstract:\n\n" + presentation.getThesis().getAbstractField(),
+                presentation.getScheduledAt(),
+                presentation.getScheduledAt().plus(60, ChronoUnit.MINUTES),
+                presentation.getThesis().getSupervisors().getFirst().getEmail(),
+                presentation.getThesis().getRoles().stream().map((role) -> role.getUser().getEmail()).toList()
+        );
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
index 7cbb67a6..30c9f12b 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
@@ -30,10 +30,9 @@ public class ThesisService {
     private final UploadService uploadService;
     private final ThesisProposalRepository thesisProposalRepository;
     private final ThesisAssessmentRepository thesisAssessmentRepository;
-    private final ThesisPresentationRepository thesisPresentationRepository;
     private final MailingService mailingService;
     private final AccessManagementService accessManagementService;
-    private final CalendarService calendarService;
+    private final ThesisPresentationService thesisPresentationService;
 
     @Autowired
     public ThesisService(
@@ -44,7 +43,10 @@ public ThesisService(
             ThesisProposalRepository thesisProposalRepository,
             ThesisAssessmentRepository thesisAssessmentRepository,
             UploadService uploadService,
-            ThesisPresentationRepository thesisPresentationRepository, MailingService mailingService, AccessManagementService accessManagementService, CalendarService calendarService) {
+            MailingService mailingService,
+            AccessManagementService accessManagementService,
+            ThesisPresentationService thesisPresentationService
+    ) {
         this.thesisRoleRepository = thesisRoleRepository;
         this.thesisRepository = thesisRepository;
         this.thesisStateChangeRepository = thesisStateChangeRepository;
@@ -52,10 +54,9 @@ public ThesisService(
         this.uploadService = uploadService;
         this.thesisProposalRepository = thesisProposalRepository;
         this.thesisAssessmentRepository = thesisAssessmentRepository;
-        this.thesisPresentationRepository = thesisPresentationRepository;
         this.mailingService = mailingService;
         this.accessManagementService = accessManagementService;
-        this.calendarService = calendarService;
+        this.thesisPresentationService = thesisPresentationService;
     }
 
     public Page<Thesis> getAll(
@@ -175,7 +176,7 @@ public Thesis updateThesis(
 
         thesis = thesisRepository.save(thesis);
 
-        updateThesisCalendarEvents(thesis);
+        thesisPresentationService.updateThesisCalendarEvents(thesis);
 
         return thesis;
     }
@@ -191,7 +192,7 @@ public Thesis updateThesisInfo(
 
         thesis = thesisRepository.save(thesis);
 
-        updateThesisCalendarEvents(thesis);
+        thesisPresentationService.updateThesisCalendarEvents(thesis);
 
         return thesis;
     }
@@ -305,90 +306,6 @@ public Resource getThesisFile(Thesis thesis) {
         return uploadService.load(filename);
     }
 
-    @Transactional
-    public Thesis createPresentation(
-            User creatingUser,
-            Thesis thesis,
-            ThesisPresentationType type,
-            ThesisPresentationVisibility visibility,
-            String location,
-            String streamUrl,
-            Instant date
-    ) {
-        ThesisPresentation presentation = new ThesisPresentation();
-
-        presentation.setThesis(thesis);
-        presentation.setType(type);
-        presentation.setVisibility(visibility);
-        presentation.setLocation(location);
-        presentation.setStreamUrl(streamUrl);
-        presentation.setScheduledAt(date);
-        presentation.setCreatedBy(creatingUser);
-        presentation.setCreatedAt(Instant.now());
-
-        presentation = thesisPresentationRepository.save(presentation);
-        presentation.setCalendarEvent(calendarService.createEvent(createPresentationCalendarEvent(presentation)));
-        presentation = thesisPresentationRepository.save(presentation);
-
-        List<ThesisPresentation> presentations = thesis.getPresentations();
-        presentations.add(presentation);
-        presentations.sort(Comparator.comparing(ThesisPresentation::getScheduledAt));
-        thesis.setPresentations(presentations);
-
-        thesis = thesisRepository.save(thesis);
-
-        mailingService.sendNewScheduledPresentationEmail(presentation);
-
-        return thesis;
-    }
-
-    @Transactional
-    public Thesis deletePresentation(User deletingUser, ThesisPresentation presentation) {
-        Thesis thesis = presentation.getThesis();
-
-        thesisPresentationRepository.deleteById(presentation.getId());
-
-        List<ThesisPresentation> presentations = new ArrayList<>(thesis.getPresentations().stream()
-                .filter(x -> !presentation.getId().equals(x.getId()))
-                .toList());
-
-        thesis.setPresentations(presentations);
-
-        thesis = thesisRepository.save(thesis);
-
-        calendarService.deleteEvent(presentation.getCalendarEvent());
-        mailingService.sendPresentationDeletedEmail(deletingUser, presentation);
-
-        return thesis;
-    }
-
-    private void updateThesisCalendarEvents(Thesis thesis) {
-        for (ThesisPresentation presentation : thesis.getPresentations()) {
-            String eventId = presentation.getCalendarEvent();
-
-            if (eventId != null) {
-                calendarService.updateEvent(eventId, createPresentationCalendarEvent(presentation));
-            }
-        }
-    }
-
-    private CalendarService.CalendarEvent createPresentationCalendarEvent(ThesisPresentation presentation) {
-        String location = presentation.getLocation();
-        String streamUrl = presentation.getStreamUrl();
-
-        return new CalendarService.CalendarEvent(
-                "Thesis Presentation \"" + presentation.getThesis().getTitle() + "\"",
-                location == null || location.isBlank() ? streamUrl : location,
-                "Title: " + presentation.getThesis().getTitle() + "\n" +
-                        (streamUrl != null && !streamUrl.isBlank() ? "Stream URL: " + streamUrl + "\n" : "") + "\n" +
-                        "Abstract:\n\n" + presentation.getThesis().getAbstractField(),
-                presentation.getScheduledAt(),
-                presentation.getScheduledAt().plus(60, ChronoUnit.MINUTES),
-                presentation.getThesis().getSupervisors().getFirst().getEmail(),
-                presentation.getThesis().getRoles().stream().map((role) -> role.getUser().getEmail()).toList()
-        );
-    }
-
     /* ASSESSMENT */
     @Transactional
     public Thesis submitAssessment(
@@ -481,17 +398,6 @@ public Thesis findById(UUID thesisId) {
                 .orElseThrow(() -> new ResourceNotFoundException(String.format("Thesis with id %s not found.", thesisId)));
     }
 
-    public ThesisPresentation findPresentationById(UUID thesisId, UUID presentationId) {
-        ThesisPresentation presentation = thesisPresentationRepository.findById(presentationId)
-                .orElseThrow(() -> new ResourceNotFoundException(String.format("Presentation with id %s not found.", presentationId)));
-
-        if (!presentation.getThesis().getId().equals(thesisId)) {
-            throw new ResourceNotFoundException(String.format("Presentation with id %s not found for thesis with id %s.", presentationId, thesisId));
-        }
-
-        return presentation;
-    }
-
     private void assignThesisRoles(
             Thesis thesis,
             User assigner,

From 3e18daeb264ec6bbe73e27f6c102445fba8ea9e0 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Fri, 30 Aug 2024 09:21:18 +0200
Subject: [PATCH 08/13] Implement feedback and code cleanup

---
 client/src/app/Routes.tsx                     | 16 +---
 .../ApplicationData/ApplicationData.tsx       |  8 +-
 .../ApplicationsFilters.tsx                   |  6 +-
 .../ApplicationsTable/ApplicationsTable.tsx   |  5 +-
 .../AuthenticatedFilePreview.tsx              |  2 +-
 .../src/components/AvatarUser/AvatarUser.tsx  | 30 ++++++
 .../AvatarUserList/AvatarUserList.tsx         | 23 +++++
 .../DeclarationOfDataConsent.tsx              |  2 +-
 .../GanttChart/GanttChart.module.css          | 34 ++++++-
 .../src/components/GanttChart/GanttChart.tsx  | 33 ++++++-
 .../PresentationsTable/PresentationsTable.tsx | 96 +++++++++++++++++++
 .../ThesesGanttChart/ThesesGanttChart.tsx     | 65 +++++++------
 .../components/ThesesTable/ThesesTable.tsx    | 10 +-
 .../src/components/ThesisData/ThesisData.tsx  | 19 ++--
 client/src/components/TopicData/TopicData.tsx | 11 +--
 .../components/TopicsTable/TopicsTable.tsx    | 19 ++--
 .../src/components/UploadArea/UploadArea.tsx  |  4 +-
 .../UserInformationForm.tsx                   | 48 +++++-----
 .../ThesesProvider/ThesesProvider.tsx         |  2 +-
 .../src/pages/DashboardPage/DashboardPage.tsx |  3 +
 .../MyTasksSection/MyTasksSection.tsx         | 62 +++++++++++-
 .../PublicPresentationsSection.tsx            | 83 ++++++++++++++++
 client/src/pages/LandingPage/LandingPage.tsx  |  1 +
 .../PublishedTheses/PublishedTheses.tsx       |  2 +-
 .../LegacySubmitApplicationPage.tsx           | 18 ++--
 .../ReplaceTopicModal/ReplaceTopicModal.tsx   |  2 +-
 .../MotivationStep/MotivationStep.tsx         |  2 +-
 .../SubmitAssessmentModal.tsx                 |  2 +-
 .../ThesisCommentsList/ThesisCommentsList.tsx |  1 -
 .../SubmitFinalGradeModal.tsx                 |  2 +-
 .../ThesisInfoSection/ThesisInfoSection.tsx   |  4 +-
 .../ThesisWritingSection.tsx                  |  4 +-
 .../PresentationsTable/PresentationsTable.tsx | 96 -------------------
 .../ThesisPresentationsTable.tsx              | 55 +++++++++++
 client/src/requests/payloads/user.ts          |  1 -
 client/src/requests/responses/dashboard.ts    |  7 ++
 client/src/requests/responses/thesis.ts       | 29 ++++--
 client/src/requests/responses/user.ts         |  2 +-
 client/src/utils/converter.ts                 | 15 +++
 client/src/utils/theme.ts                     |  8 ++
 docs/MAILS.md                                 |  1 +
 .../application-created-chair.html            |  4 +-
 .../application-created-student.html          |  4 +-
 .../mail-templates/application-reminder.html  |  8 ++
 .../ls1/ThesisTrackApplication.java           |  2 +
 .../ls1/controller/UserInfoController.java    |  1 -
 .../LegacyCreateApplicationPayload.java       |  1 -
 .../payload/UpdateUserInformationPayload.java |  1 -
 .../ls1/cron/ApplicationReminder.java         | 33 +++++++
 .../thesistrack/ls1/dto/LightUserDto.java     |  3 +-
 .../java/thesistrack/ls1/dto/TaskDto.java     |  4 -
 .../java/thesistrack/ls1/dto/UserDto.java     |  6 +-
 .../java/thesistrack/ls1/entity/Schedule.java | 26 -----
 .../java/thesistrack/ls1/entity/User.java     | 27 +++++-
 .../ls1/service/ApplicationService.java       |  2 -
 .../ls1/service/AuthenticationService.java    |  2 -
 .../ls1/service/DashboardService.java         | 81 ++++++----------
 .../ls1/service/MailingService.java           |  9 ++
 .../service/ThesisPresentationService.java    |  2 +-
 .../ls1/utility/DataFormatter.java            | 30 ++++++
 .../thesistrack/ls1/utility/MailBuilder.java  | 24 ++++-
 .../db/changelog/changes/07_cleanup.sql       |  5 +
 .../db/changelog/db.changelog-master.xml      |  1 +
 63 files changed, 748 insertions(+), 361 deletions(-)
 create mode 100644 client/src/components/AvatarUser/AvatarUser.tsx
 create mode 100644 client/src/components/AvatarUserList/AvatarUserList.tsx
 create mode 100644 client/src/components/PresentationsTable/PresentationsTable.tsx
 create mode 100644 client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx
 delete mode 100644 client/src/pages/ThesisPage/components/ThesisWritingSection/components/PresentationsTable/PresentationsTable.tsx
 create mode 100644 client/src/pages/ThesisPage/components/ThesisWritingSection/components/ThesisPresentationsTable/ThesisPresentationsTable.tsx
 create mode 100644 client/src/requests/responses/dashboard.ts
 create mode 100644 client/src/utils/converter.ts
 create mode 100644 client/src/utils/theme.ts
 create mode 100644 server/mail-templates/application-reminder.html
 create mode 100644 server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java
 delete mode 100644 server/src/main/java/thesistrack/ls1/entity/Schedule.java
 create mode 100644 server/src/main/resources/db/changelog/changes/07_cleanup.sql

diff --git a/client/src/app/Routes.tsx b/client/src/app/Routes.tsx
index 32fceb3b..24f86ad1 100644
--- a/client/src/app/Routes.tsx
+++ b/client/src/app/Routes.tsx
@@ -1,14 +1,8 @@
 import React, { lazy, Suspense } from 'react'
-import { BrowserRouter, Route, Routes } from 'react-router-dom'
+import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom'
 import AuthenticatedArea from './layout/AuthenticatedArea/AuthenticatedArea'
 import PageLoader from '../components/PageLoader/PageLoader'
 
-const LegacyThesisApplicationForm = lazy(
-  () => import('../pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage'),
-)
-const LegacyApplicationReviewPage = lazy(
-  () => import('../pages/LegacyApplicationReviewPage/LegacyApplicationReviewPage'),
-)
 const NotFoundPage = lazy(() => import('../pages/NotFoundPage/NotFoundPage'))
 const ThesisOverviewPage = lazy(() => import('../pages/ThesisOverviewPage/ThesisOverviewPage'))
 const DashboardPage = lazy(() => import('../pages/DashboardPage/DashboardPage'))
@@ -70,7 +64,7 @@ const AppRoutes = () => {
               </AuthenticatedArea>
             }
           />
-          <Route path='/applications/thesis' element={<LegacyThesisApplicationForm />} />
+          <Route path='/applications/thesis' element={<Navigate to='/' replace />} />
           <Route
             path='/applications/:applicationId?'
             element={
@@ -100,11 +94,7 @@ const AppRoutes = () => {
           />
           <Route
             path='/management/thesis-applications/:applicationId?'
-            element={
-              <AuthenticatedArea requiredGroups={['admin', 'advisor', 'supervisor']}>
-                <LegacyApplicationReviewPage />
-              </AuthenticatedArea>
-            }
+            element={<Navigate to='/applications' replace />}
           />
           <Route path='/logout' element={<LogoutPage />} />
           <Route path='/' element={<LandingPage />} />
diff --git a/client/src/components/ApplicationData/ApplicationData.tsx b/client/src/components/ApplicationData/ApplicationData.tsx
index ffdc3ca1..8b9e414e 100644
--- a/client/src/components/ApplicationData/ApplicationData.tsx
+++ b/client/src/components/ApplicationData/ApplicationData.tsx
@@ -4,11 +4,12 @@ import AuthenticatedFilePreview from '../AuthenticatedFilePreview/AuthenticatedF
 import React, { ReactNode } from 'react'
 import { GLOBAL_CONFIG } from '../../config/global'
 import { AVAILABLE_COUNTRIES } from '../../config/countries'
-import { formatApplicationState, formatDate, formatUser } from '../../utils/format'
+import { formatApplicationState, formatDate } from '../../utils/format'
 import LabeledItem from '../LabeledItem/LabeledItem'
 import DocumentEditor from '../DocumentEditor/DocumentEditor'
 import { ApplicationStateColor } from '../../config/colors'
 import TopicAccordionItem from '../TopicAccordionItem/TopicAccordionItem'
+import AvatarUser from '../AvatarUser/AvatarUser'
 
 interface IApplicationDataProps {
   application: IApplication
@@ -134,7 +135,10 @@ const ApplicationData = (props: IApplicationDataProps) => {
               <Divider />
               <Group grow>
                 {application.reviewedBy && (
-                  <LabeledItem label='Reviewer' value={formatUser(application.reviewedBy)} />
+                  <LabeledItem
+                    label='Reviewer'
+                    value={<AvatarUser user={application.reviewedBy} />}
+                  />
                 )}
                 {application.reviewedAt && (
                   <LabeledItem
diff --git a/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx b/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx
index de8ee184..ee668332 100644
--- a/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx
+++ b/client/src/components/ApplicationsFilters/ApplicationsFilters.tsx
@@ -2,10 +2,8 @@ import { Grid, MultiSelect, Select, TextInput } from '@mantine/core'
 import { MagnifyingGlass } from 'phosphor-react'
 import { ApplicationState } from '../../requests/responses/application'
 import { useApplicationsContext } from '../../contexts/ApplicationsProvider/hooks'
-import React, { useEffect } from 'react'
+import React from 'react'
 import { formatApplicationState } from '../../utils/format'
-import { useAllTopics } from '../../hooks/fetcher'
-import { useLoggedInUser } from '../../hooks/authentication'
 
 interface IApplicationsFiltersProps {
   size?: 'xl' | 'sm'
@@ -16,8 +14,6 @@ const ApplicationsFilters = (props: IApplicationsFiltersProps) => {
 
   const { topics, filters, setFilters, sort, setSort } = useApplicationsContext()
 
-  const user = useLoggedInUser()
-
   return (
     <Grid gutter='sm'>
       <Grid.Col span={12}>
diff --git a/client/src/components/ApplicationsTable/ApplicationsTable.tsx b/client/src/components/ApplicationsTable/ApplicationsTable.tsx
index 896a2f83..11b61892 100644
--- a/client/src/components/ApplicationsTable/ApplicationsTable.tsx
+++ b/client/src/components/ApplicationsTable/ApplicationsTable.tsx
@@ -3,10 +3,11 @@ import React from 'react'
 import { IApplication } from '../../requests/responses/application'
 import { DataTable, DataTableColumn } from 'mantine-datatable'
 import { Badge, Center } from '@mantine/core'
-import { formatApplicationState, formatDate, formatUser } from '../../utils/format'
+import { formatApplicationState, formatDate } from '../../utils/format'
 import { useApplicationsContext } from '../../contexts/ApplicationsProvider/hooks'
 import { IApplicationsSort } from '../../contexts/ApplicationsProvider/context'
 import { ApplicationStateColor } from '../../config/colors'
+import AvatarUser from '../AvatarUser/AvatarUser'
 
 type ApplicationColumn = 'state' | 'user' | 'thesis_title' | 'reviewed_at' | 'created_at'
 
@@ -42,7 +43,7 @@ const ApplicationsTable = (props: IApplicationsTableProps) => {
       accessor: 'user.firstName',
       title: 'Student',
       width: 200,
-      render: (application) => formatUser(application.user),
+      render: (application) => <AvatarUser user={application.user} />,
     },
     thesis_title: {
       accessor: 'thesisTitle',
diff --git a/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx b/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
index 62d6c0b8..8c630630 100644
--- a/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
+++ b/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
@@ -1,5 +1,5 @@
 import { useMemo, useState } from 'react'
-import { Button, Center, Group, Space, Stack, Text } from '@mantine/core'
+import { Button, Center, Group, Stack, Text } from '@mantine/core'
 import { downloadFile } from '../../utils/blob'
 import { useApiFile } from '../../hooks/fetcher'
 import { Link } from 'react-router-dom'
diff --git a/client/src/components/AvatarUser/AvatarUser.tsx b/client/src/components/AvatarUser/AvatarUser.tsx
new file mode 100644
index 00000000..5845ae9c
--- /dev/null
+++ b/client/src/components/AvatarUser/AvatarUser.tsx
@@ -0,0 +1,30 @@
+import { ILightUser } from '../../requests/responses/user'
+import { Avatar, Group, MantineSize, Text } from '@mantine/core'
+import { formatUser } from '../../utils/format'
+import { getSmallerMantineSize } from '../../utils/theme'
+
+interface IAvatarUserProps {
+  user: ILightUser
+  withUniversityId?: boolean
+  size?: MantineSize
+}
+
+const AvatarUser = (props: IAvatarUserProps) => {
+  const { user, withUniversityId = true, size = 'md' } = props
+
+  return (
+    <Group gap='xs' preventGrowOverflow wrap='nowrap' style={{ overflow: 'hidden' }}>
+      <Avatar
+        src={user.avatar || undefined}
+        name={`${user.firstName} ${user.lastName}`}
+        color='initials'
+        size={getSmallerMantineSize(size)}
+      />
+      <Text size={size} truncate style={{ flex: 1, minWidth: 0 }}>
+        {formatUser(user, { withUniversityId })}
+      </Text>
+    </Group>
+  )
+}
+
+export default AvatarUser
diff --git a/client/src/components/AvatarUserList/AvatarUserList.tsx b/client/src/components/AvatarUserList/AvatarUserList.tsx
new file mode 100644
index 00000000..9b01a37c
--- /dev/null
+++ b/client/src/components/AvatarUserList/AvatarUserList.tsx
@@ -0,0 +1,23 @@
+import { ILightUser } from '../../requests/responses/user'
+import { Group, MantineSize } from '@mantine/core'
+import AvatarUser from '../AvatarUser/AvatarUser'
+
+interface IAvatarUserListProps {
+  users: ILightUser[]
+  withUniversityId?: boolean
+  size?: MantineSize
+}
+
+const AvatarUserList = (props: IAvatarUserListProps) => {
+  const { users, withUniversityId, size } = props
+
+  return (
+    <Group gap='xs'>
+      {users.map((user) => (
+        <AvatarUser key={user.userId} user={user} withUniversityId={withUniversityId} size={size} />
+      ))}
+    </Group>
+  )
+}
+
+export default AvatarUserList
diff --git a/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx b/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx
index 2ab690ea..c7c1fa1e 100644
--- a/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx
+++ b/client/src/components/DeclarationOfDataConsent/DeclarationOfDataConsent.tsx
@@ -1,4 +1,4 @@
-import { Anchor, Modal, Text, Title } from '@mantine/core'
+import { Anchor, Modal } from '@mantine/core'
 import { useState } from 'react'
 import DocumentEditor from '../DocumentEditor/DocumentEditor'
 import { GLOBAL_CONFIG } from '../../config/global'
diff --git a/client/src/components/GanttChart/GanttChart.module.css b/client/src/components/GanttChart/GanttChart.module.css
index 9b8a736c..a9031ced 100644
--- a/client/src/components/GanttChart/GanttChart.module.css
+++ b/client/src/components/GanttChart/GanttChart.module.css
@@ -56,9 +56,38 @@ $chart-row-spacing: rem(0.5rem);
 .content {
     display: flex;
     flex-direction: column;
+    position: relative;
+}
+
+.contentBackground {
+    display: flex;
+    flex-direction: row;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+
+.columnBackground {
+    position: relative;
+}
+
+.timelineBackground {
+    flex-grow: 1;
+    position: relative;
+}
+
+.nowDivider {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    border-right: 1px solid var(--mantine-color-dimmed);
+    transform: translateX(-50%);
 }
 
 .groupRow {
+    z-index: 10;
     display: flex;
     flex-direction: column;
 }
@@ -79,13 +108,16 @@ $chart-row-spacing: rem(0.5rem);
 }
 
 .dataColumn {
-    line-height: calc($chart-timeline-height + 2 * $chart-row-spacing);
+    height: calc($chart-timeline-height + 2 * $chart-row-spacing);
     padding: 0 rem(5);
 
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
 
+    display: flex;
+    align-items: center;
+
     border-right: 1px solid var(--mantine-color-dimmed);
 }
 
diff --git a/client/src/components/GanttChart/GanttChart.tsx b/client/src/components/GanttChart/GanttChart.tsx
index 952a40e4..b47e201c 100644
--- a/client/src/components/GanttChart/GanttChart.tsx
+++ b/client/src/components/GanttChart/GanttChart.tsx
@@ -28,15 +28,16 @@ interface IGanttChartProps {
     timelineEvent?: ArrayElement<IGanttChartDataElement['events']>,
   ) => ReactNode
   onItemClick?: (item: IGanttChartDataElement) => unknown
-  defaultRange?: number
+  initialRangeDuration?: number
   maxTicks?: number
+  minRange?: DateRange
 }
 
 export interface IGanttChartDataElement {
   id: string
   groupId: string
   groupName: string
-  columns: string[]
+  columns: ReactNode[]
   timeline: Array<{
     id: string
     startDate: Date
@@ -65,8 +66,9 @@ const GanttChart = (props: IGanttChartProps) => {
     data,
     itemPopover,
     onItemClick,
-    defaultRange = 3600 * 24 * 30 * 3 * 1000,
+    initialRangeDuration = 3600 * 24 * 30 * 3 * 1000,
     maxTicks = 6,
+    minRange,
   } = props
 
   const [range, setRange] = useState<DateRange>()
@@ -108,6 +110,7 @@ const GanttChart = (props: IGanttChartProps) => {
           ...item.events.map((timelineEvent) => timelineEvent.time.getTime()),
         ),
       ),
+      ...(minRange ? [minRange[0]] : []),
     ),
     Math.max(
       ...data.map((item) =>
@@ -116,13 +119,14 @@ const GanttChart = (props: IGanttChartProps) => {
           ...item.events.map((timelineEvent) => timelineEvent.time.getTime()),
         ),
       ),
+      ...(minRange ? [minRange[1]] : []),
     ),
   ]
 
   // Default filtered range to currentTime if there are elements larger than current Time
   const initialEndTime = Math.min(currentTime, totalRange[1])
   const filteredRange: DateRange = [
-    Math.max(totalRange[0], range?.[0] ?? initialEndTime - defaultRange),
+    Math.max(totalRange[0], range?.[0] ?? initialEndTime - initialRangeDuration),
     Math.min(totalRange[1], range?.[1] ?? initialEndTime),
   ]
   const filteredRangeDuration = filteredRange[1] - filteredRange[0]
@@ -268,7 +272,6 @@ const GanttChart = (props: IGanttChartProps) => {
           <Text fw='bold'>Timeline Range Filter:</Text>
           <RangeSlider
             style={{ flex: 1 }}
-            labelAlwaysOn
             min={totalRange[0]}
             max={totalRange[1]}
             step={3600 * 24 * 1000}
@@ -308,6 +311,26 @@ const GanttChart = (props: IGanttChartProps) => {
           onWheel={handleWheel}
           style={{ touchAction: 'pan-x pan-y' }}
         >
+          <div className={classes.contentBackground}>
+            {columns.map((column) => (
+              <div
+                key={column.label}
+                className={classes.columnBackground}
+                style={{ width: column.width }}
+              />
+            ))}
+            <div className={classes.timelineBackground}>
+              {isInDateRange([currentTime, currentTime], filteredRange) && (
+                <div
+                  className={classes.nowDivider}
+                  style={{
+                    left: `${Math.max((100 * (currentTime - filteredRange[0])) / filteredRangeDuration, 0)}%`,
+                  }}
+                />
+              )}
+            </div>
+          </div>
+
           {groups.map((group) => (
             <div key={group.groupId} className={classes.groupRow}>
               <div>
diff --git a/client/src/components/PresentationsTable/PresentationsTable.tsx b/client/src/components/PresentationsTable/PresentationsTable.tsx
new file mode 100644
index 00000000..03705605
--- /dev/null
+++ b/client/src/components/PresentationsTable/PresentationsTable.tsx
@@ -0,0 +1,96 @@
+import { useAutoAnimate } from '@formkit/auto-animate/react'
+import React from 'react'
+import { DataTable, DataTableColumn } from 'mantine-datatable'
+import { IPublishedPresentation, IThesisPresentation } from '../../requests/responses/thesis'
+import { formatDate, formatPresentationType } from '../../utils/format'
+
+interface IPresentationsTableProps<T> {
+  presentations: T[] | undefined
+  extraColumns?: Array<DataTableColumn<T>>
+  pagination?: {
+    totalRecords: number
+    recordsPerPage: number
+    page: number
+    onPageChange: (page: number) => unknown
+  }
+}
+
+const PresentationsTable = <T extends IThesisPresentation | IPublishedPresentation>(
+  props: IPresentationsTableProps<T>,
+) => {
+  const { presentations, extraColumns, pagination } = props
+
+  const [bodyRef] = useAutoAnimate<HTMLTableSectionElement>()
+
+  const columns: Array<DataTableColumn<T>> = [
+    {
+      accessor: 'type',
+      title: 'Type',
+      textAlign: 'center',
+      render: (presentation) => formatPresentationType(presentation.type),
+    },
+    {
+      accessor: 'location',
+      title: 'Location',
+    },
+    {
+      accessor: 'streamUrl',
+      title: 'Stream URL',
+      render: (presentation) => (
+        <a
+          href={presentation.streamUrl || undefined}
+          target='_blank'
+          rel='noopener noreferrer nofollow'
+        >
+          {presentation.streamUrl}
+        </a>
+      ),
+    },
+    {
+      accessor: 'scheduledAt',
+      title: 'Scheduled At',
+      render: (presentation) => formatDate(presentation.scheduledAt),
+    },
+    ...(extraColumns ?? []),
+  ]
+
+  if (pagination) {
+    return (
+      <DataTable
+        withTableBorder
+        minHeight={200}
+        noRecordsText='No presentations scheduled yet'
+        borderRadius='sm'
+        verticalSpacing='md'
+        striped
+        highlightOnHover
+        bodyRef={bodyRef}
+        records={presentations}
+        totalRecords={pagination.totalRecords}
+        recordsPerPage={pagination.recordsPerPage}
+        page={pagination.page}
+        onPageChange={pagination.onPageChange}
+        idAccessor='presentationId'
+        columns={columns}
+      />
+    )
+  } else {
+    return (
+      <DataTable
+        withTableBorder
+        minHeight={200}
+        noRecordsText='No presentations scheduled yet'
+        borderRadius='sm'
+        verticalSpacing='md'
+        striped
+        highlightOnHover
+        bodyRef={bodyRef}
+        records={presentations}
+        idAccessor='presentationId'
+        columns={columns}
+      />
+    )
+  }
+}
+
+export default PresentationsTable
diff --git a/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx b/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
index 550bfbf3..0c77487c 100644
--- a/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
+++ b/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
@@ -10,12 +10,15 @@ import ThesisStateBadge from '../ThesisStateBadge/ThesisStateBadge'
 import { Presentation } from 'phosphor-react'
 import { arrayUnique } from '../../utils/array'
 import ThesisData from '../ThesisData/ThesisData'
+import AvatarUserList from '../AvatarUserList/AvatarUserList'
 
 const ThesesGanttChart = () => {
   const { theses } = useThesesContext()
 
   const [openedThesis, setOpenedThesis] = useState<IThesis>()
 
+  const currentTime = useMemo(() => Date.now(), [])
+
   const data = useMemo<IGanttChartDataElement[] | undefined>(() => {
     if (!theses) {
       return undefined
@@ -38,34 +41,37 @@ const ThesesGanttChart = () => {
         return endDate
       }
 
-      result.push(
-        ...thesis.advisors.map((advisor) => ({
-          id: thesis.thesisId,
-          groupId: advisor.userId,
-          groupName: formatUser(advisor),
-          columns: [
-            thesis.students
-              .map((student) => formatUser(student, { withUniversityId: false }))
-              .join(', '),
-            thesis.title,
-          ],
-          timeline: thesis.states.map((state) => ({
-            id: state.state,
-            startDate: new Date(state.startedAt),
-            endDate: getAdjustedEndDate(
-              state.state,
-              new Date(state.startedAt),
-              new Date(state.endedAt),
-            ),
-            color: ThesisStateColor[state.state],
-          })),
-          events: thesis.presentations.map((presentation) => ({
-            id: presentation.presentationId,
-            icon: <Presentation />,
-            time: new Date(presentation.scheduledAt),
-          })),
+      result.push({
+        id: thesis.thesisId,
+        groupId: thesis.advisors[0].userId,
+        groupName: formatUser(thesis.advisors[0]),
+        columns: [
+          <AvatarUserList
+            key='student'
+            users={thesis.students}
+            withUniversityId={false}
+            size='xs'
+          />,
+          <Text key='title' size='xs' truncate>
+            {thesis.title}
+          </Text>,
+        ],
+        timeline: thesis.states.map((state) => ({
+          id: state.state,
+          startDate: new Date(state.startedAt),
+          endDate: getAdjustedEndDate(
+            state.state,
+            new Date(state.startedAt),
+            new Date(state.endedAt),
+          ),
+          color: ThesisStateColor[state.state],
+        })),
+        events: thesis.presentations.map((presentation) => ({
+          id: presentation.presentationId,
+          icon: <Presentation />,
+          time: new Date(presentation.scheduledAt),
         })),
-      )
+      })
     }
 
     return result
@@ -87,10 +93,11 @@ const ThesesGanttChart = () => {
     <div>
       <GanttChart
         columns={[
-          { label: 'Student', width: '10%', textAlign: 'center' },
-          { label: 'Title', width: '15%' },
+          { label: 'Student', width: '10rem' },
+          { label: 'Title', width: '15rem' },
         ]}
         data={data}
+        minRange={[currentTime - 1000 * 3600 * 24 * 365 * 2, currentTime + 1000 * 3600 * 24 * 365]}
         itemPopover={(item, timeline, event) => {
           const thesis = theses?.content.find((row) => row.thesisId === item.id)
 
diff --git a/client/src/components/ThesesTable/ThesesTable.tsx b/client/src/components/ThesesTable/ThesesTable.tsx
index 6591d25b..cbeff2f6 100644
--- a/client/src/components/ThesesTable/ThesesTable.tsx
+++ b/client/src/components/ThesesTable/ThesesTable.tsx
@@ -1,6 +1,6 @@
 import { useAutoAnimate } from '@formkit/auto-animate/react'
 import { DataTable, DataTableColumn } from 'mantine-datatable'
-import { formatDate, formatUser } from '../../utils/format'
+import { formatDate } from '../../utils/format'
 import React from 'react'
 import { useThesesContext } from '../../contexts/ThesesProvider/hooks'
 import { IThesesSort } from '../../contexts/ThesesProvider/context'
@@ -9,6 +9,7 @@ import { IThesis } from '../../requests/responses/thesis'
 import { GLOBAL_CONFIG } from '../../config/global'
 import ThesisStateBadge from '../ThesisStateBadge/ThesisStateBadge'
 import { Center } from '@mantine/core'
+import AvatarUserList from '../AvatarUserList/AvatarUserList'
 
 type ThesisColumn =
   | 'state'
@@ -55,18 +56,17 @@ const ThesesTable = (props: IThesesTableProps) => {
     supervisors: {
       accessor: 'supervisors',
       title: 'Supervisor',
-      render: (thesis: IThesis) =>
-        thesis.supervisors.map((supervisor) => formatUser(supervisor)).join(', '),
+      render: (thesis: IThesis) => <AvatarUserList users={thesis.supervisors} />,
     },
     advisors: {
       accessor: 'advisors',
       title: 'Advisor',
-      render: (thesis: IThesis) => thesis.advisors.map((advisor) => formatUser(advisor)).join(', '),
+      render: (thesis: IThesis) => <AvatarUserList users={thesis.advisors} />,
     },
     students: {
       accessor: 'students',
       title: 'Student',
-      render: (thesis: IThesis) => thesis.students.map((student) => formatUser(student)).join(', '),
+      render: (thesis: IThesis) => <AvatarUserList users={thesis.students} />,
     },
     type: {
       accessor: 'type',
diff --git a/client/src/components/ThesisData/ThesisData.tsx b/client/src/components/ThesisData/ThesisData.tsx
index 2d564349..daeda597 100644
--- a/client/src/components/ThesisData/ThesisData.tsx
+++ b/client/src/components/ThesisData/ThesisData.tsx
@@ -1,10 +1,12 @@
 import { IPublishedThesis, isThesis, IThesis } from '../../requests/responses/thesis'
 import { Grid, Stack } from '@mantine/core'
 import LabeledItem from '../LabeledItem/LabeledItem'
-import { formatDate, formatUser } from '../../utils/format'
+import { formatDate } from '../../utils/format'
 import ThesisStateBadge from '../ThesisStateBadge/ThesisStateBadge'
 import DocumentEditor from '../DocumentEditor/DocumentEditor'
 import { GLOBAL_CONFIG } from '../../config/global'
+import AvatarUserList from '../AvatarUserList/AvatarUserList'
+import React from 'react'
 
 type availableAdditionalInformation = 'title' | 'abstract' | 'info' | 'state' | 'keywords'
 
@@ -23,22 +25,13 @@ const ThesisData = (props: IThesisDataProps) => {
       )}
       <Grid>
         <Grid.Col span={{ md: 4 }}>
-          <LabeledItem
-            label='Supervisor'
-            value={thesis.supervisors.map((supervisor) => formatUser(supervisor)).join(', ')}
-          />
+          <LabeledItem label='Supervisor' value={<AvatarUserList users={thesis.supervisors} />} />
         </Grid.Col>
         <Grid.Col span={{ md: 4 }}>
-          <LabeledItem
-            label='Advisor'
-            value={thesis.advisors.map((advisor) => formatUser(advisor)).join(', ')}
-          />
+          <LabeledItem label='Advisor' value={<AvatarUserList users={thesis.advisors} />} />
         </Grid.Col>
         <Grid.Col span={{ md: 4 }}>
-          <LabeledItem
-            label='Student'
-            value={thesis.students.map((student) => formatUser(student)).join(', ')}
-          />
+          <LabeledItem label='Student' value={<AvatarUserList users={thesis.students} />} />
         </Grid.Col>
         <Grid.Col span={{ md: 4 }}>
           <LabeledItem
diff --git a/client/src/components/TopicData/TopicData.tsx b/client/src/components/TopicData/TopicData.tsx
index c899dde5..16daa041 100644
--- a/client/src/components/TopicData/TopicData.tsx
+++ b/client/src/components/TopicData/TopicData.tsx
@@ -1,10 +1,11 @@
 import { ITopic } from '../../requests/responses/topic'
 import { Grid, Stack } from '@mantine/core'
 import LabeledItem from '../LabeledItem/LabeledItem'
-import { formatDate, formatUser } from '../../utils/format'
+import { formatDate } from '../../utils/format'
 import { GLOBAL_CONFIG } from '../../config/global'
 import DocumentEditor from '../DocumentEditor/DocumentEditor'
 import React from 'react'
+import AvatarUserList from '../AvatarUserList/AvatarUserList'
 
 interface ITopicDataProps {
   topic: ITopic
@@ -19,17 +20,13 @@ const TopicData = (props: ITopicDataProps) => {
         <Grid.Col span={{ md: 3 }}>
           <LabeledItem
             label='Supervisor'
-            value={topic.supervisors
-              .map((supervisor) => formatUser(supervisor, { withUniversityId: false }))
-              .join(', ')}
+            value={<AvatarUserList users={topic.supervisors} withUniversityId={false} />}
           />
         </Grid.Col>
         <Grid.Col span={{ md: 3 }}>
           <LabeledItem
             label='Advisor'
-            value={topic.advisors
-              .map((advisor) => formatUser(advisor, { withUniversityId: false }))
-              .join(', ')}
+            value={<AvatarUserList users={topic.advisors} withUniversityId={false} />}
           />
         </Grid.Col>
         <Grid.Col span={{ md: 3 }}>
diff --git a/client/src/components/TopicsTable/TopicsTable.tsx b/client/src/components/TopicsTable/TopicsTable.tsx
index bc0bc746..3c726b86 100644
--- a/client/src/components/TopicsTable/TopicsTable.tsx
+++ b/client/src/components/TopicsTable/TopicsTable.tsx
@@ -1,20 +1,23 @@
 import { useAutoAnimate } from '@formkit/auto-animate/react'
 import { DataTable, DataTableColumn } from 'mantine-datatable'
-import { formatDate, formatUser } from '../../utils/format'
+import { formatDate } from '../../utils/format'
 import { useTopicsContext } from '../../contexts/TopicsProvider/hooks'
 import { ITopic } from '../../requests/responses/topic'
 import { useNavigate } from 'react-router-dom'
 import { Badge } from '@mantine/core'
+import AvatarUserList from '../AvatarUserList/AvatarUserList'
+import React from 'react'
 
 type TopicColumn = 'title' | 'advisor' | 'supervisor' | 'state' | 'createdAt' | string
 
 interface ITopicsTableProps {
   columns?: TopicColumn[]
   extraColumns?: Record<string, DataTableColumn<ITopic>>
+  noBorder?: boolean
 }
 
 const TopicsTable = (props: ITopicsTableProps) => {
-  const { extraColumns, columns = ['title', 'supervisor', 'advisor'] } = props
+  const { extraColumns, columns = ['title', 'supervisor', 'advisor'], noBorder = false } = props
 
   const navigate = useNavigate()
   const [bodyRef] = useAutoAnimate<HTMLTableSectionElement>()
@@ -39,18 +42,12 @@ const TopicsTable = (props: ITopicsTableProps) => {
     supervisor: {
       accessor: 'supervisor',
       title: 'Supervisor',
-      render: (topic) =>
-        topic.supervisors
-          .map((supervisor) => formatUser(supervisor, { withUniversityId: false }))
-          .join(', '),
+      render: (topic) => <AvatarUserList users={topic.supervisors} withUniversityId={false} />,
     },
     advisor: {
       accessor: 'advisor',
       title: 'Advisor',
-      render: (topic) =>
-        topic.advisors
-          .map((advisor) => formatUser(advisor, { withUniversityId: false }))
-          .join(', '),
+      render: (topic) => <AvatarUserList users={topic.advisors} withUniversityId={false} />,
     },
     createdAt: {
       accessor: 'createdAt',
@@ -62,7 +59,7 @@ const TopicsTable = (props: ITopicsTableProps) => {
   return (
     <DataTable
       fetching={!topics}
-      withTableBorder
+      withTableBorder={!noBorder}
       minHeight={200}
       noRecordsText='No topics to show. You can suggest your own topic. The chair is always searching for motivated students'
       borderRadius='sm'
diff --git a/client/src/components/UploadArea/UploadArea.tsx b/client/src/components/UploadArea/UploadArea.tsx
index da486d75..708d2573 100644
--- a/client/src/components/UploadArea/UploadArea.tsx
+++ b/client/src/components/UploadArea/UploadArea.tsx
@@ -56,7 +56,9 @@ const UploadArea = (props: IUploadAreaProps) => {
             onChange(files[0])
           }}
           onReject={() => {
-            showSimpleError(`Failed upload file. Max file size is ${Math.floor(maxSize / 1024 / 1024)}MB`)
+            showSimpleError(
+              `Failed upload file. Max file size is ${Math.floor(maxSize / 1024 / 1024)}MB`,
+            )
           }}
           maxSize={maxSize}
           accept={PDF_MIME_TYPE}
diff --git a/client/src/components/UserInformationForm/UserInformationForm.tsx b/client/src/components/UserInformationForm/UserInformationForm.tsx
index 5c19d640..b81afc15 100644
--- a/client/src/components/UserInformationForm/UserInformationForm.tsx
+++ b/client/src/components/UserInformationForm/UserInformationForm.tsx
@@ -1,11 +1,9 @@
 import { isEmail, isNotEmpty, useForm } from '@mantine/form'
 import { IUpdateUserInformationPayload } from '../../requests/payloads/user'
-import { Button, Checkbox, Group, Select, Stack, TextInput } from '@mantine/core'
+import { Button, Checkbox, Group, NumberInput, Select, Stack, TextInput } from '@mantine/core'
 import { useAuthenticationContext, useLoggedInUser } from '../../hooks/authentication'
 import { GLOBAL_CONFIG } from '../../config/global'
 import { AVAILABLE_COUNTRIES } from '../../config/countries'
-import { DatePickerInput } from '@mantine/dates'
-import { Calendar } from 'phosphor-react'
 import UploadArea from '../UploadArea/UploadArea'
 import { DeclarationOfDataConsent } from '../DeclarationOfDataConsent/DeclarationOfDataConsent'
 import { useEffect, useState } from 'react'
@@ -13,6 +11,7 @@ import DocumentEditor from '../DocumentEditor/DocumentEditor'
 import { useApiFile } from '../../hooks/fetcher'
 import { showSimpleError } from '../../utils/notification'
 import { getHtmlTextLength } from '../../utils/validation'
+import { enrollmentDateToSemester, semesterToEnrollmentDate } from '../../utils/converter'
 
 interface IUserInformationFormProps {
   requireCompletion: boolean
@@ -26,7 +25,8 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
   const user = useLoggedInUser()
 
   const form = useForm<
-    IUpdateUserInformationPayload & {
+    Omit<IUpdateUserInformationPayload, 'enrolledAt'> & {
+      semester: string
       declarationOfConsentAccepted: boolean
       examinationReport: File | undefined
       cv: File | undefined
@@ -43,11 +43,10 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
       nationality: '',
       studyDegree: '',
       studyProgram: '',
-      enrolledAt: null,
+      semester: '',
       specialSkills: '',
       projects: '',
       interests: '',
-      isExchangeStudent: false,
       declarationOfConsentAccepted: false,
       examinationReport: undefined,
       cv: undefined,
@@ -65,7 +64,7 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
       nationality: requireCompletion ? isNotEmpty('Please state your nationality') : undefined,
       studyDegree: requireCompletion ? isNotEmpty('Please state your study degree') : undefined,
       studyProgram: requireCompletion ? isNotEmpty('Please state your study program') : undefined,
-      enrolledAt: requireCompletion ? isNotEmpty('Please state your enrollment date') : undefined,
+      semester: requireCompletion ? isNotEmpty('Please state your semester date') : undefined,
       specialSkills: (value) => {
         if (!value && requireCompletion) {
           return 'Please state your special skills.'
@@ -114,19 +113,18 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
 
   useEffect(() => {
     form.setValues({
-      isExchangeStudent: user?.isExchangeStudent ?? false,
-      email: user?.email || undefined,
-      matriculationNumber: user?.matriculationNumber || undefined,
-      firstName: user?.firstName || undefined,
-      lastName: user?.lastName || undefined,
-      gender: user?.gender || undefined,
-      nationality: user?.nationality || undefined,
-      studyDegree: user?.studyDegree || undefined,
-      studyProgram: user?.studyProgram || undefined,
-      enrolledAt: user?.enrolledAt ? new Date(user.enrolledAt) : undefined,
-      specialSkills: user?.specialSkills || undefined,
-      interests: user?.interests || undefined,
-      projects: user?.projects || undefined,
+      email: user?.email || '',
+      matriculationNumber: user?.matriculationNumber || '',
+      firstName: user?.firstName || '',
+      lastName: user?.lastName || '',
+      gender: user?.gender || '',
+      nationality: user?.nationality || '',
+      studyDegree: user?.studyDegree || '',
+      studyProgram: user?.studyProgram || '',
+      semester: user?.enrolledAt ? enrollmentDateToSemester(user.enrolledAt).toString() : '',
+      specialSkills: user?.specialSkills || '',
+      interests: user?.interests || '',
+      projects: user?.projects || '',
     })
   }, [user])
 
@@ -155,7 +153,6 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
           await updateInformation(
             {
               matriculationNumber: values.matriculationNumber || null,
-              isExchangeStudent: values.isExchangeStudent ?? false,
               firstName: values.firstName || null,
               lastName: values.lastName || null,
               gender: values.gender || null,
@@ -163,7 +160,7 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
               email: values.email || null,
               studyDegree: values.studyDegree || null,
               studyProgram: values.studyProgram || null,
-              enrolledAt: values.enrolledAt || null,
+              enrolledAt: semesterToEnrollmentDate(values.semester),
               specialSkills: values.specialSkills || null,
               interests: values.interests || null,
               projects: values.projects || null,
@@ -271,11 +268,10 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
             searchable={true}
             {...form.getInputProps('studyProgram')}
           />
-          <DatePickerInput
-            leftSection={<Calendar />}
+          <NumberInput
             required={requireCompletion}
-            label='Enrollment Date'
-            {...form.getInputProps('enrolledAt')}
+            label='Semester'
+            {...form.getInputProps('semester')}
           />
         </Group>
         <DocumentEditor
diff --git a/client/src/contexts/ThesesProvider/ThesesProvider.tsx b/client/src/contexts/ThesesProvider/ThesesProvider.tsx
index 367b248b..72f5bb6e 100644
--- a/client/src/contexts/ThesesProvider/ThesesProvider.tsx
+++ b/client/src/contexts/ThesesProvider/ThesesProvider.tsx
@@ -15,7 +15,7 @@ interface IThesesProviderProps {
 }
 
 const ThesesProvider = (props: PropsWithChildren<IThesesProviderProps>) => {
-  const { children, fetchAll = false, limit = 50, hideIfEmpty = false } = props
+  const { children, fetchAll = false, limit = 100, hideIfEmpty = false } = props
 
   const [theses, setTheses] = useState<PaginationResponse<IThesis>>()
   const [page, setPage] = useState(0)
diff --git a/client/src/pages/DashboardPage/DashboardPage.tsx b/client/src/pages/DashboardPage/DashboardPage.tsx
index 5f73cab3..1dd9142a 100644
--- a/client/src/pages/DashboardPage/DashboardPage.tsx
+++ b/client/src/pages/DashboardPage/DashboardPage.tsx
@@ -12,6 +12,7 @@ import { useHasGroupAccess } from '../../hooks/authentication'
 import { Link } from 'react-router-dom'
 import ApplicationModal from '../../components/ApplicationModal/ApplicationModal'
 import MyTasksSection from './components/MyTasksSection/MyTasksSection'
+import PublicPresentationsSection from './components/PublicPresentationsSection/PublicPresentationsSection'
 
 const DashboardPage = () => {
   usePageTitle('Dashboard')
@@ -26,6 +27,7 @@ const DashboardPage = () => {
         Dashboard
       </Title>
       <MyTasksSection />
+      <Space mb='md' />
       <ThesesProvider hideIfEmpty={!managementAccess}>
         <Title order={2}>My Theses</Title>
         {managementAccess && (
@@ -68,6 +70,7 @@ const DashboardPage = () => {
         />
         <Space mb='md' />
       </ApplicationsProvider>
+      <PublicPresentationsSection />
     </ContentContainer>
   )
 }
diff --git a/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx b/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx
index 63878979..eba6baff 100644
--- a/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx
+++ b/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx
@@ -1,5 +1,65 @@
+import { Title } from '@mantine/core'
+import React, { useEffect, useState } from 'react'
+import { doRequest } from '../../../../requests/request'
+import { showSimpleError } from '../../../../utils/notification'
+import { getApiResponseErrorMessage } from '../../../../requests/handler'
+import { ITask } from '../../../../requests/responses/dashboard'
+import { DataTable } from 'mantine-datatable'
+import { useNavigate } from 'react-router-dom'
+
 const MyTasksSection = () => {
-  return null
+  const navigate = useNavigate()
+
+  const [tasks, setTasks] = useState<ITask[]>()
+
+  useEffect(() => {
+    setTasks(undefined)
+
+    return doRequest<ITask[]>(
+      `/v2/dashboard/tasks`,
+      {
+        method: 'GET',
+        requiresAuth: true,
+      },
+      (res) => {
+        if (res.ok) {
+          setTasks(res.data)
+        } else {
+          showSimpleError(getApiResponseErrorMessage(res))
+        }
+      },
+    )
+  }, [])
+
+  if (!tasks?.length) {
+    return null
+  }
+
+  return (
+    <div>
+      <Title order={2} mb='xs'>
+        My Tasks
+      </Title>
+      <DataTable
+        withTableBorder={true}
+        minHeight={200}
+        striped
+        noHeader
+        borderRadius='sm'
+        verticalSpacing='md'
+        highlightOnHover
+        records={tasks}
+        idAccessor='message'
+        columns={[
+          {
+            accessor: 'message',
+            title: 'Message',
+          },
+        ]}
+        onRowClick={({ record }) => navigate(record.link)}
+      />
+    </div>
+  )
 }
 
 export default MyTasksSection
diff --git a/client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx b/client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx
new file mode 100644
index 00000000..f05b43d7
--- /dev/null
+++ b/client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx
@@ -0,0 +1,83 @@
+import { ActionIcon, CopyButton, Group, Text, TextInput, Title, Tooltip } from '@mantine/core'
+import React, { useEffect, useState } from 'react'
+import PresentationsTable from '../../../../components/PresentationsTable/PresentationsTable'
+import { IPublishedPresentation } from '../../../../requests/responses/thesis'
+import { doRequest } from '../../../../requests/request'
+import { PaginationResponse } from '../../../../requests/responses/pagination'
+import { showSimpleError } from '../../../../utils/notification'
+import { getApiResponseErrorMessage } from '../../../../requests/handler'
+import { GLOBAL_CONFIG } from '../../../../config/global'
+import { Check, Copy } from 'phosphor-react'
+
+const PublicPresentationsSection = () => {
+  const limit = 10
+
+  const [presentations, setPresentations] = useState<PaginationResponse<IPublishedPresentation>>()
+  const [page, setPage] = useState(0)
+
+  useEffect(() => {
+    setPresentations(undefined)
+
+    return doRequest<PaginationResponse<IPublishedPresentation>>(
+      `/v2/dashboard/presentations`,
+      {
+        method: 'GET',
+        requiresAuth: true,
+        params: {
+          page,
+          limit,
+        },
+      },
+      (res) => {
+        if (res.ok) {
+          setPresentations(res.data)
+        } else {
+          showSimpleError(getApiResponseErrorMessage(res))
+        }
+      },
+    )
+  }, [page, limit])
+
+  const calendarUrl =
+    GLOBAL_CONFIG.calendar_url || `${GLOBAL_CONFIG.server_host}/api/v2/calendar/presentations`
+
+  return (
+    <div>
+      <Title order={2} mb='xs'>
+        Public Presentations
+      </Title>
+      <Group mb='xs'>
+        <Text c='dimmed'>Subscribe to Calendar</Text>
+        <div style={{ flexGrow: 1 }}>
+          <CopyButton value={calendarUrl}>
+            {({ copied, copy }) => (
+              <TextInput
+                value={calendarUrl}
+                onChange={() => undefined}
+                onClick={(e) => e.currentTarget.select()}
+                rightSection={
+                  <Tooltip label={copied ? 'Copied' : 'Copy'} withArrow position='right'>
+                    <ActionIcon color={copied ? 'teal' : 'gray'} variant='subtle' onClick={copy}>
+                      {copied ? <Check size={16} /> : <Copy size={16} />}
+                    </ActionIcon>
+                  </Tooltip>
+                }
+              />
+            )}
+          </CopyButton>
+        </div>
+      </Group>
+      <PresentationsTable
+        presentations={presentations?.content}
+        pagination={{
+          totalRecords: presentations?.totalElements ?? 0,
+          recordsPerPage: limit,
+          page: page + 1,
+          onPageChange: (newPage) => setPage(newPage - 1),
+        }}
+      />
+    </div>
+  )
+}
+
+export default PublicPresentationsSection
diff --git a/client/src/pages/LandingPage/LandingPage.tsx b/client/src/pages/LandingPage/LandingPage.tsx
index 304b5a95..071df259 100644
--- a/client/src/pages/LandingPage/LandingPage.tsx
+++ b/client/src/pages/LandingPage/LandingPage.tsx
@@ -18,6 +18,7 @@ const LandingPage = () => {
           </Title>
           <TopicsTable
             columns={['title', 'supervisor', 'advisor', 'actions']}
+            noBorder
             extraColumns={{
               actions: {
                 accessor: 'actions',
diff --git a/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx b/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
index 788749ed..42965f03 100644
--- a/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
+++ b/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
@@ -51,7 +51,7 @@ const PublishedTheses = () => {
       <Title order={2}>Published Theses</Title>
       <DataTable
         fetching={!theses}
-        withTableBorder
+        withTableBorder={false}
         minHeight={200}
         noRecordsText='No theses published yet'
         borderRadius='sm'
diff --git a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
index e8b53ea4..0d50631a 100644
--- a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
+++ b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
@@ -47,7 +47,6 @@ const LegacySubmitApplicationPage = () => {
     mode: 'controlled',
     initialValues: {
       universityId: '',
-      isExchangeStudent: false,
       gender: undefined,
       desiredStartDate: new Date(),
       firstName: '',
@@ -71,14 +70,12 @@ const LegacySubmitApplicationPage = () => {
     },
     validateInputOnBlur: true,
     validate: {
-      universityId: (value, values) =>
-        /^[A-Za-z]{2}[0-9]{2}[A-Za-z]{3}$/.test(value ?? '') || values?.isExchangeStudent
+      universityId: (value) =>
+        /^[A-Za-z]{2}[0-9]{2}[A-Za-z]{3}$/.test(value ?? '')
           ? undefined
           : 'This is not a valid TUM ID',
-      matriculationNumber: (value, values) =>
-        /^\d{8}$/.test(value ?? '') || values?.isExchangeStudent
-          ? undefined
-          : 'This is not a valid matriculation number.',
+      matriculationNumber: (value) =>
+        /^\d{8}$/.test(value ?? '') ? undefined : 'This is not a valid matriculation number.',
       firstName: isNotEmpty('Please state your first name.'),
       lastName: isNotEmpty('Please state your last name'),
       email: isEmail('Invalid email'),
@@ -186,7 +183,6 @@ const LegacySubmitApplicationPage = () => {
                   const applicationPayload: ILegacyCreateApplicationPayload = {
                     universityId: values.universityId!,
                     matriculationNumber: values.matriculationNumber!,
-                    isExchangeStudent: values.isExchangeStudent!,
                     firstName: values.firstName!,
                     lastName: values.lastName!,
                     gender: values.gender!,
@@ -240,16 +236,14 @@ const LegacySubmitApplicationPage = () => {
                 <Group grow align='flex-start'>
                   <TextInput
                     type='text'
-                    required={!form.values.isExchangeStudent}
-                    withAsterisk={!form.values.isExchangeStudent}
+                    required={true}
                     placeholder='TUM ID'
                     label='TUM ID'
                     {...form.getInputProps('universityId')}
                   />
                   <TextInput
                     type='text'
-                    required={!form.values.isExchangeStudent}
-                    withAsterisk={!form.values.isExchangeStudent}
+                    required={true}
                     placeholder='Matriculation Number'
                     label='Matriculation Number'
                     {...form.getInputProps('matriculationNumber')}
diff --git a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
index 16c95e00..a006960e 100644
--- a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
+++ b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
@@ -1,4 +1,4 @@
-import { Button, Modal, MultiSelect, Select, Stack, TextInput } from '@mantine/core'
+import { Button, Modal, MultiSelect, Stack, TextInput } from '@mantine/core'
 import { ITopic } from '../../../../requests/responses/topic'
 import { isNotEmpty, useForm } from '@mantine/form'
 import { isNotEmptyUserList } from '../../../../utils/validation'
diff --git a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx b/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
index 7716a347..3cc4f48d 100644
--- a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
+++ b/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
@@ -1,6 +1,6 @@
 import { ITopic } from '../../../../requests/responses/topic'
 import { isNotEmpty, useForm } from '@mantine/form'
-import { Accordion, Button, MultiSelect, Select, Stack, TextInput } from '@mantine/core'
+import { Accordion, Button, Select, Stack, TextInput } from '@mantine/core'
 import DocumentEditor from '../../../../components/DocumentEditor/DocumentEditor'
 import TopicData from '../../../../components/TopicData/TopicData'
 import { useState } from 'react'
diff --git a/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx b/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
index dacadf1f..91b712d1 100644
--- a/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
@@ -1,4 +1,4 @@
-import { Button, InputLabel, Modal, Stack, TextInput } from '@mantine/core'
+import { Button, Modal, Stack, TextInput } from '@mantine/core'
 import { useState } from 'react'
 import DocumentEditor from '../../../../../../components/DocumentEditor/DocumentEditor'
 import { doRequest } from '../../../../../../requests/request'
diff --git a/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx b/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
index e19a92ad..8835bcef 100644
--- a/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
@@ -1,7 +1,6 @@
 import { useThesisCommentsContext } from '../../../../contexts/ThesisCommentsProvider/hooks'
 import {
   Button,
-  Card,
   Center,
   Group,
   Modal,
diff --git a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
index 3c52068a..39137033 100644
--- a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
@@ -1,5 +1,5 @@
 import { IThesis } from '../../../../../../requests/responses/thesis'
-import { Button, Checkbox, InputLabel, Modal, Stack, TextInput } from '@mantine/core'
+import { Button, Modal, Stack, TextInput } from '@mantine/core'
 import { doRequest } from '../../../../../../requests/request'
 import { useEffect, useState } from 'react'
 import DocumentEditor from '../../../../../../components/DocumentEditor/DocumentEditor'
diff --git a/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx b/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
index f87e4da7..45abb09b 100644
--- a/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
@@ -7,14 +7,12 @@ import {
   useLoadedThesisContext,
   useThesisUpdateAction,
 } from '../../../../contexts/ThesisProvider/hooks'
-import { Link, useNavigate } from 'react-router-dom'
+import { Link } from 'react-router-dom'
 import { ApiError } from '../../../../requests/handler'
 
 const ThesisInfoSection = () => {
   const { thesis, access } = useLoadedThesisContext()
 
-  const navigate = useNavigate()
-
   const [opened, setOpened] = useState(true)
   const [editMode, setEditMode] = useState(false)
 
diff --git a/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx b/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
index 224c4968..c6759710 100644
--- a/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
@@ -15,8 +15,8 @@ import ThesisCommentsForm from '../ThesisCommentsForm/ThesisCommentsForm'
 import ThesisCommentsProvider from '../../../../contexts/ThesisCommentsProvider/ThesisCommentsProvider'
 import ThesisCommentsList from '../ThesisCommentsList/ThesisCommentsList'
 import { ApiError, getApiResponseErrorMessage } from '../../../../requests/handler'
-import PresentationsTable from './components/PresentationsTable/PresentationsTable'
 import CreatePresentationModal from './components/CreatePresentationModal/CreatePresentationModal'
+import ThesisPresentationsTable from './components/ThesisPresentationsTable/ThesisPresentationsTable'
 
 const ThesisWritingSection = () => {
   const { thesis, access, updateThesis } = useLoadedThesisContext()
@@ -187,7 +187,7 @@ const ThesisWritingSection = () => {
                 opened={createPresentationModal}
                 onClose={() => setCreatePresentationModal(false)}
               />
-              <PresentationsTable />
+              <ThesisPresentationsTable />
               {access.advisor &&
                 [ThesisState.WRITING, ThesisState.SUBMITTED].includes(thesis.state) && (
                   <Button ml='auto' onClick={() => setCreatePresentationModal(true)}>
diff --git a/client/src/pages/ThesisPage/components/ThesisWritingSection/components/PresentationsTable/PresentationsTable.tsx b/client/src/pages/ThesisPage/components/ThesisWritingSection/components/PresentationsTable/PresentationsTable.tsx
deleted file mode 100644
index f18f61cf..00000000
--- a/client/src/pages/ThesisPage/components/ThesisWritingSection/components/PresentationsTable/PresentationsTable.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { useAutoAnimate } from '@formkit/auto-animate/react'
-import React from 'react'
-import { DataTable } from 'mantine-datatable'
-import {
-  useLoadedThesisContext,
-  useThesisUpdateAction,
-} from '../../../../../../contexts/ThesisProvider/hooks'
-import { formatDate, formatPresentationType } from '../../../../../../utils/format'
-import { Button, Group } from '@mantine/core'
-import { Trash } from 'phosphor-react'
-import { doRequest } from '../../../../../../requests/request'
-import { IThesis } from '../../../../../../requests/responses/thesis'
-import { ApiError } from '../../../../../../requests/handler'
-
-const PresentationsTable = () => {
-  const [bodyRef] = useAutoAnimate<HTMLTableSectionElement>()
-
-  const { thesis } = useLoadedThesisContext()
-
-  const [deleting, deletePresentation] = useThesisUpdateAction(
-    async (presentation: IThesis['presentations'][number]) => {
-      const response = await doRequest<IThesis>(
-        `/v2/theses/${thesis.thesisId}/presentations/${presentation.presentationId}`,
-        {
-          method: 'DELETE',
-          requiresAuth: true,
-        },
-      )
-
-      if (response.ok) {
-        return response.data
-      } else {
-        throw new ApiError(response)
-      }
-    },
-    'Presentation deleted successfully',
-  )
-
-  return (
-    <DataTable
-      withTableBorder
-      minHeight={200}
-      noRecordsText='No presentations scheduled yet'
-      borderRadius='sm'
-      verticalSpacing='md'
-      striped
-      highlightOnHover
-      bodyRef={bodyRef}
-      records={thesis.presentations}
-      idAccessor='presentationId'
-      columns={[
-        {
-          accessor: 'type',
-          title: 'Type',
-          textAlign: 'center',
-          render: (presentation) => formatPresentationType(presentation.type),
-        },
-        {
-          accessor: 'location',
-          title: 'Location',
-        },
-        {
-          accessor: 'streamUrl',
-          title: 'Stream URL',
-          render: (presentation) => (
-            <a
-              href={presentation.streamUrl || undefined}
-              target='_blank'
-              rel='noopener noreferrer nofollow'
-            >
-              {presentation.streamUrl}
-            </a>
-          ),
-        },
-        {
-          accessor: 'scheduledAt',
-          title: 'Scheduled At',
-          render: (presentation) => formatDate(presentation.scheduledAt),
-        },
-        {
-          accessor: 'presentationId',
-          title: 'Actions',
-          render: (presentation) => (
-            <Group>
-              <Button loading={deleting} onClick={() => deletePresentation(presentation)}>
-                <Trash />
-              </Button>
-            </Group>
-          ),
-        },
-      ]}
-    />
-  )
-}
-
-export default PresentationsTable
diff --git a/client/src/pages/ThesisPage/components/ThesisWritingSection/components/ThesisPresentationsTable/ThesisPresentationsTable.tsx b/client/src/pages/ThesisPage/components/ThesisWritingSection/components/ThesisPresentationsTable/ThesisPresentationsTable.tsx
new file mode 100644
index 00000000..2f68a2b9
--- /dev/null
+++ b/client/src/pages/ThesisPage/components/ThesisWritingSection/components/ThesisPresentationsTable/ThesisPresentationsTable.tsx
@@ -0,0 +1,55 @@
+import React from 'react'
+import {
+  useLoadedThesisContext,
+  useThesisUpdateAction,
+} from '../../../../../../contexts/ThesisProvider/hooks'
+import { Button, Group } from '@mantine/core'
+import { Trash } from 'phosphor-react'
+import { doRequest } from '../../../../../../requests/request'
+import { IThesis, IThesisPresentation } from '../../../../../../requests/responses/thesis'
+import { ApiError } from '../../../../../../requests/handler'
+import PresentationsTable from '../../../../../../components/PresentationsTable/PresentationsTable'
+
+const ThesisPresentationsTable = () => {
+  const { thesis } = useLoadedThesisContext()
+
+  const [deleting, deletePresentation] = useThesisUpdateAction(
+    async (presentation: IThesisPresentation) => {
+      const response = await doRequest<IThesis>(
+        `/v2/theses/${thesis.thesisId}/presentations/${presentation.presentationId}`,
+        {
+          method: 'DELETE',
+          requiresAuth: true,
+        },
+      )
+
+      if (response.ok) {
+        return response.data
+      } else {
+        throw new ApiError(response)
+      }
+    },
+    'Presentation deleted successfully',
+  )
+
+  return (
+    <PresentationsTable
+      presentations={thesis.presentations}
+      extraColumns={[
+        {
+          accessor: 'presentationId',
+          title: 'Actions',
+          render: (presentation) => (
+            <Group>
+              <Button loading={deleting} onClick={() => deletePresentation(presentation)}>
+                <Trash />
+              </Button>
+            </Group>
+          ),
+        },
+      ]}
+    />
+  )
+}
+
+export default ThesisPresentationsTable
diff --git a/client/src/requests/payloads/user.ts b/client/src/requests/payloads/user.ts
index 9586bef1..1720980f 100644
--- a/client/src/requests/payloads/user.ts
+++ b/client/src/requests/payloads/user.ts
@@ -1,6 +1,5 @@
 export interface IUpdateUserInformationPayload {
   matriculationNumber: string
-  isExchangeStudent: boolean
   firstName: string
   lastName: string
   gender: string
diff --git a/client/src/requests/responses/dashboard.ts b/client/src/requests/responses/dashboard.ts
new file mode 100644
index 00000000..e783b477
--- /dev/null
+++ b/client/src/requests/responses/dashboard.ts
@@ -0,0 +1,7 @@
+export interface ITask {
+  message: string
+  link: string
+  startDate: string | null
+  endDate: string | null
+  priority: number
+}
diff --git a/client/src/requests/responses/thesis.ts b/client/src/requests/responses/thesis.ts
index 5cf437f1..5a1508e9 100644
--- a/client/src/requests/responses/thesis.ts
+++ b/client/src/requests/responses/thesis.ts
@@ -10,6 +10,16 @@ export enum ThesisState {
   DROPPED_OUT = 'DROPPED_OUT',
 }
 
+export interface IThesisPresentation {
+  presentationId: string
+  type: string
+  location: string | null
+  streamUrl: string | null
+  scheduledAt: string
+  createdAt: string
+  createdBy: ILightUser
+}
+
 export interface IThesis {
   thesisId: string
   title: string
@@ -49,15 +59,7 @@ export interface IThesis {
     finalGrade: string
     feedback: string
   }
-  presentations: Array<{
-    presentationId: string
-    type: string
-    location: string | null
-    streamUrl: string | null
-    scheduledAt: string
-    createdAt: string
-    createdBy: ILightUser
-  }>
+  presentations: IThesisPresentation[]
   states: Array<{
     state: ThesisState
     startedAt: string
@@ -85,6 +87,15 @@ export interface IPublishedThesis {
   supervisors: ILightUser[]
 }
 
+export interface IPublishedPresentation {
+  presentationId: string
+  type: string
+  location: string | null
+  streamUrl: string | null
+  scheduledAt: string
+  thesis: IPublishedThesis
+}
+
 export function isThesis(thesis: any): thesis is IThesis {
   return thesis.thesisId && !!thesis.states
 }
diff --git a/client/src/requests/responses/user.ts b/client/src/requests/responses/user.ts
index e90bb41d..67ee41f0 100644
--- a/client/src/requests/responses/user.ts
+++ b/client/src/requests/responses/user.ts
@@ -1,6 +1,7 @@
 export interface ILightUser {
   userId: string
   universityId: string
+  avatar: string | null
   matriculationNumber: string | null
   firstName: string | null
   lastName: string | null
@@ -14,7 +15,6 @@ export interface ILightUser {
 export interface IUser extends ILightUser {
   gender: string | null
   nationality: string | null
-  isExchangeStudent: boolean | null
   projects: string | null
   interests: string | null
   specialSkills: string | null
diff --git a/client/src/utils/converter.ts b/client/src/utils/converter.ts
new file mode 100644
index 00000000..787befcf
--- /dev/null
+++ b/client/src/utils/converter.ts
@@ -0,0 +1,15 @@
+import { DateValue } from '@mantine/dates'
+
+export function semesterToEnrollmentDate(semester: string | number): DateValue {
+  if (!semester) {
+    return null
+  }
+
+  return new Date(Date.now() - (Number(semester) * 1000 * 3600 * 24 * 365) / 2)
+}
+
+export function enrollmentDateToSemester(enrollmentDate: string): number {
+  const date = new Date(enrollmentDate).getTime()
+
+  return Math.floor((Date.now() - date) / ((1000 * 3600 * 24 * 365) / 2))
+}
diff --git a/client/src/utils/theme.ts b/client/src/utils/theme.ts
new file mode 100644
index 00000000..f14cedc0
--- /dev/null
+++ b/client/src/utils/theme.ts
@@ -0,0 +1,8 @@
+import { MantineSize } from '@mantine/core'
+
+export function getSmallerMantineSize(size: MantineSize) {
+  const sizes = ['xs', 'sm', 'md', 'lg', 'xl']
+  const currentIndex = sizes.indexOf(size)
+
+  return currentIndex > 0 ? sizes[currentIndex - 1] : sizes[0]
+}
diff --git a/docs/MAILS.md b/docs/MAILS.md
index 493a137c..3e431694 100644
--- a/docs/MAILS.md
+++ b/docs/MAILS.md
@@ -12,6 +12,7 @@ By default, mail templates from the repository are used.
 | [application-created-chair.html](../server/mail-templates/application-created-chair.html)             | Chair Members       |                       |                       | All supervisors and advisors get a summary about a new application           |
 | [application-created-student.html](../server/mail-templates/application-created-student.html)         | Application User    |                       |                       | Confirmation email to the applying student when application was submitted    |
 | [application-rejected.html](../server/mail-templates/application-rejected.html)                       | Application User    |                       | `MAIL_BCC_RECIPIENTS` | Application was rejected                                                     |
+| [application-reminder.html](../server/mail-templates/application-reminder.html)                       | Chair Members       |                       |                       | Weekly email if there are more than 10 unreviewed applications               |
 | [thesis-assessment-added.html](../server/mail-templates/thesis-assessment-added.html)                 | Supervisors         |                       |                       | Assessment was added to a submitted thesis                                   |
 | [thesis-closed.html](../server/mail-templates/thesis-closed.html)                                     | Students            | Supervisors, Advisors | `MAIL_BCC_RECIPIENTS` | Thesis was closed before completion                                          |
 | [thesis-comment-posted.html](../server/mail-templates/thesis-comment-posted.html)                     | Students / Advisors | Supervisors, Advisors |                       | New comment on a thesis. TO depends whether its a student or advisor comment |
diff --git a/server/mail-templates/application-created-chair.html b/server/mail-templates/application-created-chair.html
index 506ca82e..11d87f19 100644
--- a/server/mail-templates/application-created-chair.html
+++ b/server/mail-templates/application-created-chair.html
@@ -23,10 +23,10 @@
 </p>
 <p>
   <strong>Study program:</strong><br/>
-  {{application.user.studyProgram}}&nbsp;{{application.user.studyDegree}}&nbsp;(Enrolled at {{application.user.enrolledAt}})
+  {{application.user.studyProgram}}&nbsp;{{application.user.studyDegree}}&nbsp;(Semester {{application.user.enrolledAt}})
 </p>
 <p>
-  <strong>Thesis Title Suggestion:</strong><br/>
+  <strong>Thesis Title:</strong><br/>
   {{application.thesisTitle}}
 </p>
 <p>
diff --git a/server/mail-templates/application-created-student.html b/server/mail-templates/application-created-student.html
index 7bcc5d89..e250e9d6 100644
--- a/server/mail-templates/application-created-student.html
+++ b/server/mail-templates/application-created-student.html
@@ -23,10 +23,10 @@
 </p>
 <p>
   <strong>Study program:</strong><br/>
-  {{application.user.studyProgram}}&nbsp;{{application.user.studyDegree}}&nbsp;(Enrolled at {{application.user.enrolledAt}})
+  {{application.user.studyProgram}}&nbsp;{{application.user.studyDegree}}&nbsp;(Semester {{application.user.enrolledAt}})
 </p>
 <p>
-  <strong>Thesis Title Suggestion:</strong><br/>
+  <strong>Thesis Title:</strong><br/>
   {{application.thesisTitle}}
 </p>
 <p>
diff --git a/server/mail-templates/application-reminder.html b/server/mail-templates/application-reminder.html
new file mode 100644
index 00000000..ea32f370
--- /dev/null
+++ b/server/mail-templates/application-reminder.html
@@ -0,0 +1,8 @@
+<p>Dear {{recipientName}},</p>
+<p>
+  There are currently <strong>{{unreviewedApplications}}</strong> unreviewed thesis applications.
+</p>
+
+<p>
+  Review Applications: <a target="_blank" rel="noopener noreferrer nofollow" href="{{reviewApplicationsLink}}">{{reviewApplicationsLink}}</a>
+</p>
\ No newline at end of file
diff --git a/server/src/main/java/thesistrack/ls1/ThesisTrackApplication.java b/server/src/main/java/thesistrack/ls1/ThesisTrackApplication.java
index e405bf2c..072a6bf4 100644
--- a/server/src/main/java/thesistrack/ls1/ThesisTrackApplication.java
+++ b/server/src/main/java/thesistrack/ls1/ThesisTrackApplication.java
@@ -6,8 +6,10 @@
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class ThesisTrackApplication implements ApplicationRunner {
 
 	private static final Logger logger = LoggerFactory.getLogger(ThesisTrackApplication.class);
diff --git a/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java b/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java
index a6ead709..22972d89 100644
--- a/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java
@@ -48,7 +48,6 @@ public ResponseEntity<UserDto> updateInfo(
         authenticatedUser = this.authenticationService.updateUserInformation(
                 authenticatedUser,
                 RequestValidator.validateStringMaxLengthAllowNull(payload.matriculationNumber(), StringLimits.SHORTTEXT.getLimit()),
-                RequestValidator.validateNotNull(payload.isExchangeStudent()),
                 RequestValidator.validateStringMaxLengthAllowNull(payload.firstName(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateStringMaxLengthAllowNull(payload.lastName(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateStringMaxLengthAllowNull(payload.gender(), StringLimits.SHORTTEXT.getLimit()),
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
index 419b5fc9..e7767313 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
@@ -6,7 +6,6 @@
 public record LegacyCreateApplicationPayload (
         String universityId,
         String matriculationNumber,
-        Boolean isExchangeStudent,
         String firstName,
         String lastName,
         String gender,
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java
index 1b374b7a..73b30681 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java
@@ -4,7 +4,6 @@
 
 public record UpdateUserInformationPayload(
         String matriculationNumber,
-        Boolean isExchangeStudent,
         String firstName,
         String lastName,
         String gender,
diff --git a/server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java b/server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java
new file mode 100644
index 00000000..6b2cbee7
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java
@@ -0,0 +1,33 @@
+package thesistrack.ls1.cron;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import thesistrack.ls1.repository.ApplicationRepository;
+import thesistrack.ls1.service.MailingService;
+
+import java.time.Instant;
+
+@Component
+public class ApplicationReminder {
+    private static final Logger log = LoggerFactory.getLogger(ApplicationReminder.class);
+    private final ApplicationRepository applicationRepository;
+    private final MailingService mailingService;
+
+    public ApplicationReminder(ApplicationRepository applicationRepository, MailingService mailingService) {
+        this.applicationRepository = applicationRepository;
+        this.mailingService = mailingService;
+    }
+
+    @Scheduled(cron = "0 0 10 * * WED")
+    public void emailReminder() {
+        long unreviewedApplications = applicationRepository.countUnreviewedApplications(null);
+
+        if (unreviewedApplications > 10) {
+            mailingService.sendApplicationReminderEmail(unreviewedApplications);
+        }
+
+        log.info("Scheduled task executed at {}", Instant.now());
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java b/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java
index 17799265..4ea49d34 100644
--- a/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java
@@ -8,6 +8,7 @@
 
 public record LightUserDto (
     UUID userId,
+    String avatar,
     String universityId,
     String matriculationNumber,
     String firstName,
@@ -24,7 +25,7 @@ public static LightUserDto fromUserEntity(User user) {
         }
 
         return new LightUserDto(
-                user.getId(), user.getUniversityId(), user.getMatriculationNumber(),
+                user.getId(), user.getAvatar(), user.getUniversityId(), user.getMatriculationNumber(),
                 user.getFirstName(), user.getLastName(), user.getEmail().toString(), user.getStudyDegree(), user.getStudyProgram(),
                 user.getJoinedAt(), user.getGroups().stream().map(x -> x.getId().getGroup()).toList()
         );
diff --git a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
index 47dbefc0..1aeaad50 100644
--- a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
@@ -1,11 +1,7 @@
 package thesistrack.ls1.dto;
 
-import java.time.Instant;
-
 public record TaskDto(
         String message,
         String link,
-        Instant startDate,
-        Instant endDate,
         Number priority
 ) { }
diff --git a/server/src/main/java/thesistrack/ls1/dto/UserDto.java b/server/src/main/java/thesistrack/ls1/dto/UserDto.java
index 14b1b441..52d48b79 100644
--- a/server/src/main/java/thesistrack/ls1/dto/UserDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/UserDto.java
@@ -8,6 +8,7 @@
 
 public record UserDto (
         UUID userId,
+        String avatar,
         String universityId,
         String matriculationNumber,
         String email,
@@ -15,7 +16,6 @@ public record UserDto (
         String lastName,
         String gender,
         String nationality,
-        Boolean isExchangeStudent,
         String studyDegree,
         String studyProgram,
         String projects,
@@ -35,8 +35,8 @@ public static UserDto fromUserEntity(User user) {
         }
 
         return new UserDto(
-                user.getId(), user.getUniversityId(), user.getMatriculationNumber(), user.getEmail() != null ? user.getEmail().toString() : null,
-                user.getFirstName(), user.getLastName(), user.getGender(), user.getNationality(), user.getIsExchangeStudent(),
+                user.getId(), user.getAvatar(), user.getUniversityId(), user.getMatriculationNumber(), user.getEmail() != null ? user.getEmail().toString() : null,
+                user.getFirstName(), user.getLastName(), user.getGender(), user.getNationality(),
                 user.getStudyDegree(), user.getStudyProgram(), user.getProjects(), user.getInterests(),
                 user.getSpecialSkills(), user.getEnrolledAt(), user.getUpdatedAt(), user.getJoinedAt(),
                 user.getGroups() == null ? Collections.emptySet() : new HashSet<>(user.getGroups().stream().map(x -> x.getId().getGroup()).toList()),
diff --git a/server/src/main/java/thesistrack/ls1/entity/Schedule.java b/server/src/main/java/thesistrack/ls1/entity/Schedule.java
deleted file mode 100644
index 0b605312..00000000
--- a/server/src/main/java/thesistrack/ls1/entity/Schedule.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package thesistrack.ls1.entity;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.Instant;
-
-@Getter
-@Setter
-@Entity
-@Table(name = "schedules")
-public class Schedule {
-    @Id
-    @Column(name = "schedule_name", nullable = false)
-    private String scheduleName;
-
-    @NotNull
-    @Column(name = "last_received", nullable = false)
-    private Instant lastReceived;
-
-}
\ No newline at end of file
diff --git a/server/src/main/java/thesistrack/ls1/entity/User.java b/server/src/main/java/thesistrack/ls1/entity/User.java
index cacc2160..8162bd1b 100644
--- a/server/src/main/java/thesistrack/ls1/entity/User.java
+++ b/server/src/main/java/thesistrack/ls1/entity/User.java
@@ -10,6 +10,8 @@
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.type.SqlTypes;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.time.Instant;
 import java.util.*;
 
@@ -45,9 +47,6 @@ public class User {
     @Column(name = "nationality")
     private String nationality;
 
-    @Column(name = "is_exchange_student")
-    private Boolean isExchangeStudent;
-
     @Column(name = "cv_filename")
     private String cvFilename;
 
@@ -96,6 +95,28 @@ public InternetAddress getEmail() {
         }
     }
 
+    public String getAvatar() {
+        if (email == null) {
+            return null;
+        }
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+
+            byte[] hashInBytes = md.digest(email.trim().toLowerCase().getBytes());
+
+            StringBuilder sb = new StringBuilder();
+
+            for (byte b : hashInBytes) {
+                sb.append(String.format("%02x", b));
+            }
+
+            return "https://www.gravatar.com/avatar/" + sb;
+        } catch (NoSuchAlgorithmException e) {
+            return null;
+        }
+    }
+
     public boolean hasAnyGroup(String...groups) {
         for (String group : groups) {
             for (UserGroup userGroup : getGroups()) {
diff --git a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
index f7ec463f..7d4bce27 100644
--- a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
@@ -106,9 +106,7 @@ public Application createLegacyApplication(
         student.setInterests(RequestValidator.validateStringMaxLength(payload.interests(), 1000));
         student.setProjects(RequestValidator.validateStringMaxLength(payload.projects(), 1000));
 
-        student.setIsExchangeStudent(payload.isExchangeStudent());
         student.setEnrolledAt(payload.enrolledAt());
-
         student.setUpdatedAt(currentTime);
 
         student.setExaminationFilename(uploadService.store(examinationReport, 3 * 1024 * 1024));
diff --git a/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java b/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java
index 9e21136d..7e23841b 100644
--- a/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java
@@ -96,7 +96,6 @@ public User updateAuthenticatedUser(JwtAuthenticationToken jwt) {
     public User updateUserInformation(
             User user,
             String matriculationNumber,
-            boolean isExchangeStudent,
             String firstName,
             String lastName,
             String gender,
@@ -113,7 +112,6 @@ public User updateUserInformation(
             MultipartFile degreeReport
     ) {
         user.setMatriculationNumber(matriculationNumber);
-        user.setIsExchangeStudent(isExchangeStudent);
         user.setFirstName(firstName);
         user.setLastName(lastName);
         user.setGender(gender);
diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
index f8f61fcf..6ba99757 100644
--- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java
+++ b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -17,7 +17,9 @@
 import thesistrack.ls1.repository.TopicRepository;
 
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
@@ -50,23 +52,11 @@ public List<TaskDto> getTasks(User user) {
 
         // general student tasks
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), null)) {
-            if (thesis.getAbstractField().isBlank()) {
+            if (thesis.getAbstractField().isBlank() || thesis.getInfo().isBlank()) {
                 tasks.add(new TaskDto(
-                        "Add the abstract to your thesis",
+                        "Add the abstract and additional information to thesis \"" + thesis.getTitle() + "\"",
                         getThesisLink(thesis),
-                        thesis.getCreatedAt(),
-                        null,
-                        100
-                ));
-            }
-
-            if (thesis.getInfo().isBlank()) {
-                tasks.add(new TaskDto(
-                        "Add \"Additional Information\" to your thesis",
-                        getThesisLink(thesis),
-                        thesis.getCreatedAt(),
-                        null,
-                        100
+                        50
                 ));
             }
         }
@@ -81,9 +71,7 @@ public List<TaskDto> getTasks(User user) {
                 tasks.add(new TaskDto(
                         "Add start and end date to thesis \"" + thesis.getTitle() + "\"",
                         getThesisLink(thesis),
-                        thesis.getCreatedAt(),
-                        null,
-                        100
+                        50
                 ));
             }
         }
@@ -91,24 +79,20 @@ public List<TaskDto> getTasks(User user) {
         // proposal task
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), Set.of(ThesisState.PROPOSAL))) {
             tasks.add(new TaskDto(
-                    "Add a proposal to your thesis",
+                    "Add a proposal to thesis \"" + thesis.getTitle() + "\"",
                     getThesisLink(thesis),
-                    thesis.getCreatedAt(),
-                    null,
                     100
             ));
         }
 
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.ADVISOR, ThesisRoleName.SUPERVISOR), Set.of(ThesisState.PROPOSAL))) {
-            if (!thesis.getProposals().isEmpty()) {
+            if (thesis.getProposals().isEmpty()) {
                 continue;
             }
 
             tasks.add(new TaskDto(
-                    "Review the proposal of thesis \"" + thesis.getTitle() + "\"",
+                    "A proposal was submitted to thesis \"" + thesis.getTitle() + "\". Please review and accept it or send feedback to the student.",
                     getThesisLink(thesis),
-                    thesis.getProposals().getFirst().getCreatedAt(),
-                    null,
                     100
             ));
         }
@@ -116,36 +100,34 @@ public List<TaskDto> getTasks(User user) {
         // thesis submission task
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), Set.of(ThesisState.WRITING))) {
             tasks.add(new TaskDto(
-                    "Submit your final thesis and presentation",
+                    "Submit your final thesis and presentation. You can check your submission deadline on the thesis page.",
                     getThesisLink(thesis),
-                    thesis.getStartDate(),
-                    thesis.getEndDate(),
-                    100
+                    80
             ));
         }
 
         // presentation tasks
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), null, Set.of(ThesisState.WRITING, ThesisState.SUBMITTED))) {
-            if (!thesis.getPresentations().isEmpty()) {
+            if (!thesis.getPresentations().isEmpty() || thesis.getEndDate() == null) {
+                continue;
+            }
+
+            if (thesis.getEndDate().minus(1, ChronoUnit.MONTHS).isAfter(Instant.now())) {
                 continue;
             }
 
             tasks.add(new TaskDto(
-                    "Schedule a presentation date for thesis \"" + thesis.getTitle() + "\"",
+                    "Schedule a presentation date for thesis \"" + thesis.getTitle() + "\" with the advisor.",
                     getThesisLink(thesis),
-                    thesis.getStartDate(),
-                    null,
-                    100
+                    40
             ));
         }
 
         // thesis assessment task
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.ADVISOR, ThesisRoleName.SUPERVISOR), Set.of(ThesisState.SUBMITTED))) {
             tasks.add(new TaskDto(
-                    "Add assessment to thesis \"" + thesis.getTitle() + "\"",
+                    "Thesis \"" + thesis.getTitle() + "\" was submitted. Please review the thesis and add an assessment.",
                     getThesisLink(thesis),
-                    null,
-                    null,
                     100
             ));
         }
@@ -153,10 +135,8 @@ public List<TaskDto> getTasks(User user) {
         // grade thesis task
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.SUPERVISOR), Set.of(ThesisState.ASSESSED))) {
             tasks.add(new TaskDto(
-                    "Add final grade to thesis \"" + thesis.getTitle() + "\"",
+                    "Review assessment of thesis \"" + thesis.getTitle() + "\" and add a final grade.",
                     getThesisLink(thesis),
-                    null,
-                    null,
                     100
             ));
         }
@@ -164,25 +144,21 @@ public List<TaskDto> getTasks(User user) {
         // close thesis task
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.SUPERVISOR), Set.of(ThesisState.GRADED))) {
             tasks.add(new TaskDto(
-                    "Complete thesis \"" + thesis.getTitle() + "\"",
+                    "Thesis \"" + thesis.getTitle() + "\" is graded but not completed yet.",
                     getThesisLink(thesis),
-                    null,
-                    null,
-                    100
+                    20
             ));
         }
 
         if (user.hasAnyGroup("admin", "supervisor", "advisor")) {
             // review application task
-            long unreviewedApplications = applicationRepository.countUnreviewedApplications(user.getId());
+            long unreviewedApplications = applicationRepository.countUnreviewedApplications(user.hasAnyGroup("admin") ? null : user.getId());
 
             if (unreviewedApplications > 10) {
                 tasks.add(new TaskDto(
                         "You have " + unreviewedApplications + " unreviewed applications.",
                         "/applications",
-                        null,
-                        null,
-                        100
+                        10
                 ));
             }
 
@@ -191,17 +167,16 @@ public List<TaskDto> getTasks(User user) {
 
             if (openTopics == 0) {
                 tasks.add(new TaskDto(
-                        "There are no open Topics. Please create a topic.",
+                        "There are currently no open Topics. Please create a topic.",
                         "/topics",
-                        null,
-                        null,
-                        100
+                        10
                 ));
             }
         }
 
+        tasks.sort(Comparator.comparingInt(a -> a.priority().intValue()));
 
-        return tasks;
+        return tasks.reversed();
     }
 
     private String getThesisLink(Thesis thesis) {
diff --git a/server/src/main/java/thesistrack/ls1/service/MailingService.java b/server/src/main/java/thesistrack/ls1/service/MailingService.java
index 8f32acb7..cdb1881d 100644
--- a/server/src/main/java/thesistrack/ls1/service/MailingService.java
+++ b/server/src/main/java/thesistrack/ls1/service/MailingService.java
@@ -71,6 +71,15 @@ public void sendApplicationRejectionEmail(Application application) throws Mailin
                 .send(javaMailSender, uploadService);
     }
 
+    public void sendApplicationReminderEmail(long unreviewedApplications) {
+        MailBuilder builder = new MailBuilder(config, "Unreviewed Thesis Applications", "application-reminder");
+        builder
+                .sendToChairMembers()
+                .fillPlaceholder("unreviewedApplications", String.valueOf(unreviewedApplications))
+                .fillPlaceholder("reviewApplicationsLink", config.getClientHost() + "/applications")
+                .send(javaMailSender, uploadService);
+    }
+
     public void sendThesisCreatedEmail(User creatingUser, Thesis thesis) {
         MailBuilder builder = new MailBuilder(config, "Thesis Created", "thesis-created");
         builder
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java b/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
index 0d8c8a62..4ea357a2 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
@@ -40,7 +40,7 @@ public Calendar getPresentationCalendar() {
 
         calendar.add(new ProdId("-//Thesis Track//Thesis Presentations//EN"));
         calendar.add(ImmutableCalScale.GREGORIAN);
-        calendar.getProperties().add(ImmutableMethod.PUBLISH);
+        calendar.add(ImmutableMethod.PUBLISH);
 
         List<ThesisPresentation> presentations = thesisPresentationRepository.findAllPresentations(
                 Set.of(ThesisPresentationVisibility.PUBLIC)
diff --git a/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java b/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java
index 43bbd2db..3d3c9e94 100644
--- a/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java
+++ b/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java
@@ -6,6 +6,7 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -54,4 +55,33 @@ public static String formatUsers(Object value) {
 
         return String.join(" and ", users.stream().map(user -> user.firstName() + " " + user.lastName()).toList());
     }
+
+    public static String formatConstantName(Object value) {
+        if (!(value instanceof String text)) {
+            return "";
+        }
+
+        String[] words = text.split("_");
+        StringBuilder capitalizedSentence = new StringBuilder();
+
+        for (String word : words) {
+            if (!word.isEmpty()) {
+                capitalizedSentence.append(Character.toUpperCase(word.charAt(0)))
+                        .append(word.substring(1).toLowerCase())
+                        .append(" ");
+            }
+        }
+
+        return capitalizedSentence.toString().trim();
+    }
+
+    public static String formatSemester(Object value) {
+        if (!(value instanceof Instant)) {
+            return "";
+        }
+
+        long monthsBetween = ChronoUnit.MONTHS.between((Instant) value, Instant.now());
+
+        return String.valueOf(monthsBetween / 6);
+    }
 }
diff --git a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java b/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
index 3aa595a6..f016ce21 100644
--- a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
+++ b/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java
@@ -140,16 +140,29 @@ public MailBuilder sendToThesisStudents(Thesis thesis) {
         return this;
     }
 
-    public MailBuilder fillUserPlaceholders(User user, String placeholder) {
-        HashMap<String, Function<Object, String>> formatters = new HashMap<>();
+    public MailBuilder fillPlaceholder(String placeholder, String value) {
+        content = content.replace("{{" + placeholder + "}}", value);
 
-        formatters.put(placeholder + ".enrolledAt", DataFormatter::formatDate);
+        return this;
+    }
 
-        replaceDtoPlaceholders(UserDto.fromUserEntity(user), placeholder, formatters);
+    public MailBuilder fillUserPlaceholders(User user, String placeholder) {
+        replaceDtoPlaceholders(UserDto.fromUserEntity(user), placeholder, getUserFormatters(placeholder));
 
         return this;
     }
 
+    private HashMap<String, Function<Object, String>> getUserFormatters(String placeholder) {
+        HashMap<String, Function<Object, String>> formatters = new HashMap<>();
+
+        formatters.put(placeholder + ".enrolledAt", DataFormatter::formatSemester);
+        formatters.put(placeholder + ".gender", DataFormatter::formatConstantName);
+        formatters.put(placeholder + ".studyDegree", DataFormatter::formatConstantName);
+        formatters.put(placeholder + ".studyProgram", DataFormatter::formatConstantName);
+
+        return formatters;
+    }
+
     public MailBuilder fillApplicationPlaceholders(Application application) {
         HashMap<String, Function<Object, String>> formatters = new HashMap<>();
 
@@ -161,7 +174,8 @@ public MailBuilder fillApplicationPlaceholders(Application application) {
             return Objects.requireNonNullElse(application.getThesisTitle(), "");
         });
         formatters.put("application.desiredStartDate", DataFormatter::formatDate);
-        formatters.put("application.user.enrolledAt", DataFormatter::formatDate);
+
+        formatters.putAll(getUserFormatters("application.user"));
 
         replaceDtoPlaceholders(ApplicationDto.fromApplicationEntity(application, false), "application", formatters);
 
diff --git a/server/src/main/resources/db/changelog/changes/07_cleanup.sql b/server/src/main/resources/db/changelog/changes/07_cleanup.sql
new file mode 100644
index 00000000..06313cdc
--- /dev/null
+++ b/server/src/main/resources/db/changelog/changes/07_cleanup.sql
@@ -0,0 +1,5 @@
+--liquibase formatted sql
+
+--changeset emilius:07-cleanup-1
+DROP TABLE schedules;
+ALTER TABLE users DROP COLUMN is_exchange_student;
diff --git a/server/src/main/resources/db/changelog/db.changelog-master.xml b/server/src/main/resources/db/changelog/db.changelog-master.xml
index 931bc255..6468b7e6 100644
--- a/server/src/main/resources/db/changelog/db.changelog-master.xml
+++ b/server/src/main/resources/db/changelog/db.changelog-master.xml
@@ -10,4 +10,5 @@
     <include file="changes/04_thesis_comments.sql" relativeToChangelogFile="true" />
     <include file="changes/05_thesis_presentations.sql" relativeToChangelogFile="true" />
     <include file="changes/06_topics.sql" relativeToChangelogFile="true" />
+    <include file="changes/07_cleanup.sql" relativeToChangelogFile="true" />
 </databaseChangeLog>

From ee332b8f226cb0631a6c39152cefd4c059ad2213 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Fri, 30 Aug 2024 11:08:27 +0200
Subject: [PATCH 09/13] Implement update application flow

---
 client/src/app/Routes.tsx                     | 14 ++++-
 .../ApplicationModal/ApplicationModal.tsx     | 31 +++++++++--
 .../AvatarUserList/AvatarUserList.tsx         | 13 +++--
 .../ThesesFilters/ThesesFilters.tsx           | 55 +++++++++++++------
 .../ThesesGanttChart/ThesesGanttChart.tsx     |  7 ++-
 .../ThesesProvider/ThesesProvider.tsx         | 11 +++-
 client/src/contexts/ThesesProvider/context.ts |  1 +
 .../src/pages/DashboardPage/DashboardPage.tsx |  1 +
 .../MyInformationPage/MyInformationPage.tsx   | 10 +++-
 .../ReplaceApplicationPage.tsx}               | 45 ++++++++++++---
 .../MotivationStep/MotivationStep.tsx         | 54 ++++++++++++------
 .../SelectTopicStep/SelectTopicStep.tsx       |  0
 .../StudentInformationStep.tsx                |  0
 .../ls1/controller/ApplicationController.java | 34 ++++++++++++
 .../controller/PublishedThesisController.java |  1 +
 .../ls1/controller/ThesisController.java      |  2 +
 .../thesistrack/ls1/entity/Application.java   |  8 +++
 .../exception/ResponseExceptionHandler.java   |  6 ++
 .../ResourceAlreadyExistsException.java       |  7 +++
 .../ls1/repository/ApplicationRepository.java | 12 ++++
 .../ls1/repository/ThesisRepository.java      |  2 +
 .../ls1/service/ApplicationService.java       | 17 ++++++
 .../ls1/service/ThesisService.java            |  4 ++
 23 files changed, 277 insertions(+), 58 deletions(-)
 rename client/src/pages/{SubmitApplicationPage/SubmitApplicationPage.tsx => ReplaceApplicationPage/ReplaceApplicationPage.tsx} (63%)
 rename client/src/pages/{SubmitApplicationPage => ReplaceApplicationPage}/components/MotivationStep/MotivationStep.tsx (71%)
 rename client/src/pages/{SubmitApplicationPage => ReplaceApplicationPage}/components/SelectTopicStep/SelectTopicStep.tsx (100%)
 rename client/src/pages/{SubmitApplicationPage => ReplaceApplicationPage}/components/StudentInformationStep/StudentInformationStep.tsx (100%)
 create mode 100644 server/src/main/java/thesistrack/ls1/exception/request/ResourceAlreadyExistsException.java

diff --git a/client/src/app/Routes.tsx b/client/src/app/Routes.tsx
index 24f86ad1..83c59e0d 100644
--- a/client/src/app/Routes.tsx
+++ b/client/src/app/Routes.tsx
@@ -8,8 +8,8 @@ const ThesisOverviewPage = lazy(() => import('../pages/ThesisOverviewPage/Thesis
 const DashboardPage = lazy(() => import('../pages/DashboardPage/DashboardPage'))
 const LogoutPage = lazy(() => import('../pages/LogoutPage/LogoutPage'))
 const MyInformationPage = lazy(() => import('../pages/MyInformationPage/MyInformationPage'))
-const SubmitApplicationPage = lazy(
-  () => import('../pages/SubmitApplicationPage/SubmitApplicationPage'),
+const ReplaceApplicationPage = lazy(
+  () => import('../pages/ReplaceApplicationPage/ReplaceApplicationPage'),
 )
 const ManageTopicsPage = lazy(() => import('../pages/ManageTopicsPage/ManageTopicsPage'))
 const TopicPage = lazy(() => import('../pages/TopicPage/TopicPage'))
@@ -44,7 +44,15 @@ const AppRoutes = () => {
             path='/submit-application/:topicId?'
             element={
               <AuthenticatedArea>
-                <SubmitApplicationPage />
+                <ReplaceApplicationPage />
+              </AuthenticatedArea>
+            }
+          />
+          <Route
+            path='/edit-application/:applicationId'
+            element={
+              <AuthenticatedArea>
+                <ReplaceApplicationPage />
               </AuthenticatedArea>
             }
           />
diff --git a/client/src/components/ApplicationModal/ApplicationModal.tsx b/client/src/components/ApplicationModal/ApplicationModal.tsx
index 06ca84e8..47531d9a 100644
--- a/client/src/components/ApplicationModal/ApplicationModal.tsx
+++ b/client/src/components/ApplicationModal/ApplicationModal.tsx
@@ -1,18 +1,26 @@
-import { IApplication } from '../../requests/responses/application'
-import { Modal, Stack, Divider } from '@mantine/core'
+import { ApplicationState, IApplication } from '../../requests/responses/application'
+import { Button, Divider, Modal, Stack } from '@mantine/core'
 import React from 'react'
 import ApplicationReviewForm from '../ApplicationReviewForm/ApplicationReviewForm'
 import ApplicationData from '../ApplicationData/ApplicationData'
+import { Link } from 'react-router-dom'
 
 interface IApplicationModalProps {
   application: IApplication | undefined
   onClose: () => unknown
-  allowReviews: boolean
+  allowReviews?: boolean
+  allowEdit?: boolean
   onUpdate?: (application: IApplication) => unknown
 }
 
 const ApplicationModal = (props: IApplicationModalProps) => {
-  const { application, onUpdate = () => undefined, onClose, allowReviews } = props
+  const {
+    application,
+    onUpdate = () => undefined,
+    onClose,
+    allowReviews = false,
+    allowEdit = false,
+  } = props
 
   return (
     <Modal centered size='100vw' opened={!!application} onClose={onClose}>
@@ -20,6 +28,21 @@ const ApplicationModal = (props: IApplicationModalProps) => {
         {application && (
           <ApplicationData
             application={application}
+            rightTitleSection={
+              allowEdit && application.state === ApplicationState.NOT_ASSESSED ? (
+                <Button
+                  ml='auto'
+                  mt='sm'
+                  size='sm'
+                  component={Link}
+                  to={`/edit-application/${application.applicationId}`}
+                  variant='outline'
+                  color='green'
+                >
+                  Edit
+                </Button>
+              ) : undefined
+            }
             bottomSection={
               allowReviews ? (
                 <Stack>
diff --git a/client/src/components/AvatarUserList/AvatarUserList.tsx b/client/src/components/AvatarUserList/AvatarUserList.tsx
index 9b01a37c..f67d6e83 100644
--- a/client/src/components/AvatarUserList/AvatarUserList.tsx
+++ b/client/src/components/AvatarUserList/AvatarUserList.tsx
@@ -1,22 +1,27 @@
 import { ILightUser } from '../../requests/responses/user'
-import { Group, MantineSize } from '@mantine/core'
+import { MantineSize, Stack } from '@mantine/core'
 import AvatarUser from '../AvatarUser/AvatarUser'
 
 interface IAvatarUserListProps {
   users: ILightUser[]
   withUniversityId?: boolean
   size?: MantineSize
+  oneLine?: boolean
 }
 
 const AvatarUserList = (props: IAvatarUserListProps) => {
-  const { users, withUniversityId, size } = props
+  const { users, withUniversityId, size, oneLine = false } = props
+
+  if (oneLine && users.length > 0) {
+    return <AvatarUser user={users[0]} withUniversityId={withUniversityId} size={size} />
+  }
 
   return (
-    <Group gap='xs'>
+    <Stack gap='xs'>
       {users.map((user) => (
         <AvatarUser key={user.userId} user={user} withUniversityId={withUniversityId} size={size} />
       ))}
-    </Group>
+    </Stack>
   )
 }
 
diff --git a/client/src/components/ThesesFilters/ThesesFilters.tsx b/client/src/components/ThesesFilters/ThesesFilters.tsx
index 9b15d64f..e473530f 100644
--- a/client/src/components/ThesesFilters/ThesesFilters.tsx
+++ b/client/src/components/ThesesFilters/ThesesFilters.tsx
@@ -4,37 +4,22 @@ import { useThesesContext } from '../../contexts/ThesesProvider/hooks'
 import { ThesisState } from '../../requests/responses/thesis'
 import { MagnifyingGlass } from 'phosphor-react'
 import { formatThesisState } from '../../utils/format'
+import { GLOBAL_CONFIG } from '../../config/global'
 
 const ThesesFilters = () => {
   const { filters, setFilters, sort, setSort } = useThesesContext()
 
   return (
     <Grid gutter='xs'>
-      <Grid.Col span={12}>
+      <Grid.Col span={6}>
         <TextInput
+          label='Search'
           placeholder='Search theses...'
           leftSection={<MagnifyingGlass size={16} />}
           value={filters.search || ''}
           onChange={(x) => setFilters((prev) => ({ ...prev, search: x.target.value || undefined }))}
         />
       </Grid.Col>
-      <Grid.Col span={6}>
-        <MultiSelect
-          hidePickedOptions
-          label='Thesis State'
-          data={Object.values(ThesisState).map((value) => ({
-            value: value,
-            label: formatThesisState(value),
-          }))}
-          value={filters.states || []}
-          onChange={(x) =>
-            setFilters((prev) => ({
-              ...prev,
-              states: x.length > 0 ? (x as ThesisState[]) : undefined,
-            }))
-          }
-        />
-      </Grid.Col>
       <Grid.Col span={6}>
         <Select
           label='Sort By'
@@ -53,6 +38,40 @@ const ThesesFilters = () => {
           }
         />
       </Grid.Col>
+      <Grid.Col span={6}>
+        <MultiSelect
+          hidePickedOptions
+          label='Thesis Type'
+          data={Object.keys(GLOBAL_CONFIG.thesis_types).map((key) => ({
+            value: key,
+            label: GLOBAL_CONFIG.thesis_types[key],
+          }))}
+          value={filters.types || []}
+          onChange={(x) =>
+            setFilters((prev) => ({
+              ...prev,
+              types: x.length > 0 ? x : undefined,
+            }))
+          }
+        />
+      </Grid.Col>
+      <Grid.Col span={6}>
+        <MultiSelect
+          hidePickedOptions
+          label='Thesis State'
+          data={Object.values(ThesisState).map((value) => ({
+            value: value,
+            label: formatThesisState(value),
+          }))}
+          value={filters.states || []}
+          onChange={(x) =>
+            setFilters((prev) => ({
+              ...prev,
+              states: x.length > 0 ? (x as ThesisState[]) : undefined,
+            }))
+          }
+        />
+      </Grid.Col>
     </Grid>
   )
 }
diff --git a/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx b/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
index 0c77487c..7228d4f0 100644
--- a/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
+++ b/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
@@ -41,16 +41,19 @@ const ThesesGanttChart = () => {
         return endDate
       }
 
+      const advisor = thesis.advisors[0]
+
       result.push({
         id: thesis.thesisId,
-        groupId: thesis.advisors[0].userId,
-        groupName: formatUser(thesis.advisors[0]),
+        groupId: advisor.userId,
+        groupName: formatUser(advisor),
         columns: [
           <AvatarUserList
             key='student'
             users={thesis.students}
             withUniversityId={false}
             size='xs'
+            oneLine
           />,
           <Text key='title' size='xs' truncate>
             {thesis.title}
diff --git a/client/src/contexts/ThesesProvider/ThesesProvider.tsx b/client/src/contexts/ThesesProvider/ThesesProvider.tsx
index 72f5bb6e..64246340 100644
--- a/client/src/contexts/ThesesProvider/ThesesProvider.tsx
+++ b/client/src/contexts/ThesesProvider/ThesesProvider.tsx
@@ -48,6 +48,7 @@ const ThesesProvider = (props: PropsWithChildren<IThesesProviderProps>) => {
           fetchAll: fetchAll ? 'true' : 'false',
           search: debouncedSearch,
           state: filters.states?.join(',') ?? '',
+          type: filters.types?.join(',') ?? '',
           page,
           limit,
           sortBy: sort.column,
@@ -71,7 +72,15 @@ const ThesesProvider = (props: PropsWithChildren<IThesesProviderProps>) => {
         setTheses(res.data)
       },
     )
-  }, [fetchAll, page, limit, sort, filters.states?.join(','), debouncedSearch])
+  }, [
+    fetchAll,
+    page,
+    limit,
+    sort,
+    filters.states?.join(','),
+    filters.types?.join(','),
+    debouncedSearch,
+  ])
 
   const contextState = useMemo<IThesesContext>(() => {
     return {
diff --git a/client/src/contexts/ThesesProvider/context.ts b/client/src/contexts/ThesesProvider/context.ts
index efff5009..42c9f680 100644
--- a/client/src/contexts/ThesesProvider/context.ts
+++ b/client/src/contexts/ThesesProvider/context.ts
@@ -5,6 +5,7 @@ import { PaginationResponse } from '../../requests/responses/pagination'
 export interface IThesesFilters {
   search?: string
   states?: ThesisState[]
+  types?: string[]
 }
 
 export interface IThesesSort {
diff --git a/client/src/pages/DashboardPage/DashboardPage.tsx b/client/src/pages/DashboardPage/DashboardPage.tsx
index 1dd9142a..e5c72865 100644
--- a/client/src/pages/DashboardPage/DashboardPage.tsx
+++ b/client/src/pages/DashboardPage/DashboardPage.tsx
@@ -67,6 +67,7 @@ const DashboardPage = () => {
           application={application}
           onClose={() => setApplication(undefined)}
           allowReviews={false}
+          allowEdit={true}
         />
         <Space mb='md' />
       </ApplicationsProvider>
diff --git a/client/src/pages/MyInformationPage/MyInformationPage.tsx b/client/src/pages/MyInformationPage/MyInformationPage.tsx
index 115dd4c3..ecf54e4a 100644
--- a/client/src/pages/MyInformationPage/MyInformationPage.tsx
+++ b/client/src/pages/MyInformationPage/MyInformationPage.tsx
@@ -1,8 +1,9 @@
 import ContentContainer from '../../app/layout/ContentContainer/ContentContainer'
 import React from 'react'
 import { usePageTitle } from '../../hooks/theme'
-import { Title } from '@mantine/core'
+import { Alert, Title } from '@mantine/core'
 import UserInformationForm from '../../components/UserInformationForm/UserInformationForm'
+import { Info } from 'phosphor-react'
 
 const MyInformationPage = () => {
   usePageTitle('My Information')
@@ -10,6 +11,13 @@ const MyInformationPage = () => {
   return (
     <ContentContainer>
       <Title mb='md'>My Information</Title>
+      <Alert variant='light' color='blue' title='Update Avatar' icon={<Info />} mb='md'>
+        We use{' '}
+        <a href='https://www.gravatar.com/' target='_blank' rel='noreferrer'>
+          www.gravatar.com
+        </a>{' '}
+        for avatars. If you want to add or change your avatar, please do it on the linked site.
+      </Alert>
       <UserInformationForm requireCompletion={false} />
     </ContentContainer>
   )
diff --git a/client/src/pages/SubmitApplicationPage/SubmitApplicationPage.tsx b/client/src/pages/ReplaceApplicationPage/ReplaceApplicationPage.tsx
similarity index 63%
rename from client/src/pages/SubmitApplicationPage/SubmitApplicationPage.tsx
rename to client/src/pages/ReplaceApplicationPage/ReplaceApplicationPage.tsx
index 4e4217d3..cd025e4e 100644
--- a/client/src/pages/SubmitApplicationPage/SubmitApplicationPage.tsx
+++ b/client/src/pages/ReplaceApplicationPage/ReplaceApplicationPage.tsx
@@ -2,15 +2,38 @@ import { useNavigate, useParams } from 'react-router-dom'
 import { useTopic } from '../../hooks/fetcher'
 import ContentContainer from '../../app/layout/ContentContainer/ContentContainer'
 import { Card, Center, Stack, Stepper, Text, Title } from '@mantine/core'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import SelectTopicStep from './components/SelectTopicStep/SelectTopicStep'
 import StudentInformationStep from './components/StudentInformationStep/StudentInformationStep'
 import MotivationStep from './components/MotivationStep/MotivationStep'
 import TopicsProvider from '../../contexts/TopicsProvider/TopicsProvider'
 import { useWindowScroll } from '@mantine/hooks'
+import { IApplication } from '../../requests/responses/application'
+import { doRequest } from '../../requests/request'
 
-const SubmitApplicationPage = () => {
-  const { topicId } = useParams<{ topicId: string }>()
+const ReplaceApplicationPage = () => {
+  const { topicId, applicationId } = useParams<{ topicId: string; applicationId: string }>()
+
+  const [application, setApplication] = useState<IApplication>()
+
+  useEffect(() => {
+    setApplication(undefined)
+
+    if (applicationId) {
+      return doRequest<IApplication>(
+        `/v2/applications/${applicationId}`,
+        {
+          method: 'GET',
+          requiresAuth: true,
+        },
+        (res) => {
+          if (res.ok) {
+            setApplication(res.data)
+          }
+        },
+      )
+    }
+  }, [applicationId])
 
   const [, scrollTo] = useWindowScroll()
   const navigate = useNavigate()
@@ -34,7 +57,7 @@ const SubmitApplicationPage = () => {
   return (
     <ContentContainer>
       <Title mb='md'>Submit Application</Title>
-      <Stepper active={Math.max(step, topicId ? 1 : 0)} onStepClick={updateStep}>
+      <Stepper active={Math.max(step, topicId || applicationId ? 1 : 0)} onStepClick={updateStep}>
         <Stepper.Step label='First Step' description='Select Topic'>
           <TopicsProvider limit={100}>
             <SelectTopicStep
@@ -49,13 +72,21 @@ const SubmitApplicationPage = () => {
           <StudentInformationStep onComplete={() => setStep(2)} />
         </Stepper.Step>
         <Stepper.Step label='Final step' description='Submit your Application'>
-          <MotivationStep onComplete={() => setStep(3)} topic={topic || undefined} />
+          <MotivationStep
+            onComplete={() => setStep(3)}
+            topic={topic || undefined}
+            application={application}
+          />
         </Stepper.Step>
         <Stepper.Completed>
           <Center style={{ height: '50vh' }}>
             <Card withBorder p='xl'>
               <Stack gap='sm'>
-                <Text ta='center'>Your application was successfully submitted!</Text>
+                <Text ta='center'>
+                  {application
+                    ? 'Your application was successfully updated!'
+                    : 'Your application was successfully submitted!'}
+                </Text>
                 <Text ta='center' size='sm' c='muted'>
                   We will contact you as soon as we have reviewed your application.
                 </Text>
@@ -68,4 +99,4 @@ const SubmitApplicationPage = () => {
   )
 }
 
-export default SubmitApplicationPage
+export default ReplaceApplicationPage
diff --git a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx b/client/src/pages/ReplaceApplicationPage/components/MotivationStep/MotivationStep.tsx
similarity index 71%
rename from client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
rename to client/src/pages/ReplaceApplicationPage/components/MotivationStep/MotivationStep.tsx
index 3cc4f48d..73ecf93c 100644
--- a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
+++ b/client/src/pages/ReplaceApplicationPage/components/MotivationStep/MotivationStep.tsx
@@ -3,16 +3,18 @@ import { isNotEmpty, useForm } from '@mantine/form'
 import { Accordion, Button, Select, Stack, TextInput } from '@mantine/core'
 import DocumentEditor from '../../../../components/DocumentEditor/DocumentEditor'
 import TopicData from '../../../../components/TopicData/TopicData'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { doRequest } from '../../../../requests/request'
 import { showSimpleError } from '../../../../utils/notification'
 import { getApiResponseErrorMessage } from '../../../../requests/handler'
 import { DateInput, DateValue } from '@mantine/dates'
 import { getHtmlTextLength } from '../../../../utils/validation'
 import { GLOBAL_CONFIG } from '../../../../config/global'
+import { IApplication } from '../../../../requests/responses/application'
 
 interface IMotivationStepProps {
   topic: ITopic | undefined
+  application: IApplication | undefined
   onComplete: () => unknown
 }
 
@@ -24,11 +26,13 @@ interface IMotivationStepForm {
 }
 
 const MotivationStep = (props: IMotivationStepProps) => {
-  const { topic, onComplete } = props
+  const { topic, application, onComplete } = props
 
   const [loading, setLoading] = useState(false)
   const [opened, setOpened] = useState(false)
 
+  const mergedTopic = application?.topic || topic
+
   const form = useForm<IMotivationStepForm>({
     mode: 'controlled',
     initialValues: {
@@ -40,7 +44,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
     validateInputOnBlur: true,
     validate: {
       thesisTitle: (value) => {
-        if (!topic && !value) {
+        if (!mergedTopic && !value) {
           return 'Please state your suggested thesis title'
         }
       },
@@ -56,21 +60,35 @@ const MotivationStep = (props: IMotivationStepProps) => {
     },
   })
 
+  useEffect(() => {
+    if (application) {
+      form.setValues({
+        motivation: application.motivation,
+        desiredStartDate: new Date(application.desiredStartDate),
+        thesisType: application.thesisType,
+        thesisTitle: application.thesisTitle || '',
+      })
+    }
+  }, [application?.applicationId])
+
   const onSubmit = async (values: IMotivationStepForm) => {
     setLoading(true)
 
     try {
-      const response = await doRequest('/v2/applications', {
-        method: 'POST',
-        requiresAuth: true,
-        data: {
-          topicId: topic?.topicId,
-          thesisTitle: values.thesisTitle || null,
-          thesisType: values.thesisType,
-          desiredStartDate: values.desiredStartDate,
-          motivation: values.motivation,
+      const response = await doRequest(
+        application ? `/v2/applications/${application.applicationId}` : '/v2/applications',
+        {
+          method: application ? 'PUT' : 'POST',
+          requiresAuth: true,
+          data: {
+            topicId: mergedTopic?.topicId,
+            thesisTitle: values.thesisTitle || null,
+            thesisType: values.thesisType,
+            desiredStartDate: values.desiredStartDate,
+            motivation: values.motivation,
+          },
         },
-      })
+      )
 
       if (response.ok) {
         onComplete()
@@ -85,16 +103,16 @@ const MotivationStep = (props: IMotivationStepProps) => {
   return (
     <form onSubmit={form.onSubmit((values) => onSubmit(values))}>
       <Stack gap='md'>
-        {topic ? (
+        {mergedTopic ? (
           <Accordion
             variant='separated'
             value={opened ? 'opened' : ''}
             onChange={(value) => setOpened(value === 'opened')}
           >
             <Accordion.Item value='opened'>
-              <Accordion.Control>{topic.title}</Accordion.Control>
+              <Accordion.Control>{mergedTopic.title}</Accordion.Control>
               <Accordion.Panel>
-                <TopicData topic={topic} />
+                <TopicData topic={mergedTopic} />
               </Accordion.Panel>
             </Accordion.Item>
           </Accordion>
@@ -108,7 +126,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
         <Select
           label='Thesis Type'
           required={true}
-          data={(topic?.thesisTypes || Object.keys(GLOBAL_CONFIG.thesis_types)).map(
+          data={(mergedTopic?.thesisTypes || Object.keys(GLOBAL_CONFIG.thesis_types)).map(
             (thesisType) => ({
               label: GLOBAL_CONFIG.thesis_types[thesisType] ?? thesisType,
               value: thesisType,
@@ -129,7 +147,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
           {...form.getInputProps('motivation')}
         />
         <Button type='submit' ml='auto' disabled={!form.isValid()} loading={loading}>
-          Submit Application
+          {application ? 'Update Application' : 'Submit Application'}
         </Button>
       </Stack>
     </form>
diff --git a/client/src/pages/SubmitApplicationPage/components/SelectTopicStep/SelectTopicStep.tsx b/client/src/pages/ReplaceApplicationPage/components/SelectTopicStep/SelectTopicStep.tsx
similarity index 100%
rename from client/src/pages/SubmitApplicationPage/components/SelectTopicStep/SelectTopicStep.tsx
rename to client/src/pages/ReplaceApplicationPage/components/SelectTopicStep/SelectTopicStep.tsx
diff --git a/client/src/pages/SubmitApplicationPage/components/StudentInformationStep/StudentInformationStep.tsx b/client/src/pages/ReplaceApplicationPage/components/StudentInformationStep/StudentInformationStep.tsx
similarity index 100%
rename from client/src/pages/SubmitApplicationPage/components/StudentInformationStep/StudentInformationStep.tsx
rename to client/src/pages/ReplaceApplicationPage/components/StudentInformationStep/StudentInformationStep.tsx
diff --git a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
index 1467a90b..2b7014c0 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
@@ -20,6 +20,7 @@
 import thesistrack.ls1.dto.PaginationDto;
 import thesistrack.ls1.entity.Application;
 import thesistrack.ls1.entity.User;
+import thesistrack.ls1.exception.request.ResourceAlreadyExistsException;
 import thesistrack.ls1.exception.request.ResourceInvalidParametersException;
 import thesistrack.ls1.service.ApplicationService;
 import thesistrack.ls1.service.AuthenticationService;
@@ -51,6 +52,10 @@ public ResponseEntity<ApplicationDto> createApplication(
             throw new ResourceInvalidParametersException("Either topic id or a thesis title must be provided");
         }
 
+        if (applicationService.applicationExists(authenticatedUser, payload.topicId())) {
+            throw new ResourceAlreadyExistsException("There is already a pending application for this topic. Please edit your application in the dashboard.");
+        }
+
         Application application = applicationService.createApplication(
                 authenticatedUser,
                 payload.topicId(),
@@ -107,6 +112,35 @@ public ResponseEntity<ApplicationDto> getApplication(@PathVariable UUID applicat
         return ResponseEntity.ok(ApplicationDto.fromApplicationEntity(application, application.hasManagementAccess(authenticatedUser)));
     }
 
+    @PutMapping("/{applicationId}")
+    public ResponseEntity<ApplicationDto> updateApplication(
+            @PathVariable UUID applicationId,
+            @RequestBody CreateApplicationPayload payload,
+            JwtAuthenticationToken jwt
+    ) {
+        User authenticatedUser = authenticationService.getAuthenticatedUser(jwt);
+        Application application = applicationService.findById(applicationId);
+
+        if (!application.hasEditAccess(authenticatedUser)) {
+            throw new AccessDeniedException("You do not have edit access to this application");
+        }
+
+        if (!application.getState().equals(ApplicationState.NOT_ASSESSED)) {
+            throw new ResourceInvalidParametersException("Only applications that are not assessed can be edited");
+        }
+
+        application = applicationService.updateApplication(
+                application,
+                payload.topicId(),
+                RequestValidator.validateStringMaxLengthAllowNull(payload.thesisTitle(), StringLimits.THESIS_TITLE.getLimit()),
+                RequestValidator.validateStringMaxLength(payload.thesisType(), StringLimits.THESIS_TITLE.getLimit()),
+                RequestValidator.validateNotNull(payload.desiredStartDate()),
+                RequestValidator.validateStringMaxLength(payload.motivation(), StringLimits.LONGTEXT.getLimit())
+        );
+
+        return ResponseEntity.ok(ApplicationDto.fromApplicationEntity(application, application.hasManagementAccess(authenticatedUser)));
+    }
+
     @PutMapping("/{applicationId}/comment")
     public ResponseEntity<ApplicationDto> updateComment(
             @PathVariable UUID applicationId,
diff --git a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java b/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
index addec347..50e8f6c8 100644
--- a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
@@ -42,6 +42,7 @@ public ResponseEntity<PaginationDto<PublishedThesisDto>> getTheses(
                 Set.of(ThesisVisibility.PUBLIC),
                 null,
                 new ThesisState[]{ThesisState.FINISHED},
+                null,
                 page,
                 limit,
                 sortBy,
diff --git a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
index c3d71f1d..d3d40da2 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
@@ -54,6 +54,7 @@ public ThesisController(ThesisService thesisService, AuthenticationService authe
     public ResponseEntity<PaginationDto<ThesisDto>> getTheses(
             @RequestParam(required = false) String search,
             @RequestParam(required = false) ThesisState[] state,
+            @RequestParam(required = false) String[] type,
             @RequestParam(required = false, defaultValue = "false") Boolean fetchAll,
             @RequestParam(required = false, defaultValue = "0") Integer page,
             @RequestParam(required = false, defaultValue = "50") Integer limit,
@@ -90,6 +91,7 @@ public ResponseEntity<PaginationDto<ThesisDto>> getTheses(
                 visibilities,
                 search,
                 state,
+                type,
                 page,
                 limit,
                 sortBy,
diff --git a/server/src/main/java/thesistrack/ls1/entity/Application.java b/server/src/main/java/thesistrack/ls1/entity/Application.java
index 70f2b3f6..cfc2f579 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Application.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Application.java
@@ -72,6 +72,14 @@ public boolean hasReadAccess(User user) {
         return this.user.getId().equals(user.getId());
     }
 
+    public boolean hasEditAccess(User user) {
+        if (user.hasAnyGroup("admin")) {
+            return true;
+        }
+
+        return this.user.getId().equals(user.getId());
+    }
+
     public boolean hasManagementAccess(User user) {
         return user.hasAnyGroup("admin", "advisor", "supervisor");
     }
diff --git a/server/src/main/java/thesistrack/ls1/exception/ResponseExceptionHandler.java b/server/src/main/java/thesistrack/ls1/exception/ResponseExceptionHandler.java
index 5834ed19..fa0d1385 100644
--- a/server/src/main/java/thesistrack/ls1/exception/ResponseExceptionHandler.java
+++ b/server/src/main/java/thesistrack/ls1/exception/ResponseExceptionHandler.java
@@ -11,6 +11,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 import thesistrack.ls1.dto.ErrorDto;
 import thesistrack.ls1.exception.request.AccessDeniedException;
+import thesistrack.ls1.exception.request.ResourceAlreadyExistsException;
 import thesistrack.ls1.exception.request.ResourceInvalidParametersException;
 import thesistrack.ls1.exception.request.ResourceNotFoundException;
 
@@ -23,6 +24,11 @@ protected ResponseEntity<Object> handleNotFound(RuntimeException ex, WebRequest
         return handleExceptionInternal(ex, ErrorDto.fromRuntimeException(ex), new HttpHeaders(), HttpStatus.NOT_FOUND, request);
     }
 
+    @ExceptionHandler({ ResourceAlreadyExistsException.class })
+    protected ResponseEntity<Object> handleAlreadyExists(RuntimeException ex, WebRequest request) {
+        return handleExceptionInternal(ex, ErrorDto.fromRuntimeException(ex), new HttpHeaders(), HttpStatus.CONFLICT, request);
+    }
+
     @ExceptionHandler({
             ParseException.class,
             ResourceInvalidParametersException.class,
diff --git a/server/src/main/java/thesistrack/ls1/exception/request/ResourceAlreadyExistsException.java b/server/src/main/java/thesistrack/ls1/exception/request/ResourceAlreadyExistsException.java
new file mode 100644
index 00000000..fcd264e5
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/exception/request/ResourceAlreadyExistsException.java
@@ -0,0 +1,7 @@
+package thesistrack.ls1.exception.request;
+
+public class ResourceAlreadyExistsException extends RuntimeException {
+    public ResourceAlreadyExistsException(String message) {
+        super(message);
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java b/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java
index de7180dd..eeb140ad 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java
@@ -46,4 +46,16 @@ Page<Application> searchApplications(
             "WHERE (a.topic IS NULL OR :userId IS NULL OR r.user.id = :userId) AND a.state = 'NOT_ASSESSED'"
     )
     long countUnreviewedApplications(@Param("userId") UUID userId);
+
+    @Query(
+            "SELECT EXISTS (" +
+                    "SELECT a FROM Application a " +
+                    "WHERE a.user.id = :userId AND a.state = 'NOT_ASSESSED' AND " +
+                    "((a.topic IS NULL AND :topicId IS NULL) OR (a.topic IS NOT NULL AND a.topic.id = :topicId))" +
+            ")"
+    )
+    boolean existsPendingApplication(
+            @Param("userId") UUID userId,
+            @Param("topicId") UUID topicId
+    );
 }
diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java b/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java
index 7d96a210..e59c894b 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java
@@ -22,6 +22,7 @@ public interface ThesisRepository extends JpaRepository<Thesis, UUID> {
             "(:userId IS NULL OR r.user.id = :userId) AND " +
             "(:visibilities IS NULL OR t.visibility IN :visibilities OR r.user.id = :userId) AND " +
             "(:states IS NULL OR t.state IN :states) AND " +
+            "(:types IS NULL OR t.type IN :types) AND " +
             "(:searchQuery IS NULL OR LOWER(t.title) LIKE %:searchQuery% OR " +
             "LOWER(r.user.firstName) LIKE %:searchQuery% OR " +
             "LOWER(r.user.lastName) LIKE %:searchQuery% OR " +
@@ -34,6 +35,7 @@ Page<Thesis> searchTheses(
             @Param("visibilities") Set<ThesisVisibility> visibilities,
             @Param("searchQuery") String searchQuery,
             @Param("states") Set<ThesisState> states,
+            @Param("types") Set<String> types,
             Pageable page
     );
 
diff --git a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
index 7d4bce27..5d6e42a4 100644
--- a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
@@ -155,6 +155,19 @@ public Application createApplication(User user, UUID topicId, String thesisTitle
         return application;
     }
 
+    @Transactional
+    public Application updateApplication(Application application, UUID topicId, String thesisTitle, String thesisType, Instant desiredStartDate, String motivation) {
+        application.setTopic(topicId == null ? null : topicService.findById(topicId));
+        application.setThesisTitle(thesisTitle);
+        application.setThesisType(thesisType);
+        application.setMotivation(motivation);
+        application.setDesiredStartDate(desiredStartDate);
+
+        application = applicationRepository.save(application);
+
+        return application;
+    }
+
     @Transactional
     public Application accept(
             User reviewingUser,
@@ -231,6 +244,10 @@ public Application updateComment(Application application, String comment) {
         return applicationRepository.save(application);
     }
 
+    public boolean applicationExists(User user, UUID topicId) {
+        return applicationRepository.existsPendingApplication(user.getId(), topicId);
+    }
+
     public Application findById(UUID applicationId) {
         return applicationRepository.findById(applicationId)
                 .orElseThrow(() -> new ResourceNotFoundException(String.format("Application with id %s not found.", applicationId)));
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
index 30c9f12b..1587f3a9 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
@@ -64,6 +64,7 @@ public Page<Thesis> getAll(
             Set<ThesisVisibility> visibilities,
             String searchQuery,
             ThesisState[] states,
+            String[] types,
             int page,
             int limit,
             String sortBy,
@@ -73,12 +74,14 @@ public Page<Thesis> getAll(
 
         String searchQueryFilter = searchQuery == null || searchQuery.isEmpty() ? null : searchQuery.toLowerCase();
         Set<ThesisState> statesFilter = states == null || states.length == 0 ? null : new HashSet<>(Arrays.asList(states));
+        Set<String> typesFilter = types == null || types.length == 0 ? null : new HashSet<>(Arrays.asList(types));
 
         return thesisRepository.searchTheses(
                 userId,
                 visibilities,
                 searchQueryFilter,
                 statesFilter,
+                typesFilter,
                 PageRequest.of(page, limit, Sort.by(order))
         );
     }
@@ -387,6 +390,7 @@ private boolean existsPendingThesis(User user) {
                         ThesisState.ASSESSED,
                         ThesisState.GRADED
                 ),
+                null,
                 PageRequest.ofSize(1)
         );
 

From 895a7c790429b9095bfa8b188ef1423a4c5993d5 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Fri, 30 Aug 2024 12:03:48 +0200
Subject: [PATCH 10/13] Ask for github name in user information

---
 .github/workflows/deploy_docker.yml           |  1 +
 .../src/components/AvatarUser/AvatarUser.tsx  |  2 +-
 .../UserInformationForm.tsx                   | 22 ++++++++++++++++
 client/src/config/global.ts                   |  4 +++
 client/src/config/types.ts                    |  1 +
 .../LegacySubmitApplicationPage.tsx           |  1 +
 .../MyInformationPage/MyInformationPage.tsx   |  8 ++++--
 .../MotivationStep/MotivationStep.tsx         | 16 +++---------
 .../ApplicationListItem.tsx                   |  8 +++---
 .../ThesisProposalSection.tsx                 | 25 +++++++++++--------
 client/src/requests/payloads/user.ts          |  1 +
 client/src/requests/responses/user.ts         |  1 +
 docker-compose.prod.yml                       |  1 +
 docs/CONFIGURATION.md                         |  1 +
 .../ls1/controller/UserInfoController.java    |  1 +
 .../payload/UpdateUserInformationPayload.java |  4 ++-
 .../thesistrack/ls1/dto/LightUserDto.java     |  3 +++
 .../java/thesistrack/ls1/dto/UserDto.java     |  3 ++-
 .../java/thesistrack/ls1/entity/User.java     |  4 +++
 .../ls1/service/AuthenticationService.java    |  2 ++
 .../db/changelog/changes/07_cleanup.sql       |  3 +++
 21 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/deploy_docker.yml b/.github/workflows/deploy_docker.yml
index ebe2235c..6620942d 100644
--- a/.github/workflows/deploy_docker.yml
+++ b/.github/workflows/deploy_docker.yml
@@ -109,6 +109,7 @@ jobs:
             echo "STUDY_PROGRAMS=${{ vars.STUDY_PROGRAMS }}" >> .env.prod
             echo "STUDY_DEGREES=${{ vars.STUDY_DEGREES }}" >> .env.prod
             echo "GENDERS=${{ vars.GENDERS }}" >> .env.prod
+            echo "CUSTOM_DATA=${{ vars.CUSTOM_DATA }}" >> .env.prod
 
             echo "MAIL_SENDER=${{ vars.MAIL_SENDER }}" >> .env.prod
             echo "MAIL_SIGNATURE=${{ vars.MAIL_SIGNATURE }}" >> .env.prod
diff --git a/client/src/components/AvatarUser/AvatarUser.tsx b/client/src/components/AvatarUser/AvatarUser.tsx
index 5845ae9c..bd582bac 100644
--- a/client/src/components/AvatarUser/AvatarUser.tsx
+++ b/client/src/components/AvatarUser/AvatarUser.tsx
@@ -10,7 +10,7 @@ interface IAvatarUserProps {
 }
 
 const AvatarUser = (props: IAvatarUserProps) => {
-  const { user, withUniversityId = true, size = 'md' } = props
+  const { user, withUniversityId = true, size = 'sm' } = props
 
   return (
     <Group gap='xs' preventGrowOverflow wrap='nowrap' style={{ overflow: 'hidden' }}>
diff --git a/client/src/components/UserInformationForm/UserInformationForm.tsx b/client/src/components/UserInformationForm/UserInformationForm.tsx
index b81afc15..fd4b9267 100644
--- a/client/src/components/UserInformationForm/UserInformationForm.tsx
+++ b/client/src/components/UserInformationForm/UserInformationForm.tsx
@@ -27,6 +27,7 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
   const form = useForm<
     Omit<IUpdateUserInformationPayload, 'enrolledAt'> & {
       semester: string
+      customData: Record<string, string>
       declarationOfConsentAccepted: boolean
       examinationReport: File | undefined
       cv: File | undefined
@@ -51,6 +52,9 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
       examinationReport: undefined,
       cv: undefined,
       degreeReport: undefined,
+      customData: Object.fromEntries(
+        Object.keys(GLOBAL_CONFIG.custom_data).map((key) => [key, '']),
+      ),
     },
     validateInputOnBlur: true,
     validate: {
@@ -106,6 +110,12 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
           return 'The bachelor report should not exceed 2mb'
         }
       },
+      ...Object.fromEntries(
+        Object.entries(GLOBAL_CONFIG.custom_data).map(([key, value]) => [
+          `customData.${key}`,
+          requireCompletion ? isNotEmpty(`Please state your ${value}`) : undefined,
+        ]),
+      ),
     },
   })
 
@@ -125,6 +135,9 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
       specialSkills: user?.specialSkills || '',
       interests: user?.interests || '',
       projects: user?.projects || '',
+      customData: Object.fromEntries(
+        Object.keys(GLOBAL_CONFIG.custom_data).map((key) => [key, user.customData?.[key] || '']),
+      ),
     })
   }, [user])
 
@@ -164,6 +177,7 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
               specialSkills: values.specialSkills || null,
               interests: values.interests || null,
               projects: values.projects || null,
+              customData: values.customData,
             },
             values.examinationReport,
             values.cv,
@@ -274,6 +288,14 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
             {...form.getInputProps('semester')}
           />
         </Group>
+        {Object.entries(GLOBAL_CONFIG.custom_data).map(([key, value]) => (
+          <TextInput
+            key={key}
+            required={requireCompletion}
+            label={value}
+            {...form.getInputProps(`customData.${key}`)}
+          />
+        ))}
         <DocumentEditor
           label='Special Skills (Programming languages, certificates, etc.)'
           maxLength={500}
diff --git a/client/src/config/global.ts b/client/src/config/global.ts
index 0dc28218..acf96629 100644
--- a/client/src/config/global.ts
+++ b/client/src/config/global.ts
@@ -44,6 +44,10 @@ export const GLOBAL_CONFIG: IGlobalConfig = {
     GUIDED_RESEARCH: 'Guided Research',
   },
 
+  custom_data: getEnvironmentVariable<Record<string, string>>('CUSTOM_DATA', true) || {
+    GITHUB: 'Github Profile',
+  },
+
   privacy_notice: getEnvironmentVariable('PRIVACY_NOTICE') || '',
   default_supervisors: getEnvironmentVariable('DEFAULT_SUPERVISOR_UUID')?.split(';') || [],
   calendar_url: getEnvironmentVariable('CALDAV_URL') || '',
diff --git a/client/src/config/types.ts b/client/src/config/types.ts
index 74531f11..27f1e341 100644
--- a/client/src/config/types.ts
+++ b/client/src/config/types.ts
@@ -7,6 +7,7 @@ export interface IGlobalConfig {
   study_programs: Record<string, string>
   study_degrees: Record<string, string>
   thesis_types: Record<string, string>
+  custom_data: Record<string, string>
 
   privacy_notice: string
   default_supervisors: string[]
diff --git a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
index 0d50631a..23cd845d 100644
--- a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
+++ b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
@@ -198,6 +198,7 @@ const LegacySubmitApplicationPage = () => {
                     thesisTitle: values.thesisTitle!,
                     thesisType: values.thesisType!,
                     desiredStartDate: values.desiredStartDate!,
+                    customData: {},
                   }
 
                   const formData = new FormData()
diff --git a/client/src/pages/MyInformationPage/MyInformationPage.tsx b/client/src/pages/MyInformationPage/MyInformationPage.tsx
index ecf54e4a..d421587c 100644
--- a/client/src/pages/MyInformationPage/MyInformationPage.tsx
+++ b/client/src/pages/MyInformationPage/MyInformationPage.tsx
@@ -4,6 +4,7 @@ import { usePageTitle } from '../../hooks/theme'
 import { Alert, Title } from '@mantine/core'
 import UserInformationForm from '../../components/UserInformationForm/UserInformationForm'
 import { Info } from 'phosphor-react'
+import { showSimpleSuccess } from '../../utils/notification'
 
 const MyInformationPage = () => {
   usePageTitle('My Information')
@@ -14,11 +15,14 @@ const MyInformationPage = () => {
       <Alert variant='light' color='blue' title='Update Avatar' icon={<Info />} mb='md'>
         We use{' '}
         <a href='https://www.gravatar.com/' target='_blank' rel='noreferrer'>
-          www.gravatar.com
+          gravatar.com
         </a>{' '}
         for avatars. If you want to add or change your avatar, please do it on the linked site.
       </Alert>
-      <UserInformationForm requireCompletion={false} />
+      <UserInformationForm
+        requireCompletion={false}
+        onComplete={() => showSimpleSuccess('You successfully updated your profile')}
+      />
     </ContentContainer>
   )
 }
diff --git a/client/src/pages/ReplaceApplicationPage/components/MotivationStep/MotivationStep.tsx b/client/src/pages/ReplaceApplicationPage/components/MotivationStep/MotivationStep.tsx
index 73ecf93c..48186bbe 100644
--- a/client/src/pages/ReplaceApplicationPage/components/MotivationStep/MotivationStep.tsx
+++ b/client/src/pages/ReplaceApplicationPage/components/MotivationStep/MotivationStep.tsx
@@ -2,7 +2,6 @@ import { ITopic } from '../../../../requests/responses/topic'
 import { isNotEmpty, useForm } from '@mantine/form'
 import { Accordion, Button, Select, Stack, TextInput } from '@mantine/core'
 import DocumentEditor from '../../../../components/DocumentEditor/DocumentEditor'
-import TopicData from '../../../../components/TopicData/TopicData'
 import { useEffect, useState } from 'react'
 import { doRequest } from '../../../../requests/request'
 import { showSimpleError } from '../../../../utils/notification'
@@ -11,6 +10,7 @@ import { DateInput, DateValue } from '@mantine/dates'
 import { getHtmlTextLength } from '../../../../utils/validation'
 import { GLOBAL_CONFIG } from '../../../../config/global'
 import { IApplication } from '../../../../requests/responses/application'
+import TopicAccordionItem from '../../../../components/TopicAccordionItem/TopicAccordionItem'
 
 interface IMotivationStepProps {
   topic: ITopic | undefined
@@ -29,7 +29,6 @@ const MotivationStep = (props: IMotivationStepProps) => {
   const { topic, application, onComplete } = props
 
   const [loading, setLoading] = useState(false)
-  const [opened, setOpened] = useState(false)
 
   const mergedTopic = application?.topic || topic
 
@@ -104,17 +103,8 @@ const MotivationStep = (props: IMotivationStepProps) => {
     <form onSubmit={form.onSubmit((values) => onSubmit(values))}>
       <Stack gap='md'>
         {mergedTopic ? (
-          <Accordion
-            variant='separated'
-            value={opened ? 'opened' : ''}
-            onChange={(value) => setOpened(value === 'opened')}
-          >
-            <Accordion.Item value='opened'>
-              <Accordion.Control>{mergedTopic.title}</Accordion.Control>
-              <Accordion.Panel>
-                <TopicData topic={mergedTopic} />
-              </Accordion.Panel>
-            </Accordion.Item>
+          <Accordion variant='separated'>
+            <TopicAccordionItem topic={mergedTopic} />
           </Accordion>
         ) : (
           <TextInput
diff --git a/client/src/pages/ReviewApplicationPage/components/ApplicationListItem/ApplicationListItem.tsx b/client/src/pages/ReviewApplicationPage/components/ApplicationListItem/ApplicationListItem.tsx
index 4a85fb13..f89561e5 100644
--- a/client/src/pages/ReviewApplicationPage/components/ApplicationListItem/ApplicationListItem.tsx
+++ b/client/src/pages/ReviewApplicationPage/components/ApplicationListItem/ApplicationListItem.tsx
@@ -1,4 +1,4 @@
-import { Badge, Group, Stack, Title, Text, Paper } from '@mantine/core'
+import { Badge, Group, Stack, Text, Paper } from '@mantine/core'
 import { IApplication } from '../../../../requests/responses/application'
 import { ApplicationStateColor } from '../../../../config/colors'
 import { formatApplicationState, formatDate } from '../../../../utils/format'
@@ -26,10 +26,10 @@ const ApplicationListItem = (props: IApplicationListItemProps) => {
       }}
     >
       <Stack gap='xs'>
-        <Group>
-          <Title order={3}>
+        <Group wrap='nowrap'>
+          <Text size='xl' fw='bold' truncate>
             {application.user.firstName} {application.user.lastName}
-          </Title>
+          </Text>
           <Badge color={ApplicationStateColor[application.state]} ml='auto'>
             {formatApplicationState(application.state)}
           </Badge>
diff --git a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
index 5d77a416..fa71edc3 100644
--- a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
@@ -90,21 +90,24 @@ const ThesisProposalSection = () => {
                     <Grid.Col span={{ md: 2 }}>
                       <LabeledItem
                         label='Study Degree'
-                        value={
-                          GLOBAL_CONFIG.study_degrees[student.studyDegree || ''] ??
-                          student.studyDegree
-                        }
-                      />
-                    </Grid.Col>
-                    <Grid.Col span={{ md: 2 }}>
-                      <LabeledItem
-                        label='Study Program'
-                        value={
+                        value={`${
                           GLOBAL_CONFIG.study_programs[student.studyProgram || ''] ??
                           student.studyProgram
-                        }
+                        } ${
+                          GLOBAL_CONFIG.study_degrees[student.studyDegree || ''] ??
+                          student.studyDegree
+                        } `}
                       />
                     </Grid.Col>
+                    {student.customData &&
+                      Object.entries(student.customData).map(([key, value]) => (
+                        <Grid.Col key={key} span={{ md: 2 }}>
+                          <LabeledItem
+                            label={GLOBAL_CONFIG.custom_data[key] ?? key}
+                            value={value}
+                          />
+                        </Grid.Col>
+                      ))}
                     <Grid.Col span={12}>
                       <Divider />
                     </Grid.Col>
diff --git a/client/src/requests/payloads/user.ts b/client/src/requests/payloads/user.ts
index 1720980f..7a50fc09 100644
--- a/client/src/requests/payloads/user.ts
+++ b/client/src/requests/payloads/user.ts
@@ -11,4 +11,5 @@ export interface IUpdateUserInformationPayload {
   specialSkills: string
   interests: string
   projects: string
+  customData: Record<string, string>
 }
diff --git a/client/src/requests/responses/user.ts b/client/src/requests/responses/user.ts
index 67ee41f0..a1ef2e15 100644
--- a/client/src/requests/responses/user.ts
+++ b/client/src/requests/responses/user.ts
@@ -8,6 +8,7 @@ export interface ILightUser {
   email: string | null
   studyDegree: string | null
   studyProgram: string | null
+  customData: Record<string, string> | null
   joinedAt: string
   groups: string[]
 }
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 877e28e8..802c2be8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -102,6 +102,7 @@ services:
       - STUDY_PROGRAMS
       - STUDY_DEGREES
       - GENDERS
+      - CUSTOM_DATA
       - APPLICATION_TITLE
     depends_on:
       - server
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 4e8a33d1..6d6774ef 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -34,6 +34,7 @@
 | GENDERS                             | client         | `{"MALE":"Male","FEMALE":"Female","OTHER":"Other","PREFER_NOT_TO_SAY":"Prefer not to say"}`                                                                                                           | Available genders that a user can configure                                                               |
 | STUDY_DEGREES                       | client         | `{"BACHELOR":"Bachelor","MASTER":"Master"}`                                                                                                                                                           | Available study degrees                                                                                   |
 | STUDY_PROGRAMS                      | client         | `{"COMPUTER_SCIENCE":"Computer Science","INFORMATION_SYSTEMS":"Information Systems","GAMES_ENGINEERING":"Games Engineering","MANAGEMENT_AND_TECHNOLOGY":"Management and Technology","OTHER":"Other"}` | Available study programs                                                                                  |
+| CUSTOM_DATA                         | client         | `{"GITHUB":"Github Profile"}`                                                                                                                                                                         | Additional data the user can add to the profile                                                           |
 | THESIS_TYPES                        | client         | `{"BACHELOR":"Bachelor Thesis","MASTER":"Master Thesis","INTERDISCIPLINARY_PROJECT":"Interdisciplinary Project","GUIDED_RESEARCH":"Guided Research"}`                                                 | Available thesis types                                                                                    |
 | DEFAULT_SUPERVISOR_UUID             | client         |                                                                                                                                                                                                       | The user UUID from the database if a default supervisor should be selected when creating topics or theses |
 | PRIVACY_NOTICE                      | client         |                                                                                                                                                                                                       | Privacy notice the student has to accept before submitting data                                           |
\ No newline at end of file
diff --git a/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java b/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java
index 22972d89..28033189 100644
--- a/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java
@@ -59,6 +59,7 @@ public ResponseEntity<UserDto> updateInfo(
                 RequestValidator.validateStringMaxLengthAllowNull(payload.specialSkills(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLengthAllowNull(payload.interests(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLengthAllowNull(payload.projects(), StringLimits.LONGTEXT.getLimit()),
+                RequestValidator.validateNotNull(payload.customData()),
                 examinationReport,
                 cv,
                 degreeReport
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java
index 73b30681..01e235e2 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java
@@ -1,6 +1,7 @@
 package thesistrack.ls1.controller.payload;
 
 import java.time.Instant;
+import java.util.Map;
 
 public record UpdateUserInformationPayload(
         String matriculationNumber,
@@ -14,5 +15,6 @@ public record UpdateUserInformationPayload(
         Instant enrolledAt,
         String specialSkills,
         String interests,
-        String projects
+        String projects,
+        Map<String, String> customData
 ) { }
diff --git a/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java b/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java
index 4ea49d34..7e04bd47 100644
--- a/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java
@@ -4,6 +4,7 @@
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 public record LightUserDto (
@@ -16,6 +17,7 @@ public record LightUserDto (
     String email,
     String studyDegree,
     String studyProgram,
+    Map<String, String> customData,
     Instant joinedAt,
     List<String> groups
 ) {
@@ -27,6 +29,7 @@ public static LightUserDto fromUserEntity(User user) {
         return new LightUserDto(
                 user.getId(), user.getAvatar(), user.getUniversityId(), user.getMatriculationNumber(),
                 user.getFirstName(), user.getLastName(), user.getEmail().toString(), user.getStudyDegree(), user.getStudyProgram(),
+                user.getCustomData(),
                 user.getJoinedAt(), user.getGroups().stream().map(x -> x.getId().getGroup()).toList()
         );
     }
diff --git a/server/src/main/java/thesistrack/ls1/dto/UserDto.java b/server/src/main/java/thesistrack/ls1/dto/UserDto.java
index 52d48b79..dc809606 100644
--- a/server/src/main/java/thesistrack/ls1/dto/UserDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/UserDto.java
@@ -21,6 +21,7 @@ public record UserDto (
         String projects,
         String interests,
         String specialSkills,
+        Map<String, String> customData,
         Instant enrolledAt,
         Instant updatedAt,
         Instant joinedAt,
@@ -38,7 +39,7 @@ public static UserDto fromUserEntity(User user) {
                 user.getId(), user.getAvatar(), user.getUniversityId(), user.getMatriculationNumber(), user.getEmail() != null ? user.getEmail().toString() : null,
                 user.getFirstName(), user.getLastName(), user.getGender(), user.getNationality(),
                 user.getStudyDegree(), user.getStudyProgram(), user.getProjects(), user.getInterests(),
-                user.getSpecialSkills(), user.getEnrolledAt(), user.getUpdatedAt(), user.getJoinedAt(),
+                user.getSpecialSkills(), user.getCustomData(), user.getEnrolledAt(), user.getUpdatedAt(), user.getJoinedAt(),
                 user.getGroups() == null ? Collections.emptySet() : new HashSet<>(user.getGroups().stream().map(x -> x.getId().getGroup()).toList()),
                 user.getCvFilename() != null, user.getExaminationFilename() != null, user.getDegreeFilename() != null
         );
diff --git a/server/src/main/java/thesistrack/ls1/entity/User.java b/server/src/main/java/thesistrack/ls1/entity/User.java
index 8162bd1b..7d93bbe5 100644
--- a/server/src/main/java/thesistrack/ls1/entity/User.java
+++ b/server/src/main/java/thesistrack/ls1/entity/User.java
@@ -71,6 +71,10 @@ public class User {
     @Column(name = "special_skills")
     private String specialSkills;
 
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(name = "custom_data", columnDefinition = "jsonb")
+    private Map<String, String> customData = new HashMap<>();
+
     @Column(name = "enrolled_at")
     private Instant enrolledAt;
 
diff --git a/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java b/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java
index 7e23841b..1cf18b2d 100644
--- a/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java
@@ -107,6 +107,7 @@ public User updateUserInformation(
             String specialSkills,
             String interests,
             String projects,
+            Map<String, String> customData,
             MultipartFile examinationReport,
             MultipartFile cv,
             MultipartFile degreeReport
@@ -123,6 +124,7 @@ public User updateUserInformation(
         user.setSpecialSkills(specialSkills);
         user.setInterests(interests);
         user.setProjects(projects);
+        user.setCustomData(customData);
 
         user.setExaminationFilename(examinationReport == null ? null : uploadService.store(examinationReport, 3 * 1024 * 1024));
         user.setCvFilename(cv == null ? null : uploadService.store(cv, 3 * 1024 * 1024));
diff --git a/server/src/main/resources/db/changelog/changes/07_cleanup.sql b/server/src/main/resources/db/changelog/changes/07_cleanup.sql
index 06313cdc..e89b11e5 100644
--- a/server/src/main/resources/db/changelog/changes/07_cleanup.sql
+++ b/server/src/main/resources/db/changelog/changes/07_cleanup.sql
@@ -3,3 +3,6 @@
 --changeset emilius:07-cleanup-1
 DROP TABLE schedules;
 ALTER TABLE users DROP COLUMN is_exchange_student;
+
+--changeset emilius:07-cleanup-2
+ALTER TABLE users ADD COLUMN custom_data jsonb;

From b504feefc66d0402ea169364038ed0361a4715c1 Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Fri, 30 Aug 2024 12:29:50 +0200
Subject: [PATCH 11/13] Code cleanup

---
 .../ApplicationData/ApplicationData.tsx        |  6 ++++++
 .../ThesesGanttChart/ThesesGanttChart.tsx      | 18 ++++++++++--------
 .../UserInformationForm.tsx                    | 12 ++++++------
 .../ApplicationsSidebar.tsx                    |  5 +++++
 .../ThesisProposalSection.tsx                  |  2 +-
 client/src/requests/handler.ts                 |  6 ++++--
 .../ls1/service/DashboardService.java          |  4 ++++
 .../thesistrack/ls1/utility/DataFormatter.java |  4 ++--
 8 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/client/src/components/ApplicationData/ApplicationData.tsx b/client/src/components/ApplicationData/ApplicationData.tsx
index 8b9e414e..48897b22 100644
--- a/client/src/components/ApplicationData/ApplicationData.tsx
+++ b/client/src/components/ApplicationData/ApplicationData.tsx
@@ -129,6 +129,12 @@ const ApplicationData = (props: IApplicationDataProps) => {
                 }
               />
             </Grid.Col>
+            {application.user.customData &&
+              Object.entries(application.user.customData).map(([key, value]) => (
+                <Grid.Col key={key} span={{ md: 6 }}>
+                  <LabeledItem label={GLOBAL_CONFIG.custom_data[key] ?? key} value={value} />
+                </Grid.Col>
+              ))}
           </Grid>
           {(application.reviewedBy || application.reviewedAt || application.comment) && (
             <Stack gap='md'>
diff --git a/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx b/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
index 7228d4f0..6aeea822 100644
--- a/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
+++ b/client/src/components/ThesesGanttChart/ThesesGanttChart.tsx
@@ -137,14 +137,16 @@ const ThesesGanttChart = () => {
           setOpenedThesis(theses?.content.find((thesis) => thesis.thesisId === item.id))
         }
       />
-      <Center mt='md'>
-        <Group>
-          <Text>Legend:</Text>
-          {visibleStates.map((state) => (
-            <ThesisStateBadge key={state} state={state} />
-          ))}
-        </Group>
-      </Center>
+      {visibleStates.length > 0 && (
+        <Center mt='md'>
+          <Group>
+            <Text>Legend:</Text>
+            {visibleStates.map((state) => (
+              <ThesisStateBadge key={state} state={state} />
+            ))}
+          </Group>
+        </Center>
+      )}
       <ThesisPreviewModal
         opened={!!openedThesis}
         onClose={() => setOpenedThesis(undefined)}
diff --git a/client/src/components/UserInformationForm/UserInformationForm.tsx b/client/src/components/UserInformationForm/UserInformationForm.tsx
index fd4b9267..161e7647 100644
--- a/client/src/components/UserInformationForm/UserInformationForm.tsx
+++ b/client/src/components/UserInformationForm/UserInformationForm.tsx
@@ -297,25 +297,25 @@ const UserInformationForm = (props: IUserInformationFormProps) => {
           />
         ))}
         <DocumentEditor
-          label='Special Skills (Programming languages, certificates, etc.)'
+          label='Interests (What are you interested in?)'
           maxLength={500}
           required={requireCompletion}
           editMode={true}
-          {...form.getInputProps('specialSkills')}
+          {...form.getInputProps('interests')}
         />
         <DocumentEditor
-          label='Interests (What are you interested in?)'
+          label='Projects (What projects have you worked on?)'
           maxLength={500}
           required={requireCompletion}
           editMode={true}
-          {...form.getInputProps('interests')}
+          {...form.getInputProps('projects')}
         />
         <DocumentEditor
-          label='Projects (What projects have you worked on?)'
+          label='Special Skills (Programming languages, certificates, etc.)'
           maxLength={500}
           required={requireCompletion}
           editMode={true}
-          {...form.getInputProps('projects')}
+          {...form.getInputProps('specialSkills')}
         />
         <UploadArea
           label='Examination Report'
diff --git a/client/src/pages/ReviewApplicationPage/components/ApplicationsSidebar/ApplicationsSidebar.tsx b/client/src/pages/ReviewApplicationPage/components/ApplicationsSidebar/ApplicationsSidebar.tsx
index ab3c5149..e7863a61 100644
--- a/client/src/pages/ReviewApplicationPage/components/ApplicationsSidebar/ApplicationsSidebar.tsx
+++ b/client/src/pages/ReviewApplicationPage/components/ApplicationsSidebar/ApplicationsSidebar.tsx
@@ -70,6 +70,11 @@ const ApplicationsSidebar = (props: IApplicationsSidebarProps) => {
   return (
     <Stack gap='sm'>
       <ApplicationsFilters size='sm' />
+      {applications && applications.content.length === 0 && (
+        <Text ta='center' fw='bold' my='md'>
+          No applications found
+        </Text>
+      )}
       {applications?.content.map((application) => (
         <ApplicationListItem
           key={application.applicationId}
diff --git a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
index fa71edc3..60630217 100644
--- a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
@@ -101,7 +101,7 @@ const ThesisProposalSection = () => {
                     </Grid.Col>
                     {student.customData &&
                       Object.entries(student.customData).map(([key, value]) => (
-                        <Grid.Col key={key} span={{ md: 2 }}>
+                        <Grid.Col key={key} span={{ md: 6 }}>
                           <LabeledItem
                             label={GLOBAL_CONFIG.custom_data[key] ?? key}
                             value={value}
diff --git a/client/src/requests/handler.ts b/client/src/requests/handler.ts
index 2b45cba5..a290ecfe 100644
--- a/client/src/requests/handler.ts
+++ b/client/src/requests/handler.ts
@@ -15,8 +15,10 @@ export function getApiResponseErrorMessage(response: ApiResponse<unknown>) {
     message = 'You are not authorized to access this resource'
   } else if (response.status === 404) {
     message = 'Requested resource not found'
-  } else if (response.status === 500) {
-    message = 'Internal Server Error'
+  } else if (response.status === 404) {
+    message = 'Requested resource not found'
+  } else if (response.status === 409) {
+    message = 'Resource already exists'
   } else if (response.status === 501) {
     message = 'Endpoint not implemented yet'
   } else {
diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
index 6ba99757..e8423b2e 100644
--- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java
+++ b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -78,6 +78,10 @@ public List<TaskDto> getTasks(User user) {
 
         // proposal task
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), Set.of(ThesisState.PROPOSAL))) {
+            if (!thesis.getProposals().isEmpty()) {
+                continue;
+            }
+
             tasks.add(new TaskDto(
                     "Add a proposal to thesis \"" + thesis.getTitle() + "\"",
                     getThesisLink(thesis),
diff --git a/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java b/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java
index 3d3c9e94..47adb5a9 100644
--- a/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java
+++ b/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java
@@ -80,8 +80,8 @@ public static String formatSemester(Object value) {
             return "";
         }
 
-        long monthsBetween = ChronoUnit.MONTHS.between((Instant) value, Instant.now());
+        long monthsBetween = ChronoUnit.DAYS.between((Instant) value, Instant.now());
 
-        return String.valueOf(monthsBetween / 6);
+        return String.valueOf(monthsBetween / (365 / 2));
     }
 }

From fc98c84cc97b410a8bc7cb1ae24237cff92c5c6d Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Fri, 30 Aug 2024 12:30:14 +0200
Subject: [PATCH 12/13] Code cleanup

---
 .../src/main/java/thesistrack/ls1/service/DashboardService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
index e8423b2e..63408aed 100644
--- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java
+++ b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -116,7 +116,7 @@ public List<TaskDto> getTasks(User user) {
                 continue;
             }
 
-            if (thesis.getEndDate().minus(1, ChronoUnit.MONTHS).isAfter(Instant.now())) {
+            if (thesis.getEndDate().minus(30, ChronoUnit.DAYS).isAfter(Instant.now())) {
                 continue;
             }
 

From 31146048fcc1293a49c02835fa28fd21cf8f763b Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Fri, 30 Aug 2024 13:24:16 +0200
Subject: [PATCH 13/13] Add position to thesis and topic roles

---
 .../src/components/AvatarUser/AvatarUser.tsx  |  3 +-
 .../src/pages/DashboardPage/DashboardPage.tsx |  2 +-
 client/src/utils/theme.ts                     |  8 ---
 .../payload/AcceptApplicationPayload.java     |  6 +--
 .../payload/CreateThesisPayload.java          |  8 +--
 .../payload/ReplaceTopicPayload.java          |  5 +-
 .../payload/UpdateThesisPayload.java          |  6 +--
 .../java/thesistrack/ls1/entity/Thesis.java   |  3 +-
 .../thesistrack/ls1/entity/ThesisRole.java    |  4 ++
 .../java/thesistrack/ls1/entity/Topic.java    |  7 ++-
 .../thesistrack/ls1/entity/TopicRole.java     |  4 ++
 .../ls1/service/ApplicationService.java       |  6 +--
 .../ls1/service/ThesisService.java            | 49 ++++++++++++-------
 .../thesistrack/ls1/service/TopicService.java | 36 +++++++++-----
 .../db/changelog/changes/07_cleanup.sql       |  4 ++
 15 files changed, 90 insertions(+), 61 deletions(-)
 delete mode 100644 client/src/utils/theme.ts

diff --git a/client/src/components/AvatarUser/AvatarUser.tsx b/client/src/components/AvatarUser/AvatarUser.tsx
index bd582bac..10476fe0 100644
--- a/client/src/components/AvatarUser/AvatarUser.tsx
+++ b/client/src/components/AvatarUser/AvatarUser.tsx
@@ -1,7 +1,6 @@
 import { ILightUser } from '../../requests/responses/user'
 import { Avatar, Group, MantineSize, Text } from '@mantine/core'
 import { formatUser } from '../../utils/format'
-import { getSmallerMantineSize } from '../../utils/theme'
 
 interface IAvatarUserProps {
   user: ILightUser
@@ -18,7 +17,7 @@ const AvatarUser = (props: IAvatarUserProps) => {
         src={user.avatar || undefined}
         name={`${user.firstName} ${user.lastName}`}
         color='initials'
-        size={getSmallerMantineSize(size)}
+        size={size}
       />
       <Text size={size} truncate style={{ flex: 1, minWidth: 0 }}>
         {formatUser(user, { withUniversityId })}
diff --git a/client/src/pages/DashboardPage/DashboardPage.tsx b/client/src/pages/DashboardPage/DashboardPage.tsx
index e5c72865..afff62c1 100644
--- a/client/src/pages/DashboardPage/DashboardPage.tsx
+++ b/client/src/pages/DashboardPage/DashboardPage.tsx
@@ -48,7 +48,7 @@ const DashboardPage = () => {
                 My Applications
               </Title>
               <Center>
-                <Button my='md' component={Link} to='/applications/thesis'>
+                <Button mb='md' component={Link} to='/applications/thesis'>
                   New Application
                 </Button>
               </Center>
diff --git a/client/src/utils/theme.ts b/client/src/utils/theme.ts
deleted file mode 100644
index f14cedc0..00000000
--- a/client/src/utils/theme.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { MantineSize } from '@mantine/core'
-
-export function getSmallerMantineSize(size: MantineSize) {
-  const sizes = ['xs', 'sm', 'md', 'lg', 'xl']
-  const currentIndex = sizes.indexOf(size)
-
-  return currentIndex > 0 ? sizes[currentIndex - 1] : sizes[0]
-}
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/AcceptApplicationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/AcceptApplicationPayload.java
index 37387edf..54db664a 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/AcceptApplicationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/AcceptApplicationPayload.java
@@ -1,13 +1,13 @@
 package thesistrack.ls1.controller.payload;
 
-import java.util.Set;
+import java.util.List;
 import java.util.UUID;
 
 public record AcceptApplicationPayload (
         String thesisTitle,
         String thesisType,
-        Set<UUID> advisorIds,
-        Set<UUID> supervisorIds,
+        List<UUID> advisorIds,
+        List<UUID> supervisorIds,
         Boolean notifyUser,
         Boolean closeTopic
 ) { }
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/CreateThesisPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/CreateThesisPayload.java
index d387c900..35f9821d 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/CreateThesisPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/CreateThesisPayload.java
@@ -1,13 +1,13 @@
 package thesistrack.ls1.controller.payload;
 
-import java.util.Set;
+import java.util.List;
 import java.util.UUID;
 
 public record CreateThesisPayload(
         String thesisTitle,
         String thesisType,
-        Set<UUID> studentIds,
-        Set<UUID> advisorIds,
-        Set<UUID> supervisorIds
+        List<UUID> studentIds,
+        List<UUID> advisorIds,
+        List<UUID> supervisorIds
 ) {
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
index 1781d367..0e7d5afa 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
@@ -1,5 +1,6 @@
 package thesistrack.ls1.controller.payload;
 
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
@@ -9,6 +10,6 @@ public record ReplaceTopicPayload(
         String problemStatement,
         String goals,
         String references,
-        Set<UUID> supervisorIds,
-        Set<UUID> advisorIds
+        List<UUID> supervisorIds,
+        List<UUID> advisorIds
 ) { }
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisPayload.java
index 6bd7b711..d5b743be 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisPayload.java
@@ -14,9 +14,9 @@ public record UpdateThesisPayload(
         Set<String> keywords,
         Instant startDate,
         Instant endDate,
-        Set<UUID> studentIds,
-        Set<UUID> advisorIds,
-        Set<UUID> supervisorIds,
+        List<UUID> studentIds,
+        List<UUID> advisorIds,
+        List<UUID> supervisorIds,
         List<ThesisStatePayload> states
 ) {
 
diff --git a/server/src/main/java/thesistrack/ls1/entity/Thesis.java b/server/src/main/java/thesistrack/ls1/entity/Thesis.java
index 669143a3..39c3e82a 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Thesis.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Thesis.java
@@ -83,7 +83,8 @@ public class Thesis {
     private Instant createdAt;
 
     @OneToMany(mappedBy = "thesis", fetch = FetchType.EAGER)
-    private Set<ThesisRole> roles = new HashSet<>();
+    @OrderBy("position ASC")
+    private List<ThesisRole> roles = new ArrayList<>();
 
     @OneToMany(mappedBy = "thesis", fetch = FetchType.EAGER)
     @OrderBy("createdAt DESC")
diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisRole.java b/server/src/main/java/thesistrack/ls1/entity/ThesisRole.java
index f6d1ed74..114b007d 100644
--- a/server/src/main/java/thesistrack/ls1/entity/ThesisRole.java
+++ b/server/src/main/java/thesistrack/ls1/entity/ThesisRole.java
@@ -28,6 +28,10 @@ public class ThesisRole {
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
+    @NotNull
+    @Column(name = "position", nullable = false)
+    private Integer position;
+
     @CreationTimestamp
     @NotNull
     @Column(name = "assigned_at", nullable = false)
diff --git a/server/src/main/java/thesistrack/ls1/entity/Topic.java b/server/src/main/java/thesistrack/ls1/entity/Topic.java
index 965eb1c3..9d9da7dd 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Topic.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Topic.java
@@ -10,9 +10,7 @@
 import org.hibernate.type.SqlTypes;
 
 import java.time.Instant;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 @Getter
 @Setter
@@ -63,5 +61,6 @@ public class Topic {
     private User createdBy;
 
     @OneToMany(mappedBy = "topic", fetch = FetchType.EAGER)
-    private Set<TopicRole> roles = new HashSet<>();
+    @OrderBy("position ASC")
+    private List<TopicRole> roles = new ArrayList<>();
 }
\ No newline at end of file
diff --git a/server/src/main/java/thesistrack/ls1/entity/TopicRole.java b/server/src/main/java/thesistrack/ls1/entity/TopicRole.java
index 13b85641..4d975f1f 100644
--- a/server/src/main/java/thesistrack/ls1/entity/TopicRole.java
+++ b/server/src/main/java/thesistrack/ls1/entity/TopicRole.java
@@ -26,6 +26,10 @@ public class TopicRole {
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
+    @NotNull
+    @Column(name = "position", nullable = false)
+    private Integer position;
+
     @NotNull
     @Column(name = "assigned_at", nullable = false)
     private Instant assignedAt;
diff --git a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
index 5d6e42a4..65e2bdeb 100644
--- a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
@@ -174,8 +174,8 @@ public Application accept(
             Application application,
             String thesisTitle,
             String thesisType,
-            Set<UUID> advisorIds,
-            Set<UUID> supervisorIds,
+            List<UUID> advisorIds,
+            List<UUID> supervisorIds,
             boolean notifyUser,
             boolean closeTopic
     ) {
@@ -189,7 +189,7 @@ public Application accept(
                 thesisType,
                 supervisorIds,
                 advisorIds,
-                Collections.singleton(application.getUser().getId()),
+                List.of(application.getUser().getId()),
                 application
         );
 
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
index 1587f3a9..509095cd 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
@@ -91,9 +91,9 @@ public Thesis createThesis(
             User creator,
             String thesisTitle,
             String thesisType,
-            Set<UUID> supervisorIds,
-            Set<UUID> advisorIds,
-            Set<UUID> studentIds,
+            List<UUID> supervisorIds,
+            List<UUID> advisorIds,
+            List<UUID> studentIds,
             Application application
     ) {
         Thesis thesis = new Thesis();
@@ -154,9 +154,9 @@ public Thesis updateThesis(
             Set<String> keywords,
             Instant startDate,
             Instant endDate,
-            Set<UUID> studentIds,
-            Set<UUID> advisorIds,
-            Set<UUID> supervisorIds,
+            List<UUID> studentIds,
+            List<UUID> advisorIds,
+            List<UUID> supervisorIds,
             List<ThesisStatePayload> states
     ) {
         thesis.setTitle(thesisTitle);
@@ -405,14 +405,18 @@ public Thesis findById(UUID thesisId) {
     private void assignThesisRoles(
             Thesis thesis,
             User assigner,
-            Set<UUID> supervisorIds,
-            Set<UUID> advisorIds,
-            Set<UUID> studentIds
+            List<UUID> supervisorIds,
+            List<UUID> advisorIds,
+            List<UUID> studentIds
     ) {
         List<User> supervisors = userRepository.findAllById(supervisorIds);
         List<User> advisors = userRepository.findAllById(advisorIds);
         List<User> students = userRepository.findAllById(studentIds);
 
+        supervisors.sort(Comparator.comparing(user -> supervisorIds.indexOf(user.getId())));
+        advisors.sort(Comparator.comparing(user -> advisorIds.indexOf(user.getId())));
+        students.sort(Comparator.comparing(user -> studentIds.indexOf(user.getId())));
+
         if (supervisors.isEmpty() || supervisors.size() != supervisorIds.size()) {
             throw new ResourceInvalidParametersException("No supervisors selected or supervisors not found");
         }
@@ -426,26 +430,31 @@ private void assignThesisRoles(
         }
 
         thesisRoleRepository.deleteByThesisId(thesis.getId());
-        thesis.setRoles(new HashSet<>());
+        thesis.setRoles(new ArrayList<>());
+
+        for (int i = 0; i < supervisors.size(); i++) {
+            User supervisor = supervisors.get(i);
 
-        for (User supervisor : supervisors) {
             if (!supervisor.hasAnyGroup("supervisor")) {
                 throw new ResourceInvalidParametersException("User is not a supervisor");
             }
 
-            saveThesisRole(thesis, assigner, supervisor, ThesisRoleName.SUPERVISOR);
+            saveThesisRole(thesis, assigner, supervisor, ThesisRoleName.SUPERVISOR, i);
         }
 
-        for (User advisor : advisors) {
+        for (int i = 0; i < advisors.size(); i++) {
+            User advisor = advisors.get(i);
+
             if (!advisor.hasAnyGroup("advisor", "supervisor")) {
                 throw new ResourceInvalidParametersException("User is not an advisor");
             }
 
-            saveThesisRole(thesis, assigner, advisor, ThesisRoleName.ADVISOR);
+            saveThesisRole(thesis, assigner, advisor, ThesisRoleName.ADVISOR, i);
         }
 
-        for (User student : students) {
-            saveThesisRole(thesis, assigner, student, ThesisRoleName.STUDENT);
+        for (int i = 0; i < students.size(); i++) {
+            User student = students.get(i);
+            saveThesisRole(thesis, assigner, student, ThesisRoleName.STUDENT, i);
         }
     }
 
@@ -466,7 +475,7 @@ private void saveStateChange(Thesis thesis, ThesisState state, Instant changedAt
         thesis.setStates(stateChanges);
     }
 
-    private void saveThesisRole(Thesis thesis, User assigner, User user, ThesisRoleName role) {
+    private void saveThesisRole(Thesis thesis, User assigner, User user, ThesisRoleName role, int position) {
         if (assigner == null || user == null) {
             throw new ResourceInvalidParametersException("Assigner and user must be provided.");
         }
@@ -483,11 +492,15 @@ private void saveThesisRole(Thesis thesis, User assigner, User user, ThesisRoleN
         thesisRole.setAssignedBy(assigner);
         thesisRole.setAssignedAt(Instant.now());
         thesisRole.setThesis(thesis);
+        thesisRole.setPosition(position);
 
         thesisRoleRepository.save(thesisRole);
 
-        Set<ThesisRole> roles = thesis.getRoles();
+        List<ThesisRole> roles = thesis.getRoles();
+
         roles.add(thesisRole);
+        roles.sort(Comparator.comparingInt(ThesisRole::getPosition));
+
         thesis.setRoles(roles);
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/TopicService.java b/server/src/main/java/thesistrack/ls1/service/TopicService.java
index 6346cfb4..08e7a607 100644
--- a/server/src/main/java/thesistrack/ls1/service/TopicService.java
+++ b/server/src/main/java/thesistrack/ls1/service/TopicService.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import thesistrack.ls1.constants.ThesisRoleName;
+import thesistrack.ls1.entity.ThesisRole;
 import thesistrack.ls1.entity.Topic;
 import thesistrack.ls1.entity.TopicRole;
 import thesistrack.ls1.entity.User;
@@ -58,8 +59,8 @@ public Topic createTopic(
             String problemStatement,
             String goals,
             String references,
-            Set<UUID> supervisorIds,
-            Set<UUID> advisorIds
+            List<UUID> supervisorIds,
+            List<UUID> advisorIds
     ) {
         Topic topic = new Topic();
 
@@ -88,8 +89,8 @@ public Topic updateTopic(
             String problemStatement,
             String goals,
             String references,
-            Set<UUID> supervisorIds,
-            Set<UUID> advisorIds
+            List<UUID> supervisorIds,
+            List<UUID> advisorIds
     ) {
         topic.setTitle(title);
         topic.setThesisTypes(thesisTypes);
@@ -108,10 +109,13 @@ public Topic findById(UUID topicId) {
                 .orElseThrow(() -> new ResourceNotFoundException(String.format("Topic with id %s not found.", topicId)));
     }
 
-    private void assignTopicRoles(Topic topic, User assigner, Set<UUID> advisorIds, Set<UUID> supervisorIds) {
+    private void assignTopicRoles(Topic topic, User assigner, List<UUID> advisorIds, List<UUID> supervisorIds) {
         List<User> supervisors = userRepository.findAllById(supervisorIds);
         List<User> advisors = userRepository.findAllById(advisorIds);
 
+        supervisors.sort(Comparator.comparing(user -> supervisorIds.indexOf(user.getId())));
+        advisors.sort(Comparator.comparing(user -> advisorIds.indexOf(user.getId())));
+
         if (supervisors.isEmpty() || supervisors.size() != supervisorIds.size()) {
             throw new ResourceInvalidParametersException("No supervisors selected or supervisors not found");
         }
@@ -121,26 +125,30 @@ private void assignTopicRoles(Topic topic, User assigner, Set<UUID> advisorIds,
         }
 
         topicRoleRepository.deleteByTopicId(topic.getId());
-        topic.setRoles(new HashSet<>());
+        topic.setRoles(new ArrayList<>());
+
+        for (int i = 0; i < supervisors.size(); i++) {
+            User supervisor = supervisors.get(i);
 
-        for (User supervisor : supervisors) {
             if (!supervisor.hasAnyGroup("supervisor")) {
                 throw new ResourceInvalidParametersException("User is not a supervisor");
             }
 
-            saveTopicRole(topic, assigner, supervisor, ThesisRoleName.SUPERVISOR);
+            saveTopicRole(topic, assigner, supervisor, ThesisRoleName.SUPERVISOR, i);
         }
 
-        for (User advisor : advisors) {
+        for (int i = 0; i < advisors.size(); i++) {
+            User advisor = advisors.get(i);
+
             if (!advisor.hasAnyGroup("advisor", "supervisor")) {
                 throw new ResourceInvalidParametersException("User is not an advisor");
             }
 
-            saveTopicRole(topic, assigner, advisor, ThesisRoleName.ADVISOR);
+            saveTopicRole(topic, assigner, advisor, ThesisRoleName.ADVISOR, i);
         }
     }
 
-    private void saveTopicRole(Topic topic, User assigner, User user, ThesisRoleName role) {
+    private void saveTopicRole(Topic topic, User assigner, User user, ThesisRoleName role, int position) {
         if (assigner == null || user == null) {
             throw new ResourceInvalidParametersException("Assigner and user must be provided.");
         }
@@ -157,11 +165,15 @@ private void saveTopicRole(Topic topic, User assigner, User user, ThesisRoleName
         topicRole.setAssignedBy(assigner);
         topicRole.setAssignedAt(Instant.now());
         topicRole.setTopic(topic);
+        topicRole.setPosition(position);
 
         topicRoleRepository.save(topicRole);
 
-        Set<TopicRole> roles = topic.getRoles();
+        List<TopicRole> roles = topic.getRoles();
+
         roles.add(topicRole);
+        roles.sort(Comparator.comparingInt(TopicRole::getPosition));
+
         topic.setRoles(roles);
     }
 }
diff --git a/server/src/main/resources/db/changelog/changes/07_cleanup.sql b/server/src/main/resources/db/changelog/changes/07_cleanup.sql
index e89b11e5..ceaecef6 100644
--- a/server/src/main/resources/db/changelog/changes/07_cleanup.sql
+++ b/server/src/main/resources/db/changelog/changes/07_cleanup.sql
@@ -6,3 +6,7 @@ ALTER TABLE users DROP COLUMN is_exchange_student;
 
 --changeset emilius:07-cleanup-2
 ALTER TABLE users ADD COLUMN custom_data jsonb;
+
+--changeset emilius:07-cleanup-3
+ALTER TABLE thesis_roles ADD COLUMN position INT NOT NULL DEFAULT 0;
+ALTER TABLE topic_roles ADD COLUMN position INT NOT NULL DEFAULT 0;