Skip to content
Snippets Groups Projects
Commit 6bd4cb64 authored by André Noack's avatar André Noack Committed by Jan-Hendrik Willms
Browse files

Resolve #3873 "Raumverwaltung: Raumplanung > Anfragenplan"

Closes #3873

Merge request studip/studip!2734
parent 42cad4a1
No related branches found
No related tags found
No related merge requests found
...@@ -2345,7 +2345,7 @@ class Resources_RoomRequestController extends AuthenticatedController ...@@ -2345,7 +2345,7 @@ class Resources_RoomRequestController extends AuthenticatedController
Navigation::activateItem('/resources/planning/requests_planning'); Navigation::activateItem('/resources/planning/requests_planning');
} }
PageLayout::setTitle(_('Anfragenliste')); PageLayout::setTitle(_('Anfragenplan'));
PageLayout::allowFullscreenMode(); PageLayout::allowFullscreenMode();
$this->setupSidebar('planning'); $this->setupSidebar('planning');
...@@ -2584,6 +2584,7 @@ class Resources_RoomRequestController extends AuthenticatedController ...@@ -2584,6 +2584,7 @@ class Resources_RoomRequestController extends AuthenticatedController
); );
} }
$sidebar->addWidget($widget); $sidebar->addWidget($widget);
}
$widget = new SelectWidget( $widget = new SelectWidget(
_('Räume'), _('Räume'),
...@@ -2608,7 +2609,7 @@ class Resources_RoomRequestController extends AuthenticatedController ...@@ -2608,7 +2609,7 @@ class Resources_RoomRequestController extends AuthenticatedController
} }
$sidebar->addWidget($widget); $sidebar->addWidget($widget);
}
$widget = new OptionsWidget(_('Filter')); $widget = new OptionsWidget(_('Filter'));
$widget->addRadioButton( $widget->addRadioButton(
......
<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)): ?> <? if (!empty($resource)): ?>
<? <?
$min_time = Config::get()->INSTITUTE_COURSE_PLAN_START_HOUR . ':00'; $min_time = Config::get()->INSTITUTE_COURSE_PLAN_START_HOUR . ':00';
...@@ -256,7 +242,6 @@ ...@@ -256,7 +242,6 @@
'resources/room_request/resolve/' . $request->id, 'resources/room_request/resolve/' . $request->id,
[ [
'searched_room_id' => $resource->id, 'searched_room_id' => $resource->id,
'alternatives_selection' => 'room_search',
'selected_rooms' => [$range_str => $resource->id], 'selected_rooms' => [$range_str => $resource->id],
'reload-on-close' => 1 'reload-on-close' => 1
]); ?>" ]); ?>"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment