Merged in fix/support-email (pull request #332)

Add uk support email to error page

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."
               )
             }}
-            <div>
+            <ul>
+              <li>
+                {{ $t("a.Versicherungsvermittler/-in") }}
                 <a class="underline" href="mailto:vermittler@vbv-afa.ch">
                   vermittler@vbv-afa.ch
                 </a>
-            </div>
+              </li>
+              <li>
+                {{ $t("a.Überbetriebliche Kurse") }}
+                <a class="underline" href="mailto:uek-support@vbv-afa.ch">
+                  uek-support@vbv-afa.ch
+                </a>
+              </li>
+            </ul>
             <div v-if="error.message" class="my-4">
               {{ $t("a.Fehlermeldung") }}: {{ error.message }}
             </div>

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

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"]
+                "handlers": (
-                if IT_LOCAL_HIDE_DJANGO_SERVER_LOGS
+                    ["null"] if IT_LOCAL_HIDE_DJANGO_SERVER_LOGS else ["default"]
-                else ["default"],
+                ),
                 "level": "INFO",
                 "propagate": False,
             },

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

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
+        learning_content_page_id=(
-        if learning_content_page
+            learning_content_page.id if learning_content_page else None
-        else None,
+        ),
     )
 
     if initialize_completion:

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)
+                session_to_continue_id=(
-                if session_to_continue
+                    str(session_to_continue.id) if session_to_continue else None
-                else None,
+                ),
             )
         )
 

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]
+        key: (
+            updated_data[key]
             if updated_data.get(key, "") != ""
             else original_data.get(key)
+        )
         for key in initial_data.keys()
     }
 

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
+                status=(
+                    MentorCompletionStatus.EVALUATED
                     if f.feedback_submitted
-                else MentorCompletionStatus.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}",