Add fetch to upcoming assignments for professor

src/screens/professor/Classroom/AnnouncementsTab/index.js

@@ -1,8 +1,10 @@
+import { useState } from 'react';
 import {
   Button,
   Card,
   Container,
   Grid,
+  Link,
   Skeleton,
   Stack,
   Typography,
@@ -13,7 +15,6 @@ import styles from './styles';
 import jitsiLogo from '../../../../assets/jitsi.svg';
 import { createArrayFrom1ToN } from '../../../../utils/createArrayFrom1ToN';
 import PublishAnnouncementCard from '../../../../components/PublishAnnouncementCard';
-import { useState } from 'react';
 
 function AnnouncementsTab({
   layoutType,
@@ -90,6 +91,21 @@ function AnnouncementsTab({
                   >
                     <Stack justifyContent="flex-start" spacing={1}>
                       <h3 style={{ fontWeight: 500 }}>Próximas Atividades</h3>
+                      {announcementsTabData.upcomingAssignments.length !== 0 ? (
+                        announcementsTabData.upcomingAssignments.map(ua => (
+                          <Link
+                            href={`/assignment/${ua.id}`}
+                            sx={{ fontSize: '15px' }}
+                            key={ua.id}
+                          >
+                            {ua.title}
+                          </Link>
+                        ))
+                      ) : (
+                        <Container disableGutters>
+                          <p>Nenhuma atividade encontrada!</p>
+                        </Container>
+                      )}
                     </Stack>
                   </Card>
                   <Card
@@ -222,6 +238,22 @@ function AnnouncementsTab({
                 >
                   <Stack justifyContent="flex-start" spacing={1}>
                     <h3 style={{ fontWeight: 500 }}>Próximas Atividades</h3>
+
+                    {announcementsTabData.upcomingAssignments.length !== 0 ? (
+                      announcementsTabData.upcomingAssignments.map(ua => (
+                        <Link
+                          href={`/assignment/${ua.id}`}
+                          sx={{ fontSize: '15px' }}
+                          key={ua.id}
+                        >
+                          {ua.title}
+                        </Link>
+                      ))
+                    ) : (
+                      <Container disableGutters>
+                        <p>Nenhuma atividade encontrada!</p>
+                      </Container>
+                    )}
                   </Stack>
                 </Card>
                 <Card

src/screens/professor/Classroom/index.js

@@ -22,10 +22,14 @@ function Classroom() {
       params.id
     );
 
+    const upcomingAssignments =
+      await userService.fetchUpcomingAssignmentsByClassId(params.id);
+
     setTabData({
       tab: 'announcements',
       state: 'idle',
       announcements: [...announcements.data],
+      upcomingAssignments: [...upcomingAssignments.data],
     });
   }, [userService, params.id]);
 

src/services/professor.js

@@ -21,4 +21,7 @@ export default class ProfessorService {
   fetchPeopleByClassId = classId => ProfessorApi.getPeopleByClassId(classId);
 
   fetchGradesByClassId = classId => ProfessorApi.getGradesByClassId(classId);
+
+  fetchUpcomingAssignmentsByClassId = classId =>
+    ProfessorApi.getUpcomingAssignmentsByClassId(classId);
 }

src/utils/mocks/api.js

@@ -72,6 +72,16 @@ const CommonApi = {
         data: allPeople.filter(p => p.classes[0].id === classId),
       };
     }),
+
+  getUpcomingAssignmentsByClassId: classId =>
+    sleep(300).then(() => {
+      console.log('Getting upcoming assignments by class id ' + classId);
+      return {
+        data: allUpcomingAssignments.filter(
+          a => a.classrooms.filter(c => c.id === classId)[0]
+        ),
+      };
+    }),
 };
 
 const StudentApi = {
@@ -84,16 +94,6 @@ const StudentApi = {
       };
     }),
 
-  getUpcomingAssignmentsByClassId: classId =>
-    sleep(300).then(() => {
-      console.log('Getting upcoming assignments by class id ' + classId);
-      return {
-        data: allUpcomingAssignments.filter(
-          a => a.classrooms.filter(c => c.id === classId)[0]
-        ),
-      };
-    }),
-
   getAllAssignments: userId =>
     sleep(400).then(() => {
       console.log('Getting all assignments ' + userId);