allow setting a booking text for simple resource requests, closes #5800

Closes #5800

Merge request studip/studip!4424

3 files changed, 36 insertions, 4 deletions

diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php
index 07af488..e74995a 100644
--- a/app/controllers/resources/room_request.php
+++ b/app/controllers/resources/room_request.php
@@ -668,6 +668,7 @@ class Resources_RoomRequestController extends AuthenticatedController
         $this->subsequent_time  = 0;
         $this->max_preparation_time = $config->RESOURCES_MAX_PREPARATION_TIME;
         $this->comment = '';
+        $this->booking_text = '';
 
         $this->show_form = true;
 
@@ -718,7 +719,8 @@ class Resources_RoomRequestController extends AuthenticatedController
             }
 
             //Comment is optional.
-            $this->comment = Request::get('comment');
+            $this->comment      = Request::get('comment');
+            $this->booking_text = Request::get('booking_text');
 
             //Convert the date and time strings to DateTime objects:
 
@@ -758,7 +760,8 @@ class Resources_RoomRequestController extends AuthenticatedController
                     $new_end,
                     $this->comment,
                     $this->preparation_time * 60,
-                    $this->subsequent_time * 60
+                    $this->subsequent_time * 60,
+                    $this->booking_text
                 );
 
                 if ($request) {
@@ -885,6 +888,7 @@ class Resources_RoomRequestController extends AuthenticatedController
         $this->subsequent_time      = $this->request->subsequent_time / 60;
         $this->max_preparation_time = $config->RESOURCES_MAX_PREPARATION_TIME;
         $this->comment              = $this->request->comment;
+        $this->booking_text         = $this->request->booking_text;
 
         $this->show_form = true;
 
@@ -935,7 +939,8 @@ class Resources_RoomRequestController extends AuthenticatedController
             }
 
             //Comment is optional.
-            $this->comment = Request::get('comment');
+            $this->comment      = Request::get('comment');
+            $this->booking_text = Request::get('booking_text');
 
             //Convert the date and time strings to DateTime objects:
 
@@ -970,6 +975,7 @@ class Resources_RoomRequestController extends AuthenticatedController
             $this->request->begin            = $new_begin->getTimestamp();
             $this->request->end              = $new_end->getTimestamp();
             $this->request->comment          = $this->comment;
+            $this->request->booking_text     = $this->booking_text;
             $this->request->preparation_time = $this->preparation_time * 60;
             $this->request->subsequent_time  = $this->subsequent_time * 60;
 
@@ -1657,7 +1663,7 @@ class Resources_RoomRequestController extends AuthenticatedController
                             0,
                             null,
                             $this->request->preparation_time,
-                            '',
+                            $this->request->booking_text ?? '',
                             '',
                             ResourceBooking::TYPE_NORMAL,
                             false,
diff --git a/app/views/resources/room_request/_add_edit_form.php b/app/views/resources/room_request/_add_edit_form.php
index c9fef86..c256e02 100644
--- a/app/views/resources/room_request/_add_edit_form.php
+++ b/app/views/resources/room_request/_add_edit_form.php
@@ -1,3 +1,21 @@
+<?php
+/**
+ * @var bool $show_form
+ * @var string $form_action_link
+ * @var string $origin_url
+ * @var string $begin_date_str
+ * @var string $end_date_str
+ * @var string $begin_time_str
+ * @var string $end_time_str
+ * @var int $preparation_time
+ * @var int $max_preparation_time
+ * @var int $subsequent_time
+ * @var string $comment
+ * @var string $booking_text
+ * @var ResourceRequest $request
+ * @var Resources_RoomRequestController $controller
+ */
+?>
 <? if ($show_form): ?>
     <form class="default" method="post" action="<?= $form_action_link ?>" data-dialog="reload-on-close">
         <input type="hidden" name="origin_url" value="<?= htmlReady($origin_url ?? '') ?>">
@@ -46,6 +64,10 @@
             <?= _('Interner Kommentar') ?>
             <textarea name="comment"><?= htmlReady($comment) ?></textarea>
         </label>
+        <label>
+            <?= _('Buchungstext') ?>
+            <textarea name="booking_text"><?= htmlReady($booking_text) ?></textarea>
+        </label>
         <footer data-dialog-button>
             <?= \Studip\Button::create(_('Speichern'), 'save') ?>
             <? if ($request): ?>
diff --git a/app/views/resources/room_request/resolve.php b/app/views/resources/room_request/resolve.php
index 7c518fb..a6c9ec6 100644
--- a/app/views/resources/room_request/resolve.php
+++ b/app/views/resources/room_request/resolve.php
@@ -169,6 +169,10 @@
                             <?= htmlReady($request->resource->name) ?>
                         </dd>
                     <? endif ?>
+                    <? if ($request->booking_text) : ?>
+                        <dt><?= _('Buchungstext') ?></dt>
+                        <dd><?= htmlReady($request->booking_text) ?></dd>
+                    <? endif ?>
                     <? if ($request->comment) : ?>
                         <dt><?= _('Interner Kommentar') ?></dt>
                         <dd><?= htmlReady($request->comment) ?></dd>