From a3d65eb78d2f8b63155977a2bfaf89e0317d1fab Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 28 Feb 2024 07:50:31 +0100 Subject: [PATCH 1/5] WIP: Add feedback export to file --- .../feedback/management/__init__.py | 0 .../feedback/management/commands/__init__.py | 0 .../management/commands/export_feedback.py | 74 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 server/vbv_lernwelt/feedback/management/__init__.py create mode 100644 server/vbv_lernwelt/feedback/management/commands/__init__.py create mode 100644 server/vbv_lernwelt/feedback/management/commands/export_feedback.py diff --git a/server/vbv_lernwelt/feedback/management/__init__.py b/server/vbv_lernwelt/feedback/management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/server/vbv_lernwelt/feedback/management/commands/__init__.py b/server/vbv_lernwelt/feedback/management/commands/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/server/vbv_lernwelt/feedback/management/commands/export_feedback.py b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py new file mode 100644 index 00000000..011275f3 --- /dev/null +++ b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py @@ -0,0 +1,74 @@ +from datetime import datetime +from itertools import groupby +from operator import attrgetter + +import djclick as click +import structlog +from openpyxl import Workbook + +from vbv_lernwelt.feedback.models import FeedbackResponse + +logger = structlog.get_logger(__name__) + +VV_FEEDBACK_QUESTIONS = [ + ("satisfaction", "Zufriedenheit insgesamt"), + ("goal_attainment", "Zielerreichung insgesamt"), + ( + "proficiency", + "Wie beurteilst du deine Sicherheit bezüglichen den Themen nach dem Circle?", + ), + ("preparation_task_clarity", "Waren die Praxisaufträge klar und verständlich?"), + ("would_recommend", "Würdest du den Circle weiterempfehlen?"), + ("course_positive_feedback", "Was hat dir besonders gut gefallen?"), + ("course_negative_feedback", "Wo siehst du Verbesserungspotential?"), +] + +logger = structlog.get_logger(__name__) + + +@click.command() +@click.argument("course_session_id") +def command(course_session_id): + wb = Workbook() + wb.remove_sheet(wb.active) + # Create another sheet + feedbacks = FeedbackResponse.objects.filter( + course_session_id=course_session_id + ).order_by("circle") + grouped_feedbacks = groupby(feedbacks, key=attrgetter("circle")) + + for circle, group_feedbacks in grouped_feedbacks: + logger.debug( + "export_feedback_for_circle", + data={ + "circle": circle.title, + "course_session_id": course_session_id, + "count": sum(1 for _ in group_feedbacks), + }, + label="feedback_export", + ) + create_sheet(wb, circle.title, group_feedbacks) + + today_date = datetime.today().strftime("%Y-%m-%d") + + # Set the filename with today's date + filename = f"feedback_export_{today_date}.xlsx" + wb.save("example.xlsx") + + +def create_sheet(wb: Workbook, title: str, data: list[FeedbackResponse]): + sheet = wb.create_sheet(title=title) + # add header + questions = [q[1] for q in VV_FEEDBACK_QUESTIONS] + for col_idx, title in enumerate(questions, start=2): + sheet.cell(row=1, column=col_idx, value=title) + + add_rows(sheet, data) + return sheet + + +def add_rows(sheet, data): + for row_idx, feedback in enumerate(data, start=2): + for col_idx, question in enumerate(VV_FEEDBACK_QUESTIONS, start=2): + response = feedback.data.get(question[0], "") + sheet.cell(row=row_idx, column=col_idx, value=response) From 603c0544c2cadec22ca6ab6430d857c997d936b1 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 28 Feb 2024 10:50:03 +0100 Subject: [PATCH 2/5] WIP: Add view --- server/config/urls.py | 10 ++++-- .../management/commands/export_feedback.py | 36 +++++++++++++++---- server/vbv_lernwelt/feedback/views.py | 19 +++++++++- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/server/config/urls.py b/server/config/urls.py index 1f2b36fa..2d96e5cb 100644 --- a/server/config/urls.py +++ b/server/config/urls.py @@ -10,6 +10,9 @@ from django.views import defaults as default_views from django.views.decorators.csrf import csrf_exempt from django_ratelimit.exceptions import Ratelimited from graphene_django.views import GraphQLView +from wagtail import urls as wagtail_urls +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.documents import urls as media_library_urls from vbv_lernwelt.api.directory import list_entities from vbv_lernwelt.api.user import ( @@ -52,6 +55,7 @@ from vbv_lernwelt.edoniq_test.views import ( from vbv_lernwelt.feedback.views import ( get_expert_feedbacks_for_course, get_feedback_for_circle, + export_feedback_for_course_session, ) from vbv_lernwelt.files.views import presign from vbv_lernwelt.importer.views import ( @@ -61,9 +65,6 @@ from vbv_lernwelt.importer.views import ( ) from vbv_lernwelt.media_files.views import user_image from vbv_lernwelt.notify.views import email_notification_settings -from wagtail import urls as wagtail_urls -from wagtail.admin import urls as wagtailadmin_urls -from wagtail.documents import urls as media_library_urls class SignedIntConverter(IntConverter): @@ -171,6 +172,9 @@ urlpatterns = [ name='storage_presign'), # feedback + path(r'api/core/feedback/export//', + export_feedback_for_course_session, + name='export_feedback_for_course_session'), path(r'api/core/feedback//summary/', get_expert_feedbacks_for_course, name='feedback_summary'), diff --git a/server/vbv_lernwelt/feedback/management/commands/export_feedback.py b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py index 011275f3..8864f956 100644 --- a/server/vbv_lernwelt/feedback/management/commands/export_feedback.py +++ b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py @@ -1,4 +1,5 @@ from datetime import datetime +from io import BytesIO from itertools import groupby from operator import attrgetter @@ -28,32 +29,48 @@ logger = structlog.get_logger(__name__) @click.command() @click.argument("course_session_id") -def command(course_session_id): +@click.option( + "--save-as-file/--no-save-as-file", + default=True, + help="`save-as-file` to save the file, `no-save-as-file` returns bytes. Default is `save-as-file`.", +) +def command(course_session_id, save_as_file): + # using the output from call_command was a bit cumbersome, so this is just a wrapper for the actual function + export_feedback(course_session_id, save_as_file) + + +def export_feedback(course_session_id: str, save_as_file: bool): wb = Workbook() + + # remove the first sheet is just easier than keeping track of the active sheet wb.remove_sheet(wb.active) - # Create another sheet + feedbacks = FeedbackResponse.objects.filter( course_session_id=course_session_id ).order_by("circle") grouped_feedbacks = groupby(feedbacks, key=attrgetter("circle")) for circle, group_feedbacks in grouped_feedbacks: + group_feedbacks = list(group_feedbacks) logger.debug( "export_feedback_for_circle", data={ "circle": circle.title, "course_session_id": course_session_id, - "count": sum(1 for _ in group_feedbacks), + "count": len(group_feedbacks), }, label="feedback_export", ) create_sheet(wb, circle.title, group_feedbacks) - today_date = datetime.today().strftime("%Y-%m-%d") + if save_as_file: + wb.save(make_export_filename()) + else: + output = BytesIO() + wb.save(output) - # Set the filename with today's date - filename = f"feedback_export_{today_date}.xlsx" - wb.save("example.xlsx") + output.seek(0) + return output.getvalue() def create_sheet(wb: Workbook, title: str, data: list[FeedbackResponse]): @@ -72,3 +89,8 @@ def add_rows(sheet, data): for col_idx, question in enumerate(VV_FEEDBACK_QUESTIONS, start=2): response = feedback.data.get(question[0], "") sheet.cell(row=row_idx, column=col_idx, value=response) + + +def make_export_filename(): + today_date = datetime.today().strftime("%Y-%m-%d") + return f"feedback_export_{today_date}.xlsx" diff --git a/server/vbv_lernwelt/feedback/views.py b/server/vbv_lernwelt/feedback/views.py index ecd11483..13dbe37c 100644 --- a/server/vbv_lernwelt/feedback/views.py +++ b/server/vbv_lernwelt/feedback/views.py @@ -1,10 +1,14 @@ import itertools import structlog -from rest_framework.decorators import api_view +from django.http import HttpResponse +from rest_framework import authentication +from rest_framework.decorators import api_view, authentication_classes, permission_classes from rest_framework.exceptions import PermissionDenied +from rest_framework.permissions import IsAdminUser from rest_framework.response import Response +from vbv_lernwelt.feedback.management.commands.export_feedback import export_feedback, make_export_filename from vbv_lernwelt.feedback.models import FeedbackResponse from vbv_lernwelt.feedback.utils import feedback_users from vbv_lernwelt.iam.permissions import is_course_session_expert @@ -78,3 +82,16 @@ def get_feedback_for_circle(request, course_session_id, circle_id): feedback_data["questions"][field].append(data) return Response(status=200, data=feedback_data) + + +@api_view(["GET"]) +@authentication_classes((authentication.SessionAuthentication,)) +@permission_classes((IsAdminUser,)) +def export_feedback_for_course_session(request, course_session_id): + excel_bytes = export_feedback(course_session_id, False) + + response = HttpResponse(content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") + response['Content-Disposition'] = f"attachment; filename={make_export_filename()}" + response.write(excel_bytes) + + return response From 798c159ee75050974602cc5489a6252d047b38b8 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 28 Feb 2024 11:40:10 +0100 Subject: [PATCH 3/5] Move code to service, add admin action --- server/config/urls.py | 10 +- server/vbv_lernwelt/course/admin.py | 4 + .../management/commands/export_feedback.py | 80 +--------------- server/vbv_lernwelt/feedback/services.py | 94 +++++++++++++++++++ server/vbv_lernwelt/feedback/views.py | 19 +--- 5 files changed, 103 insertions(+), 104 deletions(-) diff --git a/server/config/urls.py b/server/config/urls.py index 2d96e5cb..1f2b36fa 100644 --- a/server/config/urls.py +++ b/server/config/urls.py @@ -10,9 +10,6 @@ from django.views import defaults as default_views from django.views.decorators.csrf import csrf_exempt from django_ratelimit.exceptions import Ratelimited from graphene_django.views import GraphQLView -from wagtail import urls as wagtail_urls -from wagtail.admin import urls as wagtailadmin_urls -from wagtail.documents import urls as media_library_urls from vbv_lernwelt.api.directory import list_entities from vbv_lernwelt.api.user import ( @@ -55,7 +52,6 @@ from vbv_lernwelt.edoniq_test.views import ( from vbv_lernwelt.feedback.views import ( get_expert_feedbacks_for_course, get_feedback_for_circle, - export_feedback_for_course_session, ) from vbv_lernwelt.files.views import presign from vbv_lernwelt.importer.views import ( @@ -65,6 +61,9 @@ from vbv_lernwelt.importer.views import ( ) from vbv_lernwelt.media_files.views import user_image from vbv_lernwelt.notify.views import email_notification_settings +from wagtail import urls as wagtail_urls +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.documents import urls as media_library_urls class SignedIntConverter(IntConverter): @@ -172,9 +171,6 @@ urlpatterns = [ name='storage_presign'), # feedback - path(r'api/core/feedback/export//', - export_feedback_for_course_session, - name='export_feedback_for_course_session'), path(r'api/core/feedback//summary/', get_expert_feedbacks_for_course, name='feedback_summary'), diff --git a/server/vbv_lernwelt/course/admin.py b/server/vbv_lernwelt/course/admin.py index 581266a9..1285f3e8 100644 --- a/server/vbv_lernwelt/course/admin.py +++ b/server/vbv_lernwelt/course/admin.py @@ -1,8 +1,11 @@ from django.contrib import admin from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser +from vbv_lernwelt.feedback.services import get_feedbacks_for_course from vbv_lernwelt.learnpath.models import Circle +get_feedbacks_for_course.short_description = "Feedback export" + @admin.register(Course) class CourseAdmin(admin.ModelAdmin): @@ -26,6 +29,7 @@ class CourseSessionAdmin(admin.ModelAdmin): "created_at", "updated_at", ] + actions = [get_feedbacks_for_course] @admin.register(CourseSessionUser) diff --git a/server/vbv_lernwelt/feedback/management/commands/export_feedback.py b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py index 8864f956..f0cae06b 100644 --- a/server/vbv_lernwelt/feedback/management/commands/export_feedback.py +++ b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py @@ -1,28 +1,7 @@ -from datetime import datetime -from io import BytesIO -from itertools import groupby -from operator import attrgetter - import djclick as click import structlog -from openpyxl import Workbook -from vbv_lernwelt.feedback.models import FeedbackResponse - -logger = structlog.get_logger(__name__) - -VV_FEEDBACK_QUESTIONS = [ - ("satisfaction", "Zufriedenheit insgesamt"), - ("goal_attainment", "Zielerreichung insgesamt"), - ( - "proficiency", - "Wie beurteilst du deine Sicherheit bezüglichen den Themen nach dem Circle?", - ), - ("preparation_task_clarity", "Waren die Praxisaufträge klar und verständlich?"), - ("would_recommend", "Würdest du den Circle weiterempfehlen?"), - ("course_positive_feedback", "Was hat dir besonders gut gefallen?"), - ("course_negative_feedback", "Wo siehst du Verbesserungspotential?"), -] +from vbv_lernwelt.feedback.services import export_feedback logger = structlog.get_logger(__name__) @@ -37,60 +16,3 @@ logger = structlog.get_logger(__name__) def command(course_session_id, save_as_file): # using the output from call_command was a bit cumbersome, so this is just a wrapper for the actual function export_feedback(course_session_id, save_as_file) - - -def export_feedback(course_session_id: str, save_as_file: bool): - wb = Workbook() - - # remove the first sheet is just easier than keeping track of the active sheet - wb.remove_sheet(wb.active) - - feedbacks = FeedbackResponse.objects.filter( - course_session_id=course_session_id - ).order_by("circle") - grouped_feedbacks = groupby(feedbacks, key=attrgetter("circle")) - - for circle, group_feedbacks in grouped_feedbacks: - group_feedbacks = list(group_feedbacks) - logger.debug( - "export_feedback_for_circle", - data={ - "circle": circle.title, - "course_session_id": course_session_id, - "count": len(group_feedbacks), - }, - label="feedback_export", - ) - create_sheet(wb, circle.title, group_feedbacks) - - if save_as_file: - wb.save(make_export_filename()) - else: - output = BytesIO() - wb.save(output) - - output.seek(0) - return output.getvalue() - - -def create_sheet(wb: Workbook, title: str, data: list[FeedbackResponse]): - sheet = wb.create_sheet(title=title) - # add header - questions = [q[1] for q in VV_FEEDBACK_QUESTIONS] - for col_idx, title in enumerate(questions, start=2): - sheet.cell(row=1, column=col_idx, value=title) - - add_rows(sheet, data) - return sheet - - -def add_rows(sheet, data): - for row_idx, feedback in enumerate(data, start=2): - for col_idx, question in enumerate(VV_FEEDBACK_QUESTIONS, start=2): - response = feedback.data.get(question[0], "") - sheet.cell(row=row_idx, column=col_idx, value=response) - - -def make_export_filename(): - today_date = datetime.today().strftime("%Y-%m-%d") - return f"feedback_export_{today_date}.xlsx" diff --git a/server/vbv_lernwelt/feedback/services.py b/server/vbv_lernwelt/feedback/services.py index 6d6979f7..265139d1 100644 --- a/server/vbv_lernwelt/feedback/services.py +++ b/server/vbv_lernwelt/feedback/services.py @@ -1,6 +1,12 @@ +from datetime import datetime +from io import BytesIO +from itertools import groupby +from operator import attrgetter from typing import Union import structlog +from django.http import HttpResponse +from openpyxl import Workbook from vbv_lernwelt.core.models import User from vbv_lernwelt.course.models import CourseCompletionStatus, CourseSession @@ -13,6 +19,19 @@ from vbv_lernwelt.learnpath.models import ( logger = structlog.get_logger(__name__) +VV_FEEDBACK_QUESTIONS = [ + ("satisfaction", "Zufriedenheit insgesamt"), + ("goal_attainment", "Zielerreichung insgesamt"), + ( + "proficiency", + "Wie beurteilst du deine Sicherheit bezüglichen den Themen nach dem Circle?", + ), + ("preparation_task_clarity", "Waren die Praxisaufträge klar und verständlich?"), + ("would_recommend", "Würdest du den Circle weiterempfehlen?"), + ("course_positive_feedback", "Was hat dir besonders gut gefallen?"), + ("course_negative_feedback", "Wo siehst du Verbesserungspotential?"), +] + def update_feedback_response( feedback_user: User, @@ -100,3 +119,78 @@ def initial_data_for_feedback_page( "feedback_type": "vv", } return {} + + +def export_feedback(course_session_id: str, save_as_file: bool): + wb = Workbook() + + # remove the first sheet is just easier than keeping track of the active sheet + wb.remove_sheet(wb.active) + + feedbacks = FeedbackResponse.objects.filter( + course_session_id=course_session_id, + submitted=True, + ).order_by("circle", "updated_at") + grouped_feedbacks = groupby(feedbacks, key=attrgetter("circle")) + + for circle, group_feedbacks in grouped_feedbacks: + group_feedbacks = list(group_feedbacks) + logger.debug( + "export_feedback_for_circle", + data={ + "circle": circle.id, + "course_session_id": course_session_id, + "count": len(group_feedbacks), + }, + label="feedback_export", + ) + _create_sheet(wb, circle.title, group_feedbacks) + + if save_as_file: + wb.save(make_export_filename()) + else: + output = BytesIO() + wb.save(output) + + output.seek(0) + return output.getvalue() + + +def _create_sheet(wb: Workbook, title: str, data: list[FeedbackResponse]): + sheet = wb.create_sheet(title=title) + # add header + sheet.cell(row=1, column=1, value="Datum") + questions = [q[1] for q in VV_FEEDBACK_QUESTIONS] + for col_idx, title in enumerate(questions, start=2): + sheet.cell(row=1, column=col_idx, value=title) + + _add_rows(sheet, data) + return sheet + + +def _add_rows(sheet, data): + for row_idx, feedback in enumerate(data, start=2): + sheet.cell( + row=row_idx, column=1, value=feedback.updated_at.date().strftime("%d.%m.%Y") + ) + for col_idx, question in enumerate(VV_FEEDBACK_QUESTIONS, start=2): + response = feedback.data.get(question[0], "") + sheet.cell(row=row_idx, column=col_idx, value=response) + + +def make_export_filename(): + today_date = datetime.today().strftime("%Y-%m-%d") + return f"feedback_export_{today_date}.xlsx" + + +# used as admin action, that's why it's not in the views.py +def get_feedbacks_for_course(_modeladmin, _request, queryset): + excel_bytes = export_feedback(queryset.first(), False) + + response = HttpResponse( + content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + ) + response["Content-Disposition"] = f"attachment; filename={make_export_filename()}" + response.write(excel_bytes) + + return response diff --git a/server/vbv_lernwelt/feedback/views.py b/server/vbv_lernwelt/feedback/views.py index 13dbe37c..ecd11483 100644 --- a/server/vbv_lernwelt/feedback/views.py +++ b/server/vbv_lernwelt/feedback/views.py @@ -1,14 +1,10 @@ import itertools import structlog -from django.http import HttpResponse -from rest_framework import authentication -from rest_framework.decorators import api_view, authentication_classes, permission_classes +from rest_framework.decorators import api_view from rest_framework.exceptions import PermissionDenied -from rest_framework.permissions import IsAdminUser from rest_framework.response import Response -from vbv_lernwelt.feedback.management.commands.export_feedback import export_feedback, make_export_filename from vbv_lernwelt.feedback.models import FeedbackResponse from vbv_lernwelt.feedback.utils import feedback_users from vbv_lernwelt.iam.permissions import is_course_session_expert @@ -82,16 +78,3 @@ def get_feedback_for_circle(request, course_session_id, circle_id): feedback_data["questions"][field].append(data) return Response(status=200, data=feedback_data) - - -@api_view(["GET"]) -@authentication_classes((authentication.SessionAuthentication,)) -@permission_classes((IsAdminUser,)) -def export_feedback_for_course_session(request, course_session_id): - excel_bytes = export_feedback(course_session_id, False) - - response = HttpResponse(content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") - response['Content-Disposition'] = f"attachment; filename={make_export_filename()}" - response.write(excel_bytes) - - return response From 93efd7333ecda943d75c7653224927eb8aba49e0 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 28 Feb 2024 14:57:19 +0100 Subject: [PATCH 4/5] Handle export for multiple course sessions --- server/vbv_lernwelt/course/admin.py | 8 +++--- .../management/commands/export_feedback.py | 2 +- server/vbv_lernwelt/feedback/services.py | 27 +++++++++++++------ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/server/vbv_lernwelt/course/admin.py b/server/vbv_lernwelt/course/admin.py index 1285f3e8..afaa928f 100644 --- a/server/vbv_lernwelt/course/admin.py +++ b/server/vbv_lernwelt/course/admin.py @@ -1,10 +1,11 @@ from django.contrib import admin from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser -from vbv_lernwelt.feedback.services import get_feedbacks_for_course +from vbv_lernwelt.feedback.services import get_feedbacks_for_course_sessions, get_feedbacks_for_courses from vbv_lernwelt.learnpath.models import Circle -get_feedbacks_for_course.short_description = "Feedback export" +get_feedbacks_for_course_sessions.short_description = "Feedback export" +get_feedbacks_for_courses.short_description = "Feedback export" @admin.register(Course) @@ -15,6 +16,7 @@ class CourseAdmin(admin.ModelAdmin): "category_name", "slug", ] + actions = [get_feedbacks_for_courses] @admin.register(CourseSession) @@ -29,7 +31,7 @@ class CourseSessionAdmin(admin.ModelAdmin): "created_at", "updated_at", ] - actions = [get_feedbacks_for_course] + actions = [get_feedbacks_for_course_sessions] @admin.register(CourseSessionUser) diff --git a/server/vbv_lernwelt/feedback/management/commands/export_feedback.py b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py index f0cae06b..790661d9 100644 --- a/server/vbv_lernwelt/feedback/management/commands/export_feedback.py +++ b/server/vbv_lernwelt/feedback/management/commands/export_feedback.py @@ -15,4 +15,4 @@ logger = structlog.get_logger(__name__) ) def command(course_session_id, save_as_file): # using the output from call_command was a bit cumbersome, so this is just a wrapper for the actual function - export_feedback(course_session_id, save_as_file) + export_feedback([course_session_id], save_as_file) diff --git a/server/vbv_lernwelt/feedback/services.py b/server/vbv_lernwelt/feedback/services.py index 265139d1..7e84915b 100644 --- a/server/vbv_lernwelt/feedback/services.py +++ b/server/vbv_lernwelt/feedback/services.py @@ -121,14 +121,14 @@ def initial_data_for_feedback_page( return {} -def export_feedback(course_session_id: str, save_as_file: bool): +def export_feedback(course_session_ids: list[str], save_as_file: bool): wb = Workbook() # remove the first sheet is just easier than keeping track of the active sheet wb.remove_sheet(wb.active) feedbacks = FeedbackResponse.objects.filter( - course_session_id=course_session_id, + course_session_id__in=course_session_ids, submitted=True, ).order_by("circle", "updated_at") grouped_feedbacks = groupby(feedbacks, key=attrgetter("circle")) @@ -139,7 +139,7 @@ def export_feedback(course_session_id: str, save_as_file: bool): "export_feedback_for_circle", data={ "circle": circle.id, - "course_session_id": course_session_id, + "course_session_ids": course_session_ids, "count": len(group_feedbacks), }, label="feedback_export", @@ -178,19 +178,30 @@ def _add_rows(sheet, data): sheet.cell(row=row_idx, column=col_idx, value=response) -def make_export_filename(): +def make_export_filename(name: str = "feedback_export"): today_date = datetime.today().strftime("%Y-%m-%d") - return f"feedback_export_{today_date}.xlsx" + return f"{name}_{today_date}.xlsx" # used as admin action, that's why it's not in the views.py -def get_feedbacks_for_course(_modeladmin, _request, queryset): - excel_bytes = export_feedback(queryset.first(), False) +def get_feedbacks_for_course_sessions(_modeladmin, _request, queryset): + file_name = "feedback_export_durchfuehrungen" + return _handle_feedback_export_action(queryset, file_name) + + +def get_feedbacks_for_courses(_modeladmin, _request, queryset): + course_sessions = CourseSession.objects.filter(course__in=queryset) + file_name = "feedback_export_lehrgaenge" + return _handle_feedback_export_action(course_sessions, file_name) + + +def _handle_feedback_export_action(course_seesions, file_name): + excel_bytes = export_feedback(course_seesions, False) response = HttpResponse( content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ) - response["Content-Disposition"] = f"attachment; filename={make_export_filename()}" + response["Content-Disposition"] = f"attachment; filename={make_export_filename(file_name)}" response.write(excel_bytes) return response From 36c7a1a5b3d5d2ce91e01d97e59790706b685c1f Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 28 Feb 2024 15:35:20 +0100 Subject: [PATCH 5/5] Handle uk feedback as well --- server/vbv_lernwelt/course/admin.py | 5 +- server/vbv_lernwelt/feedback/services.py | 61 ++++++++++++++++++++---- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/server/vbv_lernwelt/course/admin.py b/server/vbv_lernwelt/course/admin.py index afaa928f..5777b9be 100644 --- a/server/vbv_lernwelt/course/admin.py +++ b/server/vbv_lernwelt/course/admin.py @@ -1,7 +1,10 @@ from django.contrib import admin from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser -from vbv_lernwelt.feedback.services import get_feedbacks_for_course_sessions, get_feedbacks_for_courses +from vbv_lernwelt.feedback.services import ( + get_feedbacks_for_course_sessions, + get_feedbacks_for_courses, +) from vbv_lernwelt.learnpath.models import Circle get_feedbacks_for_course_sessions.short_description = "Feedback export" diff --git a/server/vbv_lernwelt/feedback/services.py b/server/vbv_lernwelt/feedback/services.py index 7e84915b..cd597e4e 100644 --- a/server/vbv_lernwelt/feedback/services.py +++ b/server/vbv_lernwelt/feedback/services.py @@ -32,6 +32,34 @@ VV_FEEDBACK_QUESTIONS = [ ("course_negative_feedback", "Wo siehst du Verbesserungspotential?"), ] +UK_FEEDBACK_QUESTIONS = [ + ("satisfaction", "Zufriedenheit insgesamt"), + ("goal_attainment", "Zielerreichung insgesamt"), + ( + "proficiency", + "Wie beurteilst du deine Sicherheit bezüglichen den Themen nach dem Kurs?", + ), + ( + "preparation_task_clarity", + "Waren die Vorbereitungsaufträge klar und verständlich?", + ), + ( + "instructor_competence", + "Wie beurteilst du die Themensicherheit und Fachkompetenz des Kursleiters/der Kursleiterin?", + ), + ( + "instructor_respect", + "Wurden Fragen und Anregungen der Kursteilnehmenden ernst genommen und aufgegriffen?", + ), + ( + "instructor_open_feedback", + "Was möchtest du dem Kursleiter/der Kursleiterin sonst noch sagen?", + ), + ("would_recommend", "Würdest du den Kurs weiterempfehlen?"), + ("course_positive_feedback", "Was hat dir besonders gut gefallen?"), + ("course_negative_feedback", "Wo siehst du Verbesserungspotential?"), +] + def update_feedback_response( feedback_user: User, @@ -130,7 +158,7 @@ def export_feedback(course_session_ids: list[str], save_as_file: bool): feedbacks = FeedbackResponse.objects.filter( course_session_id__in=course_session_ids, submitted=True, - ).order_by("circle", "updated_at") + ).order_by("circle", "course_session", "updated_at") grouped_feedbacks = groupby(feedbacks, key=attrgetter("circle")) for circle, group_feedbacks in grouped_feedbacks: @@ -158,22 +186,35 @@ def export_feedback(course_session_ids: list[str], save_as_file: bool): def _create_sheet(wb: Workbook, title: str, data: list[FeedbackResponse]): sheet = wb.create_sheet(title=title) + + if len(data) == 0: + return sheet + + # we instruct the users not to mix exports of different courses, so we can assume the questions are the same and of the first type + question_data = ( + UK_FEEDBACK_QUESTIONS + if data[0].data["feedback_type"] == "uk" + else VV_FEEDBACK_QUESTIONS + ) + # add header - sheet.cell(row=1, column=1, value="Datum") - questions = [q[1] for q in VV_FEEDBACK_QUESTIONS] - for col_idx, title in enumerate(questions, start=2): + sheet.cell(row=1, column=1, value="Durchführung") + sheet.cell(row=1, column=2, value="Datum") + questions = [q[1] for q in question_data] + for col_idx, title in enumerate(questions, start=3): sheet.cell(row=1, column=col_idx, value=title) - _add_rows(sheet, data) + _add_rows(sheet, data, question_data) return sheet -def _add_rows(sheet, data): +def _add_rows(sheet, data, question_data): for row_idx, feedback in enumerate(data, start=2): + sheet.cell(row=row_idx, column=1, value=feedback.course_session.title) sheet.cell( - row=row_idx, column=1, value=feedback.updated_at.date().strftime("%d.%m.%Y") + row=row_idx, column=2, value=feedback.updated_at.date().strftime("%d.%m.%Y") ) - for col_idx, question in enumerate(VV_FEEDBACK_QUESTIONS, start=2): + for col_idx, question in enumerate(question_data, start=3): response = feedback.data.get(question[0], "") sheet.cell(row=row_idx, column=col_idx, value=response) @@ -201,7 +242,9 @@ def _handle_feedback_export_action(course_seesions, file_name): response = HttpResponse( content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ) - response["Content-Disposition"] = f"attachment; filename={make_export_filename(file_name)}" + response[ + "Content-Disposition" + ] = f"attachment; filename={make_export_filename(file_name)}" response.write(excel_bytes) return response