From 4fa03f0b32fde4bada013f60bc65ed3f4664075c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 30 Mar 2017 12:14:07 +0200 Subject: [exams] Extend "upcoming lectures" from 5 to 30 days; collapse list if > 5 Closes #3099 --- modules-available/exams/page.inc.php | 9 +++++++-- modules-available/exams/templates/page-upcoming-lectures.html | 11 ++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'modules-available/exams') diff --git a/modules-available/exams/page.inc.php b/modules-available/exams/page.inc.php index 49b48bb6..930ba62c 100644 --- a/modules-available/exams/page.inc.php +++ b/modules-available/exams/page.inc.php @@ -165,7 +165,8 @@ class Page_Exams extends Page { $out = []; $now = time(); - $cutoff = strtotime('+ 5 day'); + $cutoff = strtotime('+30 day'); + $theCount = 0; foreach ($this->lectures as $lecture) { if ($lecture['endtime'] < $now || $lecture['starttime'] > $cutoff) continue; @@ -179,6 +180,9 @@ class Page_Exams extends Page if ($duration < 86400) { $entry['duration_s'] = gmdate('H:i', $duration); } + if (++$theCount > 5) { + $entry['class'] = 'collapse'; + } $out[] = $entry; } return $out; @@ -356,7 +360,8 @@ class Page_Exams extends Page Message::addInfo('no-upcoming-lecture-exams'); } else { Render::addTemplate('page-upcoming-lectures', [ - 'pending_lectures' => $upcoming + 'pending_lectures' => $upcoming, + 'decollapse' => array_key_exists('class', end($upcoming)) ]); } // Vis.js timeline diff --git a/modules-available/exams/templates/page-upcoming-lectures.html b/modules-available/exams/templates/page-upcoming-lectures.html index 4a62bc29..a1867444 100644 --- a/modules-available/exams/templates/page-upcoming-lectures.html +++ b/modules-available/exams/templates/page-upcoming-lectures.html @@ -8,7 +8,7 @@ {{lang_actions}} {{#pending_lectures}} - + {{displayname}}
@@ -30,5 +30,14 @@ {{/pending_lectures}} + {{#decollapse}} + + + + + + + + {{/decollapse}}
\ No newline at end of file -- cgit v1.2.3-55-g7522