From ea72a07a748f69f77ea28b01b84fb512fd344cdb Mon Sep 17 00:00:00 2001
From: Fabian Emilius <fabian.emilius@tum.de>
Date: Mon, 7 Oct 2024 18:21:39 +0200
Subject: [PATCH] Improve presentation scheduling logic

---
 .../PresentationsTable/PresentationsTable.tsx | 26 +++++--
 .../PublicPresentationsTable.tsx              | 75 +++++++++++++++++++
 .../components/ThesesTable/ThesesTable.tsx    | 14 ++--
 client/src/hooks/authentication.ts            |  4 +
 .../src/pages/DashboardPage/DashboardPage.tsx |  4 +-
 .../PublicPresentationsSection.tsx            | 52 ++-----------
 .../NotificationSettings.tsx                  |  4 +-
 .../ThesisOverviewPage/ThesisOverviewPage.tsx |  4 +-
 .../ReplacePresentationModal.tsx              | 49 +++++++-----
 client/src/pages/TopicPage/TopicPage.tsx      |  4 +-
 client/src/requests/responses/thesis.ts       |  7 +-
 .../PublishedPresentationController.java      |  2 +
 .../ls1/dto/PublishedPresentationDto.java     |  3 +
 .../ls1/service/DashboardService.java         | 11 +++
 .../service/ThesisPresentationService.java    |  8 +-
 15 files changed, 172 insertions(+), 95 deletions(-)
 create mode 100644 client/src/components/PublicPresentationsTable/PublicPresentationsTable.tsx

diff --git a/client/src/components/PresentationsTable/PresentationsTable.tsx b/client/src/components/PresentationsTable/PresentationsTable.tsx
index 0e0f3642..799dff24 100644
--- a/client/src/components/PresentationsTable/PresentationsTable.tsx
+++ b/client/src/components/PresentationsTable/PresentationsTable.tsx
@@ -2,15 +2,19 @@ import React from 'react'
 import { DataTable, DataTableColumn } from 'mantine-datatable'
 import {
   IPublishedPresentation,
+  isPublishedPresentation,
   isThesisPresentation,
+  IThesis,
   IThesisPresentation,
 } from '../../requests/responses/thesis'
 import { formatDate, formatPresentationType } from '../../utils/format'
 import { GLOBAL_CONFIG } from '../../config/global'
 import { Anchor, Badge, Center } from '@mantine/core'
+import AvatarUserList from '../AvatarUserList/AvatarUserList'
 
 type PresentationColumn =
   | 'state'
+  | 'students'
   | 'type'
   | 'location'
   | 'streamUrl'
@@ -51,14 +55,22 @@ const PresentationsTable = <T extends IThesisPresentation | IPublishedPresentati
       ellipsis: true,
       render: (presentation) => (
         <Center>
-          {isThesisPresentation(presentation) && (
-            <Badge color={presentation.state === 'DRAFTED' ? 'grey' : undefined}>
-              {presentation.state}
-            </Badge>
-          )}
+          <Badge color={presentation.state === 'DRAFTED' ? 'grey' : undefined}>
+            {presentation.state}
+          </Badge>
         </Center>
       ),
     },
+    students: {
+      accessor: 'students',
+      title: 'Student',
+      width: 180,
+      ellipsis: true,
+      render: (presentation) =>
+        isPublishedPresentation(presentation) && (
+          <AvatarUserList users={presentation.thesis.students} />
+        ),
+    },
     type: {
       accessor: 'type',
       title: 'Type',
@@ -122,7 +134,7 @@ const PresentationsTable = <T extends IThesisPresentation | IPublishedPresentati
         page={pagination.page}
         onPageChange={pagination.onPageChange}
         idAccessor='presentationId'
-        columns={columns.map((column) => columnConfig[column])}
+        columns={columns.filter((column) => column).map((column) => columnConfig[column])}
         onRowClick={onRowClick ? ({ record }) => onRowClick(record) : undefined}
       />
     )
@@ -138,7 +150,7 @@ const PresentationsTable = <T extends IThesisPresentation | IPublishedPresentati
         highlightOnHover
         records={presentations}
         idAccessor='presentationId'
-        columns={columns.map((column) => columnConfig[column])}
+        columns={columns.filter((column) => column).map((column) => columnConfig[column])}
       />
     )
   }
diff --git a/client/src/components/PublicPresentationsTable/PublicPresentationsTable.tsx b/client/src/components/PublicPresentationsTable/PublicPresentationsTable.tsx
new file mode 100644
index 00000000..911136b6
--- /dev/null
+++ b/client/src/components/PublicPresentationsTable/PublicPresentationsTable.tsx
@@ -0,0 +1,75 @@
+import PresentationsTable from '../PresentationsTable/PresentationsTable'
+import React, { useEffect, useState } from 'react'
+import { PaginationResponse } from '../../requests/responses/pagination'
+import { IPublishedPresentation } from '../../requests/responses/thesis'
+import { doRequest } from '../../requests/request'
+import { showSimpleError } from '../../utils/notification'
+import { getApiResponseErrorMessage } from '../../requests/handler'
+import { useNavigate } from 'react-router-dom'
+
+interface IPublicPresentationsTableProps {
+  includeDrafts?: boolean
+  limit?: number
+  reducedData?: boolean
+}
+
+const PublicPresentationsTable = (props: IPublicPresentationsTableProps) => {
+  const { includeDrafts = false, limit = 10, reducedData = false } = props
+
+  const navigate = useNavigate()
+
+  const [presentations, setPresentations] = useState<PaginationResponse<IPublishedPresentation>>()
+  const [page, setPage] = useState(0)
+
+  useEffect(() => {
+    setPresentations(undefined)
+
+    return doRequest<PaginationResponse<IPublishedPresentation>>(
+      `/v2/published-presentations`,
+      {
+        method: 'GET',
+        requiresAuth: false,
+        params: {
+          page,
+          limit,
+          includeDrafts,
+        },
+      },
+      (res) => {
+        if (res.ok) {
+          setPresentations(res.data)
+        } else {
+          showSimpleError(getApiResponseErrorMessage(res))
+        }
+      },
+    )
+  }, [page, limit, includeDrafts])
+
+  return (
+    <PresentationsTable
+      columns={
+        reducedData
+          ? [includeDrafts ? 'state' : '', 'students', 'location', 'scheduledAt']
+          : [
+              includeDrafts ? 'state' : '',
+              'students',
+              'type',
+              'location',
+              'streamUrl',
+              'language',
+              'scheduledAt',
+            ]
+      }
+      presentations={presentations?.content}
+      onRowClick={(presentation) => navigate(`/presentations/${presentation.presentationId}`)}
+      pagination={{
+        totalRecords: presentations?.totalElements ?? 0,
+        recordsPerPage: limit,
+        page: page + 1,
+        onPageChange: (newPage) => setPage(newPage - 1),
+      }}
+    />
+  )
+}
+
+export default PublicPresentationsTable
diff --git a/client/src/components/ThesesTable/ThesesTable.tsx b/client/src/components/ThesesTable/ThesesTable.tsx
index 5a5ad6ff..bde5a428 100644
--- a/client/src/components/ThesesTable/ThesesTable.tsx
+++ b/client/src/components/ThesesTable/ThesesTable.tsx
@@ -45,7 +45,7 @@ const ThesesTable = (props: IThesesTableProps) => {
       title: 'State',
       textAlign: 'center',
       width: 150,
-      render: (thesis: IThesis) => {
+      render: (thesis) => {
         return (
           <Center>
             <ThesisStateBadge state={thesis.state} />
@@ -57,28 +57,28 @@ const ThesesTable = (props: IThesesTableProps) => {
       accessor: 'supervisors',
       title: 'Supervisor',
       width: 180,
-      render: (thesis: IThesis) => <AvatarUserList users={thesis.supervisors} />,
+      render: (thesis) => <AvatarUserList users={thesis.supervisors} />,
     },
     advisors: {
       accessor: 'advisors',
       title: 'Advisor(s)',
       ellipsis: true,
       width: 180,
-      render: (thesis: IThesis) => <AvatarUserList users={thesis.advisors} />,
+      render: (thesis) => <AvatarUserList users={thesis.advisors} />,
     },
     students: {
       accessor: 'students',
       title: 'Student(s)',
       ellipsis: true,
       width: 180,
-      render: (thesis: IThesis) => <AvatarUserList users={thesis.students} />,
+      render: (thesis) => <AvatarUserList users={thesis.students} />,
     },
     type: {
       accessor: 'type',
       title: 'Type',
       ellipsis: true,
       width: 150,
-      render: (thesis: IThesis) => formatThesisType(thesis.type),
+      render: (thesis) => formatThesisType(thesis.type),
     },
     title: {
       accessor: 'title',
@@ -91,7 +91,7 @@ const ThesesTable = (props: IThesesTableProps) => {
       sortable: true,
       ellipsis: true,
       width: 130,
-      render: (thesis: IThesis) => formatDate(thesis.startDate, { withTime: false }),
+      render: (thesis) => formatDate(thesis.startDate, { withTime: false }),
     },
     end_date: {
       accessor: 'endDate',
@@ -99,7 +99,7 @@ const ThesesTable = (props: IThesesTableProps) => {
       sortable: true,
       ellipsis: true,
       width: 130,
-      render: (thesis: IThesis) => formatDate(thesis.endDate, { withTime: false }),
+      render: (thesis) => formatDate(thesis.endDate, { withTime: false }),
     },
     ...extraColumns,
   }
diff --git a/client/src/hooks/authentication.ts b/client/src/hooks/authentication.ts
index 9c7ca114..062aeacd 100644
--- a/client/src/hooks/authentication.ts
+++ b/client/src/hooks/authentication.ts
@@ -59,3 +59,7 @@ export function useHasGroupAccess(...groups: string[]) {
 
   return user?.groups.some((group) => groups.includes(group)) ?? false
 }
+
+export function useManagementAccess() {
+  return useHasGroupAccess('admin', 'supervisor', 'advisor')
+}
diff --git a/client/src/pages/DashboardPage/DashboardPage.tsx b/client/src/pages/DashboardPage/DashboardPage.tsx
index 99c3d4d7..779e70f7 100644
--- a/client/src/pages/DashboardPage/DashboardPage.tsx
+++ b/client/src/pages/DashboardPage/DashboardPage.tsx
@@ -7,7 +7,7 @@ import ThesesProvider from '../../contexts/ThesesProvider/ThesesProvider'
 import { Button, Center, Group, Stack, Title } from '@mantine/core'
 import { ApplicationState, IApplication } from '../../requests/responses/application'
 import ThesesGanttChart from '../../components/ThesesGanttChart/ThesesGanttChart'
-import { useHasGroupAccess } from '../../hooks/authentication'
+import { useHasGroupAccess, useManagementAccess } from '../../hooks/authentication'
 import { Link } from 'react-router-dom'
 import ApplicationModal from '../../components/ApplicationModal/ApplicationModal'
 import MyTasksSection from './components/MyTasksSection/MyTasksSection'
@@ -20,7 +20,7 @@ const DashboardPage = () => {
 
   const [application, setApplication] = useState<IApplication>()
 
-  const managementAccess = useHasGroupAccess('admin', 'supervisor', 'advisor')
+  const managementAccess = useManagementAccess()
 
   return (
     <Stack gap='md'>
diff --git a/client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx b/client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx
index 62d6be8f..c39e020d 100644
--- a/client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx
+++ b/client/src/pages/DashboardPage/components/PublicPresentationsSection/PublicPresentationsSection.tsx
@@ -8,47 +8,14 @@ import {
   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 React from 'react'
 import { GLOBAL_CONFIG } from '../../../../config/global'
 import { Check, Copy } from 'phosphor-react'
-import { useNavigate } from 'react-router-dom'
+import { useManagementAccess } from '../../../../hooks/authentication'
+import PublicPresentationsTable from '../../../../components/PublicPresentationsTable/PublicPresentationsTable'
 
 const PublicPresentationsSection = () => {
-  const limit = 10
-
-  const navigate = useNavigate()
-
-  const [presentations, setPresentations] = useState<PaginationResponse<IPublishedPresentation>>()
-  const [page, setPage] = useState(0)
-
-  useEffect(() => {
-    setPresentations(undefined)
-
-    return doRequest<PaginationResponse<IPublishedPresentation>>(
-      `/v2/published-presentations`,
-      {
-        method: 'GET',
-        requiresAuth: false,
-        params: {
-          page,
-          limit,
-        },
-      },
-      (res) => {
-        if (res.ok) {
-          setPresentations(res.data)
-        } else {
-          showSimpleError(getApiResponseErrorMessage(res))
-        }
-      },
-    )
-  }, [page, limit])
+  const managementAccess = useManagementAccess()
 
   const calendarUrl =
     GLOBAL_CONFIG.calendar_url || `${GLOBAL_CONFIG.server_host}/api/v2/calendar/presentations`
@@ -77,16 +44,7 @@ const PublicPresentationsSection = () => {
           </CopyButton>
         </div>
       </Group>
-      <PresentationsTable
-        presentations={presentations?.content}
-        onRowClick={(presentation) => navigate(`/presentations/${presentation.presentationId}`)}
-        pagination={{
-          totalRecords: presentations?.totalElements ?? 0,
-          recordsPerPage: limit,
-          page: page + 1,
-          onPageChange: (newPage) => setPage(newPage - 1),
-        }}
-      />
+      <PublicPresentationsTable includeDrafts={managementAccess} />
     </Stack>
   )
 }
diff --git a/client/src/pages/SettingsPage/components/NotificationSettings/NotificationSettings.tsx b/client/src/pages/SettingsPage/components/NotificationSettings/NotificationSettings.tsx
index f0b32270..1d8a5be7 100644
--- a/client/src/pages/SettingsPage/components/NotificationSettings/NotificationSettings.tsx
+++ b/client/src/pages/SettingsPage/components/NotificationSettings/NotificationSettings.tsx
@@ -1,6 +1,6 @@
 import { Group, Stack, Text } from '@mantine/core'
 import { usePageTitle } from '../../../../hooks/theme'
-import { useHasGroupAccess, useLoggedInUser } from '../../../../hooks/authentication'
+import { useHasGroupAccess, useLoggedInUser, useManagementAccess } from '../../../../hooks/authentication'
 import ThesesTable from '../../../../components/ThesesTable/ThesesTable'
 import ThesesProvider from '../../../../contexts/ThesesProvider/ThesesProvider'
 import React, { useEffect, useState } from 'react'
@@ -12,7 +12,7 @@ const NotificationSettings = () => {
   usePageTitle('Notification Settings')
 
   const user = useLoggedInUser()
-  const managementAccess = useHasGroupAccess('admin', 'supervisor', 'advisor')
+  const managementAccess = useManagementAccess()
 
   const [settings, setSettings] = useState<Array<{ name: string; email: string }>>()
 
diff --git a/client/src/pages/ThesisOverviewPage/ThesisOverviewPage.tsx b/client/src/pages/ThesisOverviewPage/ThesisOverviewPage.tsx
index 3ff16aee..e4a9c85d 100644
--- a/client/src/pages/ThesisOverviewPage/ThesisOverviewPage.tsx
+++ b/client/src/pages/ThesisOverviewPage/ThesisOverviewPage.tsx
@@ -8,14 +8,14 @@ import { Button, Group, Space, Stack, Title } from '@mantine/core'
 import { ThesisState } from '../../requests/responses/thesis'
 import CreateThesisModal from './components/CreateThesisModal/CreateThesisModal'
 import { Plus } from 'phosphor-react'
-import { useHasGroupAccess } from '../../hooks/authentication'
+import { useManagementAccess } from '../../hooks/authentication'
 
 const ThesisOverviewPage = () => {
   usePageTitle('Theses')
 
   const [openCreateThesisModal, setOpenCreateThesisModal] = useState(false)
 
-  const managementAccess = useHasGroupAccess('admin', 'supervisor', 'advisor')
+  const managementAccess = useManagementAccess()
 
   return (
     <Stack>
diff --git a/client/src/pages/ThesisPage/components/ThesisWritingSection/components/ReplacePresentationModal/ReplacePresentationModal.tsx b/client/src/pages/ThesisPage/components/ThesisWritingSection/components/ReplacePresentationModal/ReplacePresentationModal.tsx
index c866a6fa..799f3af8 100644
--- a/client/src/pages/ThesisPage/components/ThesisWritingSection/components/ReplacePresentationModal/ReplacePresentationModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisWritingSection/components/ReplacePresentationModal/ReplacePresentationModal.tsx
@@ -5,12 +5,13 @@ import {
   useLoadedThesisContext,
   useThesisUpdateAction,
 } from '../../../../../../contexts/ThesisProvider/hooks'
-import { Alert, Button, Group, Modal, Select, Stack, TextInput } from '@mantine/core'
+import { Accordion, Alert, Button, Divider, Group, Modal, Select, Stack, TextInput } from '@mantine/core'
 import { doRequest } from '../../../../../../requests/request'
 import { IThesis, IThesisPresentation } from '../../../../../../requests/responses/thesis'
 import { ApiError } from '../../../../../../requests/handler'
 import { formatPresentationType } from '../../../../../../utils/format'
 import { GLOBAL_CONFIG } from '../../../../../../config/global'
+import PublicPresentationsTable from '../../../../../../components/PublicPresentationsTable/PublicPresentationsTable'
 
 interface IReplacePresentationModalProps {
   opened: boolean
@@ -18,19 +19,21 @@ interface IReplacePresentationModalProps {
   presentation?: IThesisPresentation
 }
 
+interface IFormValues {
+  type: string
+  visibility: string
+  location: string
+  streamUrl: string
+  language: string | null
+  date: DateValue
+}
+
 const ReplacePresentationModal = (props: IReplacePresentationModalProps) => {
   const { presentation, opened, onClose } = props
 
   const { thesis } = useLoadedThesisContext()
 
-  const form = useForm<{
-    type: string
-    visibility: string
-    location: string
-    streamUrl: string
-    language: string | null
-    date: DateValue
-  }>({
+  const form = useForm<IFormValues>({
     mode: 'controlled',
     initialValues: {
       type: 'INTERMEDIATE',
@@ -122,6 +125,7 @@ const ReplacePresentationModal = (props: IReplacePresentationModalProps) => {
 
   return (
     <Modal
+      size='xl'
       opened={opened}
       onClose={onClose}
       title={presentation ? 'Update Presentation' : 'Create Presentation'}
@@ -139,6 +143,14 @@ const ReplacePresentationModal = (props: IReplacePresentationModalProps) => {
               presentation.
             </Alert>
           )}
+          <Accordion variant='separated'>
+            <Accordion.Item value='presentations'>
+              <Accordion.Control>Currently Scheduled Presentations</Accordion.Control>
+              <Accordion.Panel>
+                <PublicPresentationsTable includeDrafts={true} reducedData={true} />
+              </Accordion.Panel>
+            </Accordion.Item>
+          </Accordion>
           <Select
             label='Presentation Type'
             required
@@ -169,16 +181,15 @@ const ReplacePresentationModal = (props: IReplacePresentationModalProps) => {
             {...form.getInputProps('language')}
           />
           <DateTimePicker label='Scheduled At' required {...form.getInputProps('date')} />
-          <Group grow>
-            <Button
-              type='submit'
-              onClick={onReplacePresentation}
-              disabled={!thesis.abstractText || !form.isValid()}
-              loading={replacing}
-            >
-              {presentation ? 'Update Presentation' : 'Create Presentation Draft'}
-            </Button>
-          </Group>
+          <Button
+            type='submit'
+            fullWidth
+            onClick={onReplacePresentation}
+            disabled={!thesis.abstractText || !form.isValid()}
+            loading={replacing}
+          >
+            {presentation ? 'Update Presentation' : 'Create Presentation Draft'}
+          </Button>
         </Stack>
       </form>
     </Modal>
diff --git a/client/src/pages/TopicPage/TopicPage.tsx b/client/src/pages/TopicPage/TopicPage.tsx
index ba8a89bb..cad986d7 100644
--- a/client/src/pages/TopicPage/TopicPage.tsx
+++ b/client/src/pages/TopicPage/TopicPage.tsx
@@ -6,7 +6,7 @@ import NotFound from '../../components/NotFound/NotFound'
 import PageLoader from '../../components/PageLoader/PageLoader'
 import { Button, Divider, Group, Stack, Title } from '@mantine/core'
 import TopicData from '../../components/TopicData/TopicData'
-import { useHasGroupAccess } from '../../hooks/authentication'
+import { useManagementAccess } from '../../hooks/authentication'
 import ApplicationsProvider from '../../contexts/ApplicationsProvider/ApplicationsProvider'
 import ApplicationsTable from '../../components/ApplicationsTable/ApplicationsTable'
 
@@ -14,7 +14,7 @@ const TopicPage = () => {
   const { topicId } = useParams<{ topicId: string }>()
 
   const navigate = useNavigate()
-  const managementAccess = useHasGroupAccess('admin', 'supervisor', 'advisor')
+  const managementAccess = useManagementAccess()
 
   const topic = useTopic(topicId)
 
diff --git a/client/src/requests/responses/thesis.ts b/client/src/requests/responses/thesis.ts
index a125bba6..a1b57baf 100644
--- a/client/src/requests/responses/thesis.ts
+++ b/client/src/requests/responses/thesis.ts
@@ -100,6 +100,7 @@ export interface IPublishedThesis {
 
 export interface IPublishedPresentation {
   presentationId: string
+  state: string
   type: string
   location: string | null
   streamUrl: string | null
@@ -113,5 +114,9 @@ export function isThesis(thesis: any): thesis is IThesis {
 }
 
 export function isThesisPresentation(presentation: any): presentation is IThesisPresentation {
-  return presentation.presentationId && !!presentation.state
+  return presentation.presentationId && !presentation.thesis
+}
+
+export function isPublishedPresentation(presentation: any): presentation is IPublishedPresentation {
+  return presentation.presentationId && presentation.thesis
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/PublishedPresentationController.java b/server/src/main/java/thesistrack/ls1/controller/PublishedPresentationController.java
index cfdc8c61..f3f8f17a 100644
--- a/server/src/main/java/thesistrack/ls1/controller/PublishedPresentationController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/PublishedPresentationController.java
@@ -35,12 +35,14 @@ public PublishedPresentationController(ThesisPresentationService thesisPresentat
 
     @GetMapping()
     public ResponseEntity<PaginationDto<PublishedPresentationDto>> getPresentations(
+            @RequestParam(required = false, defaultValue = "false") Boolean includeDrafts,
             @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 = thesisPresentationService.getPublicPresentations(
+                includeDrafts,
                 page,
                 limit,
                 sortBy,
diff --git a/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java b/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
index 307f790f..33d1d455 100644
--- a/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
@@ -1,5 +1,6 @@
 package thesistrack.ls1.dto;
 
+import thesistrack.ls1.constants.ThesisPresentationState;
 import thesistrack.ls1.constants.ThesisPresentationType;
 import thesistrack.ls1.entity.ThesisPresentation;
 
@@ -8,6 +9,7 @@
 
 public record PublishedPresentationDto (
         UUID presentationId,
+        ThesisPresentationState state,
         ThesisPresentationType type,
         String location,
         String streamUrl,
@@ -22,6 +24,7 @@ public static PublishedPresentationDto fromPresentationEntity(ThesisPresentation
 
         return new PublishedPresentationDto(
                 presentation.getId(),
+                presentation.getState(),
                 presentation.getType(),
                 presentation.getLocation(),
                 presentation.getStreamUrl(),
diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
index 1c1fc5f5..f098bc2d 100644
--- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java
+++ b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -5,6 +5,7 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import thesistrack.ls1.constants.ThesisPresentationState;
 import thesistrack.ls1.constants.ThesisPresentationVisibility;
 import thesistrack.ls1.constants.ThesisRoleName;
 import thesistrack.ls1.constants.ThesisState;
@@ -78,6 +79,16 @@ public List<TaskDto> getTasks(User user) {
                         50
                 ));
             }
+
+            for (ThesisPresentation presentation : thesis.getPresentations()) {
+                if (presentation.getState() == ThesisPresentationState.DRAFTED) {
+                    tasks.add(new TaskDto(
+                            "There is a presentation draft for thesis \"" + thesis.getTitle() + "\". Please review and confirm it.",
+                            getThesisLink(thesis),
+                            80
+                    ));
+                }
+            }
         }
 
         // proposal task
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java b/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
index 8fca653f..8444239b 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
@@ -51,12 +51,12 @@ public ThesisPresentationService(
         this.clientHost = clientHost;
     }
 
-    public Page<ThesisPresentation> getPublicPresentations(Integer page, Integer limit, String sortBy, String sortOrder) {
+    public Page<ThesisPresentation> getPublicPresentations(Boolean includeDrafts, 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(),
-                Set.of(ThesisPresentationState.SCHEDULED),
+                includeDrafts ? Set.of(ThesisPresentationState.DRAFTED, ThesisPresentationState.SCHEDULED) : Set.of(ThesisPresentationState.SCHEDULED),
                 Set.of(ThesisPresentationVisibility.PUBLIC),
                 PageRequest.of(page, limit, Sort.by(order))
         );
@@ -70,10 +70,6 @@ public ThesisPresentation getPublicPresentation(UUID presentationId) {
             throw new AccessDeniedException("Presentation is not public");
         }
 
-        if (presentation.getState() != ThesisPresentationState.SCHEDULED) {
-            throw new AccessDeniedException("Presentation is not scheduled yet");
-        }
-
         return presentation;
     }