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

Closes #5800

Merge request studip/studip!4424

6 files changed, 18 insertions, 8 deletions

diff --git a/lib/models/resources/BrokenResource.php b/lib/models/resources/BrokenResource.php
index 324851f..fdb7d71 100644
--- a/lib/models/resources/BrokenResource.php
+++ b/lib/models/resources/BrokenResource.php
@@ -121,7 +121,8 @@ class BrokenResource extends Resource
         DateTime $end,
         $comment = '',
         $preparation_time = 0,
-        $subsequent_time = 0
+        $subsequent_time = 0,
+        $booking_text = ''
     )
     {
         return null;
diff --git a/lib/models/resources/Building.php b/lib/models/resources/Building.php
index 1c571ed..eafd6eb 100644
--- a/lib/models/resources/Building.php
+++ b/lib/models/resources/Building.php
@@ -475,7 +475,8 @@ class Building extends Resource
         DateTime $end,
         $comment = '',
         $preparation_time = 0,
-        $subsequent_time = 0
+        $subsequent_time = 0,
+        $booking_text = ''
     )
     {
         return null;
diff --git a/lib/models/resources/Location.php b/lib/models/resources/Location.php
index 75c6c12..3783ef2 100644
--- a/lib/models/resources/Location.php
+++ b/lib/models/resources/Location.php
@@ -396,7 +396,8 @@ class Location extends Resource
         DateTime $end,
         $comment = '',
         $preparation_time = 0,
-        $subsequent_time = 0
+        $subsequent_time = 0,
+        $booking_text = ''
     )
     {
         return null;
diff --git a/lib/models/resources/Resource.php b/lib/models/resources/Resource.php
index 2b71574..5906b9f 100644
--- a/lib/models/resources/Resource.php
+++ b/lib/models/resources/Resource.php
@@ -966,6 +966,9 @@ class Resource extends SimpleORMap implements StudipItem
      *       that is reserved for cleaning up or similar activities after the
      *       booking.
      *
+     * @param string $booking_text The text that shall be displayed when the
+     *       request has been turned into a booking.
+     *
      * @return ResourceRequest A resource request object.
      * @throws AccessDeniedException If the user is not permitted
      *     to request this resource.
@@ -984,7 +987,8 @@ class Resource extends SimpleORMap implements StudipItem
         DateTime $end,
         $comment = '',
         $preparation_time = 0,
-        $subsequent_time = 0
+        $subsequent_time = 0,
+        $booking_text = ''
     )
     {
         //All users are permitted to create a request,
@@ -1031,8 +1035,9 @@ class Resource extends SimpleORMap implements StudipItem
             ? $subsequent_time
             : 0;
 
-        $request->closed  = '0';
-        $request->comment = $comment;
+        $request->closed       = '0';
+        $request->comment      = $comment;
+        $request->booking_text = $booking_text;
 
         if (!$request->store()) {
             throw new ResourceRequestException(
diff --git a/lib/models/resources/ResourceLabel.php b/lib/models/resources/ResourceLabel.php
index e55b3d1..246cab4 100644
--- a/lib/models/resources/ResourceLabel.php
+++ b/lib/models/resources/ResourceLabel.php
@@ -114,7 +114,8 @@ class ResourceLabel extends Resource
         DateTime $end,
         $comment = '',
         $preparation_time = 0,
-        $subsequent_time = 0
+        $subsequent_time = 0,
+        $booking_text = ''
     )
     {
         return null;
diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php
index 77ed732..7cdf18c 100644
--- a/lib/models/resources/ResourceRequest.php
+++ b/lib/models/resources/ResourceRequest.php
@@ -9,7 +9,7 @@
  * the License, or (at your option) any later version.
  *
  * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
+ * @copyright   2017-2025
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
  * @category    Stud.IP
  * @package     resources
@@ -29,6 +29,7 @@
  * @property string|null $category_id database column
  * @property string|null $comment database column
  * @property string|null $reply_comment database column
+ * @property string|null $booking_text database column
  * @property string $reply_recipients database column
  * @property int $closed database column
  * @property int|null $mkdate database column