Merge remote-tracking branch 'origin/master' into publisher-info

Alexander-Klee · Alexander-Klee · commit a3dbd7db3373 · 2025-03-05T14:44:58.000+01:00
# Conflicts:
#	src/main/resources/messages_de.properties
diff --git a/docs/testbericht/chapters/04_bugs.tex b/docs/testbericht/chapters/04_bugs.tex
@@ -107,4 +107,9 @@ \section{Footer überdeckt Sidebar auf kleineren Bildschirmen}
 \reason{Der Footer wurde fix positioniert, was zur Folge hatte, dass seine Höhe nicht berücksichtigt wurde.}
 \solution{Die Sidebar wurde mittels Flexbox so angepasst, dass der Footer keine besondere Positionierung benötigt.}
 
+\section{Fehlerdialoge sind nicht zentriert}
+\symptom{Fehlerdialoge sind nicht zentriert.}
+\reason{Die Positionierung der Fehlerdialoge wurde nicht korrekt festgelegt.}
+\solution{Die Positionierung der Fehlerdialoge wurde korrekt festgelegt.}
+
 \todo{Jeden gefundenen Bug dokumentieren}
diff --git a/src/main/java/edu/kit/hci/soli/config/template/JteContext.java b/src/main/java/edu/kit/hci/soli/config/template/JteContext.java
@@ -27,10 +27,10 @@ public JteContext(MessageSource messageSource, String hostname, Locale locale, T
         this.hostname = hostname;
         this.locale = locale;
         this.symbols = new DateFormatSymbols(locale == null ? Locale.getDefault() : locale);
-        this.dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
+        this.dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
                 .withLocale(locale)
                 .withZone(timeZone.toZoneId());
-        this.timeFormatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.MEDIUM)
+        this.timeFormatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
                 .withLocale(locale)
                 .withZone(timeZone.toZoneId());
         this.timeZone = timeZone;
diff --git a/src/main/java/edu/kit/hci/soli/filter/DisabledUsersFilter.java b/src/main/java/edu/kit/hci/soli/filter/DisabledUsersFilter.java
@@ -32,11 +32,18 @@ protected void doFilterInternal(HttpServletRequest request, @NotNull HttpServlet
             return;
         }
 
+        // Make sure we are not running into a recursion
         if (request.getRequestURI().equals("/disabled")) {
             filterChain.doFilter(request, response);
             return;
         }
 
+        // Add an exception for style related stuff
+        if (request.getRequestURI().equals("/favicon.svg") || request.getRequestURI().equals("/soli.css")) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
         // The principal is preserved throughout the session, but we always need to check latest user status
         User user = userService.findByUserId(request.getUserPrincipal().getName());
 
diff --git a/src/main/jte/bookings/create/conflict.jte b/src/main/jte/bookings/create/conflict.jte
@@ -17,11 +17,12 @@
         <div class="max-w-md">
             <h1 class="text-2xl font-bold mb-2">${context.localize("bookings.conflict.resolution")}</h1>
 
-            <ul class="list bg-base-100 rounded-box shadow-md text-left">
-                <li class="mb-4">${context.localize("bookings.conflict.recommend")}</li>
+            <ul class="list bg-base-100 rounded-box shadow-md text-left p-8 mb-3">
+                <li>${context.localize("bookings.conflict.recommend")}</li>
 
                 @if (!bookingResult.contact().isEmpty())
-                    <h2>${context.localize("bookings.conflict.contact")}</h2>
+                    <h2 class="mt-4">${context.localize("bookings.conflict.contact")}</h2>
+                    <p class="text-gray-500 text-sm">${context.localize("bookings.conflict.contact.message")}</p>
                     @for (Booking booking : bookingResult.contact())
                         <li class="list-row">
                             <div class="text-xs uppercase font-semibold opacity-60 list-col-grow">
@@ -38,7 +39,7 @@
                 @endif
 
                 @if (!bookingResult.override().isEmpty())
-                    <h2>${context.localize("bookings.conflict.delete")}</h2>
+                    <h2 class="mt-4">${context.localize("bookings.conflict.delete")}</h2>
                     <p class="text-gray-500 text-sm">${context.localize("bookings.conflict.delete.message")}</p>
                     @for (Booking booking : bookingResult.override())
                         <li class="list-row">
@@ -56,7 +57,7 @@
                 @endif
 
                 @if (!bookingResult.cooperate().isEmpty())
-                    <h2>${context.localize("bookings.conflict.cooperate")}</h2>
+                    <h2 class="mt-4">${context.localize("bookings.conflict.cooperate")}</h2>
                     <p class="text-gray-500 text-sm">${context.localize("bookings.conflict.cooperate.message")}</p>
                     @for (Booking booking : bookingResult.cooperate())
                         <li class="list-row">
@@ -73,9 +74,13 @@
                     @endfor
                 @endif
             </ul>
-            @template.util.form(csrf = csrf, action = "/" + attemptedBooking.getRoom().getId() + "/bookings/new/conflict", method = POST, content = @`
-                <button class="btn btn-primary" type="submit" title="${context.localize("bookings.conflict.solve.tooltip")}">${context.localize("bookings.conflict.solve")}</button>
-            `)
+
+            <div class="modal-action">
+                <a class="btn" href="/${attemptedBooking.getRoom().getId()}">${context.localize("generic.cancel")}</a>
+                @template.util.form(csrf = csrf, action = "/" + attemptedBooking.getRoom().getId() + "/bookings/new/conflict", method = POST, content = @`
+                    <button class="btn btn-primary" type="submit" title="${context.localize("bookings.conflict.solve.tooltip")}">${context.localize("bookings.conflict.solve")}</button>
+                `)
+            </div>
         </div>
     </div>
 `)
diff --git a/src/main/jte/bookings/list.jte b/src/main/jte/bookings/list.jte
@@ -38,7 +38,7 @@
                         <td>${booking.getId()} ${booking.getOpenRequests().isEmpty() ? context.empty() : context.localize("bookings.outstanding", booking.getOpenRequests().size())}</td>
                         <td>${booking.getDescription()}</td>
                         <td>${context.format(booking.getStartDate())}</td>
-                        <td>${context.format(booking.getEndDate())}</td>
+                        <td>${context.format(booking.getEndDate().toLocalTime())}</td>
                         <td>${context.localize("bookings.share." + booking.getShareRoomType())}</td>
                         <td>${context.localize("bookings.priority." + booking.getPriority())}</td>
                         <td>
diff --git a/src/main/jte/bookings/single.jte b/src/main/jte/bookings/single.jte
@@ -35,8 +35,7 @@
 @if (!booking.getOpenRequests().isEmpty())
     <p>${context.localize("bookings.outstanding", booking.getOpenRequests().size())}</p>
 @endif
-<p>${context.localize("bookings.start.value", context.format(booking.getStartDate()))}</p>
-<p>${context.localize("bookings.end.value", context.format(booking.getEndDate()))}</p>
+<p>${context.format(booking.getStartDate())} - ${context.format(booking.getEndDate().toLocalTime())}</p>
 
 @if (!booking.getDescription().isBlank())
     <label class="label">${context.localize("bookings.description")}</label>
@@ -56,6 +55,8 @@
         <i class="fa-solid fa-pen"></i>
     </label>
     <input type="checkbox" id="soli-edit-toggle" class="hidden" />
+@else
+    <label class="label">${context.localize("bookings.description.none")}</label>
 @endif
 @if (allowEditing)
     @template.util.form(csrf = csrf, cssClass = "soli-edit-content relative w-full", action = "/" + booking.getRoom().getId() + "/bookings/" + booking.getId(), method = PATCH, content = @`
diff --git a/src/main/jte/error/disabled_user.jte b/src/main/jte/error/disabled_user.jte
@@ -10,7 +10,7 @@
 @param Date timestamp
 
 @template.layout(page = context.page("error"), context = context, layout = layout, content = @`
-    <div class="hero-content text-center">
+    <div class="hero-content text-center mx-auto">
         <div class="max-w-md">
             <h1 class="text-5xl font-bold">${context.localize("user.deactivated.title")}</h1>
             <p class="py-6">${context.localize("user.deactivated.message")}</p>
diff --git a/src/main/jte/error/known.jte b/src/main/jte/error/known.jte
@@ -8,7 +8,7 @@
 @param KnownError error
 
 @template.layout(page = context.page(error.title), context = context, layout = layout, content = @`
-    <div class="hero-content text-center">
+    <div class="hero-content text-center mx-auto">
         <div class="max-w-md">
             <h1 class="text-5xl font-bold">${context.localize(error.title)}</h1>
             <p class="py-6">${context.localize(error.message)}</p>
diff --git a/src/main/jte/error/unknown.jte b/src/main/jte/error/unknown.jte
@@ -8,7 +8,7 @@
 @param String error = null
 
 @template.layout(page = context.page("error"), context = context, layout = layout, content = @`
-    <div class="hero-content text-center">
+    <div class="hero-content text-center mx-auto">
         <div class="max-w-md">
             <h1 class="text-5xl font-bold">${context.localize("error.unknown.title")}</h1>
             <p class="py-6">${context.localize("error.unknown.message")}</p>
diff --git a/src/main/jte/layout.jte b/src/main/jte/layout.jte
@@ -146,9 +146,7 @@
 
                         @if(layout.getRoom() != null)
                             <div class="divider"></div>
-                            <li class="pointer-events-none">
-                                <label>${context.localize("layout.current_room", layout.getRoom().getName())}</label>
-                            </li>
+                            <li><a href="/"><i class="fa-solid fa-folder-tree"></i> ${context.localize("layout.current_room", layout.getRoom().getName())}</a></li>
                         @endif
 
                         @if(layout.getLogin().kind() == LoginStateModel.Kind.ADMIN)
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
@@ -87,8 +87,6 @@ administration.statistics.hour=Per Hour
 administration.statistics.month=Per Month
 administration.statistics.recent=Recent
 administration.statistics.all_time=All Time
-bookings.start.value=Start: {0}
-bookings.end.value=End: {0}
 layout.welcome=Welcome, {0}
 layout.about=About
 layout.legal=Legal
@@ -119,7 +117,7 @@ room.status.open=Room is not booked right now.
 room.status.none=No room selected.
 error.invalid_username=Invalid username or password
 error.logout=You have been logged out.
-bookings.conflict.recommend=A conflict was detected.\n\
+bookings.conflict.recommend=One or more conflicts were found.\n\
 Recommended solution:
 bookings.conflict.resolution=Conflict Resolution
 bookings.description.none=No Description
@@ -178,7 +176,7 @@ bookings.collaboration.NO=Not Shareable
 bookings.collaboration.ON_REQUEST=Shareable On Request
 bookings.delete.tooltip=Delete booking
 bookings.request.tooltip=Request for shared use of the room during this booking
-bookings.conflict.solve.tooltip=Solve conflict
+bookings.conflict.solve.tooltip=Solve conflict as recommended
 login.kit.description=Login via KIT account
 rooms.save=Save Room
 rooms.select=Select Room
@@ -203,8 +201,12 @@ administration.opening_hours.start_time.tooltip=Must be specified in 15 minute i
 administration.opening_hours.closing_time.hint=Must be after the start time and specified in 15 minute increments
 administration.opening_hours.start_time.hint=Must be specified in 15 minute increments
 rooms.description.tooltip=Used to specify e.g. equipment or type of use of the room (e.g. relaxation room)
-bookings.conflict.delete.message=The owner of the booking to be deleted will be notified of the deletion
-bookings.conflict.cooperate.message=The owner of the booking receives a notification about the shared use of the room
+bookings.conflict.contact.message=A collaboration request will be sent to the owner of the \
+following booking.
+bookings.conflict.delete.message=The following booking will be deleted. The owner of the \
+booking will be notified of the deletion.
+bookings.conflict.cooperate.message=The owner of the booking receives a notification about the \
+shared use of the room.
 layout.current_room=Room: {0}
 layout.source=Sourcecode (GitHub)
 layout.publisherInfo=Contact: soli@iar.kit.edu
diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties
@@ -82,8 +82,6 @@ administration.statistics.hour=Nach Stunde
 administration.statistics.month=Nach Monat
 administration.statistics.recent=Kürzlich
 administration.statistics.all_time=Alle
-bookings.start.value=Start: {0}
-bookings.end.value=Ende: {0}
 layout.welcome=Hallo, {0}
 layout.about=Über
 layout.legal=Legal
@@ -114,13 +112,13 @@ administration.opening_hours.end=Start des {0}s
 room.status.none=Kein Raum ausgewählt.
 error.invalid_username=Ungültiger Benutzername oder Passwort
 error.logout=Sie wurden abgemeldet.
-bookings.conflict.recommend=Ein lösbarer Konflikt wurde festgestellt.\n\
+bookings.conflict.recommend=Ein oder mehrere lösbare Konflikte sind aufgetreten.\n\
 Vorgeschlagene Lösung:
 bookings.conflict.resolution=Konfliktlösung
 bookings.description.none=Keine Beschreibung
 bookings.conflict.delete=Löschen
-bookings.conflict.cooperate=Nutze den Raum gleichzeitig mit folgender Buchung
-bookings.conflict.contact=Kontaktiere Eigentümer*in folgender Buchung
+bookings.conflict.cooperate=Den Raum gleichzeitig nutzen
+bookings.conflict.contact=Den/die Eigentümer*in der bereits vorhanden Buchung kontaktieren
 bookings.conflict.solve=Lösen
 bookings.view=Buchung ansehen
 administration.opening_hours.day=Tag
@@ -148,7 +146,7 @@ bookings.check_out=Checkout
 bookings.delete_reason.ADMIN=Ein/e Admin hat diese Buchung gelöscht.
 bookings.delete_reason.CONFLICT=Ein Konflikt mit einer anderen Buchung hat zur Löschung dieser Buchung geführt.
 bookings.delete_reason.SELF=Sie haben diese Buchung selbst gelöscht.
-user.visitor=Besucher
+user.visitor=Besucher*in
 bookings.view.page=Terminansicht
 error=Fehler
 user.deactivated.title=Deaktiviert
@@ -175,7 +173,7 @@ mail.open_requests_cleared.last_phrase=Vielen Dank, dass Sie unseren Service nut
 pagination.page=Seite {0} von {1}
 bookings.delete.tooltip=Buchung löschen
 bookings.request.tooltip=Anfrage zur gemeinsamen Nutzung des Raumes während der Buchung
-bookings.conflict.solve.tooltip=Konflikt lösen
+bookings.conflict.solve.tooltip=Konflikt wie vorgeschlagen lösen
 login.kit.description=Anmelden per KIT Konto
 rooms.save=Raum speichern
 rooms.select=Raum auswählen
@@ -203,10 +201,14 @@ administration.opening_hours.start_time.tooltip=Muss in 15-Minuten-Schritten ang
 administration.opening_hours.closing_time.hint=Muss nach der Startzeit liegen und in 15-Minuten-Schritten angegeben werden
 administration.opening_hours.start_time.hint=Muss in 15-Minuten-Schritten angegeben werden
 rooms.description.tooltip=Wird genutzt um z.B. Ausstattung oder Nutzungsart des Raums anzugeben (z.B. Ruheraum)
-bookings.conflict.delete.message=Der/Die Besitzende der zu löschenden Buchung wird über die Löschung benachrichtigt
-bookings.conflict.cooperate.message=Der/Die Erstellende der Buchung erhält eine Benachrichtigung über die geteilte Raumnutzung
+bookings.conflict.delete.message=Die folgende Buchung wird gelöscht und der/die Besitzer*in \
+der Buchung wird darüber benachrichtigt.
+bookings.conflict.cooperate.message=Der/Die Ersteller*in der folgenden Buchung erhält eine \
+Benachrichtigung über die geteilte Raumnutzung.
 bookings.none=Du hast noch keine Reservierungen.
 layout.current_room=Raum: {0}
+bookings.conflict.contact.message=Es wird eine Kollaborations-Anfrage an den/die Eigentümer*in \
+der folgenden Buchung gesendet.
 layout.source=Quellcode (GitHub)
 layout.publisherInfo=Kontakt: soli@iar.kit.edu
 
