Skip to content

Fix post-event schedule appearing as empty #2380

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

Open
rixx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix post-event schedule appearing as empty #2380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions js/schedule/ScheduleData.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,26 @@ class ScheduleData {
this.ageRanges = [];
this.ageRangesSeen = new Set();

this.allFinished = true;
let scheduleItems = this.rawSchedule.map((row) =>
this.parseScheduleItem(row),
);

let count = 0;
this.rawSchedule.forEach((row) => {
let sid = this.parseScheduleItem(row);
// Once the event is over, we include finished talks by default,
// to avoid showing an entirely empty schedule
this.allFinished = scheduleItems.every((sid) =>
sid.occurrences.every((od) => od.endTime < options.currentTime),
);
let includeFinished = options.includeFinished || this.allFinished;

let count = 0;
scheduleItems.forEach((sid) => {
this.addEventType(sid.type, sid.humanReadableType);
this.addAgeRange(sid.age_range);

for (const od of sid.occurrences) {
// Apply filtering

if (od.endTime >= options.currentTime) {
this.allFinished = false;
} else if (!options.includeFinished) {
if (od.endTime < options.currentTime && !includeFinished) {
continue;
}

Expand Down Expand Up @@ -72,7 +77,7 @@ class ScheduleData {
// We can now add this occurrence to our schedule

let startHour = od.startTime.startOf("hour");
if (od.startTime <= options.currentTime && !options.includeFinished) {
if (od.startTime <= options.currentTime && !includeFinished) {
/* Put ongoing events under the current time slot to avoid
* having to make one up or include multiple earlier ones */
startHour = options.currentTime.startOf("hour");
Expand Down
Loading