Skip to content

Commit

Permalink
feat(canvas): 🚸 sort fetched assignments by due date
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesNZL committed Jul 20, 2022
1 parent 6c79e01 commit 426675e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/popup/fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ function roundToNextHour(date: Date): Date {

const emojiedCourseCode = `${(courseIcon) ? `${courseIcon} ` : ''}${courseCode}`;

// TODO: sort by due date
const timeNow = new Date();

const canvasAssignments = assignmentGroups.flatMap(group => group.assignments)
.filter(assignment => options.canvas.importMissingDueDates || assignment.due_at)
.sort(({ due_at: a }, { due_at: b }) => {
return Date.parse(a ?? timeNow) - Date.parse(b ?? timeNow);
})
.map(assignment => ({
name: assignment.name,
description: assignment.description,
Expand All @@ -64,7 +68,7 @@ function roundToNextHour(date: Date): Date {
course: courseCode,
icon: courseIcon,
url: assignment.html_url,
available: assignment.unlock_at ?? roundToNextHour(new Date()).toISOString(),
available: assignment.unlock_at ?? roundToNextHour(timeNow).toISOString(),
due: assignment.due_at,
}));

Expand Down

0 comments on commit 426675e

Please sign in to comment.