From 86a065d0d66cb902b7f482b456d256d24360ef4e Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 16 Feb 2021 16:31:42 +0100 Subject: [PATCH 1/4] Fixed: Now checking user by prestudent_id to entitle to read DMS document Signed-off-by: cris-technikum --- .../controllers/lehre/anrechnung/RequestAnrechnung.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php index 784065b19..4f589e5f5 100644 --- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php +++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php @@ -292,11 +292,16 @@ class requestAnrechnung extends Auth_Controller */ private function _checkIfEntitledToReadDMSDoc($dms_id) { + if (!$student = getData($this->StudentModel->load(array('student_uid' => $this->_uid)))[0]) + { + show_error('Failed loading Student'); + } + $result = $this->AnrechnungModel->loadWhere(array('dms_id' => $dms_id)); if($result = getData($result)[0]) { - if ($result->insertvon == $this->_uid) + if ($result->prestudent_id == $student->prestudent_id) { return; } From 1ca22970a9e27e0fb220cc02eb5d5de0adf83493 Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 16 Feb 2021 17:37:14 +0100 Subject: [PATCH 2/4] Adapted: Show only applications that were requested for recommendation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change in lectors overview. Now lectors only get Anrechnungsanträge, where the STGL had requested a recommendation. Signed-off-by: cris-technikum --- .../lehre/anrechnung/reviewAnrechnungUebersichtData.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php index 0f5704c79..7382df85b 100644 --- a/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php +++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php @@ -48,6 +48,12 @@ $query = ' AND le.studiensemester_kurzbz = anrechnungen.studiensemester_kurzbz AND lema.mitarbeiter_uid = \'' . $LEKTOR_UID . '\' AND le.lehre = TRUE + AND EXISTS ( + SELECT 1 + FROM lehre.tbl_anrechnung_anrechnungstatus + WHERE anrechnung_id = anrechnungen.anrechnung_id + AND status_kurzbz=\'inProgressLektor\' + ) '; $filterWidgetArray = array( From 241fb34b23df64d2648c2fb8b82877879ded0584 Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 16 Feb 2021 18:04:27 +0100 Subject: [PATCH 3/4] Added filter button to STGL Overview (filter: show all progressed by STGL) Signed-off-by: cris-technikum --- .../approveAnrechnungUebersicht.php | 5 +++++ .../anrechnung/approveAnrechnungUebersicht.js | 5 ++--- system/phrasesupdate.php | 22 +++++++++++++++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php index 258e09aca..1789706c8 100644 --- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php +++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php @@ -189,6 +189,11 @@ $this->load->view(