diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php index 4a78bcdaee2d4a0c220f17d47131a459ca43e80a..6421f23aa9ae6527accd15f2908b911e23a411e6 100644 --- a/app/controllers/resources/room_request.php +++ b/app/controllers/resources/room_request.php @@ -2345,7 +2345,7 @@ class Resources_RoomRequestController extends AuthenticatedController Navigation::activateItem('/resources/planning/requests_planning'); } - PageLayout::setTitle(_('Anfragenliste')); + PageLayout::setTitle(_('Anfragenplan')); PageLayout::allowFullscreenMode(); $this->setupSidebar('planning'); @@ -2584,31 +2584,32 @@ class Resources_RoomRequestController extends AuthenticatedController ); } $sidebar->addWidget($widget); + } - $widget = new SelectWidget( - _('Räume'), - $this->filterURL('from_request', 'room_id', $from_params), - 'room_id' - ); + $widget = new SelectWidget( + _('Räume'), + $this->filterURL('from_request', 'room_id', $from_params), + 'room_id' + ); + $widget->addElement( + new SelectElement( + '', + _('Bitte wählen'), + empty($this->filter['room_id']) + ) + ); + foreach ($this->available_rooms as $room) { $widget->addElement( new SelectElement( - '', - _('Bitte wählen'), - empty($this->filter['room_id']) + $room->id, + $room->name, + !empty($this->filter['room_id']) && $room->id == $this->filter['room_id'] ) ); - foreach ($this->available_rooms as $room) { - $widget->addElement( - new SelectElement( - $room->id, - $room->name, - !empty($this->filter['room_id']) && $room->id == $this->filter['room_id'] - ) - ); - } - $sidebar->addWidget($widget); - } + $sidebar->addWidget($widget); + + $widget = new OptionsWidget(_('Filter')); $widget->addRadioButton( diff --git a/app/views/resources/room_request/planning.php b/app/views/resources/room_request/planning.php index 0653043278618a375c1da502b91d71fab5b6d421..1ad51fd2c5288a91ffc860e679ff19158290707c 100644 --- a/app/views/resources/room_request/planning.php +++ b/app/views/resources/room_request/planning.php @@ -1,17 +1,3 @@ -<form method="get" class="default" action="<?= $controller->planning() ?>"> - <fieldset> - <legend><?= _('Raumauswahl') ?></legend> - - <select name="room_id" aria-labelledby="<?= _('Bitte wählen Sie einen Raum aus') ?>" onchange="this.form.submit()"> - <option value=""><?= _('Bitte wählen') ?></option> - <? foreach ($this->available_rooms as $room) : ?> - <option value="<?= $room->id ?>" <?= !empty($resource) && $resource->id === $room->id ? 'selected' : '' ?>> - <?= htmlReady($room->name) ?> - </option> - <? endforeach ?> - </select> - </fieldset> -</form> <? if (!empty($resource)): ?> <? $min_time = Config::get()->INSTITUTE_COURSE_PLAN_START_HOUR . ':00'; @@ -253,7 +239,6 @@ 'resources/room_request/resolve/' . $request->id, [ 'searched_room_id' => $resource->id, - 'alternatives_selection' => 'room_search', 'selected_rooms' => [$range_str => $resource->id], 'reload-on-close' => 1 ]); ?>"