Sort lesson absences by time on preceding absences modal (#309)

bkd-mba-fbi · Jun 11, 2021 · fd99109 · fd99109
1 parent 4449b7a
commit fd99109
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/src/app/presence-control/utils/lessons.ts b/src/app/presence-control/utils/lessons.ts
@@ -79,7 +79,7 @@ function getPrecedingAbsences(
         absence.LessonRef.From < lesson?.LessonDateTimeFrom
     ),
     'Id'
-  ).sort();
+  ).sort(lessonAbsenceTimeComparator);
 }
 
 export function getPresenceControlEntriesForLesson(
@@ -143,3 +143,24 @@ function lessonPresencesComparator(
 ): number {
   return a.StudentFullName.localeCompare(b.StudentFullName);
 }
+
+/**
+ * Sorts by LessonRef.From and LessonRef.To, if present.
+ */
+function lessonAbsenceTimeComparator(
+  a: LessonAbsence,
+  b: LessonAbsence
+): number {
+  if (
+    a.LessonRef.From &&
+    a.LessonRef.To &&
+    b.LessonRef.From &&
+    b.LessonRef.To
+  ) {
+    if (a.LessonRef.From.getTime() - b.LessonRef.From.getTime() === 0) {
+      return a.LessonRef.To.getTime() - b.LessonRef.To.getTime();
+    }
+    return a.LessonRef.From.getTime() - b.LessonRef.From.getTime();
+  }
+  return 0;
+}