do not show room names for each regular date when grouping them by room, fixes #6372

Closes #6372

Merge request studip/studip!4833

4 files changed, 16 insertions, 13 deletions

diff --git a/lib/classes/CourseDateList.php b/lib/classes/CourseDateList.php
index 5aa1a02..cb1c504 100644
--- a/lib/classes/CourseDateList.php
+++ b/lib/classes/CourseDateList.php
@@ -240,7 +240,7 @@ class CourseDateList implements Stringable
     {
         $output = [];
         foreach ($this->regular_dates as $regular_date) {
-            $date_line = $regular_date->toString('long-start');
+            $date_line = $regular_date->toString($with_room_names ? 'long-start' : 'long-start-without-room');
             if ($with_room_names || $group_by_rooms) {
                 $room = $regular_date->getMostBookedRoom();
                 if ($room instanceof Room) {
diff --git a/lib/models/SeminarCycleDate.php b/lib/models/SeminarCycleDate.php
index 799cd4a..ad467bf 100644
--- a/lib/models/SeminarCycleDate.php
+++ b/lib/models/SeminarCycleDate.php
@@ -204,11 +204,12 @@ class SeminarCycleDate extends SimpleORMap
     /**
      * Generates a string for a regular date. Depending on the selected format, more or less information
      * are present in the generated string:
-     * - short:      Only the weekday, beginning and end
-     * - long:       Weekday, beginning, end and the repetition interval
-     * - long-start: Same as long but with the start date.
-     * - full:       Same as long, but also with the start and end week of the regular date in the semester
-     *               and the description of the regular date, if provided.
+     * - short:                   Only the weekday, beginning and end
+     * - long:                    Weekday, beginning, end and the repetition interval
+     * - long-start:              Same as long but with the start date.
+     * - long-start-without-room: Same as long-start but without the room.
+     * - full:                    Same as long, but also with the start and end week of the regular date in the semester
+     *                            and the description of the regular date, if provided.
      *
      * @param string $format The format string: "short", "long" or "full". Defaults to "short".
      *
@@ -216,7 +217,7 @@ class SeminarCycleDate extends SimpleORMap
      */
     public function toString(string $format = 'short', bool $as_html = false) : string
     {
-        if (!in_array($format, ['short', 'long', 'long-start', 'full'])) {
+        if (!in_array($format, ['short', 'long', 'long-start', 'long-start-without-room', 'full'])) {
             //Invalid format:
             return '';
         }
@@ -241,10 +242,12 @@ class SeminarCycleDate extends SimpleORMap
                     _('%{weekday}, %{beginning} - %{end}, %{interval}'),
                     $parameters
                 );
-            } elseif ($format === 'long-start') {
+            } elseif (in_array($format, ['long-start', 'long-start-without-room'])) {
                 $text = _('%{weekday}, %{beginning} - %{end}, %{interval}');
-                $room = $this->getMostBookedRoom();
-
+                $room = null;
+                if ($format === 'long-start') {
+                    $room = $this->getMostBookedRoom();
+                }
                 if ($room) {
                     if ($as_html) {
                         $parameters['room_name'] = sprintf(
@@ -255,7 +258,7 @@ class SeminarCycleDate extends SimpleORMap
                     } else {
                         $parameters['room_name'] = $room->name;
                     }
-                } else {
+                } elseif ($format !== 'long-start-without-room') {
                     //Use the freetext room name:
                     $room = $this->getMostUsedFreetextRoomName();
                     if ($room) {
diff --git a/templates/dates/course_date_list.php b/templates/dates/course_date_list.php
index 0a7bf41..bcc9eb7 100644
--- a/templates/dates/course_date_list.php
+++ b/templates/dates/course_date_list.php
@@ -13,7 +13,7 @@
     <ul class="list-unstyled">
         <? foreach ($collection->getRegularDates() as $regular_date) : ?>
             <li>
-                <?= $regular_date->toString('long-start', true) ?>
+                <?= $regular_date->toString($with_room_names ? 'long-start' : 'long-start-without-room', true) ?>
             </li>
         <? endforeach ?>
         <? foreach ($collection->getSingleDates() as $single_date) : ?>
diff --git a/templates/dates/room_grouped_course_date_list.php b/templates/dates/room_grouped_course_date_list.php
index 29e5c94..96bef98 100644
--- a/templates/dates/room_grouped_course_date_list.php
+++ b/templates/dates/room_grouped_course_date_list.php
@@ -20,5 +20,5 @@
     <? else : ?>
         <h4><?= htmlReady($room_name) ?></h4>
     <? endif ?>
-    <?= $grouped_date->toHtml(false, $with_cancelled_dates) ?>
+    <?= $grouped_date->toHtml(false, false, $with_cancelled_dates) ?>
 <? endforeach ?>