Add logic for displaying Y session courses in the course modal #1740
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -133,8 +133,12 @@ class CourseModal extends React.Component { | |
| } | ||
| } | ||
|
|
||
| /** | ||
| * Generate the data needed for the course modal table based on the meeting times corresponding | ||
| * to a course in a given session. | ||
| * @param allMeetingTimes An array of MeetTime' objects corresponding to a particular course. | ||
| * @param session The session (F, S, Y) to query. | ||
| * @returns A map containing the table data that will appear in the course modal. | ||
| */ | ||
| getTable(allMeetingTimes, session) { | ||
| const sessions = allMeetingTimes.filter(lec => lec.meetData.session === session) | ||
|
|
@@ -144,6 +148,7 @@ class CourseModal extends React.Component { | |
|
|
||
| return sortedSessions.map(lecture => { | ||
| const occurrences = { times: [], locations: [] } | ||
| const yearOccurrences = {fallTimes: [], fallLocations: [], winterTimes: [], winterLocations: []} | ||
| const sortedTimeData = lecture.timeData.sort((occ1, occ2) => | ||
| occ1.weekDay > occ2.weekDay ? 1 : -1 | ||
| ) | ||
|
|
@@ -152,14 +157,42 @@ class CourseModal extends React.Component { | |
| if (occurrence.timeLocation !== null && occurrence.timeLocation !== undefined) { | ||
| location = occurrence.timeLocation.buildingCode | ||
| } | ||
|
|
||
| // Time and location formatting for Y session courses | ||
| if (session === "Y") { | ||
| if (occurrence.timeSession.endsWith("9")) { | ||
| yearOccurrences.fallLocations.push(location) | ||
| yearOccurrences.fallTimes.push( | ||
| DAY_TO_INT[occurrence.weekDay].substring(0, 3) + | ||
| " " + | ||
| occurrence.startHour + | ||
| " - " + | ||
| occurrence.endHour | ||
| ) | ||
| } | ||
| else { | ||
| yearOccurrences.winterLocations.push(location) | ||
| yearOccurrences.winterTimes.push( | ||
| DAY_TO_INT[occurrence.weekDay].substring(0, 3) + | ||
| " " + | ||
| occurrence.startHour + | ||
| " - " + | ||
| occurrence.endHour | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| // Time and location formatting for F/S courses | ||
| else { | ||
| occurrences.locations.push(location) | ||
| occurrences.times.push( | ||
| DAY_TO_INT[occurrence.weekDay] + | ||
| " " + | ||
| occurrence.startHour + | ||
| " - " + | ||
| occurrence.endHour | ||
| ) | ||
| } | ||
| }) | ||
| const rowData = { | ||
| activity: lecture.meetData.section, | ||
|
|
@@ -169,10 +202,14 @@ class CourseModal extends React.Component { | |
| lecture.meetData.enrol + | ||
| " of " + | ||
| lecture.meetData.cap + | ||
| (session === "Y" ? "" : " available"), // Account for shortened column width for Y courses | ||
|
Contributor
There was a problem hiding this comment. Don't shorten this column text. We can play with the width of the modal to make it wider |
||
| waitList: lecture.meetData.wait + " students", | ||
| time: occurrences.times, | ||
| location: occurrences.locations, | ||
| fallTime: yearOccurrences.fallTimes, | ||
| fallLocation: yearOccurrences.fallLocations, | ||
| winterTime: yearOccurrences.winterTimes, | ||
| winterLocation: yearOccurrences.winterLocations | ||
| } | ||
|
|
||
| return rowData | ||
|
|
@@ -269,10 +306,12 @@ class Description extends React.Component { | |
| <AgGridReact | ||
| rowData={this.props.sessions[session]} | ||
| columnDefs={[ | ||
| { field: "activity", width: session === "Y" ? 100 : 130 }, | ||
| { field: "instructor", width: session === "Y" ? 172 : 190 }, | ||
| { field: "availability", width: session === "Y" ? 130 : 180 }, | ||
| { field: "waitList", width: session === "Y" ? 120 : 130 }, | ||
|
|
||
| /* Single-session occurrence columns */ | ||
|
Contributor
There was a problem hiding this comment. Similar to my above comment, use one set of columns ( You can make the column header names conditional on whether a fall/winter or full-year session is being displayed by using the |
||
| { | ||
| field: "time", | ||
| cellStyle: { | ||
|
|
@@ -284,6 +323,7 @@ class Description extends React.Component { | |
| valueFormatter: col => col.data.time.join("\n"), | ||
| width: 180, | ||
| autoHeight: true, | ||
| hide: session === "Y", | ||
| }, | ||
| { | ||
| field: "location", | ||
|
|
@@ -296,6 +336,71 @@ class Description extends React.Component { | |
| valueFormatter: col => col.data.location.join("\n"), | ||
| width: 128, | ||
| autoHeight: true, | ||
| hide: session === "Y" | ||
| }, | ||
|
|
||
| /* Y session occurrence columns */ | ||
| { | ||
| field: "fallTime", | ||
| cellStyle: { | ||
| whiteSpace: "pre", | ||
| lineHeight: "1.8", | ||
| paddingTop: "7px", | ||
| paddingBottom: "6px", | ||
| }, | ||
| valueFormatter: col => col.data.fallTime.join("\n"), | ||
| width: 115, | ||
| autoHeaderHeight: false, | ||
| autoHeight: true, | ||
| wrapHeaderText: true, | ||
| autoHeaderHeight: true, | ||
| hide: session !== "Y", | ||
| }, | ||
| { | ||
| field: "fallLocation", | ||
| cellStyle: { | ||
| whiteSpace: "pre", | ||
| lineHeight: "1.8", | ||
| paddingTop: "7px", | ||
| paddingBottom: "6px", | ||
| }, | ||
| valueFormatter: col => col.data.fallLocation.join("\n"), | ||
| width: 93, | ||
| autoHeaderHeight: false, | ||
| autoHeight: true, | ||
| wrapHeaderText: true, | ||
| autoHeaderHeight: true, | ||
| hide: session !== "Y", | ||
| }, | ||
| { | ||
| field: "winterTime", | ||
| cellStyle: { | ||
| whiteSpace: "pre", | ||
| lineHeight: "1.8", | ||
| paddingTop: "7px", | ||
| paddingBottom: "6px", | ||
| }, | ||
| valueFormatter: col => col.data.winterTime.join("\n"), | ||
| width: 115, | ||
| autoHeight: true, | ||
| wrapHeaderText: true, | ||
| autoHeaderHeight: true, | ||
| hide: session !== "Y", | ||
| }, | ||
| { | ||
| field: "winterLocation", | ||
| cellStyle: { | ||
| whiteSpace: "pre", | ||
| lineHeight: "1.8", | ||
| paddingTop: "7px", | ||
| paddingBottom: "6px", | ||
| }, | ||
| valueFormatter: col => col.data.winterLocation.join("\n"), | ||
| width: 93, | ||
| autoHeight: true, | ||
| wrapHeaderText: true, | ||
| autoHeaderHeight: true, | ||
| hide: session !== "Y", | ||
| }, | ||
| ]} | ||
| domLayout="autoHeight" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't use two different variables (
occurrencesandyearOccurrences). Stick with one object with keystimes1,locations1,times2,locations2. Use justtimes1andlocations1for fall and winter courses, and both locations for year-long courses.This will let you simplify the logic below (
times1/locations1are updated in all cases except whensession === "Y" && occurences.timeSession.endsWith("1")