aboutsummaryrefslogtreecommitdiff
path: root/lib/extern/ExternPageTimetable.php
diff options
context:
space:
mode:
authorPhilipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de>2024-09-24 10:53:31 +0200
committerPhilipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de>2024-09-24 10:53:31 +0200
commit4459dd7917f4d1c34f40bb68f0e991e9c3d53e4c (patch)
tree5c07151ae61276d334e88f6309c30d439a85c12e /lib/extern/ExternPageTimetable.php
parentda0022e5c1abbf9825ae76debaabdff7e8623bb4 (diff)
parent97a188592c679890a25c37ab78463add76a52ff7 (diff)
Merge branch 'main' into issue-3911issue-3911
Diffstat (limited to 'lib/extern/ExternPageTimetable.php')
-rw-r--r--lib/extern/ExternPageTimetable.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/extern/ExternPageTimetable.php b/lib/extern/ExternPageTimetable.php
index d427600..1e0e66a 100644
--- a/lib/extern/ExternPageTimetable.php
+++ b/lib/extern/ExternPageTimetable.php
@@ -119,7 +119,11 @@ class ExternPageTimetable extends ExternPage
LEFT JOIN `seminar_inst`
ON `seminare`.`Seminar_id` = `seminar_inst`.`Seminar_id`";
$query .= "
- WHERE (`termine`.`date` >= :start AND `termine`.`date` <= :end) "
+ WHERE (
+ `seminare`.`visible` = 1
+ AND termine`.`date` >= :start
+ AND `termine`.`date` <= :end
+ )"
. $this->getEventTypeSQL($params)
. $this->getScopesSQL($params, $this->studyareas, (bool) $this->scope_kids)
. $this->getInstitutesSQL($params)
@@ -162,7 +166,7 @@ class ExternPageTimetable extends ExternPage
$time = new DateTime();
switch ($this->date_offset) {
case 'start_date':
- $time = DateTime::createFromFormat('d.m.Y', $this->date);
+ $time = $this->date ? DateTime::createFromFormat('d.m.Y', $this->date) : $time;
break;
case 'current_semester':
$semester = Semester::findCurrent();
@@ -228,6 +232,7 @@ class ExternPageTimetable extends ExternPage
protected function getContent()
{
$count = 0;
+ $date_content = [];
foreach ($this->getDates() as $date) {
$day = new DateTime();
$day->setTimestamp($date->date)->setTime(0, 0);