From e17d45aa52a4bee539b7b3b27b451a38339255b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Mon, 26 Jun 2023 23:33:27 +0200
Subject: [PATCH] UI NPE lastFuzzyTimestamp

---
 .../angular/src/app/api/schedule/Schedule.ts   |  2 +-
 src/main/angular/src/app/app.component.html    | 18 ++++++++++--------
 .../pages/bulk/list/bulk-list.component.html   |  1 +
 .../angular/src/environments/environment.ts    |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/angular/src/app/api/schedule/Schedule.ts b/src/main/angular/src/app/api/schedule/Schedule.ts
index b8f9326..108441d 100644
--- a/src/main/angular/src/app/api/schedule/Schedule.ts
+++ b/src/main/angular/src/app/api/schedule/Schedule.ts
@@ -16,7 +16,7 @@ export class Schedule {
     readonly astros: Astro[],
   ) {
     this.next = entries.filter(e => e.nextFuzzyTimestamp).sort((a, b) => a.nextFuzzyTimestamp.date.getTime() - b.nextFuzzyTimestamp.date.getTime())[0];
-    this.last = entries.filter(e => e.lastFuzzyTimestamp).sort((a, b) => b.nextFuzzyTimestamp.date.getTime() - a.nextFuzzyTimestamp.date.getTime())[0];
+    this.last = entries.filter(e => e.lastFuzzyTimestamp).sort((a, b) => b.lastFuzzyTimestamp.date.getTime() - a.lastFuzzyTimestamp.date.getTime())[0];
   }
 
   static fromJson(json: any): Schedule {
diff --git a/src/main/angular/src/app/app.component.html b/src/main/angular/src/app/app.component.html
index e532e72..6c27e95 100644
--- a/src/main/angular/src/app/app.component.html
+++ b/src/main/angular/src/app/app.component.html
@@ -1,21 +1,23 @@
 <div class="menubar">
 
-  <div class="item" routerLink="/ScheduleList" routerLinkActive="itemActive">
-    Zeitpläne
-  </div>
-
   <div class="item" [routerLink]="['/DeviceList', {'type': 'DeviceSwitch'}]" [class.itemActive]="isRouteActive('/DeviceList', 'DeviceSwitch')">
     Geräte
   </div>
+
   <div class="item" [routerLink]="['/DeviceList', {'type': 'DeviceShutter'}]" [class.itemActive]="isRouteActive('/DeviceList', 'DeviceShutter')">
     Rollläden
   </div>
-  <div class="item" [routerLink]="['/DeviceList', {'type': 'DeviceStateScene'}]" [class.itemActive]="isRouteActive('/DeviceList', 'DeviceStateScene')">
-    Gruppen
-  </div>
+
+  <!--  <div class="item" [routerLink]="['/DeviceList', {'type': 'DeviceStateScene'}]" [class.itemActive]="isRouteActive('/DeviceList', 'DeviceStateScene')">-->
+  <!--    Gruppen-->
+  <!--  </div>-->
 
   <div class="item" routerLink="/BulkList" routerLinkActive="itemActive">
-    Massenausführungen
+    Stapel
+  </div>
+
+  <div class="item" routerLink="/ScheduleList" routerLinkActive="itemActive">
+    Zeitpläne
   </div>
 
   <div class="item itemSecondary" routerLink="/PropertyList" routerLinkActive="itemActive">
diff --git a/src/main/angular/src/app/pages/bulk/list/bulk-list.component.html b/src/main/angular/src/app/pages/bulk/list/bulk-list.component.html
index cb4c463..68d9cbe 100644
--- a/src/main/angular/src/app/pages/bulk/list/bulk-list.component.html
+++ b/src/main/angular/src/app/pages/bulk/list/bulk-list.component.html
@@ -3,6 +3,7 @@
     <th>&nbsp;</th>
     <th>Bezeichnung</th>
     <th>&nbsp;</th>
+    <th>&nbsp;</th>
   </tr>
   <tr *ngFor="let bulk of bulks.sort(Bulk.compareName); trackBy: Bulk.trackBy">
 
diff --git a/src/main/angular/src/environments/environment.ts b/src/main/angular/src/environments/environment.ts
index eb18ddd..5e41d22 100644
--- a/src/main/angular/src/environments/environment.ts
+++ b/src/main/angular/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 import {getBaseUrl} from "./UrlHelper";
 
-const PROD: boolean = false;
+const PROD: boolean = true;
 
 export const environment = {
   production: false,