Skip to content
Snippets Groups Projects
Commit a37fcf3e authored by Moritz Strohm's avatar Moritz Strohm Committed by Elmar Ludwig
Browse files

resources/room_request/resolve: fixed preparation time inconsitencies, closes #859 

Closes #859

Merge request studip/studip!942
parent 7d8d8fe2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/views/resources/room_request/resolve.php
+ 12
− 3
View file @ a37fcf3e
...@@ -103,6 +103,15 @@ ...@@ -103,6 +103,15 @@
<?= implode('<br>', $dates) ?> <?= implode('<br>', $dates) ?>
<? endif ?> <? endif ?>
</dd> </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): ?> <? if ($room_request->preparation_time): ?>
<? $preparation_time_minutes = intval($room_request->preparation_time / 60) ?> <? $preparation_time_minutes = intval($room_request->preparation_time / 60) ?>
...@@ -250,10 +259,10 @@ ...@@ -250,10 +259,10 @@
<? if ($data['metadate'] instanceof SeminarCycleDate) : ?> <? if ($data['metadate'] instanceof SeminarCycleDate) : ?>
<?php <?php
$date_string1 = getWeekday($data['metadate']->weekday); $date_string1 = getWeekday($data['metadate']->weekday);
$real_begin = mktime($data['metadate']->start_hour, $data['metadate']->start_minute - $request->preparation_time / 60);
$date_string2 = sprintf( $date_string2 = sprintf(
'%02s:%02s - %02s:%02s', '%s - %02s:%02s',
$data['metadate']->start_hour, date('H:i', $real_begin),
$data['metadate']->start_minute,
$data['metadate']->end_hour, $data['metadate']->end_hour,
$data['metadate']->end_minute $data['metadate']->end_minute
); );
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment