From b965722e8b78f330ff5fa3b92cf35ed9237f7eb4 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 18 Oct 2023 06:42:28 +0200 Subject: [PATCH 1/2] Fix unpack error in import --- cypress/e2e/competenceNavi/competenceCertificate.cy.js | 4 ++-- server/vbv_lernwelt/edoniq_test/result_import/services.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/competenceNavi/competenceCertificate.cy.js b/cypress/e2e/competenceNavi/competenceCertificate.cy.js index fa02af85..1398fb62 100644 --- a/cypress/e2e/competenceNavi/competenceCertificate.cy.js +++ b/cypress/e2e/competenceNavi/competenceCertificate.cy.js @@ -119,7 +119,7 @@ describe("competenceCertificate.cy.js", () => { .should("contain", "10") .and("contain", "Bewertung freigegeben") .and("contain", "42%") - .and("contain", "Nicht Bestanden"); + .and("contain", "Nicht bestanden"); // it can open learning content page directly cy.get( @@ -128,7 +128,7 @@ describe("competenceCertificate.cy.js", () => { cy.get('[data-cy="test-result"]') .should("contain", "10 von 24 Punkten") .and("contain", "42%") - .and("contain", "Nicht Bestanden"); + .and("contain", "Nicht bestanden"); }); it("check with finished edoniq test and finished casework", () => { diff --git a/server/vbv_lernwelt/edoniq_test/result_import/services.py b/server/vbv_lernwelt/edoniq_test/result_import/services.py index 5d0a120b..bc7f19d6 100644 --- a/server/vbv_lernwelt/edoniq_test/result_import/services.py +++ b/server/vbv_lernwelt/edoniq_test/result_import/services.py @@ -148,6 +148,7 @@ def upsert_edoniq_test_result( edoniq_extended_time_flag=edoniq_extended_time_flag, validate_submission_update=False, ) + return None, False except Exception as e: logger.warning( From f59b82900868917d21719374b42c547a62ea7724 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 18 Oct 2023 11:35:21 +0200 Subject: [PATCH 2/2] Update translation keys --- .../assignment/AssignmentSubmissionView.vue | 4 ++-- cypress/e2e/assignment/assignmentStudent.cy.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue index 3475dff2..b779ab9a 100644 --- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue +++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue @@ -4,9 +4,9 @@ import ItButton from "@/components/ui/ItButton.vue"; import ItCheckbox from "@/components/ui/ItCheckbox.vue"; import ItSuccessAlert from "@/components/ui/ItSuccessAlert.vue"; import { + useCourseData, useCourseSessionDetailQuery, useCurrentCourseSession, - useCourseData, } from "@/composables"; import { bustItGetCache } from "@/fetchHelpers"; import { UPSERT_ASSIGNMENT_COMPLETION_MUTATION } from "@/graphql/mutations"; @@ -117,7 +117,7 @@ const onSubmit = async () => {