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

Don't create date if none is present

This commit is contained in:
Christian Cueni 2024-01-24 15:17:59 +01:00
parent 58213bcb90
commit 978136fba0
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
View File

@ -65,7 +65,9 @@ const assignmentDetail = computed(() => {
}); });
const dueDate = computed(() => const dueDate = computed(() =>
dayjs(assignmentDetail.value?.evaluation_deadline?.start) assignmentDetail.value?.evaluation_deadline?.start
? dayjs(assignmentDetail.value?.evaluation_deadline?.start)
: undefined
); );
const inEvaluationTask = computed( const inEvaluationTask = computed(

10
client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
View File

@ -11,7 +11,7 @@ const props = defineProps<{
assignmentUser: CourseSessionUser; assignmentUser: CourseSessionUser;
assignment: Assignment; assignment: Assignment;
assignmentCompletion: AssignmentCompletion; assignmentCompletion: AssignmentCompletion;
dueDate?: Dayjs; dueDate?: Dayjs | undefined;
}>(); }>();
const emit = defineEmits(["startEvaluation"]); const emit = defineEmits(["startEvaluation"]);
@ -101,7 +101,13 @@ async function startEvaluation() {
</p> </p>
<p class="my-4" data-cy="instruction"> <p class="my-4" data-cy="instruction">
{{ $t(text.evaluationInstruction) }} {{
$t(text.evaluationInstruction, {
name: `${
props.assignmentUser.first_name + " " + props.assignmentUser.last_name
}`,
})
}}
</p> </p>
<p v-if="props.assignment.assignment_type === 'CASEWORK'" class="my-4"> <p v-if="props.assignment.assignment_type === 'CASEWORK'" class="my-4">

5
cypress/e2e/assignment/assignmentTrainer.cy.js
View File

@ -218,7 +218,10 @@ describe("assignmentTrainer.cy.js", () => {
cy.get('[data-cy="title"]').should("contain", "Feedback"); cy.get('[data-cy="title"]').should("contain", "Feedback");
cy.get('[data-cy="evaluation-duedate]"').should("not.exist"); cy.get('[data-cy="evaluation-duedate]"').should("not.exist");
cy.get('[data-cy="instruction"]').should("contain", "Intro für Feedback"); cy.get('[data-cy="instruction"]').should(
"contain",
"Bitte unterstütze Test Student1 und gib Feedback zum Auftrag."
);
cy.get('[data-cy="start-evaluation"]').click(); cy.get('[data-cy="start-evaluation"]').click();
cy.get('[data-cy="evaluation-task"]').should("contain", "Feedback 1 / 5"); cy.get('[data-cy="evaluation-task"]').should("contain", "Feedback 1 / 5");