From 59f9ac49944b62a584a2c941a41840ce04722d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Mon, 26 Feb 2024 14:45:40 +0000
Subject: [PATCH] Resolve #179 "Buchungen mit Kommentaren: Nur Buchungen mit
 internen Kommentaren werden angezeigt"

Closes #179

Merge request studip/studip!2583
---
 app/controllers/room_management/planning.php            | 7 +++----
 app/views/room_management/planning/booking_comments.php | 4 ++--
 lib/navigation/ResourceNavigation.php                   | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php
index 9bfd00fe226..c450c642ee8 100644
--- a/app/controllers/room_management/planning.php
+++ b/app/controllers/room_management/planning.php
@@ -1063,7 +1063,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
 
     public function booking_comments_action($selected_clipboard_id = null)
     {
-        PageLayout::setTitle(_('Buchungen mit Kommentaren'));
+        PageLayout::setTitle(_('Buchungsübersicht mit Kommentaren'));
 
         if (Navigation::hasItem('/resources/planning/booking_comments')) {
             Navigation::activateItem('/resources/planning/booking_comments');
@@ -1139,7 +1139,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
             $this->clipboard = $clipboard;
             if ($clipboard) {
                 PageLayout::setTitle(
-                    $clipboard->name . ': ' . _('Buchungen mit Kommentaren')
+                    $clipboard->name . ': ' . _('Buchungsübersicht mit Kommentaren')
                 );
                 $room_ids = $clipboard->getAllRangeIds('Room');
                 $rooms = Resource::findMany($room_ids);
@@ -1193,8 +1193,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         $booking_intervals = ResourceBookingInterval::findBySql(
             "INNER JOIN resource_bookings rb
             ON resource_booking_intervals.booking_id = rb.id
-            WHERE rb.internal_comment <> ''
-            AND rb.resource_id IN ( :room_ids )
+            WHERE rb.resource_id IN ( :room_ids )
             AND resource_booking_intervals.begin < :end AND resource_booking_intervals.end > :begin
             ORDER BY resource_booking_intervals.begin ASC, resource_booking_intervals.end ASC",
             [
diff --git a/app/views/room_management/planning/booking_comments.php b/app/views/room_management/planning/booking_comments.php
index 72e3edd7145..5f497f7df7d 100644
--- a/app/views/room_management/planning/booking_comments.php
+++ b/app/views/room_management/planning/booking_comments.php
@@ -114,14 +114,14 @@
     <? if ($standalone): ?>
         <p>
             <?= sprintf(
-                _('In der %d. Kalenderwoche sind keine Buchungen mit Kommentaren vorhanden!'),
+                _('In der %d. Kalenderwoche sind keine Buchungen vorhanden!'),
                 $date->format('W')
             ) ?>
         </p>
     <? else: ?>
         <?= MessageBox::info(
             sprintf(
-                _('In der %d. Kalenderwoche sind keine Buchungen mit Kommentaren vorhanden!'),
+                _('In der %d. Kalenderwoche sind keine Buchungen vorhanden!'),
                 $date->format('W')
             )
         ) ?>
diff --git a/lib/navigation/ResourceNavigation.php b/lib/navigation/ResourceNavigation.php
index b2e3a8a66ee..17ca4be48ae 100644
--- a/lib/navigation/ResourceNavigation.php
+++ b/lib/navigation/ResourceNavigation.php
@@ -154,7 +154,7 @@ class ResourceNavigation extends Navigation
                 $this->addSubNavigation('planning', $sub_navigation);
 
                 $sub_sub_nav = new Navigation(
-                    _('Buchungen mit Kommentaren'),
+                    _('Buchungsübersicht mit Kommentaren'),
                     'dispatch.php/room_management/planning/booking_comments'
                 );
                 $sub_navigation->addSubNavigation('booking_comments', $sub_sub_nav);
@@ -194,7 +194,7 @@ class ResourceNavigation extends Navigation
 
             if (RoomManager::userHasRooms($user, 'autor', true)) {
                 $sub_sub_nav = new Navigation(
-                    _('Buchungen mit Kommentaren'),
+                    _('Buchungsübersicht mit Kommentaren'),
                     'dispatch.php/room_management/planning/booking_comments'
                 );
                 $sub_navigation->addSubNavigation('booking_comments', $sub_sub_nav);
-- 
GitLab