summaryrefslogtreecommitdiffstats
path: root/modules-available/exams
diff options
context:
space:
mode:
authorSimon Rettberg2016-06-24 14:24:04 +0200
committerSimon Rettberg2016-06-24 14:24:04 +0200
commitce3a398d1d8f465e5681e8664caa8abc3475b9c0 (patch)
tree9ed25fe4cde44091dd65367fe5cec64a88d3f7d3 /modules-available/exams
parent[exams] Indent location by tree depth; fix ordering of locations in vis.js (diff)
parentdisplay locationid=0 as locationid=* (diff)
downloadslx-admin-ce3a398d1d8f465e5681e8664caa8abc3475b9c0.tar.gz
slx-admin-ce3a398d1d8f465e5681e8664caa8abc3475b9c0.tar.xz
slx-admin-ce3a398d1d8f465e5681e8664caa8abc3475b9c0.zip
Merge branch 'modularization' of dnbd3:openslx-ng/slx-admin into modularization
Diffstat (limited to 'modules-available/exams')
-rw-r--r--modules-available/exams/page.inc.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/modules-available/exams/page.inc.php b/modules-available/exams/page.inc.php
index 94973a4d..54fad5cf 100644
--- a/modules-available/exams/page.inc.php
+++ b/modules-available/exams/page.inc.php
@@ -63,7 +63,14 @@ class Page_Exams extends Page
$unique_ids = 1;
/* add the red shadows */
foreach ($this->exams as $e) {
- foreach (explode(',', $e['locationids']) as $locationid) {
+ $locationids = explode(',', $e['locationids']);
+ if ($locationids[0] == 0) {
+ $locationids = [];
+ foreach($this->locations as $l) {
+ $locationids[] = $l['locationid'];
+ }
+ }
+ foreach ($locationids as $locationid) {
$out[] = ['id' => 'shadow_' . $unique_ids++,
'content' => '',
'start' => intval($e['starttime']) * 1000,