diff --git a/client/src/pages/learningMentor/InvitationAcceptPage.vue b/client/src/pages/learningMentor/InvitationAcceptPage.vue index 36f3e55b..e92481a1 100644 --- a/client/src/pages/learningMentor/InvitationAcceptPage.vue +++ b/client/src/pages/learningMentor/InvitationAcceptPage.vue @@ -36,11 +36,20 @@ const { data, error } = useCSRFFetch( "a.Die Einladung konnte nicht akzeptiert werden. Bitte melde dich beim Support." ) }} -
- - vermittler@vbv-afa.ch - -
+
{{ $t("a.Fehlermeldung") }}: {{ error.message }}
diff --git a/server/config/asgi.py b/server/config/asgi.py index ea86455d..c92d68bd 100644 --- a/server/config/asgi.py +++ b/server/config/asgi.py @@ -7,6 +7,7 @@ For more information on this file, see https://docs.djangoproject.com/en/dev/howto/deployment/asgi/ """ + import os import sys from pathlib import Path diff --git a/server/config/settings/base.py b/server/config/settings/base.py index 358cccb1..6a342330 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -1,6 +1,7 @@ """ Base settings to build other settings files upon. """ + import logging from pathlib import Path @@ -398,9 +399,9 @@ if IT_DJANGO_LOGGING_CONF == "IT_DJANGO_LOGGING_CONF_CONSOLE_COLOR": "propagate": False, }, "django.server": { - "handlers": ["null"] - if IT_LOCAL_HIDE_DJANGO_SERVER_LOGS - else ["default"], + "handlers": ( + ["null"] if IT_LOCAL_HIDE_DJANGO_SERVER_LOGS else ["default"] + ), "level": "INFO", "propagate": False, }, diff --git a/server/config/wsgi.py b/server/config/wsgi.py index bb428756..83ea67eb 100644 --- a/server/config/wsgi.py +++ b/server/config/wsgi.py @@ -13,6 +13,7 @@ middleware here, or combine a Django application with an application of another framework. """ + import os import sys from pathlib import Path diff --git a/server/vbv_lernwelt/assignment/services.py b/server/vbv_lernwelt/assignment/services.py index 94a00b49..5598305c 100644 --- a/server/vbv_lernwelt/assignment/services.py +++ b/server/vbv_lernwelt/assignment/services.py @@ -67,9 +67,9 @@ def update_assignment_completion( assignment_user_id=assignment_user.id, assignment_id=assignment.id, course_session_id=course_session.id, - learning_content_page_id=learning_content_page.id - if learning_content_page - else None, + learning_content_page_id=( + learning_content_page.id if learning_content_page else None + ), ) if initialize_completion: diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py index 2e1eb012..8ee1a51d 100644 --- a/server/vbv_lernwelt/dashboard/views.py +++ b/server/vbv_lernwelt/dashboard/views.py @@ -433,9 +433,9 @@ def get_course_config( is_mentor=is_mentor, widgets=get_widgets_for_course(role_key, is_uk, is_vv, is_mentor), has_preview=has_preview(role_key), - session_to_continue_id=str(session_to_continue.id) - if session_to_continue - else None, + session_to_continue_id=( + str(session_to_continue.id) if session_to_continue else None + ), ) ) diff --git a/server/vbv_lernwelt/feedback/services.py b/server/vbv_lernwelt/feedback/services.py index b593992a..8625c293 100644 --- a/server/vbv_lernwelt/feedback/services.py +++ b/server/vbv_lernwelt/feedback/services.py @@ -83,9 +83,11 @@ def update_feedback_response( initial_data = initial_data_for_feedback_page(learning_content_feedback_page) merged_data = initial_data | { - key: updated_data[key] - if updated_data.get(key, "") != "" - else original_data.get(key) + key: ( + updated_data[key] + if updated_data.get(key, "") != "" + else original_data.get(key) + ) for key in initial_data.keys() } diff --git a/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py b/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py index 959f6f41..da451959 100644 --- a/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py +++ b/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py @@ -70,9 +70,11 @@ def get_self_feedback_evaluation( MentorAssignmentCompletion( # feedback_submitted as seen from the perspective of the evaluation user (feedback provider) # means that the feedback has been evaluated by the feedback provider, hence the status is EVALUATED - status=MentorCompletionStatus.EVALUATED - if f.feedback_submitted - else MentorCompletionStatus.SUBMITTED, + status=( + MentorCompletionStatus.EVALUATED + if f.feedback_submitted + else MentorCompletionStatus.SUBMITTED + ), user_id=f.feedback_requester_user.id, last_name=f.feedback_requester_user.last_name, url=f"/course/{course.slug}/cockpit/mentor/self-evaluation-feedback/{f.learning_unit.id}",