From 0f6ec66122f040753d2e8ac84438153c409c1906 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Fri, 23 Aug 2024 13:26:47 +0000 Subject: [PATCH] Merged in feature/berufsbilnder-cypress (pull request #378) Feature/berufsbilnder cypress * Berufsbildner cypress test * Fix tests --- .../dashboard/AgentConnectionCount.vue | 1 + .../dashboard/BerufsbildnerStatistics.vue | 13 +- .../src/components/dashboard/CoursePanel.vue | 2 +- .../dashboard/StatisticFilterList.vue | 5 + client/src/composables.ts | 21 +- .../CompetenceCertificateDetailPage.vue | 3 +- .../CompetenceCertificateListPage.vue | 1 + client/src/pages/competence/utils.ts | 3 +- .../pages/dashboard/DashboardAsideWidget.vue | 4 +- .../agentAssignment/AgentAssignmentDetail.vue | 1 + .../AgentCompetenceGradeDetailPage.vue | 13 +- .../AgentCompetenceGradePage.vue | 3 +- .../dashboard/statistic/AssignmentList.vue | 3 +- .../userProfile/CompetenceProfilePage.vue | 1 + client/src/types.ts | 3 + cypress/e2e/berufsbildner/berufsbildner.cy.js | 155 ++++++++ .../competenceCertificate.cy.js | 374 +++++++++--------- .../e2e/dashboard/dashboardSupervisor.cy.js | 4 +- cypress/e2e/dueDates.cy.js | 14 +- server/vbv_lernwelt/assignment/export.py | 11 +- server/vbv_lernwelt/core/constants.py | 1 + .../vbv_lernwelt/core/create_default_users.py | 10 + .../core/management/commands/cypress_reset.py | 2 +- .../course/creators/test_course.py | 109 +++-- .../dashboard/graphql/types/assignment.py | 4 +- server/vbv_lernwelt/sso/tests/test_signals.py | 5 +- 26 files changed, 518 insertions(+), 248 deletions(-) create mode 100644 cypress/e2e/berufsbildner/berufsbildner.cy.js diff --git a/client/src/components/dashboard/AgentConnectionCount.vue b/client/src/components/dashboard/AgentConnectionCount.vue index 71f047f8..077b8f87 100644 --- a/client/src/components/dashboard/AgentConnectionCount.vue +++ b/client/src/components/dashboard/AgentConnectionCount.vue @@ -40,6 +40,7 @@ onMounted(async () => {
{{ menteeCount }}
diff --git a/client/src/components/dashboard/BerufsbildnerStatistics.vue b/client/src/components/dashboard/BerufsbildnerStatistics.vue index 29c35afd..75aad90b 100644 --- a/client/src/components/dashboard/BerufsbildnerStatistics.vue +++ b/client/src/components/dashboard/BerufsbildnerStatistics.vue @@ -37,10 +37,13 @@ onMounted(async () => { }); const averageGrade = computed(() => { - return percentToRoundedGrade( - assignmentStats.value?.summary.average_evaluation_percent ?? 0, - false - ); + if (assignmentStats.value?.summary.average_evaluation_percent) { + return percentToRoundedGrade( + assignmentStats.value?.summary.average_evaluation_percent ?? 0, + false + ); + } + return null; }); @@ -59,7 +62,7 @@ const averageGrade = computed(() => { >