Improved a bit of the evaluation system

This commit is contained in:
Tiago Ribeiro
2023-10-22 09:13:25 +01:00
parent 9f9e36f0cd
commit e10aebf4c0
3 changed files with 30 additions and 24 deletions

View File

@@ -1,11 +1,17 @@
import {Evaluation, Exam, SpeakingExam, SpeakingExercise, UserSolution, WritingExam, WritingExercise} from "@/interfaces/exam";
import {
Evaluation,
Exam,
InteractiveSpeakingExercise,
SpeakingExam,
SpeakingExercise,
UserSolution,
WritingExam,
WritingExercise,
} from "@/interfaces/exam";
import axios from "axios";
import {speakingReverseMarking, writingReverseMarking} from "./score";
export const evaluateWritingAnswer = async (exams: Exam[], examId: string, exerciseId: string, solution: UserSolution) => {
const writingExam = exams.find((x) => x.id === examId)! as WritingExam;
const exercise = writingExam.exercises.find((x) => x.id === exerciseId)! as WritingExercise;
export const evaluateWritingAnswer = async (exercise: WritingExercise, solution: UserSolution) => {
const response = await axios.post<Evaluation>("/api/evaluate/writing", {
question: `${exercise.prompt} ${exercise.attachment ? exercise.attachment.description : ""}`.replaceAll("\n", ""),
answer: solution.solutions[0].solution.trim().replaceAll("\n", " "),
@@ -19,22 +25,19 @@ export const evaluateWritingAnswer = async (exams: Exam[], examId: string, exerc
missing: 0,
total: 100,
},
solutions: [{id: exerciseId, solution: solution.solutions[0].solution, evaluation: response.data}],
solutions: [{id: exercise.id, solution: solution.solutions[0].solution, evaluation: response.data}],
};
}
return undefined;
};
export const evaluateSpeakingAnswer = async (exams: Exam[], examId: string, exerciseId: string, solution: UserSolution) => {
const speakingExam = exams.find((x) => x.id === examId)! as SpeakingExam;
const exercise = speakingExam.exercises.find((x) => x.id === exerciseId);
export const evaluateSpeakingAnswer = async (exercise: SpeakingExercise | InteractiveSpeakingExercise, solution: UserSolution) => {
switch (exercise?.type) {
case "speaking":
return await evaluateSpeakingExercise(exercise, exerciseId, solution);
return await evaluateSpeakingExercise(exercise, exercise.id, solution);
case "interactiveSpeaking":
return await evaluateInteractiveSpeakingExercise(exerciseId, solution);
return await evaluateInteractiveSpeakingExercise(exercise.id, solution);
default:
return undefined;
}