From 33f12b79f43e77d592c813238317d176a4a131f4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 4 Mar 2022 11:50:28 +0000
Subject: [PATCH] fix userdata export for consultations, fixes #762
---
lib/modules/ConsultationModule.class.php | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/modules/ConsultationModule.class.php b/lib/modules/ConsultationModule.class.php
index 3154977dddd..e77b79a7d67 100644
--- a/lib/modules/ConsultationModule.class.php
+++ b/lib/modules/ConsultationModule.class.php
@@ -121,7 +121,7 @@ class ConsultationModule extends CorePlugin implements StudipModule, SystemPlugi
function ($block) {
return $block->toRawArray();
},
- "teacher_id = :user_id OR (range_id = :user_id AND range_type = 'user')",
+ "range_id = :user_id AND range_type = 'user'",
[':user_id' => $storage->user_id]
)
);
@@ -132,8 +132,19 @@ class ConsultationModule extends CorePlugin implements StudipModule, SystemPlugi
function ($booking) {
return $booking->toRawArray();
},
- 'user_id = ?',
- [$storage->user_id]
+ 'user_id = :user_id',
+ [':user_id' => $storage->user_id]
+ )
+ );
+ $storage->addTabularData(
+ _('Terminverantwortlichkeiten'),
+ 'consultation_responsibilities',
+ ConsultationResponsibility::findAndMapBySQL(
+ function ($responsibility) {
+ return $responsibility->toRawArray();
+ },
+ "range_id = :user_id AND range_type = 'user'",
+ [':user_id' => $storage->user_id]
)
);
}
--
GitLab