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

Fix type errors

This commit is contained in:
Elia Bieri 2024-10-01 14:09:58 +02:00 committed by Christian Cueni
parent 49085ebdc4
commit b98b4f8792
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/services/dashboard.ts
View File

@ -80,6 +80,7 @@ export type DashboardPersonType = {
avatar_url: string; avatar_url: string;
avatar_url_small: string; avatar_url_small: string;
chosen_profile: string; chosen_profile: string;
csu_id: string;
competence_metrics?: { competence_metrics?: {
passed_count: number; passed_count: number;
failed_count: number; failed_count: number;

3
client/src/types.ts
View File

@ -632,7 +632,6 @@ export type DashboardPersonsPageMode = "default" | "competenceMetrics";
export interface StatisticsFilterItem { export interface StatisticsFilterItem {
_id: string; _id: string;
course_session_user_id: string;
course_session_id: string; course_session_id: string;
region: string; region: string;
generation: string; generation: string;
@ -645,7 +644,7 @@ export interface XlsExportRequestData {
} }
export interface XlsPersonExportRequestData { export interface XlsPersonExportRequestData {
courseSessionUserIds: number[]; courseSessionUserIds: string[];
} }
export interface XlsExportResponseData { export interface XlsExportResponseData {

14
server/vbv_lernwelt/dashboard/views.py
View File

@ -26,7 +26,6 @@ from vbv_lernwelt.competence.services import (
from vbv_lernwelt.core.models import User from vbv_lernwelt.core.models import User
from vbv_lernwelt.course.models import ( from vbv_lernwelt.course.models import (
CourseConfiguration, CourseConfiguration,
CourseSession,
CourseSessionUser, CourseSessionUser,
) )
from vbv_lernwelt.course.views import logger from vbv_lernwelt.course.views import logger
@ -468,16 +467,19 @@ def export_feedback_as_xsl(request):
@api_view(["POST"]) @api_view(["POST"])
def export_persons_as_xsl(request): def export_persons_as_xsl(request):
requested_course_session_user_ids = request.data.get("courseSessionUserIds", []) requested_course_session_user_ids = request.data.get("courseSessionUserIds", [])
permitted_course_session_users = _get_permitted_csus_for_user( data = _export_persons_as_xls_data(request.user, requested_course_session_user_ids)
request.user, requested_course_session_user_ids
)
data = export_persons(permitted_course_session_users)
if data: if data:
return _make_excel_response(data, PERSONS_EXPORT_FILENAME) return _make_excel_response(data, PERSONS_EXPORT_FILENAME)
return Response(status=status.HTTP_400_BAD_REQUEST) return Response(status=status.HTTP_400_BAD_REQUEST)
def _export_persons_as_xls_data(user: User, course_session_user_ids: List[str]):
permitted_course_session_users = _get_permitted_csus_for_user(
user, course_session_user_ids
)
return export_persons(permitted_course_session_users)
def _get_permitted_csus_for_user( def _get_permitted_csus_for_user(
user: User, requested_coursesessionuser_ids: List[str] user: User, requested_coursesessionuser_ids: List[str]
) -> List[CourseSessionUser]: ) -> List[CourseSessionUser]: