Merge pull request #434 from NIAEFEUP/fix/schedule-issues

Fix/schedule issues
NIAEFEUP · Feb 6, 2025 · 450a263 · 450a263
2 parents aa95835 + bc40f97
commit 450a263
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 18 deletions.
diff --git a/src/components/admin/requests/AdminSendEmail.tsx b/src/components/admin/requests/AdminSendEmail.tsx
@@ -5,11 +5,14 @@ type Props = {
     nmec: string | Array<string>
 }
 
+/**
+ * This component is so that the admin can send an email to the users without a pre defined subject and body.
+ */
 export const AdminSendEmail = ({
     nmec
 }: Props) => {
     return <>
-        <a href={`${mailtoStringBuilder(nmec)}?subject=Pedido de Inscrição em Turmas&[email protected]&body=Viva,%0D%0A%0D%0AForam alocadas turmas nas UCs indicadas.%0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`}>
+        <a href={`${mailtoStringBuilder(nmec)}[email protected]&body=Viva,%0D%0A%0D%0A %0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`}>
             <Button
                 variant="secondary"
             >

diff --git a/src/components/admin/requests/cards/AdminRequestCardFooter.tsx b/src/components/admin/requests/cards/AdminRequestCardFooter.tsx
@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction } from "react"
-import { AdminRequestType, CourseUnitEnrollment, DirectExchangeRequest, UrgentRequest } from "../../../../@types"
+import { CourseUnitEnrollment, DirectExchangeRequest, UrgentRequest } from "../../../../@types"
+import { AdminRequestType } from "../../../../utils/exchange"
 import exchangeRequestService from "../../../../api/services/exchangeRequestService"
 import { mailtoStringBuilder } from "../../../../utils/mail"
 import { Button } from "../../../ui/button"
@@ -28,7 +29,12 @@ const rejectRequest = async (
         await exchangeRequestService.adminRejectExchangeRequest(requestType, id);
 
         const a = document.createElement('a');
-        a.href = `${mailtoStringBuilder(nmecs)}?subject=Pedido de Alteração de Turma&[email protected]&body=Viva,%0D%0A%0D%0AA alteração pedida não pode ser efetuada.%0D%0A${exchangeMessage}%0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`;
+        if(requestType === AdminRequestType.DIRECT_EXCHANGE || requestType === AdminRequestType.URGENT_EXCHANGE) {
+            a.href = `${mailtoStringBuilder(nmecs)}?subject=Pedido de Alteração de Turma&[email protected]&body=Viva,%0D%0A%0D%0AA alteração pedida não pode ser efetuada.%0D%0A${exchangeMessage}%0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`;
+        } else {
+            a.href = `${mailtoStringBuilder(nmecs)}?subject=Pedido de Inscrição em Unidades Curriculares&[email protected]&body=Viva,%0D%0A%0D%0AO pedido de inscriçao em unidades curriculares não pode ser efetuado..%0D%0A${exchangeMessage}%0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`;
+        }
+
         a.click();
     } catch (e) {
         console.error(e);
@@ -45,7 +51,11 @@ const acceptRequest = async (
         await exchangeRequestService.adminAcceptExchangeRequest(requestType, id);
 
         const a = document.createElement('a');
-        a.href = `${mailtoStringBuilder(nmecs)}?subject=Pedido de Troca de Turma&[email protected]&body=Viva,%0D%0A%0D%0AA alteração pedida foi efetuada.%0D%0A${exchangeMessage}%0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`;
+        if(requestType === AdminRequestType.DIRECT_EXCHANGE || requestType === AdminRequestType.URGENT_EXCHANGE) {
+            a.href = `${mailtoStringBuilder(nmecs)}?subject=Pedido de Troca de Turma&[email protected]&body=Viva,%0D%0A%0D%0AA alteração pedida foi efetuada.%0D%0A${exchangeMessage}%0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`;
+        } else {
+            a.href = `${mailtoStringBuilder(nmecs)}?subject=Pedido de Inscrição em Unidades Curriculares&[email protected]&body=Viva,%0D%0A%0D%0AA alteração pedida foi efetuada.%0D%0A${exchangeMessage}%0D%0A%0D%0ACmpts,%0D%0ADaniel Silva%0D%0A(pela comissão de inscrição em turmas)`;
+        }
         a.click();
     } catch (e) {
         console.error(e);
@@ -69,6 +79,7 @@ export const AdminRequestCardFooter = ({
     setExchange,
     courseId
 }: Props) => {
+
     return <>
         <Separator className="my-4" />
         <CardFooter className="justify-end gap-4">

diff --git a/src/components/admin/requests/cards/MultipleStudentExchangeCard.tsx b/src/components/admin/requests/cards/MultipleStudentExchangeCard.tsx
@@ -104,10 +104,11 @@ export const MultipleStudentExchangeCard = ({
                 {open &&
                     <AdminRequestCardFooter
                         nmecs={
-                            exchange.options.map(option => option.participant_nmec)
+                            [...new Set(exchange.options.map(option => option.participant_nmec))]
                         }
                         exchangeMessage={listEmailExchanges(
                             exchange.options.map(option => ({
+                                participant_nmec: option.participant_nmec,
                                 goes_from: option.class_participant_goes_from.name,
                                 goes_to: option.class_participant_goes_to.name,
                                 course_acronym: option.course_unit

diff --git a/src/components/admin/requests/cards/SingleStudentExchangeCard.tsx b/src/components/admin/requests/cards/SingleStudentExchangeCard.tsx
@@ -109,6 +109,7 @@ export const SingleStudentExchangeCard = ({
                         nmecs={[exchange.user_nmec]} 
                         exchangeMessage={listEmailExchanges(
                             exchange.options.map(option => ({
+                                participant_nmec: exchange.user_nmec,
                                 goes_from: option.class_user_goes_from.name,
                                 goes_to: option.class_user_goes_to.name,
                                 course_acronym: option.course_unit.acronym

diff --git a/src/components/admin/requests/cards/StudentEnrollmentCard.tsx b/src/components/admin/requests/cards/StudentEnrollmentCard.tsx
@@ -10,6 +10,7 @@ import useStudentsSchedule from "../../../../hooks/admin/useStudentsSchedule"
 import { RequestDate } from "./RequestDate"
 import { AdminRequestType } from "../../../../utils/exchange"
 import { ExchangeStatus } from "./ExchangeStatus"
+import { listEmailEnrollments } from "../../../../utils/mail"
 
 type Props = {
     enrollment: CourseUnitEnrollment
@@ -109,7 +110,16 @@ export const StudentEnrollmentCard = ({
                 {open &&
                     <AdminRequestCardFooter
                         nmecs={[enrollment.user_nmec]}
-                        exchangeMessage={""}
+                        exchangeMessage={
+                            listEmailEnrollments(
+                                enrollment.options.map(option => ({
+                                    participant_nmec: enrollment.user_nmec,
+                                    goes_to: option.course_unit.name,
+                                    course: option.course_unit.course,
+                                    course_unit_id: option.course_unit.id
+                                }))
+                            )
+                        }
                         requestType={AdminRequestType.ENROLLMENT}
                         requestId={enrollment.id}
                         setExchange={setEnrollmentState}

diff --git a/src/components/exchange/requests/view/cards/CommonCardHeader.tsx b/src/components/exchange/requests/view/cards/CommonCardHeader.tsx
@@ -42,8 +42,13 @@ export const CommonCardHeader = ({
             ? StudentRequestCardStatus.ACCEPTED
             : StudentRequestCardStatus.PENDING
         );
+
+        if(request.type === "directexchange") {
+            (request as DirectExchangeRequest).options = (request as DirectExchangeRequest).options.filter((option) => option.participant_nmec === username);
+        }
     }, [request]);
 
+
     return <CardHeader
         className="flex flex-row gap-x-2 items-center p-4"
     >

diff --git a/src/components/exchange/verify/ExchangeVerifyStatus.tsx b/src/components/exchange/verify/ExchangeVerifyStatus.tsx
@@ -11,7 +11,7 @@ type Props = {
 export const ExchangeVerifyStatus = ({
     verified
 }: Props) => {
-    return (<div className="flex flex-col items-center gap-y-2">
+    return (<div className="my-auto flex flex-col items-center gap-y-2">
         {verified
             ? <>
                 <Check size={100} />

diff --git a/src/contexts/CombinedProvider.tsx b/src/contexts/CombinedProvider.tsx
@@ -28,7 +28,7 @@ const CombinedProvider = ({ children }: Props) => {
   const [multipleOptions, setMultipleOptionsState] = useState<MultipleOptions>(StorageAPI.getMultipleOptionsStorage());
   const [selectedOption, setSelectedOptionState] = useState<number>(StorageAPI.getSelectedOptionStorage());
 
-  const { signedIn: userSignedIn, user, isLoading: isSessionLoading } = useSession();
+  const { signedIn: userSignedIn, user, isLoading: isSessionLoading, forceScheduleRevalidation } = useSession();
   const [signedIn, setSignedIn] = useState<boolean>(Boolean(localStorage.getItem("signedIn") ?? false));
   useEffect(() => {
     setSignedIn(userSignedIn);
@@ -53,7 +53,7 @@ const CombinedProvider = ({ children }: Props) => {
   }
 
   return (
-    <SessionContext.Provider value={{ signedIn, setSignedIn, user, isSessionLoading }}>
+    <SessionContext.Provider value={{ signedIn, setSignedIn, user, isSessionLoading, forceScheduleRevalidation }}>
       <ThemeContext.Provider value={{ enabled, setEnabled }}>
         <MajorContext.Provider value={{ majors, setMajors }}>
           <CourseContext.Provider value={

diff --git a/src/contexts/SessionContext.tsx b/src/contexts/SessionContext.tsx
@@ -5,13 +5,15 @@ interface SessionContextContent {
   user: any
   isSessionLoading: boolean
   setSignedIn: Dispatch<SetStateAction<boolean>>
+  forceScheduleRevalidation: () => void
 }
 
 const SessionContext: Context<SessionContextContent> = createContext({
   signedIn: false,
   user: null,
   isSessionLoading: false,
-  setSignedIn: () => { }
+  setSignedIn: () => { },
+  forceScheduleRevalidation: () => { }
 });
 
 export default SessionContext
diff --git a/src/hooks/useSession.tsx b/src/hooks/useSession.tsx
@@ -15,7 +15,7 @@ const useSession = () => {
     }
   }
 
-  const { data, isLoading } = useSwr("auth/info/", trySession, {
+  const { data, isLoading, mutate } = useSwr("auth/info/", trySession, {
     focusThrottleInterval: 1800000
   });
 
@@ -26,6 +26,7 @@ const useSession = () => {
   return {
     signedIn: data ? data.signed : false,
     user: data ? data : null,
+    forceScheduleRevalidation: mutate,
     isLoading
   }
 }

diff --git a/src/hooks/useStudentCourseUnits.tsx b/src/hooks/useStudentCourseUnits.tsx
@@ -29,6 +29,6 @@ export default () => {
     error,
     loading: !data,
     isValidating,
-    mutate,
+    forceCourseUnitsRevalidation: mutate,
   };
 };
diff --git a/src/pages/Exchange.tsx b/src/pages/Exchange.tsx
@@ -43,8 +43,16 @@ const ExchangePage = () => {
   const { schedule, loading: loadingSchedule , sigarraSynced} = useSchedule();
   const [originalExchangeSchedule, setOriginalExchangeSchedule] = useState<Array<ClassDescriptor>>([]);
   const [exchangeSchedule, setExchangeSchedule] = useState<Array<ClassDescriptor>>([]);
-  const { signedIn, user } = useContext(SessionContext);
-  const { enrolledCourseUnits } = useStudentCourseUnits();
+  const { signedIn, user, forceScheduleRevalidation, isSessionLoading } = useContext(SessionContext);
+  const { enrolledCourseUnits, forceCourseUnitsRevalidation } = useStudentCourseUnits();
+
+  useEffect(() => {
+    forceScheduleRevalidation();
+  }, [schedule])
+
+  useEffect(() => {
+    if(user?.eligible_exchange) forceCourseUnitsRevalidation();
+  }, [user])
 
   useEffect(() => {
     if (creatingRequest) setSidebarStatus(ExchangeSidebarStatus.CREATING_REQUEST)
@@ -112,7 +120,7 @@ const ExchangePage = () => {
               <TabsTrigger value="enrollments">Inscrições</TabsTrigger>
             </TabsList>
             <TabsContent value="requests">
-              {user?.eligible_exchange 
+              {!isSessionLoading && user?.eligible_exchange
                 ? <ExchangeSidebarStatusView
                   sidebarStatus={sidebarStatus}
                   setExchangeSidebarStatus={setSidebarStatus}

diff --git a/src/utils/mail.ts b/src/utils/mail.ts
@@ -2,19 +2,29 @@ export const mailtoStringBuilder = (nmec: string | Array<string>) => {
     if (Array.isArray(nmec)) {
         let mailto = "mailto:"
         nmec.forEach(nmec => {
-            mailto += `up${nmec}@up.pt,`
+            mailto += `up${nmec}@up.pt;`
         })
 
-        return mailto;
+        return mailto.slice(0, -1);
     }
 
     return `mailto:up${nmec}@up.pt`
 }
 
 export const listEmailExchanges = (items: Array<{
+    participant_nmec: string,
     goes_from: string,
     goes_to: string,
     course_acronym: string
 }>) => {
-    return items.map(item => `De ${item.goes_from} para ${item.goes_to} no curso ${item.course_acronym}.`).join("%0D%0A")
+    return items.map(item => `${item.participant_nmec} pediu para trocar de ${item.goes_from} para ${item.goes_to} no curso ${item.course_acronym}.`).join("%0D%0A")
+}
+
+export const listEmailEnrollments = (items: Array<{
+    participant_nmec: string,
+    goes_to: string,
+    course: number,
+    course_unit_id: number
+}>) => {
+    return items.map(item => `${item.participant_nmec} pediu para ir para ${item.goes_to} (${item.course_unit_id}) no curso ${item.course}.`).join("%0D%0A")
 }