+
+
diff --git a/client/src/components/ui/ItTextarea.vue b/client/src/components/ui/ItTextarea.vue
index 5ec21117..694b6a31 100644
--- a/client/src/components/ui/ItTextarea.vue
+++ b/client/src/components/ui/ItTextarea.vue
@@ -4,6 +4,8 @@
@@ -12,11 +14,14 @@
+
+
+ {{ text }}
+{{ $t("assignment.initialSituationTitle") }}
+{{ props.assignment.starting_position }}
+ +{{ $t("assignment.taskDefinitionTitle") }}
++ {{ $t("assignment.taskDefinition") }} +
+-
+
- + - + {{ task.value.title }} + +
{{ $t("assignment.dueDateTitle") }}
++ {{ + $t("assignment.dueDateIntroduction", { + date: dueDate!.format("DD.MM.YYYY"), + time: dueDate!.format("HH:mm"), + }) + }} +
++ {{ $t("assignment.dueDateNotSet") }} +
+ +{{ $t("assignment.effortTitle") }}
+{{ props.assignment.effort_required }}
+ ++ {{ $t("assignment.performanceObjectivesTitle") }} +
++ {{ performance_objective.value.text }} +
+ +{{ $t("assignment.assessmentTitle") }}
+{{ props.assignment.assessment_description }}
+ + {{ $t("assignment.showAssessmentDocument") }} + + diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionResponses.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionResponses.vue new file mode 100644 index 00000000..22863429 --- /dev/null +++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionResponses.vue @@ -0,0 +1,37 @@ + + +
+
+
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue
new file mode 100644
index 00000000..acb37e9b
--- /dev/null
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue
@@ -0,0 +1,131 @@
+
+
+
+
+ {{ task.value.title }}
+ +
+
+ {{ taskBlock.value.text }}
++ {{ (completionData[taskBlock.id].user_data as UserDataText).text }} +
+
+
+ + {{ $t("assignment.acceptConditionsDisclaimer") }} +
+ +
+
+
+
+
+
+
+ ![Notification icon]()
+
+
+ + {{ circleExpertName }} +
+
+
+ {{ $t("assignment.assessmentDocumentDisclaimer") }}
+ + {{ $t("assignment.showAssessmentDocument") }} + ++ {{ $t("assignment.dueDateSubmission", { date: dueDate.format("DD.MM.YYYY") }) }} +
+{{ $t("assignment.submitAssignment") }}
+
+
+ + {{ + $t("assignment.submissionNotificationDisclaimer", { name: circleExpertName }) + }} +
+
+
+
+
+
+
+
+
+ {{ block.value.text }}
+
+
+
+
+ {{ block.value.text }}
+
+ {{ $t("assignment.lastChangesNotSaved") }}
+
+
+
+
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index 38610ad3..745f2d53 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -1,24 +1,39 @@
- Datei hochladen
+ ++ Mögliche Formate: .JPG, .PNG, .PDF, .DOC, .MOV, .PPT +
+
- ": {"user_data": {"text": "some text from user"}},
+ // "": {"user_data": {"confirmation": true}},
+ // }
+ [key: BlockId]: { user_data: UserDataText | UserDataConfirmation };
+}
+
export const useAssignmentStore = defineStore({
id: "assignmentStore",
state: () => {
return {
assignment: undefined,
+ completion_data: {},
+ submitted: false,
} as AssignmentStoreState;
},
getters: {},
@@ -23,9 +45,42 @@ export const useAssignmentStore = defineStore({
if (!assignmentData) {
throw `No assignment found with: ${assignmentId}`;
}
-
this.assignment = assignmentData;
return this.assignment;
},
+ async loadAssignmentCompletion(assignmentId: number, courseSessionId: number) {
+ log.debug("load assignment completion", assignmentId, courseSessionId);
+ try {
+ const data = await itGet(`/api/assignment/${assignmentId}/${courseSessionId}/`);
+ this.completion_data = data.completion_data;
+ this.submitted = data.completion_status === "submitted";
+ } catch (e) {
+ log.debug("no completion data found ", e);
+ return undefined;
+ }
+ return this.completion_data;
+ },
+ getCompletionDataForUserInput(id: BlockId) {
+ return this.completion_data[id];
+ },
+ async upsertAssignmentCompletion(
+ assignmentId: number,
+ completion_data: AssignmentCompletionData,
+ courseSessionId: number,
+ submit: boolean
+ ) {
+ const data = {
+ assignment_id: assignmentId,
+ completion_status: submit ? "submitted" : "in_progress",
+ course_session_id: courseSessionId,
+ completion_data: completion_data,
+ };
+ const responseData = await itPost(`/api/assignment/upsert/`, data);
+ if (responseData) {
+ this.completion_data = responseData.completion_data;
+ this.submitted = responseData.completion_status === "submitted";
+ }
+ return responseData;
+ },
},
});
diff --git a/cypress/.eslintrc.json b/cypress/.eslintrc.json
new file mode 100644
index 00000000..37391427
--- /dev/null
+++ b/cypress/.eslintrc.json
@@ -0,0 +1,5 @@
+{
+ "extends": [
+ "plugin:cypress/recommended"
+ ]
+}
diff --git a/cypress/e2e/assignmentCompletion.cy.js b/cypress/e2e/assignmentCompletion.cy.js
new file mode 100644
index 00000000..8cf8127a
--- /dev/null
+++ b/cypress/e2e/assignmentCompletion.cy.js
@@ -0,0 +1,78 @@
+import { login } from "./helpers";
+
+const navigateToAssignment = () => {
+ cy.visit(
+ "/course/überbetriebliche-kurse/learn/fahrzeug/überprüfen-einer-motorfahrzeug-versicherungspolice"
+ );
+};
+
+describe("assignment completion", () => {
+ beforeEach(() => {
+ cy.manageCommand("cypress_reset");
+ login("admin", "test");
+ navigateToAssignment();
+ });
+
+ it("can open assignment", () => {
+ cy.testLearningContentTitle("Einleitung");
+ cy.testLearningContentSubtitle(
+ "Überprüfen einer Motorfahrzeugs-Versicherungspolice"
+ );
+ });
+
+ it("can navigate through assignment", () => {
+ // 1 Step forward
+ cy.learningContentMultiLayoutNextStep();
+ cy.testLearningContentTitle(
+ "Teilaufgabe 1: Beispiel einer Versicherungspolice finden"
+ );
+
+ // 2 Steps forward, 1 step backwards
+ for (let i = 0; i !== 2; i++) {
+ cy.learningContentMultiLayoutNextStep();
+ }
+ cy.learningContentMultiLayoutPreviousStep();
+
+ cy.testLearningContentTitle(
+ "Teilaufgabe 2: Kundensituation und Ausgangslage"
+ );
+ });
+
+ it("can save confirmation", () => {
+ // 1 Step forward
+ cy.learningContentMultiLayoutNextStep();
+ cy.testLearningContentTitle(
+ "Teilaufgabe 1: Beispiel einer Versicherungspolice finden"
+ );
+ // Click confirmation
+ cy.get('[data-cy="it-checkbox-confirmation-1"]').click({ force: true });
+ cy.wait(250);
+ cy.reload();
+ // 1 Step forward
+ cy.learningContentMultiLayoutNextStep();
+ cy.get('[data-cy="it-checkbox-confirmation-1"]').should("be.checked");
+ });
+
+ it("can save text", () => {
+ // 2 Steps forward
+ cy.learningContentMultiLayoutNextStep();
+ cy.learningContentMultiLayoutNextStep();
+ cy.testLearningContentTitle(
+ "Teilaufgabe 2: Kundensituation und Ausgangslage"
+ );
+ // Enter text
+ cy.get('[data-cy="it-textarea-user-text-input-1"]')
+ .clear()
+ .type("Hallovelo");
+ cy.wait(550);
+ cy.reload();
+
+ // 2 Step forward
+ cy.learningContentMultiLayoutNextStep();
+ cy.learningContentMultiLayoutNextStep();
+ cy.get('[data-cy="it-textarea-user-text-input-1"]').should(
+ "have.value",
+ "Hallovelo"
+ );
+ });
+});
diff --git a/cypress/e2e/circle.cy.js b/cypress/e2e/circle.cy.js
index 7030a693..65ce2c28 100644
--- a/cypress/e2e/circle.cy.js
+++ b/cypress/e2e/circle.cy.js
@@ -34,18 +34,18 @@ describe("circle page", () => {
cy.get(
'[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-verschaffe-dir-einen-überblick"]'
).click();
- cy.get('[data-cy="ln-title"]').should(
+ cy.get('[data-cy="lc-title"]').should(
"contain",
"Verschaffe dir einen Überblick"
);
cy.get('[data-cy="complete-and-continue"]').click({ force: true });
cy.get('[data-cy="ls-continue-button"]').click();
- cy.get('[data-cy="ln-title"]').should("contain", "Mediathek Fahrzeug");
+ cy.get('[data-cy="lc-title"]').should("contain", "Mediathek Fahrzeug");
cy.get('[data-cy="complete-and-continue"]').click({ force: true });
cy.get('[data-cy="ls-continue-button"]').click();
- cy.get('[data-cy="ln-title"]').should("contain", "Vorbereitungsauftrag");
+ cy.get('[data-cy="lc-title"]').should("contain", "Vorbereitungsauftrag");
cy.get('[data-cy="complete-and-continue"]').click({ force: true });
cy.get(
@@ -64,7 +64,7 @@ describe("circle page", () => {
cy.get('[data-cy="ls-continue-button"]').should("contain", "Los geht's");
cy.get('[data-cy="ls-continue-button"]').click();
- cy.get('[data-cy="ln-title"]').should(
+ cy.get('[data-cy="lc-title"]').should(
"contain",
"Verschaffe dir einen Überblick"
);
@@ -72,12 +72,12 @@ describe("circle page", () => {
cy.get('[data-cy="ls-continue-button"]').should("contain", "Weiter geht's");
cy.get('[data-cy="ls-continue-button"]').click();
- cy.get('[data-cy="ln-title"]').should("contain", "Mediathek Fahrzeug");
+ cy.get('[data-cy="lc-title"]').should("contain", "Mediathek Fahrzeug");
});
it("can open learning content by url", () => {
cy.visit("/course/test-lehrgang/learn/fahrzeug/mediathek-fahrzeug");
- cy.get('[data-cy="ln-title"]').should("contain", "Mediathek Fahrzeug");
+ cy.get('[data-cy="lc-title"]').should("contain", "Mediathek Fahrzeug");
cy.get('[data-cy="close-learning-content"]').click();
cy.get('[data-cy="circle-title"]').should("contain", "Fahrzeug");
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 49b22544..988073ee 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -121,3 +121,19 @@ Cypress.Commands.add('makeSelfEvaluation', (answers) => {
// 'myservice.apps.apiclient.serializers.ApiClientRequestResponseLogSerializer'
// );
// });
+
+Cypress.Commands.add("learningContentMultiLayoutNextStep", () => {
+ return cy.get('[data-cy="next-step"]').click({ force: true });
+});
+
+Cypress.Commands.add("learningContentMultiLayoutPreviousStep", () => {
+ return cy.get('[data-cy="previous-step"]').click({ force: true });
+});
+
+Cypress.Commands.add("testLearningContentTitle", (title) => {
+ return cy.get('[data-cy="lc-title"]').should("contain", title);
+});
+
+Cypress.Commands.add("testLearningContentSubtitle", (subtitle) => {
+ return cy.get('[data-cy="lc-subtitle"]').should("contain", subtitle);
+});
-
+
+
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/AssignmentBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/AssignmentBlock.vue
index 37548374..0afb1a47 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/AssignmentBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/AssignmentBlock.vue
@@ -1,6 +1,5 @@
Einleitung
- -Ausgangslage
-{{ state.assignment.starting_position }}
- -Abgabetermin
-- {{ state.courseSessionAssignmentDetails }} -
-Keine Abgabedaten erfasst für diese Durchführung
- -
- {{ state.assignment }}
-
+
+
-
+
+
-
-
- +
{{ props.subtitle }}
+
{{ props.title }}
+
{{ type.title }}
+
{{ type.title }}