Merge branch 'tic-13' into 'main'

Mehr Termininformationen beim Erstellen/Bearbeiten von Raumanfragen in VA anzeigen

See merge request studip/studip!5

app/views/course/room_requests/_request_edit_header.php

@@ -12,7 +12,15 @@
 <section class="resources-grid">
     <section class="contentbox">
         <header><h1><?= _('Anfrage') ?></h1></header>
-        <section><?= htmlready($request->getTypeString(), 1, 1) ?></section>
+        <section>
+            <?= htmlready($request->getTypeString(), 1, 1) ?>
+            <? if ($request->getType() == 'course'): ?>
+                <?
+                $dates = $request->getDateString(true);
+                ?>
+                <?= tooltipHtmlIcon(implode('<br>', $dates)) ?>
+            <? endif ?>
+        </section>
     </section>
     <section class="contentbox">
         <header><h1><?= _('Bearbeitungsstatus') ?></h1></header>

lib/models/resources/ResourceRequest.class.php

@@ -1397,7 +1397,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
             } else {
                 return sprintf(
                     _('Regelmäßige Termine (%s)'),
-                    $this->cycle->toString('short')
+                    $this->cycle->toString('full')
                 );
             }
         } elseif ($this->course) {
@@ -2307,4 +2307,4 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
         $diff  = round(($first['begin'] - time()) / 86400);
         return $diff;
     }
-}
\ No newline at end of file
+}