try get student name even better

This commit is contained in:
Primakov Alexandr Alexandrovich committed 2024-12-12 12:09:25 +03:00
1 parent 0aebb87210
commit d44a511a3d
3 files changed
+1908 -597

No files matched your search

+6 -4
View File
@@ -24,12 +24,14 @@ export const Attendance = () => {
attendance.forEach((lesson) => {
lesson.students.forEach((student) => {
const current = studentsMap.get(student.sub) || {}
studentsMap.set(student.sub, {
...student,
value:
student.family_name && student.given_name
id: student.sub,
value: current || (student.family_name && student.given_name
? `${student.family_name} ${student.given_name}`
: student.name || student.email || student.preferred_username || student.family_name || student.given_name,
: student.name || student.email || student.preferred_username || student.family_name || student.given_name),
})
})
})
@@ -60,7 +62,7 @@ export const Attendance = () => {
<th>Дата</th>
<th>Название занятия</th>
{data.students.map((student) => (
<th key={student.sub}>{student.name}</th>
<th id={student.id || student.sub} key={student.sub}>{student.name || student.value}</th>
))}
</tr>
</thead>
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff