select the correct rooms when resolving a room request, fixes #710

Closes #710

Merge request studip/studip!590

app/controllers/resources/room_request.php

@@ -1214,10 +1214,7 @@ class Resources_RoomRequestController extends AuthenticatedController
                         $room,
                         [$interval]
                     );
-                    if ($interval_available[0]) {
-                        $range_index = $interval['range'] . '_' . $interval['range_id'];
-                        $this->selected_rooms[$range_index] = $room->id;
-                    } else {
+                    if (!$interval_available[0]) {
                         $this->unavailable_dates[$room->id]++;
                         $this->unavailable_metadate_dates[$room->id][$metadate_id]++;
                     }
@@ -1432,7 +1429,7 @@ class Resources_RoomRequestController extends AuthenticatedController
         }
 
         $this->alternatives_selection = 'room_search';
-        if (Request::submitted('select_alternatives')) {
+        if (Request::get('alternatives_selection')) {
             CSRFProtection::verifyUnsafeRequest();
             $this->selected_rooms = Request::getArray('selected_rooms');
             $this->alternatives_selection = Request::get('alternatives_selection');

app/views/resources/room_request/resolve.php

@@ -301,7 +301,7 @@
                                         <input type="radio" name="<?= htmlReady($room_radio_name) ?>"
                                                class="text-bottom radio-null"
                                                value=""
-                                            <?= $selected_dates[$range_index] == null
+                                            <?= empty($selected_rooms[$range_index])
                                                 ? 'checked="checked"'
                                                 : '' ?>>
                                     </td>
@@ -316,7 +316,7 @@
                                             <input type="radio" name="<?= htmlReady($room_radio_name) ?>"
                                                    class="radio-null text-bottom"
                                                    value=""
-                                                <?= $selected_dates[$range_index] == null
+                                                <?= empty($selected_rooms[$range_index]) && empty($interval['booked_room'])
                                                     ? 'checked="checked"'
                                                     : '' ?>>
                                         </td>
@@ -333,7 +333,7 @@
                                     'time_intervals' => $request_time_intervals,
                                     'availability' => $room_availability[$request_resource->id],
                                     'underload' => $room_underload[$room_request->resource_id],
-                                    'selected_dates' => $selected_rooms
+                                    'selected_rooms' => $selected_rooms
                                 ]
                             ) ?>
                         <? endif ?>
@@ -346,7 +346,7 @@
                                         'time_intervals' => $request_time_intervals,
                                         'availability' => $this->room_availability[$room->id],
                                         'underload' => $room_underload[$room->id],
-                                        'selected_dates' => $selected_rooms
+                                        'selected_rooms' => $selected_rooms
                                     ]
                                 ) ?>
                             <? endforeach ?>

app/views/resources/room_request/resolve_room_tr.php

@@ -56,7 +56,7 @@
                        class="text-bottom radio-<?= htmlReady($room->id) ?>"
                        value="<?= htmlReady($room->id) ?>"
                     <?= $availability <= 0.0 ? 'disabled="disabled"' : '' ?>
-                <?= ($availability > 0 && $selected_dates[$range_index] == $room->id)
+                <?= ($availability > 0 && $selected_rooms[$range_index] == $room->id)
                     ? 'checked="checked"'
                     : ''?>>
                 <? if ($availability >= 1.0) : ?>
@@ -97,7 +97,7 @@
                         <input type="radio" name="<?= htmlReady($room_radio_name) ?>"
                                class="text-bottom radio-<?= htmlReady($room->id) ?>"
                                value="<?= htmlReady($room->id) ?>"
-                               <?= ($selected_dates[$range_index] == $room->id
+                               <?= ($selected_rooms[$range_index] == $room->id
                                      || $interval['booked_room'] == $room->id)
                                  ? 'checked="checked"'
                                  : ''?>>