From e5a6af7eb3e50ea9124fe38261450ad3c65da76a Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 18 Jun 2021 09:16:02 +0200 Subject: [PATCH] first guess adding filter for upcoming exams --- .../lehre/pruefungsprotokollUebersicht.php | 2 ++ .../pruefungsprotokollUebersichtData.php | 1 + system/phrasesupdate.php | 20 +++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php index 35bea7963..2416b30bd 100644 --- a/application/views/lehre/pruefungsprotokollUebersicht.php +++ b/application/views/lehre/pruefungsprotokollUebersicht.php @@ -48,6 +48,8 @@ name="period" value="today">p->t('ui','heute'); ?> + diff --git a/application/views/lehre/pruefungsprotokollUebersichtData.php b/application/views/lehre/pruefungsprotokollUebersichtData.php index dd247c2eb..caee939a5 100644 --- a/application/views/lehre/pruefungsprotokollUebersichtData.php +++ b/application/views/lehre/pruefungsprotokollUebersichtData.php @@ -21,6 +21,7 @@ WHERE AND ( '". $PERIOD. "' = 'today' AND datum = NOW()::date OR '". $PERIOD. "' = 'lastWeek' AND datum = (NOW() - interval '1 week')::date OR + '". $PERIOD. "' = 'upcoming' AND datum > NOW()::date OR '". $PERIOD. "' = 'all' AND datum >= '2020-05-27' ) ORDER BY datum, nachname, vorname diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index b49aa6044..18098af91 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -7949,6 +7949,26 @@ Any unusual occurrences ) ) ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'zukuenftige', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Zukünftige', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'upcoming', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'ui',