From 69e96391d91e3087ae3f18d11b04cfffdae54067 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Mon, 8 May 2023 16:40:53 +0200 Subject: [PATCH] Show "Bewertung abschliessen" when finished --- .../AssignmentEvaluationPage.vue | 5 +-- .../EvaluationContainer.vue | 26 ++++++++++++--- .../EvaluationIntro.vue | 31 +++++++++++++----- .../EvaluationSummary.vue | 14 ++++++-- .../EvaluationTask.vue | 3 ++ .../assignment/creators/create_assignments.py | 11 ++++--- .../UK_03_09_NACH_KN_Beurteilungsraster.pdf | Bin 0 -> 453384 bytes 7 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 server/vbv_lernwelt/static/media/assignments/UK_03_09_NACH_KN_Beurteilungsraster.pdf diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue index a700e108..e683c81e 100644 --- a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue +++ b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue @@ -58,7 +58,7 @@ onMounted(async () => { } }); -function exit() { +function close() { router.push({ path: `/course/${props.courseSlug}/cockpit/assignment`, }); @@ -84,7 +84,7 @@ const assignmentCompletion = computed(() => assignmentStore.assignmentCompletion type="button" class="absolute right-2 top-2 h-8 w-8 cursor-pointer lg:right-4 lg:top-4" data-cy="close-learning-content" - @click="exit()" + @click="close()" > @@ -117,6 +117,7 @@ const assignmentCompletion = computed(() => assignmentStore.assignmentCompletion :assignment-completion="assignmentCompletion" :assignment-user="state.assignmentUser" :assignment="state.assignment" + @close="close()" > diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue index 2e64c352..3f396d80 100644 --- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue +++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue @@ -20,6 +20,8 @@ const props = defineProps<{ assignment: Assignment; }>(); +const emit = defineEmits(["close"]); + log.debug("UserEvaluation setup"); interface StateInterface { @@ -95,6 +97,10 @@ function nextButtonEnabled() { } return true; } + +function finishButtonEnabled() { + return props.assignmentCompletion.completion_status === "evaluation_submitted"; +}