ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing "contact trainer"-functionality

This commit is contained in:
Christian Cueni 2023-08-14 17:33:26 +02:00
parent 406cf425c2
commit a411cc82d1
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/pages/learningPath/circlePage/CirclePage.vue
View File

@ -204,9 +204,13 @@ onMounted(async () => {
</p> </p>
</div> </div>
</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") }} {{ $t("circlePage.contactExpertButton") }}
</button> </a>
</div> </div>
</div> </div>
</div> </div>

6
server/vbv_lernwelt/feedback/admin.py
View File

@ -5,5 +5,9 @@ from vbv_lernwelt.feedback.models import FeedbackResponse
@admin.register(FeedbackResponse) @admin.register(FeedbackResponse)
class FeedbackResponseModel(admin.ModelAdmin): class FeedbackResponseModel(admin.ModelAdmin):
list_display = ["course_session", "circle", "created_at", ] list_display = [
"course_session",
"circle",
"created_at",
]
list_filter = ["course_session", "circle"] list_filter = ["course_session", "circle"]

4
server/vbv_lernwelt/importer/services.py
View File

@ -362,7 +362,9 @@ def create_or_update_course_session(
== AssignmentType.CASEWORK.value == AssignmentType.CASEWORK.value
and end 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() csa.submission_deadline.save()
return cs return cs

11
server/vbv_lernwelt/importer/tests/test_import_course_sessions.py
View File

@ -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.core.models import User
from vbv_lernwelt.course.creators.test_course import create_test_course from vbv_lernwelt.course.creators.test_course import create_test_course
from vbv_lernwelt.course.models import CourseSession, CourseSessionUser 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.duedate.models import DueDate
from vbv_lernwelt.importer.services import ( from vbv_lernwelt.importer.services import (
create_or_update_course_session, create_or_update_course_session,
@ -89,7 +92,8 @@ class CreateOrUpdateCourseSessionTestCase(TestCase):
self.assertEqual(4, DueDate.objects.count()) self.assertEqual(4, DueDate.objects.count())
casework = CourseSessionAssignment.objects.filter( casework = CourseSessionAssignment.objects.filter(
learning_content__assignment_type=AssignmentType.CASEWORK.value).first() learning_content__assignment_type=AssignmentType.CASEWORK.value
).first()
self.assertEqual( self.assertEqual(
casework.submission_deadline.end.isoformat(), "2023-07-06T11:30:00+00:00" 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()) self.assertEqual(4, DueDate.objects.count())
casework = CourseSessionAssignment.objects.filter( casework = CourseSessionAssignment.objects.filter(
learning_content__assignment_type=AssignmentType.CASEWORK.value).first() learning_content__assignment_type=AssignmentType.CASEWORK.value
).first()
self.assertEqual( self.assertEqual(
casework.submission_deadline.end.isoformat(), "2023-07-06T12:30:00+00:00" casework.submission_deadline.end.isoformat(), "2023-07-06T12:30:00+00:00"
) )