Merge pull request #277 from SELab-2/no_group_names

bij projecten zonder groepen worden nu student namen getoond
SELab-2 · May 19, 2024 · 5471223 · 5471223
2 parents 7fd0dc0 + 881b2f1
commit 5471223
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx b/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
@@ -62,6 +62,7 @@ export function AssignmentPage() {
     const [assignment, setAssignment] = useState<Project>()
     const [submissions, setSubmissions] = useState<Submission[]>([])
     const [groups, setGroups] = useState<Group[]>([])
+    const [singleStudents, setSingleStudents] = useState<User[]>([])
     const [submissionFile, setSubmissionFile] = useState<File>()
     const [submit, setSubmit] = useState(false)
     const [students, setStudents] = useState<User[]>([])
@@ -131,6 +132,18 @@ export function AssignmentPage() {
                             `/groepen/?project=${assignmentId}`
                         )
                         setGroups(groupsResponse.data)
+                        if(newAssignment.max_groep_grootte == 1) {
+                            const temp_students = []
+                            for (const g of groupsResponse.data) {
+                                try {
+                                    const userResponse = await instance.get(`/gebruikers/${g.studenten[0]}/`)
+                                    temp_students.push(userResponse.data)
+                                } catch (error) {
+                                    console.error('Error fetching student data:', error)
+                                }
+                            }
+                            setSingleStudents(temp_students)
+                        }
                     } else {
                         const groupResponse = await instance.get<[Group]>(
                             `/groepen/?student=${user.user}&project=${assignmentId}`
@@ -495,7 +508,7 @@ export function AssignmentPage() {
                                         pr={3}
                                     >
                                         <Typography sx={{ fontWeight: 'bold' }}>
-                                            {t('group')}
+                                            Student
                                         </Typography>
                                         <Typography sx={{ fontWeight: 'bold' }}>
                                             {t('time')}
@@ -550,7 +563,9 @@ export function AssignmentPage() {
                                                                     assignment
                                                                         ? assignment.max_groep_grootte > 1
                                                                             ? t('group') + ' ' + (index + 1).toString()
-                                                                            : t('group') + ' ' + (index + 1).toString() //TODO Dit vervangen door de naam van de student
+                                                                            : singleStudents[index]
+                                                                                ? singleStudents[index].first_name + ' ' + singleStudents[index].last_name
+                                                                                : ''
                                                                         : ''
                                                                 }
                                                                 group_id={group.groep_id.toString()}