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

Fix pull-request comments

This commit is contained in:
Daniel Egger 2024-09-30 14:35:13 +02:00
parent dc471aa8a1
commit 2874023a3b
3 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/src/components/assignment/evaluation/EvaluationContainer.vue
View File

@ -118,22 +118,6 @@ const taskExpertDataText = computed(() => {
return result; return result;
}); });
const text = computed(() => {
if (props.assignment.assignment_type === "CASEWORK") {
return {
evaluationFinish: "a.Schliessen",
};
} else if (props.assignment.assignment_type === "PRAXIS_ASSIGNMENT") {
return {
evaluationFinish: "a.Schliessen",
};
} else {
return {
evaluationFinish: "UNKNOWN ASSIGNMENT TYPE",
};
}
});
function nextButtonEnabled() { function nextButtonEnabled() {
if (inEvaluationTask.value) { if (inEvaluationTask.value) {
return taskExpertDataText.value ?? false; return taskExpertDataText.value ?? false;
@ -142,13 +126,12 @@ function nextButtonEnabled() {
} }
function previousButtonVisible() { function previousButtonVisible() {
if ( // Bei einer "bewerteten" Arbeit, kann man im letzten Schritt nicht mehr "zurück"
// man kann aber die Bewertung wieder "bearbeiten"
return !(
stepIndex.value > numTasks.value && stepIndex.value > numTasks.value &&
props.assignmentCompletion.completion_status === "EVALUATION_SUBMITTED" props.assignmentCompletion.completion_status === "EVALUATION_SUBMITTED"
) { );
return false;
}
return true;
} }
function finishButtonEnabled() { function finishButtonEnabled() {
@ -231,7 +214,7 @@ function finishButtonEnabled() {
@click="emit('close')" @click="emit('close')"
> >
<span class="flex items-center"> <span class="flex items-center">
{{ $t(text.evaluationFinish) }} {{ $t("a.Schliessen") }}
</span> </span>
</button> </button>
</div> </div>

8
client/src/components/assignment/evaluation/EvaluationIntro.vue
View File

@ -132,8 +132,8 @@ async function startEvaluation() {
</button> </button>
</div> </div>
<section class="mt-8"> <ol class="mt-8">
<div <li
v-for="historyEntry in props.assignmentCompletion.additional_json_data v-for="historyEntry in props.assignmentCompletion.additional_json_data
?.submission_history ?? []" ?.submission_history ?? []"
:key="historyEntry.timestamp" :key="historyEntry.timestamp"
@ -141,8 +141,8 @@ async function startEvaluation() {
{{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}: {{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}:
{{ $t(historyEntry.translation_key) }} {{ $t(historyEntry.translation_key) }}
({{ historyEntry.user_display_name }}) ({{ historyEntry.user_display_name }})
</div> </li>
</section> </ol>
</div> </div>
</template> </template>

21
client/src/components/assignment/evaluation/EvaluationSummary.vue
View File

@ -302,16 +302,17 @@ const showPassed = computed(() => {
</div> </div>
<section class="mt-4" data-cy="assignment-history"> <section class="mt-4" data-cy="assignment-history">
<div <ol>
v-for="historyEntry in props.assignmentCompletion.additional_json_data <li
?.submission_history ?? []" v-for="historyEntry in props.assignmentCompletion.additional_json_data
:key="historyEntry.timestamp" ?.submission_history ?? []"
data-cy="assignment-history-entry" :key="historyEntry.timestamp"
> >
{{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}: {{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}:
{{ $t(historyEntry.translation_key) }} {{ $t(historyEntry.translation_key) }}
({{ historyEntry.user_display_name }}) ({{ historyEntry.user_display_name }})
</div> </li>
</ol>
</section> </section>
</section> </section>