fix: 🐛 Felaktig sortering av lektioner (kolplattformen#595)

* fix: 🐛 incorrect sorting of lessons in timetable ✅ Closes: kolplattformen#591 * fix: 🐛 end time when overlapping lessons * style: 💄 lint
imzeeshan · Dec 10, 2021 · ed3a27b · ed3a27b
1 parent 69e21ac
commit ed3a27b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/apps/skolplattformen-app/components/daySummary.component.tsx b/apps/skolplattformen-app/components/daySummary.component.tsx
@@ -32,7 +32,7 @@ export const DaySummary = ({
 
   const lessons = weekLessons
     .filter((lesson) => lesson.dayOfWeek === currentDate.isoWeekday())
-    .sort((a, b) => a.dateStart.localeCompare(b.dateStart))
+    .sort((a, b) => a.timeStart.localeCompare(b.timeStart))
 
   if (lessons.length <= 0) {
     return null
@@ -62,7 +62,9 @@ export const DaySummary = ({
               {translate('schedule.end')}
             </Text>
             <Text category="h5">
-              {lessons[lessons.length - 1].timeEnd.slice(0, 5)}
+              {lessons
+                .sort((a, b) => a.timeEnd.localeCompare(b.timeEnd))
+                [lessons.length - 1].timeEnd.slice(0, 5)}
             </Text>
           </View>
         </View>

diff --git a/apps/skolplattformen-app/components/week.component.tsx b/apps/skolplattformen-app/components/week.component.tsx
@@ -169,7 +169,7 @@ export const Week = ({ child }: WeekProps) => {
               lunch={menu[index] || {}}
               lessons={lessons
                 .filter((lesson) => days[lesson.dayOfWeek - 1] === weekDay)
-                .sort((a, b) => a.dateStart.localeCompare(b.dateStart))}
+                .sort((a, b) => a.timeStart.localeCompare(b.timeStart))}
             />
           ))}
         </ViewPager>