diff options
| author | Simon Rettberg | 2017-04-28 10:05:28 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-04-28 10:05:28 +0200 |
| commit | 6faec4aee961c35394c0bd57ed2719be67fdd012 (patch) | |
| tree | e204dd54cc2a43fdcf2649795a44bc9356d940e4 /modules-available/exams | |
| parent | [baseconfig_bwlp] Add setting for default pvs checkbox state in vmChooser (diff) | |
| download | slx-admin-6faec4aee961c35394c0bd57ed2719be67fdd012.tar.gz slx-admin-6faec4aee961c35394c0bd57ed2719be67fdd012.tar.xz slx-admin-6faec4aee961c35394c0bd57ed2719be67fdd012.zip | |
[exams] Add ORDER BY to queries generating UI content, change wording
This fixes #3123
Diffstat (limited to 'modules-available/exams')
| -rw-r--r-- | modules-available/exams/lang/de/template-tags.json | 2 | ||||
| -rw-r--r-- | modules-available/exams/lang/en/template-tags.json | 2 | ||||
| -rw-r--r-- | modules-available/exams/page.inc.php | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/modules-available/exams/lang/de/template-tags.json b/modules-available/exams/lang/de/template-tags.json index 6f4dce62..b98f8525 100644 --- a/modules-available/exams/lang/de/template-tags.json +++ b/modules-available/exams/lang/de/template-tags.json @@ -20,7 +20,7 @@ "lang_end_time": "Uhrzeit", "lang_examModeDescription": "Hier k\u00f6nnen Sie bwLehrpool-R\u00e4ume zeitgesteuert in den Pr\u00fcfungsmodus versetzen. Im Pr\u00fcfungsmodus ist das Client-System st\u00e4rker abgeriegelt, sodass es sich zum Schreiben von E-Pr\u00fcfungen eignet. Nach dem Ein- bzw. Ausschalten des Pr\u00fcfungsmodus ist es notwendig, die Rechner in den betroffenen R\u00e4umen neuzustarten.", "lang_global": "Global", - "lang_headingAllExamLectures": "Liste ausstehender Pr\u00fcfungsveranstaltungen", + "lang_headingAllExamLectures": "Ausstehende Pr\u00fcfungsveranstaltungen (30 Tage)", "lang_headingGraphicalOverview": "Grafische Darstellung", "lang_headingMain": "bwLehrpool Pr\u00fcfungsmodus", "lang_id": "ID", diff --git a/modules-available/exams/lang/en/template-tags.json b/modules-available/exams/lang/en/template-tags.json index f91329c9..eee74793 100644 --- a/modules-available/exams/lang/en/template-tags.json +++ b/modules-available/exams/lang/en/template-tags.json @@ -20,7 +20,7 @@ "lang_end_time": "Time", "lang_examModeDescription": "Here you can define time spans during which selected rooms will be set to exam mode. In exam mode, the client computers are more locked down than usual so it is suitable for writing electronic exams.", "lang_global": "Global", - "lang_headingAllExamLectures": "Upcoming lectures marked as exams", + "lang_headingAllExamLectures": "Upcoming lectures marked as exams (30 days)", "lang_headingGraphicalOverview": "Graphical overview", "lang_headingMain": "bwLehrpool exam mode", "lang_id": "ID", diff --git a/modules-available/exams/page.inc.php b/modules-available/exams/page.inc.php index 930ba62c..5b4df01a 100644 --- a/modules-available/exams/page.inc.php +++ b/modules-available/exams/page.inc.php @@ -35,7 +35,8 @@ class Page_Exams extends Page . "NATURAL LEFT JOIN exams_x_location exl " . "NATURAL LEFT JOIN location loc " . "LEFT JOIN sat.lecture l USING (lectureid) " - . "GROUP BY examid "); + . "GROUP BY examid " + . "ORDER BY examid ASC"); while ($exam = $tmp->fetch(PDO::FETCH_ASSOC)) { $this->exams[] = $exam; } @@ -49,7 +50,8 @@ class Page_Exams extends Page "INNER JOIN sat.user ON (user.userid = lecture.ownerid) " . "NATURAL LEFT JOIN sat.lecture_x_location " . "WHERE isexam <> 0 AND starttime < :rangeMax AND endtime > :rangeMin " . - "GROUP BY lectureid", + "GROUP BY lectureid " . + "ORDER BY starttime ASC, displayname ASC", ['rangeMax' => $this->rangeMax, 'rangeMin' => $this->rangeMin]); while ($lecture = $tmp->fetch(PDO::FETCH_ASSOC)) { $this->lectures[] = $lecture; |