Skip to content
Snippets Groups Projects
Commit a1e25a04 authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

check the dates in resource_request_appointments instead of all course dates, fixes #3509

Closes #3509

Merge request studip/studip!2399
parent 67db2d8e
No related branches found
No related tags found
No related merge requests found
...@@ -302,7 +302,11 @@ class Resources_RoomRequestController extends AuthenticatedController ...@@ -302,7 +302,11 @@ class Resources_RoomRequestController extends AuthenticatedController
OR OR
(resource_requests.metadate_id <> '' AND EXISTS (SELECT * FROM termine WHERE termine.metadate_id=resource_requests.metadate_id AND termine.date BETWEEN :begin AND :semester_end)) (resource_requests.metadate_id <> '' AND EXISTS (SELECT * FROM termine WHERE termine.metadate_id=resource_requests.metadate_id AND termine.date BETWEEN :begin AND :semester_end))
OR OR
(resource_requests.termin_id = '' AND resource_requests.metadate_id = '' AND EXISTS (SELECT * FROM termine WHERE termine.range_id=resource_requests.course_id AND termine.date BETWEEN :begin AND :semester_end)) (resource_requests.termin_id = '' AND resource_requests.metadate_id = '' AND (
EXISTS (SELECT * FROM termine JOIN resource_request_appointments ON termine.termin_id = appointment_id WHERE request_id = resource_requests.id AND termine.date BETWEEN :begin AND :semester_end)
OR
NOT EXISTS (SELECT * FROM resource_request_appointments WHERE request_id = resource_requests.id) AND EXISTS (SELECT * FROM termine WHERE termine.range_id=resource_requests.course_id AND termine.date BETWEEN :begin AND :semester_end)
))
"; ";
if (empty($this->filter['request_periods'])) { if (empty($this->filter['request_periods'])) {
......
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