From 7187ae6253c93554a6adf27ce0a8deef01724266 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 2 Sep 2022 15:13:34 +0000
Subject: [PATCH] resources/room_request/resolve: fixed preparation time
inconsitencies, closes #859
Closes #859
Merge request studip/studip!942
---
app/views/resources/room_request/resolve.php | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/app/views/resources/room_request/resolve.php b/app/views/resources/room_request/resolve.php
index e71df8b1f67..2347698c0e1 100644
--- a/app/views/resources/room_request/resolve.php
+++ b/app/views/resources/room_request/resolve.php
@@ -103,6 +103,15 @@
<?= implode('<br>', $dates) ?>
<? endif ?>
</dd>
+ <? if ($request->preparation_time) : ?>
+ <dt><?= _('Rüstzeit') ?></dt>
+ <dd>
+ <?= htmlReady(sprintf(
+ ngettext('%d Minute', '%d Minuten', $request->preparation_time / 60),
+ $request->preparation_time / 60
+ )) ?>
+ </dd>
+ <? endif ?>
<? if ($room_request->preparation_time): ?>
<? $preparation_time_minutes = intval($room_request->preparation_time / 60) ?>
@@ -250,10 +259,10 @@
<? if ($data['metadate'] instanceof SeminarCycleDate) : ?>
<?php
$date_string1 = getWeekday($data['metadate']->weekday);
+ $real_begin = mktime($data['metadate']->start_hour, $data['metadate']->start_minute - $request->preparation_time / 60);
$date_string2 = sprintf(
- '%02s:%02s - %02s:%02s',
- $data['metadate']->start_hour,
- $data['metadate']->start_minute,
+ '%s - %02s:%02s',
+ date('H:i', $real_begin),
$data['metadate']->end_hour,
$data['metadate']->end_minute
);
--
GitLab