Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ui): multiple instructors are formatted properly, displays last name only, and are capitalized in all course blocks (#342) #403

Merged
merged 10 commits into from
Oct 29, 2024
Merged

fix(ui): multiple instructors are formatted properly, displays last name only, and are capitalized in all course blocks (#342) #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85d1c63
fix(ui): updated multiple instructor name formatting in course blocks
adityamkk Oct 29, 2024
85bce9d
fix(ui): display instructor last names only in all course blocks
adityamkk Oct 29, 2024
03b2be9
refactor: use instructor toString when getting instructor full name
adityamkk Oct 29, 2024
fe95bf5
refactor: toString in useFlattenedCourseSchedule without template lit…
adityamkk Oct 29, 2024
12eec5b
refactor: delete type hint and unnecessary comments
adityamkk Oct 29, 2024
972429f
Merge branch 'fix/multiple-instructor-name-view' of https://github.co…
adityamkk Oct 29, 2024
819c349
fix(ui): instructor names semicolon delimiter in calendar course block
adityamkk Oct 29, 2024
f80332c
fix(ui): removed 'unknown' when there are no instructors
adityamkk Oct 29, 2024
6cc6f1b
fix(ui): change - to &ndash
adityamkk Oct 29, 2024
632cc86
fix(ui): changed - to ndash in hook
adityamkk Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/views/components/common/PopupCourseBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ export default function PopupCourseBlock({
<DragIndicatorIcon className='h-6 w-6 text-white' />
</div>
<Text className={clsx('flex-1 py-3.5 truncate', fontColor)} variant='h1-course'>
<span className='px-0.5 font-450'>{formattedUniqueId}</span> {course.department} {course.number} &ndash;{' '}
{course.instructors.length === 0 ? 'Unknown' : course.instructors.map(v => v.lastName)}
<span className='px-0.5 font-450'>{formattedUniqueId}</span> {course.department} {course.number}
{course.instructors.length > 0 ? <> &ndash; </> : ''}
{course.instructors.map(v => v.toString({ format: 'last', case: 'capitalize' })).join('; ')}
</Text>
{enableCourseStatusChips && course.status !== Status.OPEN && (
<div
Expand Down
7 changes: 2 additions & 5 deletions src/views/components/injected/CourseCatalogInjectedPopup/HeadingAndActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,8 @@ export default function HeadingAndActions({ course, activeSchedule, onClose }: H
const formattedUniqueId = uniqueId.toString().padStart(5, '0');
const isInCalendar = useCalendar();

const getInstructorFullName = (instructor: Instructor) => {
const { firstName = '', lastName = '' } = instructor;
if (firstName === '') return capitalizeString(lastName);
return `${capitalizeString(firstName)} ${capitalizeString(lastName)}`;
};
const getInstructorFullName = (instructor: Instructor) =>
instructor.toString({ format: 'first_last', case: 'capitalize' });
adityamkk marked this conversation as resolved.
Show resolved Hide resolved

const getBuildingUrl = (building: string) =>
`https://utdirect.utexas.edu/apps/campus/buildings/nlogon/maps/UTM/${building}`;
Expand Down
8 changes: 5 additions & 3 deletions src/views/hooks/useFlattenedCourseSchedule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,11 @@ function extractCourseInfo(course: Course) {

let courseDeptAndInstr = `${course.department} ${course.number}`;

const mainInstructor = course.instructors[0];
if (mainInstructor) {
courseDeptAndInstr += ` – ${mainInstructor.toString({ format: 'first_last', case: 'capitalize' })}`;
if (course.instructors.length > 0) {
courseDeptAndInstr += ' \u2013 ';
courseDeptAndInstr += course.instructors
.map(instructor => instructor.toString({ format: 'last', case: 'capitalize' }))
.join('; ');
}

return { status, courseDeptAndInstr, meetings, course };
Expand Down
Loading