From a214347757bf8d99bcf1d6a5d01d89d9c0168326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Fri, 29 Oct 2021 11:29:52 +0200 Subject: [PATCH] UI: sorting ScheduleEntry by daySeconds (excluding date) --- .../angular/src/app/api/schedule/entry/ScheduleEntry.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/angular/src/app/api/schedule/entry/ScheduleEntry.ts b/src/main/angular/src/app/api/schedule/entry/ScheduleEntry.ts index 5b1252e..0f2ce33 100644 --- a/src/main/angular/src/app/api/schedule/entry/ScheduleEntry.ts +++ b/src/main/angular/src/app/api/schedule/entry/ScheduleEntry.ts @@ -1,6 +1,10 @@ import {validateBooleanNotNull, validateDateAllowNull, validateNumberNotNull, validateStringNotEmptyNotNull} from "../../validators"; import {Timestamp} from "../../Timestamp"; +function getDaySeconds(date: Date): number { + return date.getHours() * 3600 + date.getMinutes() * 60 + date.getSeconds(); +} + export class ScheduleEntry { private constructor( @@ -61,7 +65,7 @@ export class ScheduleEntry { } else if (b.nextFuzzyTimestamp === null) { return -1; } - return a.nextFuzzyTimestamp.date.getTime() - b.nextFuzzyTimestamp.date.getTime(); + return getDaySeconds(a.nextFuzzyTimestamp.date) - getDaySeconds(b.nextFuzzyTimestamp.date); } }