Skip to content

Activete Status from Lower Austria again #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JPromi merged 3 commits into from
Jan 29, 2026
Merged

Activete Status from Lower Austria again #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a69a542
Fix link to firedepartment in unit
JPromi Jan 27, 2026
e0a43a6
Bring back LA unit status
JPromi Jan 29, 2026
80983c9
Merge remote-tracking branch 'origin/dev/jpromi' into dev/jpromi
JPromi Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
});
Expand All @@ -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()
);
});
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/jpromi/operation_point/model/OperationResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/admin/unit-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ <h1>Einheiten</h1>
<p th:if="${!page.hasPrevious()}">
<span class="arrow left"></span>
</p>
<a th:if="${page.hasPrevious()}" th:href="@{/admin/dashboard/firedepartment(q=${q}, page=${page.number - 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
<a th:if="${page.hasPrevious()}" th:href="@{/admin/dashboard/unit(q=${q}, page=${page.number - 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
<span class="arrow left"></span>
</a>

<a th:if="${page.hasNext()}" th:href="@{/admin/dashboard/firedepartment(q=${q}, page=${page.number + 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
<a th:if="${page.hasNext()}" th:href="@{/admin/dashboard/unit(q=${q}, page=${page.number + 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
<span class="arrow right"></span>
</a>
<p th:if="${!page.hasNext()}">
Expand Down
Loading