From 00a36b52c868eebbc9ce52a791f356b8587e2cf5 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 14 Sep 2023 16:19:18 +0200 Subject: [PATCH] =?UTF-8?q?=C3=9Cbersetzungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationContainer.vue | 2 +- .../EvaluationSummary.vue | 7 +++-- .../EvaluationTask.vue | 6 ++-- .../assignmentsPage/AssignmentDetails.vue | 2 +- .../cockpitPage/SubmissionsOverview.vue | 2 +- .../circlePage/LearningSequence.vue | 9 ++++-- .../attendanceCourse/AttendanceCourse.vue | 6 ++-- .../selfEvaluationPage/SelfEvaluation.vue | 4 +-- server/vbv_lernwelt/competence/factories.py | 4 +-- .../migrations/0004_rename_models.py | 26 ++++++++-------- .../migrations/0005_move_action_competence.py | 30 ++++++++++++++----- 11 files changed, 60 insertions(+), 38 deletions(-) diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue index 36fb835c..916fb7a9 100644 --- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue +++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue @@ -94,7 +94,7 @@ function finishButtonEnabled() { diff --git a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue index d5676613..b25263bd 100644 --- a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue +++ b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue @@ -91,7 +91,7 @@ const getShowDetailsText = (lc: LearningContent) => { if (isAssignment(lc)) { const assignmentType = (lc as LearningContentAssignment).assignment_type; if (assignmentType === "CASEWORK" || assignmentType === "REFLECTION") { - return t("Ergebnisse anschauen"); + return t("a.Ergebnisse anschauen"); } else if ( assignmentType === "PREP_ASSIGNMENT" || assignmentType === "CONDITION_ACCEPTANCE" diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue index 1ee3ebf3..6e6cd218 100644 --- a/client/src/pages/learningPath/circlePage/LearningSequence.vue +++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue @@ -180,11 +180,14 @@ function checkboxIconUncheckedTailwindClass(lc: LearningContent) { checkboxIconUncheckedTailwindClass(learningContent) " @toggle="toggleCompleted(learningContent)" - @click.stop=" - () => { + @click=" + (event) => { // when disabled open the learning content directly - if (!learningContent.can_user_self_toggle_course_completion) + if (!learningContent.can_user_self_toggle_course_completion) { circleStore.openLearningContent(learningContent); + event.preventDefault(); + event.stopPropagation(); + } } " /> diff --git a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue index bc8b4d3d..57e3241a 100644 --- a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue +++ b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue @@ -1,12 +1,12 @@ diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue index 6bbc5dd4..f47d1486 100644 --- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue +++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue @@ -73,7 +73,7 @@ onUnmounted(() => { {

- {{ currentQuestion.competence_id }} {{ currentQuestion.title }} + {{ currentQuestion.title }}