Add task for scientific writing

ls1intum · Sep 26, 2024 · 918753c · 918753c
1 parent 152bb7a
commit 918753c
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 25 deletions.
diff --git a/.github/workflows/deploy_docker.yml b/.github/workflows/deploy_docker.yml
@@ -115,6 +115,8 @@ jobs:
             echo "GENDERS=${{ vars.GENDERS }}" >> .env.prod
             echo "LANGUAGES=${{ vars.LANGUAGES }}" >> .env.prod
             echo "CUSTOM_DATA=${{ vars.CUSTOM_DATA }}" >> .env.prod
+            
+            echo "SCIENTIFIC_WRITING_GUIDE=${{ vars.SCIENTIFIC_WRITING_GUIDE }}" >> .env.prod
 
             echo "MAIL_SENDER=${{ vars.MAIL_SENDER }}" >> .env.prod
             echo "MAIL_SIGNATURE=${{ vars.MAIL_SIGNATURE }}" >> .env.prod

diff --git a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
@@ -11,7 +11,7 @@ import {
   Tooltip,
 } from '@mantine/core'
 import * as classes from './AuthenticatedArea.module.css'
-import { Link, useLocation } from 'react-router-dom'
+import { Link, useLocation, useNavigate } from 'react-router-dom'
 import { useDebouncedValue, useDisclosure } from '@mantine/hooks'
 import {
   CaretDoubleLeft,
@@ -80,6 +80,7 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
     requiredGroups,
   } = props
 
+  const navigate = useNavigate()
   const [opened, { toggle, close }] = useDisclosure()
 
   const minimizeAnimationDuration = 200
@@ -154,7 +155,7 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
           {!minimized && (
             <Group preventGrowOverflow={false}>
               <Logo className={classes.logo} />
-              <Text className={classes.siteName} fw='bold'>
+              <Text className={classes.siteName} fw='bold' style={{cursor: 'pointer'}} onClick={() => navigate('/')}>
                 ThesisTrack
               </Text>
               <ColorSchemeToggleButton ml='auto' />

diff --git a/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx b/client/src/pages/DashboardPage/components/MyTasksSection/MyTasksSection.tsx
@@ -40,6 +40,14 @@ const MyTasksSection = () => {
     return null
   }
 
+  const redirectTask = (task: ITask) => {
+    if (task.link.startsWith('http')) {
+      window.location.replace(task.link)
+    } else {
+      navigate(task.link)
+    }
+  }
+
   return (
     <Stack gap='xs'>
       <Title order={2}>My Tasks</Title>
@@ -63,15 +71,15 @@ const MyTasksSection = () => {
             render: (record) => (
               <Center>
                 <Group gap='xs' onClick={(e) => e.stopPropagation()} wrap='nowrap'>
-                  <ActionIcon onClick={() => navigate(record.link)}>
+                  <ActionIcon onClick={() => redirectTask(record)}>
                     <LinkIcon />
                   </ActionIcon>
                 </Group>
               </Center>
             ),
           },
         ]}
-        onRowClick={({ record }) => navigate(record.link)}
+        onRowClick={({ record }) => redirectTask(record)}
       />
     </Stack>
   )

diff --git a/client/src/requests/handler.ts b/client/src/requests/handler.ts
@@ -26,7 +26,7 @@ export function getApiResponseErrorMessage(response: ApiResponse<unknown>) {
   } else if (response.status === 501) {
     message = 'Endpoint not implemented yet'
   } else {
-    message = 'Unknown error'
+    message = `Unknown error ${response.status}`
   }
 
   if (!response.ok && response.error) {

diff --git a/client/src/requests/payloads/application.ts b/client/src/requests/payloads/application.ts
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -75,6 +75,7 @@ services:
       - CALDAV_URL
       - CALDAV_USERNAME
       - CALDAV_PASSWORD
+      - SCIENTIFIC_WRITING_GUIDE
     networks:
       - thesis-track-network
 

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
@@ -30,6 +30,7 @@
 | 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                                                                |
+| SCIENTIFIC_WRITING_GUIDE            | server         |                                                                                                                                                                                                       | Link to a guide that explains scientific writing at the chair                                             |
 | 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                                                                                   |

diff --git a/server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java b/server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java
@@ -30,7 +30,7 @@ public void emailReminder() {
         for (User user : userRepository.getRoleMembers(Set.of("admin", "supervisor", "advisor"))) {
             long unreviewedApplications = applicationRepository.countUnreviewedApplications(user.getId());
 
-            if (unreviewedApplications > 10) {
+            if (unreviewedApplications > 0) {
                 mailingService.sendApplicationReminderEmail(user, unreviewedApplications);
             }
         }

diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -1,5 +1,6 @@
 package thesistrack.ls1.service;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -25,21 +26,34 @@
 
 @Service
 public class DashboardService {
-    private final ThesisPresentationRepository thesisPresentationRepository;
     private final ThesisRepository thesisRepository;
     private final ApplicationRepository applicationRepository;
     private final TopicRepository topicRepository;
-
-    public DashboardService(ThesisPresentationRepository thesisPresentationRepository, ThesisRepository thesisRepository, ApplicationRepository applicationRepository, TopicRepository topicRepository) {
-        this.thesisPresentationRepository = thesisPresentationRepository;
+    private final String scientificWritingGuide;
+
+    public DashboardService(
+            ThesisRepository thesisRepository,
+            ApplicationRepository applicationRepository,
+            TopicRepository topicRepository,
+            @Value("${thesis-track.scientific-writing-guide}") String scientificWritingGuide
+    ) {
         this.thesisRepository = thesisRepository;
         this.applicationRepository = applicationRepository;
         this.topicRepository = topicRepository;
+        this.scientificWritingGuide = scientificWritingGuide;
     }
 
     public List<TaskDto> getTasks(User user) {
         List<TaskDto> tasks = new ArrayList<>();
 
+        if (user.hasAnyGroup("student") && !scientificWritingGuide.isBlank()) {
+            tasks.add(new TaskDto(
+                    "Please make yourself familiar with scientific writing",
+                    scientificWritingGuide,
+                    50
+            ));
+        }
+
         // general student tasks
         for (Thesis thesis : thesisRepository.findActiveThesesForRole(user.getId(), Set.of(ThesisRoleName.STUDENT), null)) {
             if (thesis.getAbstractField().isBlank() || thesis.getInfo().isBlank()) {
@@ -146,13 +160,15 @@ public List<TaskDto> getTasks(User user) {
 
         if (user.hasAnyGroup("admin", "supervisor", "advisor")) {
             // review application task
-            long unreviewedApplications = applicationRepository.countUnreviewedApplications(user.hasAnyGroup("admin") ? null : user.getId());
+            long unreviewedApplications = applicationRepository.countUnreviewedApplications(user.getId());
 
-            tasks.add(new TaskDto(
-                    "You have " + unreviewedApplications + " unreviewed applications.",
-                    "/applications",
-                    10
-            ));
+            if (unreviewedApplications > 0) {
+                tasks.add(new TaskDto(
+                        "You have " + unreviewedApplications + " unreviewed applications.",
+                        "/applications",
+                        10
+                ));
+            }
 
             // no open topic task
             long openTopics = topicRepository.countOpenTopics();

diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
@@ -81,3 +81,4 @@ thesis-track:
     mail-template-location: ${MAIL_TEMPLATE_FOLDER:server/mail-templates}
   storage:
     upload-location: ${UPLOAD_FOLDER:uploads}
+  scientific-writing-guide: ${SCIENTIFIC_WRITING_GUIDE:}