Skip to content
Snippets Groups Projects
Commit afad197d authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

prevent warnings in room-requests, fixes #4613

Closes #4613

Merge request studip/studip!3426
parent 6faf87e8
No related branches found
No related tags found
No related merge requests found
......@@ -474,7 +474,7 @@ class Resources_RoomRequestController extends AuthenticatedController
$end = new DateTime();
$begin->setTimestamp($interval['begin']);
$end->setTimestamp($interval['end']);
$availability[] = $room->isAvailable($begin, $end, $interval['booking_id'] ? [$interval['booking_id']] : []);
$availability[] = $room->isAvailable($begin, $end, !empty($interval['booking_id']) ? [$interval['booking_id']] : []);
}
return $availability;
......@@ -759,7 +759,7 @@ class Resources_RoomRequestController extends AuthenticatedController
$new_begin->setTime(
$begin_time_arr[0],
$begin_time_arr[1],
$begin_time_arr[2]
$begin_time_arr[2] ?? 0
);
$new_end = new DateTime();
$new_end->setDate(
......@@ -770,7 +770,7 @@ class Resources_RoomRequestController extends AuthenticatedController
$new_end->setTime(
$end_time_arr[0],
$end_time_arr[1],
$end_time_arr[2]
$end_time_arr[2] ?? 0
);
try {
......@@ -1435,7 +1435,7 @@ class Resources_RoomRequestController extends AuthenticatedController
$booked_rooms = [];
foreach($this->request_time_intervals as $key => $data) {
foreach ($data['intervals'] as $timeslot) {
if (!isset($booked_rooms[$timeslot['booked_room']])) {
if (!empty($timeslot['booked_room']) && !isset($booked_rooms[$timeslot['booked_room']])) {
$room = Room::find($timeslot['booked_room']);
if ($room) {
$booked_rooms[$timeslot['booked_room']] = $room;
......@@ -1739,7 +1739,7 @@ class Resources_RoomRequestController extends AuthenticatedController
if ($save_only) {
// redirect to reload all infos and showing the most current ones
$this->redirect('resources/room_request/resolve/' . $request_id);
} elseif (Request::isDialog() && Context::get()->id) {
} elseif (Request::isDialog() && Context::get()) {
$this->response->add_header('X-Dialog-Execute', '{"func": "STUDIP.AdminCourses.App.loadCourse", "payload": "' . Context::get()->id . '"}');
}
}
......
<? 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) ?>">
<input type="hidden" name="origin_url" value="<?= htmlReady($origin_url ?? '') ?>">
<label>
<input type="checkbox" <?= ($begin_date_str != $end_date_str) ? 'checked' : ''; ?>
onClick="$('#end_date_section').toggle();">
......
<?php
/**
* @var Room $room
* @var User $current_user
* @var array $time_intervals
* @var Resources_RoomPlanningController $controller
* @var string $underload
* @var array $room_availability_share
* @var array $unavailable_dates
* @var array $amount_of_dates
* @var array $metadate_availability_share
* @var array $selected_rooms
* @var array $unavailable_metadate_dates
* @var array $amount_of_metadate_dates
* @var array $room_availability
*/
?>
<tr class="nohover">
<td class="nowrap">
<? if ($room->bookingPlanVisibleForUser($current_user)): ?>
......@@ -21,7 +39,7 @@
<? endif ?>
<?= tooltipIcon($room->room_type) ?>
<?= htmlReady(sprintf('%d Sitzplätze', $room->seats)) ?>
<? if ($underload) : ?>
<? if (!empty($underload)) : ?>
[<?= htmlReady($underload) ?>%]
<? endif ?>
</td>
......@@ -71,15 +89,15 @@
$amount_of_metadate_dates[$room->id][$metadate_id]
)) ?>
<? endif ?>
<? $stats = 0; array_walk($data['intervals'], function(&$item, $key, $room_id) use (&$stats) {
if ($item['booked_room'] == $room_id) {
<? $stats = 0; array_walk($data['intervals'], function($item, $key, $room_id) use (&$stats) {
if ($item['booked_room'] === $room_id) {
$stats++;
}
}, $room->id) ?>
<? if ($stats > 0) : ?>
<?= tooltipIcon(sprintf(
_('%s von %s Terminen sind in diesem Raum'),
$stats, sizeof($data['intervals'])
$stats, count($data['intervals'])
));
?>
<? endif ?>
......@@ -88,7 +106,7 @@
<? $i = 0 ?>
<? foreach($data['intervals'] as $interval) : ?>
<?
$available = $room_availability[$room->id][$metadate_id][$i];
$available = !empty($room_availability[$room->id][$metadate_id][$i]);
$range_index = $interval['range'] . '_' . $interval['range_id'];
$room_radio_name = 'selected_rooms[' . $range_index . ']';
?>
......@@ -97,8 +115,8 @@
<input type="radio" name="<?= htmlReady($room_radio_name) ?>"
class="text-bottom radio-<?= htmlReady($room->id) ?>"
value="<?= htmlReady($room->id) ?>"
<?= ($selected_rooms[$range_index] == $room->id
|| $interval['booked_room'] == $room->id)
<?= (!empty($selected_rooms[$range_index]) && $selected_rooms[$range_index] === $room->id
|| (!empty($interval['booked_room']) && $interval['booked_room'] === $room->id))
? 'checked="checked"'
: ''?>>
<?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asImg(['class' => 'text-bottom']) ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment