From a69a54265c9419f3f5f5bc58be1a7df71d068225 Mon Sep 17 00:00:00 2001 From: Jonas Date: Tue, 27 Jan 2026 06:30:18 +0100 Subject: [PATCH 1/2] Fix link to firedepartment in unit --- src/main/resources/templates/admin/unit-list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/admin/unit-list.html b/src/main/resources/templates/admin/unit-list.html index 01253a2..baffe67 100644 --- a/src/main/resources/templates/admin/unit-list.html +++ b/src/main/resources/templates/admin/unit-list.html @@ -45,11 +45,11 @@

Einheiten

- + - +

From e0a43a6e44696fa71a8cd343f54332ce9b70931e Mon Sep 17 00:00:00 2001 From: JPromi Date: Thu, 29 Jan 2026 11:26:25 +0100 Subject: [PATCH 2/2] Bring back LA unit status --- .../mapper/OperationResponseMapper.java | 18 ++++++++---------- .../model/OperationResponse.java | 5 +++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java b/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java index 64de41b..307d0a5 100644 --- a/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java +++ b/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java @@ -64,11 +64,10 @@ public OperationResponse fromOperation(Operation operation) { .isVolunteer(fd.getFiredepartment().getIsVolunteer()) .build() : null ) - // TMP fix to hide times for LA_WASTL_PUB operations (Legal reasons) - .alarmTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getAlarmTime()) - .dispoTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getDispoTime()) - .inTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getInTime()) - .outTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getOutTime()) + .alarmTime(fd.getAlarmTime()) + .dispoTime(fd.getDispoTime()) + .inTime(fd.getInTime()) + .outTime(fd.getOutTime()) .build() ); }); @@ -88,11 +87,10 @@ public OperationResponse fromOperation(Operation operation) { .name(unit.getUnit().getFriendlyName()) .build() : null ) - // TMP fix to hide times for LA_WASTL_PUB operations (Legal reasons) - .alarmTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getAlarmTime()) - .dispoTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getDispoTime()) - .outTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getOutTime()) - .inTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getInTime()) + .alarmTime(unit.getAlarmTime()) + .dispoTime(unit.getDispoTime()) + .outTime(unit.getOutTime()) + .inTime(unit.getInTime()) .build() ); }); diff --git a/src/main/java/com/jpromi/operation_point/model/OperationResponse.java b/src/main/java/com/jpromi/operation_point/model/OperationResponse.java index 8371341..f1e0abb 100644 --- a/src/main/java/com/jpromi/operation_point/model/OperationResponse.java +++ b/src/main/java/com/jpromi/operation_point/model/OperationResponse.java @@ -1,6 +1,8 @@ package com.jpromi.operation_point.model; import com.jpromi.operation_point.enums.ServiceOriginEnum; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.xml.bind.annotation.XmlRootElement; import lombok.*; @@ -16,6 +18,9 @@ @NoArgsConstructor @AllArgsConstructor @XmlRootElement +@Schema( + description = "Für Niederösterreich werden die Zeiten der Einheiten und Feuerwehren auf die erste stelle der Minute gerundet von der Schnittstelle mitgegeben, diese Daten IMMER wieflogt anziegen: HH:Mx:xx (z.B. 14:23:00 -> 14:2x:xx) (Oder ein ähnliches Format). Für alle anderen Bundesländer werden die Zeiten exakt übergeben." +) public class OperationResponse { private UUID uuid; @Builder.Default