Skip to content
Snippets Groups Projects
Commit f70e52b5 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

prevent warnings in times/rooms, fixes #4647

Closes #4647

Merge request studip/studip!3458
parent 5f78b312
No related branches found
No related tags found
No related merge requests found
...@@ -59,14 +59,21 @@ class Course_TimesroomsController extends AuthenticatedController ...@@ -59,14 +59,21 @@ class Course_TimesroomsController extends AuthenticatedController
PageLayout::setTitle($title); PageLayout::setTitle($title);
$dates_in_time_range = CourseDate::countBySql( $parameters = [
"`range_id` = :course_id AND `date` BETWEEN :beginning AND :end", ':course_id' => $this->course->id,
[ ':beginning' => $this->course->start_semester->beginn,
'course_id' => $this->course->id, ];
'beginning' => $this->course->start_semester->beginn, if ($this->course->isOpenEnded()) {
'end' => $this->course->end_semester->vorles_ende $condition_in = '`range_id` = :course_id AND `date` >= :beginning';
] $condition_out = '`range_id` = :course_id AND `date` < :beginning';
) > 0; } else {
$condition_in = '`range_id` = :course_id AND `date` BETWEEN :beginning AND :end';
$condition_out = '`range_id` = :course_id AND `date` NOT BETWEEN :beginning AND :end';
$parameters[':end'] = $this->course->end_semester->vorles_ende;
}
$dates_in_time_range = CourseDate::countBySql($condition_in, $parameters) > 0;
$dates_outside_of_time_range = CourseDate::countBySql($condition_out, $parameters) > 0;
URLHelper::bindLinkParam('semester_filter', $this->semester_filter); URLHelper::bindLinkParam('semester_filter', $this->semester_filter);
...@@ -84,15 +91,6 @@ class Course_TimesroomsController extends AuthenticatedController ...@@ -84,15 +91,6 @@ class Course_TimesroomsController extends AuthenticatedController
$selectable_semesters = $this->course->semesters->toArray(); $selectable_semesters = $this->course->semesters->toArray();
} }
$dates_outside_of_time_range = CourseDate::countBySql(
"`range_id` = :course_id AND `date` NOT BETWEEN :beginning AND :end",
[
'course_id' => $this->course->id,
'beginning' => $this->course->start_semester->beginn,
'end' => $this->course->end_semester->vorles_ende
]
) > 0;
if (count($selectable_semesters) > 1 || (count($selectable_semesters) == 1 && $dates_outside_of_time_range)) { if (count($selectable_semesters) > 1 || (count($selectable_semesters) == 1 && $dates_outside_of_time_range)) {
$selectable_semesters[] = ['name' => _('Alle Semester'), 'semester_id' => 'all']; $selectable_semesters[] = ['name' => _('Alle Semester'), 'semester_id' => 'all'];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment