From a411cc82d18b751da12bd243d03c420c72f9e073 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 14 Aug 2023 17:33:26 +0200
Subject: [PATCH] Fix missing "contact trainer"-functionality

---
 .../src/pages/learningPath/circlePage/CirclePage.vue  |  8 ++++++--
 server/vbv_lernwelt/feedback/admin.py                 |  6 +++++-
 server/vbv_lernwelt/importer/services.py              |  4 +++-
 .../importer/tests/test_import_course_sessions.py     | 11 ++++++++---
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/client/src/pages/learningPath/circlePage/CirclePage.vue b/client/src/pages/learningPath/circlePage/CirclePage.vue
index ca4ae572..77e0d90d 100644
--- a/client/src/pages/learningPath/circlePage/CirclePage.vue
+++ b/client/src/pages/learningPath/circlePage/CirclePage.vue
@@ -204,9 +204,13 @@ onMounted(async () => {
                         </p>
                       </div>
                     </div>
-                    <button class="btn-secondary mt-4 text-xl">
+                    <a
+                      v-if="courseSessionsStore.circleExperts.length > 0"
+                      :href="'mailto:' + courseSessionsStore.circleExperts[0].email"
+                      class="btn-secondary mt-4 text-xl"
+                    >
                       {{ $t("circlePage.contactExpertButton") }}
-                    </button>
+                    </a>
                   </div>
                 </div>
               </div>
diff --git a/server/vbv_lernwelt/feedback/admin.py b/server/vbv_lernwelt/feedback/admin.py
index db8ecf49..7e839024 100644
--- a/server/vbv_lernwelt/feedback/admin.py
+++ b/server/vbv_lernwelt/feedback/admin.py
@@ -5,5 +5,9 @@ from vbv_lernwelt.feedback.models import FeedbackResponse
 
 @admin.register(FeedbackResponse)
 class FeedbackResponseModel(admin.ModelAdmin):
-    list_display = ["course_session", "circle", "created_at", ]
+    list_display = [
+        "course_session",
+        "circle",
+        "created_at",
+    ]
     list_filter = ["course_session", "circle"]
diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py
index 24de03ca..30b35e9a 100644
--- a/server/vbv_lernwelt/importer/services.py
+++ b/server/vbv_lernwelt/importer/services.py
@@ -362,7 +362,9 @@ def create_or_update_course_session(
                     == AssignmentType.CASEWORK.value
                     and end
                 ):
-                    csa.submission_deadline.end = timezone.make_aware(start) + timezone.timedelta(days=30)
+                    csa.submission_deadline.end = timezone.make_aware(
+                        start
+                    ) + timezone.timedelta(days=30)
                     csa.submission_deadline.save()
 
     return cs
diff --git a/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py b/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py
index b9469c66..e1d5c75e 100644
--- a/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py
+++ b/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py
@@ -8,7 +8,10 @@ from vbv_lernwelt.core.create_default_users import create_default_users
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.creators.test_course import create_test_course
 from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
-from vbv_lernwelt.course_session.models import CourseSessionAttendanceCourse, CourseSessionAssignment
+from vbv_lernwelt.course_session.models import (
+    CourseSessionAssignment,
+    CourseSessionAttendanceCourse,
+)
 from vbv_lernwelt.duedate.models import DueDate
 from vbv_lernwelt.importer.services import (
     create_or_update_course_session,
@@ -89,7 +92,8 @@ class CreateOrUpdateCourseSessionTestCase(TestCase):
         self.assertEqual(4, DueDate.objects.count())
 
         casework = CourseSessionAssignment.objects.filter(
-            learning_content__assignment_type=AssignmentType.CASEWORK.value).first()
+            learning_content__assignment_type=AssignmentType.CASEWORK.value
+        ).first()
         self.assertEqual(
             casework.submission_deadline.end.isoformat(), "2023-07-06T11:30:00+00:00"
         )
@@ -172,7 +176,8 @@ class CreateOrUpdateCourseSessionTestCase(TestCase):
         self.assertEqual(4, DueDate.objects.count())
 
         casework = CourseSessionAssignment.objects.filter(
-            learning_content__assignment_type=AssignmentType.CASEWORK.value).first()
+            learning_content__assignment_type=AssignmentType.CASEWORK.value
+        ).first()
         self.assertEqual(
             casework.submission_deadline.end.isoformat(), "2023-07-06T12:30:00+00:00"
         )