patrick/Homeautomation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Schedule-list does not really show NEXT execution but any other

Browse Source
This commit is contained in:
Patrick Haßel 2022-10-25 15:47:44 +02:00
parent 9bc0111c01
commit 113614f1e7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/angular/src/app/api/schedule/Schedule.ts
View File

@ -11,7 +11,7 @@ export class Schedule {
readonly title: string, readonly title: string,
readonly entries: ScheduleEntry[], 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 { static fromJson(json: any): Schedule {

6
src/main/angular/src/app/pages/schedule/list/schedule-list.component.html
View File

@ -18,9 +18,9 @@
{{schedule.title}} {{schedule.title}}
</td> </td>
<td class="number first" [class.empty]="!schedule.next?.nextClearTimestamp">{{schedule.next?.nextClearTimestamp.dayName}}</td> <td class="number first" [class.empty]="!schedule.next?.nextFuzzyTimestamp">{{schedule.next?.nextFuzzyTimestamp.dayName}}</td>
<td class="number middle" [class.empty]="!schedule.next?.nextClearTimestamp">:&nbsp;</td> <td class="number middle" [class.empty]="!schedule.next?.nextFuzzyTimestamp">:&nbsp;</td>
<td class="number last" [class.empty]="!schedule.next?.nextClearTimestamp">{{schedule.next?.nextClearTimestamp.timeString}}</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 first" [class.empty]="!schedule.next?.property">{{schedule.next?.property?.title}}</td>
<td class="number middle" [class.empty]="!schedule.next?.property">&nbsp;=&nbsp;</td> <td class="number middle" [class.empty]="!schedule.next?.property">&nbsp;=&nbsp;</td>