From f0f82e9f9916219c8cd1e4de4eb73ed83798f687 Mon Sep 17 00:00:00 2001 From: arttu Date: Wed, 3 Jan 2024 17:55:35 +0200 Subject: [PATCH] [Completed courses] Hover shows exact course code --- .../CompletedCoursesSearchResults.jsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearchResults.jsx b/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearchResults.jsx index 5f1340cf2b..fe2f7be99f 100644 --- a/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearchResults.jsx +++ b/services/frontend/src/components/CompletedCoursesSearch/CompletedCoursesSearchResults.jsx @@ -56,14 +56,18 @@ const getColumns = (courses, showStudentNames, getTextIn) => { ] const getCellProps = (student, courseCode) => { - const creditDate = student.credits.find(credit => credit.courseCode === courseCode)?.date - const enrollmentDate = student.enrollments[courseCode]?.date - if (!creditDate && !enrollmentDate) { + const credit = student.credits.find(credit => credit.courseCode === courseCode) + const enrollment = student.enrollments[courseCode] + if (!credit && !enrollment) { return { style } } - const title = creditDate - ? `Passed on ${moment(creditDate).format('YYYY-MM-DD')} ` - : `Last enrollment on ${moment(enrollmentDate).format('YYYY-MM-DD')} ` + const title = credit + ? `Passed on ${moment(credit.date).format('YYYY-MM-DD')}\nCourse code: ${ + credit.substitution ? credit.substitution : credit.courseCode + }` + : `Last enrollment on ${moment(enrollment.date).format('YYYY-MM-DD')}\nCourse code ${ + enrollment.substitution ? enrollment.substitution : enrollment.courseCode + }` return { style, title } }