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

Merge branch 'develop' into feature/VBV-496-dash-regionalleiter

This commit is contained in:
Reto Aebersold 2023-10-19 09:49:22 +02:00
parent 3925d074ee 799ea85815
commit 69c56dfb9a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue
View File

@ -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 () => {
<template>
<div class="w-full border border-gray-400 p-8">
<h3 class="heading-3 border-b border-gray-400 pb-6">
{{ $t("assignment.acceptConditionsDisclaimer") }}
{{ $t("assignment.submitAssignment") }}
</h3>
<div v-if="completionStatus === 'IN_PROGRESS'">

4
cypress/e2e/assignment/assignmentStudent.cy.js
View File

@ -92,7 +92,7 @@ describe("assignmentStudent.cy.js", () => {
cy.visit(
"/course/test-lehrgang/learn/fahrzeug/überprüfen-einer-motorfahrzeug-versicherungspolice?step=7"
);
cy.get('[data-cy="confirm-submit-results"]').click();
cy.get('[data-cy="confirm-submit-results"] label').click();
cy.get('[data-cy="confirm-submit-person"]').click();
cy.get('[data-cy="submit-assignment"]').click();
cy.get('[data-cy="success-text"]').should("exist");
@ -199,7 +199,7 @@ describe("assignmentStudent.cy.js", () => {
cy.wait(550);
cy.learningContentMultiLayoutNextStep();
cy.get('[data-cy="confirm-submit-results"]').click();
cy.get('[data-cy="confirm-submit-results"] label').click();
cy.get('[data-cy="confirm-submit-person"]').click();
cy.get('[data-cy="submit-assignment"]').click();
cy.get('[data-cy="success-text"]').should("exist");

4
cypress/e2e/competenceNavi/competenceCertificate.cy.js
View File

@ -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", () => {

1
server/vbv_lernwelt/edoniq_test/result_import/services.py
View File

@ -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(