From 113614f1e7d22f63fc2d455ee7a02ef4ea14616a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Tue, 25 Oct 2022 15:47:44 +0200
Subject: [PATCH] FIX: Schedule-list does not really show NEXT execution but
 any other

---
 src/main/angular/src/app/api/schedule/Schedule.ts           | 2 +-
 .../app/pages/schedule/list/schedule-list.component.html    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/angular/src/app/api/schedule/Schedule.ts b/src/main/angular/src/app/api/schedule/Schedule.ts
index 83b7bcb..f4e94d9 100644
--- a/src/main/angular/src/app/api/schedule/Schedule.ts
+++ b/src/main/angular/src/app/api/schedule/Schedule.ts
@@ -11,7 +11,7 @@ export class Schedule {
     readonly title: string,
     readonly entries: ScheduleEntry[],
   ) {
-    this.next = entries.filter(e => e.nextFuzzyTimestamp)[0];
+    this.next = entries.filter(e => e.nextFuzzyTimestamp).sort((a, b) => a.nextFuzzyTimestamp.date.getTime() - b.nextFuzzyTimestamp.date.getTime())[0];
   }
 
   static fromJson(json: any): Schedule {
diff --git a/src/main/angular/src/app/pages/schedule/list/schedule-list.component.html b/src/main/angular/src/app/pages/schedule/list/schedule-list.component.html
index 100737a..7f10ec9 100644
--- a/src/main/angular/src/app/pages/schedule/list/schedule-list.component.html
+++ b/src/main/angular/src/app/pages/schedule/list/schedule-list.component.html
@@ -18,9 +18,9 @@
       {{schedule.title}}
     </td>
 
-    <td class="number first" [class.empty]="!schedule.next?.nextClearTimestamp">{{schedule.next?.nextClearTimestamp.dayName}}</td>
-    <td class="number middle" [class.empty]="!schedule.next?.nextClearTimestamp">:&nbsp;</td>
-    <td class="number last" [class.empty]="!schedule.next?.nextClearTimestamp">{{schedule.next?.nextClearTimestamp.timeString}}</td>
+    <td class="number first" [class.empty]="!schedule.next?.nextFuzzyTimestamp">{{schedule.next?.nextFuzzyTimestamp.dayName}}</td>
+    <td class="number middle" [class.empty]="!schedule.next?.nextFuzzyTimestamp">:&nbsp;</td>
+    <td class="number last" [class.empty]="!schedule.next?.nextFuzzyTimestamp">{{schedule.next?.nextFuzzyTimestamp.timeString}}</td>
 
     <td class="number first" [class.empty]="!schedule.next?.property">{{schedule.next?.property?.title}}</td>
     <td class="number middle" [class.empty]="!schedule.next?.property">&nbsp;=&nbsp;</td>