From 41e8ec6fc1a960b419d2de44f16ef95a2708df15 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Thu, 11 Jun 2026 21:43:39 -0500
Subject: [PATCH 01/21] Exercise: Migrate legacy exercise tool to Vue

---
 assets/vue/router/exercise.js                 |   68 +
 assets/vue/router/index.js                    |    2 +
 assets/vue/services/exerciseService.js        |  179 +
 .../exercise/ExerciseConfigurationView.vue    |  863 +++++
 .../vue/views/exercise/ExerciseListView.vue   |  598 +++
 .../vue/views/exercise/ExercisePlayerView.vue | 1204 ++++++
 .../exercise/ExerciseQuestionEditorView.vue   | 3426 +++++++++++++++++
 .../exercise/ExerciseQuestionSelectorView.vue | 1008 +++++
 .../vue/views/exercise/ExerciseReportView.vue |  608 +++
 .../vue/views/exercise/ExerciseResultView.vue | 1008 +++++
 public/main/exercise/answer.class.php         |    6 +-
 public/main/exercise/exercise.class.php       |    8 +-
 .../Exercise/ExerciseConfiguration.php        |  242 ++
 .../ApiResource/Exercise/ExerciseList.php     |   79 +
 .../ApiResource/Exercise/ExerciseQuestion.php |   85 +
 .../Exercise/ExerciseQuestionAction.php       |   71 +
 .../Exercise/ExerciseQuestionEditor.php       |  313 ++
 .../ApiResource/Exercise/ExerciseRuntime.php  |   98 +
 .../Exercise/ExerciseRuntimeAnswer.php        |   91 +
 .../Exercise/ExerciseRuntimeAttempt.php       |  117 +
 .../Exercise/ExerciseRuntimeAttemptDelete.php |   64 +
 .../Exercise/ExerciseRuntimeCorrection.php    |   85 +
 .../Exercise/ExerciseRuntimeFinish.php        |   83 +
 .../Exercise/ExerciseRuntimeReport.php        |   82 +
 .../Exercise/ExerciseRuntimeResult.php        |   90 +
 .../Exercise/ExerciseRuntimeUploadAnswer.php  |  114 +
 ...erciseRuntimeAttemptFileDownloadAction.php |  212 +
 src/CoreBundle/Controller/IndexController.php |    1 +
 .../ExerciseConfigurationProcessor.php        |  510 +++
 .../ExerciseConfigurationProvider.php         |  422 ++
 .../State/Exercise/ExerciseListProvider.php   |  410 ++
 .../ExerciseQuestionActionProcessor.php       |  508 +++
 .../ExerciseQuestionEditorProcessor.php       | 2551 ++++++++++++
 .../ExerciseQuestionEditorProvider.php        | 1449 +++++++
 .../Exercise/ExerciseQuestionProvider.php     |  838 ++++
 .../ExerciseRuntimeAnswerProcessor.php        |  690 ++++
 .../ExerciseRuntimeAttemptDeleteProcessor.php |  185 +
 .../ExerciseRuntimeAttemptProcessor.php       |  547 +++
 .../ExerciseRuntimeCorrectionProcessor.php    |  365 ++
 .../ExerciseRuntimeFinishProcessor.php        | 1077 ++++++
 .../Exercise/ExerciseRuntimeProvider.php      |  990 +++++
 .../ExerciseRuntimeReportProvider.php         |  382 ++
 .../ExerciseRuntimeResultProvider.php         | 1267 ++++++
 .../ExerciseRuntimeUploadAnswerProcessor.php  |  548 +++
 src/CoreBundle/Tool/Exercise.php              |    2 +-
 src/CourseBundle/Entity/CQuizQuestion.php     |    7 +
 46 files changed, 23545 insertions(+), 8 deletions(-)
 create mode 100644 assets/vue/router/exercise.js
 create mode 100644 assets/vue/services/exerciseService.js
 create mode 100644 assets/vue/views/exercise/ExerciseConfigurationView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseListView.vue
 create mode 100644 assets/vue/views/exercise/ExercisePlayerView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseQuestionEditorView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseReportView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseResultView.vue
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseList.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseQuestionAction.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntime.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptDelete.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
 create mode 100644 src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseListProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php

diff --git a/assets/vue/router/exercise.js b/assets/vue/router/exercise.js
new file mode 100644
index 00000000000..06467aa58a0
--- /dev/null
+++ b/assets/vue/router/exercise.js
@@ -0,0 +1,68 @@
+export default {
+  path: "/resources/exercise/:node/",
+  meta: {
+    requiresAuth: true,
+    showBreadcrumb: true,
+    tool: "exercise",
+    breadcrumb: "Exercises",
+  },
+  name: "exercise",
+  component: () => import("../components/layout/SimpleRouterViewLayout.vue"),
+  redirect: { name: "ExerciseList" },
+  children: [
+    {
+      name: "ExerciseList",
+      path: "",
+      meta: { breadcrumb: "Exercises" },
+      component: () => import("../views/exercise/ExerciseListView.vue"),
+    },
+    {
+      name: "ExerciseCreate",
+      path: "create",
+      meta: { breadcrumb: "Create exercise" },
+      component: () => import("../views/exercise/ExerciseConfigurationView.vue"),
+    },
+    {
+      name: "ExerciseEdit",
+      path: ":exerciseId/edit",
+      meta: { breadcrumb: "Edit exercise" },
+      component: () => import("../views/exercise/ExerciseConfigurationView.vue"),
+    },
+    {
+      name: "ExercisePlayer",
+      path: ":exerciseId/player",
+      meta: { breadcrumb: "Exercise player" },
+      component: () => import("../views/exercise/ExercisePlayerView.vue"),
+    },
+    {
+      name: "ExerciseResult",
+      path: ":exerciseId/result/:attemptId",
+      meta: { breadcrumb: "Exercise result" },
+      component: () => import("../views/exercise/ExerciseResultView.vue"),
+    },
+    {
+      name: "ExerciseReport",
+      path: ":exerciseId/report",
+      meta: { breadcrumb: "Learner score" },
+      component: () => import("../views/exercise/ExerciseReportView.vue"),
+    },
+    {
+      name: "ExerciseQuestions",
+      path: ":exerciseId/questions",
+      meta: { breadcrumb: "Questions" },
+      component: () => import("../views/exercise/ExerciseQuestionSelectorView.vue"),
+    },
+    {
+      name: "ExerciseQuestionCreate",
+      path: ":exerciseId/questions/create/:questionType",
+      meta: { breadcrumb: "Create question" },
+      component: () => import("../views/exercise/ExerciseQuestionEditorView.vue"),
+    },
+    {
+      name: "ExerciseQuestionEdit",
+      path: ":exerciseId/questions/:questionId/edit",
+      meta: { breadcrumb: "Edit question" },
+      component: () => import("../views/exercise/ExerciseQuestionEditorView.vue"),
+    },
+  ],
+}
diff --git a/assets/vue/router/index.js b/assets/vue/router/index.js
index 14465a9cd2c..16b2ba4c2f8 100644
--- a/assets/vue/router/index.js
+++ b/assets/vue/router/index.js
@@ -26,6 +26,7 @@ import assignments from "./assignments"
 import links from "./links"
 import forum from "./forum"
 import survey from "./survey"
+import exercise from "./exercise"
 import glossary from "./glossary"
 import attendance from "./attendance"
 import lpRoutes from "./lp"
@@ -381,6 +382,7 @@ const router = createRouter({
     links,
     forum,
     survey,
+    exercise,
     glossary,
     attendance,
     lpRoutes,
diff --git a/assets/vue/services/exerciseService.js b/assets/vue/services/exerciseService.js
new file mode 100644
index 00000000000..79017d2fba3
--- /dev/null
+++ b/assets/vue/services/exerciseService.js
@@ -0,0 +1,179 @@
+import baseService from "./baseService"
+
+function cleanParams(params = {}) {
+  const query = {}
+
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== undefined && value !== null && String(value) !== "") {
+      query[key] = value
+    }
+  }
+
+  return query
+}
+
+function buildQueryString(params = {}) {
+  const query = new URLSearchParams()
+
+  for (const [key, value] of Object.entries(cleanParams(params))) {
+    query.set(key, String(value))
+  }
+
+  const queryString = query.toString()
+
+  return queryString ? `?${queryString}` : ""
+}
+
+function exerciseRequestConfig(config = {}) {
+  return {
+    skipCourseContext: true,
+    ...config,
+  }
+}
+
+export default {
+  async getExerciseList(params = {}) {
+    return await baseService.get("/api/exercise/list", cleanParams(params), exerciseRequestConfig())
+  },
+
+  async getExerciseConfiguration(params = {}, exerciseId = null) {
+    const endpoint = exerciseId ? `/api/exercise/configuration/${exerciseId}` : "/api/exercise/configuration"
+
+    return await baseService.get(endpoint, cleanParams(params), exerciseRequestConfig())
+  },
+
+
+  async getExerciseQuestions(params = {}, exerciseId) {
+    return await baseService.get(`/api/exercise/questions/${exerciseId}`, cleanParams(params), exerciseRequestConfig())
+  },
+
+  async getExerciseRuntime(params = {}, exerciseId) {
+    return await baseService.get(`/api/exercise/runtime/${exerciseId}`, cleanParams(params), exerciseRequestConfig())
+  },
+
+  async startExerciseAttempt(payload = {}, params = {}, exerciseId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async saveExerciseRuntimeAnswer(payload = {}, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/answer${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+
+  async uploadExerciseRuntimeAnswer(formData, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.postForm(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/upload-answer${queryString}`,
+      formData,
+      exerciseRequestConfig(),
+    )
+  },
+
+  async finishExerciseRuntimeAttempt(payload = {}, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/finish${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async getExerciseRuntimeResult(params = {}, exerciseId, attemptId) {
+    return await baseService.get(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/result`,
+      cleanParams(params),
+      exerciseRequestConfig(),
+    )
+  },
+
+  async getExerciseRuntimeReport(params = {}, exerciseId) {
+    return await baseService.get(
+      `/api/exercise/runtime/${exerciseId}/attempts`,
+      cleanParams(params),
+      exerciseRequestConfig(),
+    )
+  },
+
+  async deleteExerciseRuntimeAttempt(payload = {}, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/delete${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async saveExerciseRuntimeCorrection(payload = {}, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/correction${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async getExerciseQuestionEditor(params = {}, exerciseId, questionId = null, questionType = null) {
+    const queryParams = { ...params }
+
+    if (questionType !== null && questionType !== undefined) {
+      queryParams.type = questionType
+    }
+
+    const endpoint = questionId
+      ? `/api/exercise/questions/${exerciseId}/editor/${questionId}`
+      : `/api/exercise/questions/${exerciseId}/editor`
+
+    return await baseService.get(endpoint, cleanParams(queryParams), exerciseRequestConfig())
+  },
+
+  async saveExerciseQuestion(payload, params = {}, exerciseId, questionId = null) {
+    const queryString = buildQueryString(params)
+    const endpoint = questionId
+      ? `/api/exercise/questions/${exerciseId}/editor/${questionId}${queryString}`
+      : `/api/exercise/questions/${exerciseId}/editor${queryString}`
+
+    return await baseService.post(endpoint, payload, {}, exerciseRequestConfig())
+  },
+
+  async saveExerciseQuestionAction(payload, params = {}, exerciseId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/questions/${exerciseId}/action${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async saveExerciseConfiguration(payload, params = {}, exerciseId = null) {
+    const queryString = buildQueryString(params)
+
+    if (exerciseId) {
+      return await baseService.put(`/api/exercise/configuration/${exerciseId}${queryString}`, payload, exerciseRequestConfig())
+    }
+
+    return await baseService.post(`/api/exercise/configuration${queryString}`, payload, {}, exerciseRequestConfig())
+  },
+}
diff --git a/assets/vue/views/exercise/ExerciseConfigurationView.vue b/assets/vue/views/exercise/ExerciseConfigurationView.vue
new file mode 100644
index 00000000000..bb59aa339a0
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseConfigurationView.vue
@@ -0,0 +1,863 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+      <BaseButton
+        :label="t('Back to exercises')"
+        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="isEditMode"
+        :label="t('Edit questions')"
+        :route="questionsRoute"
+        icon="edit"
+        only-icon
+        size="small"
+        type="secondary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-4 text-sm text-gray-700 shadow-sm"
+    >
+      {{ t("Loading") }}
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="successMessage"
+      class="rounded-xl border border-green-200 bg-green-50 p-4 text-sm text-green-700"
+    >
+      {{ successMessage }}
+    </div>
+
+    <form
+      v-if="!isLoading"
+      class="space-y-5"
+      @submit.prevent="saveConfiguration"
+    >
+      <h1 class="text-2xl font-semibold text-gray-90">
+        {{ isEditMode ? t("Edit test") : t("Create a new test") }}
+      </h1>
+
+      <div class="border-b border-gray-20" />
+
+      <BaseInputText
+        id="exercise-title"
+        v-model="form.title"
+        :is-invalid="formSubmitted && !form.title.trim()"
+        :label="t('* Test name')"
+        name="title"
+        required
+      />
+
+      <button
+        class="inline-flex items-center gap-2 text-sm font-semibold text-primary hover:text-primary-dark"
+        type="button"
+        @click="showAdvancedSettings = !showAdvancedSettings"
+      >
+        <BaseIcon
+          :icon="showAdvancedSettings ? 'chevron-down' : 'chevron-right'"
+          size="small"
+        />
+        <span>{{ showAdvancedSettings ? t("Hide advanced settings") : t("Advanced settings") }}</span>
+      </button>
+
+      <div
+        v-if="showAdvancedSettings"
+        class="space-y-6"
+      >
+        <section class="space-y-3 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+          <h2 class="text-base font-semibold text-gray-90">{{ t("Context") }}</h2>
+          <BaseTinyEditor
+            editor-id="exercise-description"
+            v-model="form.description"
+            :editor-config="mainEditorConfig"
+            :full-page="false"
+            :title="t('Give a context to the test')"
+          />
+        </section>
+
+        <section class="space-y-4 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+          <h2 class="text-base font-semibold text-gray-90">{{ t("Feedback and results") }}</h2>
+
+          <div class="grid gap-6 xl:grid-cols-2">
+            <FieldGroup :title="t('Feedback')">
+              <RadioChoice
+                v-for="option in feedbackOptions"
+                :key="`feedback-${option.value}`"
+                v-model="form.feedbackType"
+                name="feedbackType"
+                :option="option"
+              />
+              <p class="mt-2 text-xs text-primary">
+                {{
+                  t(
+                    "How should we show the feedback/comment for each question? This option defines how it will be shown to the learner when taking the test.",
+                  )
+                }}
+              </p>
+            </FieldGroup>
+
+            <FieldGroup :title="t('Show score to learner')">
+              <RadioChoice
+                v-for="option in resultOptions"
+                :key="`result-${option.value}`"
+                v-model="form.resultsDisabled"
+                name="resultsDisabled"
+                :option="option"
+              />
+            </FieldGroup>
+          </div>
+
+          <FieldGroup :title="t('Results page configuration')">
+            <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
+              <BaseCheckbox
+                id="exercise-hide-expected-answers"
+                v-model="form.pageResultConfiguration.hideExpectedAnswers"
+                :label="t('Hide expected answers column')"
+                name="hideExpectedAnswers"
+              />
+              <BaseCheckbox
+                id="exercise-hide-total-score"
+                v-model="form.pageResultConfiguration.hideTotalScore"
+                :label="t('Hide total score')"
+                name="hideTotalScore"
+              />
+              <BaseCheckbox
+                id="exercise-hide-question-score"
+                v-model="form.pageResultConfiguration.hideQuestionScore"
+                :label="t('Hide question score')"
+                name="hideQuestionScore"
+              />
+              <BaseCheckbox
+                id="exercise-hide-category-table"
+                v-model="form.pageResultConfiguration.hideCategoryTable"
+                :label="t('Hide category table')"
+                name="hideCategoryTable"
+              />
+              <BaseCheckbox
+                id="exercise-hide-correct-answered-questions"
+                v-model="form.pageResultConfiguration.hideCorrectAnsweredQuestions"
+                :label="t('Hide correct answered questions')"
+                name="hideCorrectAnsweredQuestions"
+              />
+            </div>
+          </FieldGroup>
+        </section>
+
+        <section class="space-y-4 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+          <h2 class="text-base font-semibold text-gray-90">{{ t("Questions behavior") }}</h2>
+
+          <div class="grid gap-6 xl:grid-cols-2">
+            <FieldGroup :title="t('Questions per page')">
+              <RadioChoice
+                v-for="option in typeOptions"
+                :key="`type-${option.value}`"
+                v-model="form.type"
+                name="type"
+                :option="option"
+              />
+            </FieldGroup>
+
+            <div class="space-y-4">
+              <BaseSelect
+                id="exercise-question-selection-type"
+                v-model="form.questionSelectionType"
+                :label="t('Question selection type')"
+                name="questionSelectionType"
+                :options="questionSelectionTypeOptions"
+                option-label="label"
+                option-value="value"
+              />
+
+              <BaseInputNumber
+                v-if="showRandomQuestionCount"
+                id="exercise-random"
+                v-model="form.random"
+                :help-text="t('Use 0 to keep all available questions. Use -1 for all questions where legacy accepts it.')"
+                :label="t('Random questions')"
+                name="random"
+                :min="-1"
+              />
+
+              <BaseSelect
+                v-if="showCategorySelectionOptions"
+                id="exercise-random-by-category"
+                v-model="form.randomByCategory"
+                :label="t('Random by category')"
+                name="randomByCategory"
+                :options="randomByCategoryOptions"
+                option-label="label"
+                option-value="value"
+              />
+            </div>
+          </div>
+
+          <div class="grid gap-6 md:grid-cols-2 xl:grid-cols-3">
+            <FieldGroup :title="t('Shuffle answers')">
+              <RadioChoice
+                v-for="option in booleanOptions"
+                :key="`random-answers-${option.booleanValue}`"
+                v-model="form.randomAnswers"
+                name="randomAnswers"
+                :option="option"
+                value-key="booleanValue"
+              />
+            </FieldGroup>
+
+            <FieldGroup :title="t('Display questions category')">
+              <RadioChoice
+                v-for="option in booleanOptions"
+                :key="`display-category-${option.booleanValue}`"
+                v-model="form.displayCategoryName"
+                name="displayCategoryName"
+                :option="option"
+                value-key="booleanValue"
+              />
+            </FieldGroup>
+
+            <FieldGroup :title="t('Hide question title')">
+              <RadioChoice
+                v-for="option in booleanOptions"
+                :key="`hide-question-title-${option.booleanValue}`"
+                v-model="form.hideQuestionTitle"
+                name="hideQuestionTitle"
+                :option="option"
+                value-key="booleanValue"
+              />
+            </FieldGroup>
+          </div>
+
+          <div class="grid gap-6 md:grid-cols-2 xl:grid-cols-3">
+            <BaseCheckbox
+              v-if="settings.allowShowPreviousButtonSetting"
+              id="exercise-show-previous-button"
+              v-model="form.showPreviousButton"
+              :label="t('Show previous button')"
+              name="showPreviousButton"
+            />
+            <BaseCheckbox
+              v-if="settings.allowHideQuestionNumberSetting"
+              id="exercise-hide-question-number"
+              v-model="form.hideQuestionNumber"
+              :label="t('Hide question number')"
+              name="hideQuestionNumber"
+            />
+            <BaseCheckbox
+              id="exercise-auto-launch"
+              v-model="form.autoLaunch"
+              :label="t('Auto launch')"
+              name="autoLaunch"
+            />
+          </div>
+        </section>
+
+        <section class="space-y-4 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+          <h2 class="text-base font-semibold text-gray-90">{{ t("Attempts and timing") }}</h2>
+
+          <div class="grid gap-6 md:grid-cols-2 xl:grid-cols-3">
+            <BaseInputNumber
+              id="exercise-max-attempt"
+              v-model="form.maxAttempt"
+              :label="t('Max number of attempts')"
+              name="maxAttempt"
+              :min="0"
+            />
+
+            <BaseCheckbox
+              id="exercise-enable-start-time"
+              v-model="form.enableStartTime"
+              :label="t('Enable start time')"
+              name="enableStartTime"
+            />
+
+            <BaseCheckbox
+              id="exercise-enable-end-time"
+              v-model="form.enableEndTime"
+              :label="t('Enable end time')"
+              name="enableEndTime"
+            />
+          </div>
+
+          <div class="grid gap-6 md:grid-cols-2">
+            <BaseInputText
+              v-if="form.enableStartTime"
+              id="exercise-start-time"
+              v-model="form.startTime"
+              :label="t('Available from')"
+              name="startTime"
+              type="datetime-local"
+            />
+
+            <BaseInputText
+              v-if="form.enableEndTime"
+              id="exercise-end-time"
+              v-model="form.endTime"
+              :label="t('Until')"
+              name="endTime"
+              type="datetime-local"
+            />
+          </div>
+
+          <div class="grid gap-6 md:grid-cols-2 xl:grid-cols-3">
+            <BaseCheckbox
+              id="exercise-propagate-negative-results"
+              v-model="form.propagateNeg"
+              :label="t('Propagate negative results between questions')"
+              name="propagateNeg"
+            />
+
+            <BaseSelect
+              id="exercise-save-correct-answers"
+              v-model="form.saveCorrectAnswers"
+              :label="t('Save answers')"
+              name="saveCorrectAnswers"
+              :options="saveCorrectAnswerOptions"
+              option-label="label"
+              option-value="value"
+            />
+
+            <BaseCheckbox
+              id="exercise-review-answers"
+              v-model="form.reviewAnswers"
+              :label="t('Review my answers')"
+              name="reviewAnswers"
+            />
+
+            <BaseCheckbox
+              id="exercise-enable-time-control"
+              v-model="form.enableTimeControl"
+              :label="t('Enable time control')"
+              name="enableTimeControl"
+            />
+
+            <BaseInputNumber
+              v-if="form.enableTimeControl"
+              id="exercise-expired-time"
+              v-model="form.expiredTime"
+              :help-text="t('Legacy stores this value as total duration in minutes.')"
+              :label="t('Total duration in minutes of the test')"
+              name="expiredTime"
+              :min="0"
+            />
+
+            <BaseCheckbox
+              id="exercise-prevent-backwards"
+              v-model="form.preventBackwards"
+              :label="t('Prevent moving backwards between questions')"
+              name="preventBackwards"
+            />
+          </div>
+        </section>
+
+        <section class="space-y-4 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+          <h2 class="text-base font-semibold text-gray-90">{{ t("Score and final messages") }}</h2>
+
+          <BaseInputNumber
+            id="exercise-pass-percentage"
+            v-model="form.passPercentage"
+            :label="t('Pass percentage')"
+            name="passPercentage"
+            :max="100"
+            :min="0"
+          />
+          <p class="-mt-3 text-sm text-gray-50">%</p>
+
+          <BaseTinyEditor
+            editor-id="exercise-text-when-finished"
+            v-model="form.textWhenFinished"
+            :editor-config="messageEditorConfig"
+            :full-page="false"
+            :title="t('Text appearing at the end of the test when the user has succeeded or if no pass percentage was set.')"
+          />
+
+          <BaseTinyEditor
+            editor-id="exercise-text-when-finished-failure"
+            v-model="form.textWhenFinishedFailure"
+            :editor-config="messageEditorConfig"
+            :full-page="false"
+            :title="t('Text appearing at the end of the test when the user has failed.')"
+          />
+        </section>
+
+        <section class="space-y-4 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+          <h2 class="text-base font-semibold text-gray-90">{{ t("Extra settings") }}</h2>
+
+          <div class="grid gap-6 md:grid-cols-2">
+            <BaseSelect
+              v-if="settings.allowExerciseCategories && categoryOptions.length > 1"
+              id="exercise-category"
+              v-model="form.categoryId"
+              :label="t('Category')"
+              name="categoryId"
+              :options="categoryOptions"
+              option-label="label"
+              option-value="value"
+            />
+
+            <BaseCheckbox
+              id="exercise-hide-attempts-table"
+              v-model="form.hideAttemptsTable"
+              :label="t('Hide attempts table on start page')"
+              name="hideAttemptsTable"
+            />
+          </div>
+
+          <FieldGroup
+            v-if="settings.allowNotificationSettingPerExercise"
+            :title="t('E-mail notifications')"
+          >
+            <div class="grid gap-3 md:grid-cols-2">
+              <label
+                v-for="option in notificationOptions"
+                :key="`notification-${option.value}`"
+                class="flex cursor-pointer items-start gap-2 text-sm text-gray-90"
+              >
+                <input
+                  :checked="isNotificationSelected(option.value)"
+                  class="mt-0.5"
+                  name="notifications[]"
+                  type="checkbox"
+                  :value="option.value"
+                  @change="toggleNotification(option.value, $event.target.checked)"
+                />
+                <span>{{ option.label }}</span>
+              </label>
+            </div>
+          </FieldGroup>
+        </section>
+      </div>
+
+      <div class="flex flex-col-reverse items-stretch gap-3 pt-4 md:flex-row md:items-center md:justify-end">
+        <BaseButton
+          :label="t('Cancel')"
+          :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+          icon="close"
+          type="black"
+        />
+        <BaseButton
+          :is-loading="isSaving"
+          :label="t('Proceed to questions')"
+          icon="edit"
+          :is-submit="true"
+          type="success"
+        />
+      </div>
+
+      <p class="text-xs text-gray-90">* {{ t("Required field") }}</p>
+    </form>
+  </section>
+</template>
+
+<script setup>
+import { computed, defineComponent, h, onMounted, reactive, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseCheckbox from "../../components/basecomponents/BaseCheckbox.vue"
+import BaseIcon from "../../components/basecomponents/BaseIcon.vue"
+import BaseInputNumber from "../../components/basecomponents/BaseInputNumber.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import BaseTinyEditor from "../../components/basecomponents/BaseTinyEditor.vue"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+
+const isLoading = ref(false)
+const isSaving = ref(false)
+const formSubmitted = ref(false)
+const showAdvancedSettings = ref(false)
+const errorMessage = ref("")
+const successMessage = ref("")
+const csrfToken = ref("")
+const questionsUrl = ref("")
+const settings = ref({})
+const options = ref({})
+
+const mainEditorConfig = {
+  height: 320,
+  menubar: false,
+}
+
+const messageEditorConfig = {
+  height: 260,
+  menubar: false,
+}
+
+const FieldGroup = defineComponent({
+  name: "FieldGroup",
+  props: {
+    title: {
+      type: String,
+      required: true,
+    },
+  },
+  setup(props, { slots }) {
+    return () =>
+      h("fieldset", { class: "space-y-2" }, [
+        h("legend", { class: "mb-2 text-sm font-semibold text-gray-90" }, props.title),
+        slots.default?.(),
+      ])
+  },
+})
+
+const RadioChoice = defineComponent({
+  name: "RadioChoice",
+  props: {
+    modelValue: {
+      type: [String, Number, Boolean],
+      required: true,
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    option: {
+      type: Object,
+      required: true,
+    },
+    valueKey: {
+      type: String,
+      default: "value",
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, { emit }) {
+    return () => {
+      const value = props.option[props.valueKey]
+      const id = `exercise-${props.name}-${String(value).replace(/[^a-zA-Z0-9_-]/g, "-")}`
+
+      return h("label", { class: "flex cursor-pointer items-start gap-2 text-sm text-gray-90", for: id }, [
+        h("input", {
+          id,
+          checked: props.modelValue === value,
+          class: "mt-0.5",
+          name: props.name,
+          type: "radio",
+          value: String(value),
+          onChange: () => emit("update:modelValue", value),
+        }),
+        h("span", props.option.label),
+      ])
+    }
+  },
+})
+
+const form = reactive({
+  title: "",
+  description: "",
+  type: 2,
+  categoryId: 0,
+  startTime: "",
+  endTime: "",
+  enableStartTime: false,
+  enableEndTime: false,
+  duration: 0,
+  maxAttempt: 0,
+  passPercentage: 0,
+  random: 0,
+  randomByCategory: 0,
+  randomAnswers: false,
+  showPreviousButton: true,
+  preventBackwards: false,
+  hideAttemptsTable: false,
+  autoLaunch: false,
+  notifications: [],
+  accessCondition: "",
+  sound: "",
+  feedbackType: 0,
+  resultsDisabled: 0,
+  questionSelectionType: 1,
+  displayCategoryName: true,
+  hideQuestionTitle: false,
+  hideQuestionNumber: false,
+  propagateNeg: false,
+  saveCorrectAnswers: 0,
+  reviewAnswers: false,
+  enableTimeControl: false,
+  expiredTime: 0,
+  displayChartDegreeCertainty: 0,
+  sendEmailChartDegreeCertainty: 0,
+  notDisplayBalancePercentageCategorieQuestion: 0,
+  displayChartDegreeCertaintyCategory: 0,
+  gatherQuestionsCategories: 0,
+  pageResultConfiguration: {
+    hideExpectedAnswers: false,
+    hideTotalScore: false,
+    hideQuestionScore: false,
+    hideCategoryTable: false,
+    hideCorrectAnsweredQuestions: false,
+  },
+  textWhenFinished: "",
+  textWhenFinishedFailure: "",
+})
+
+const exerciseId = computed(() => Number(getQueryValue(route.params.exerciseId) || 0))
+const isEditMode = computed(() => exerciseId.value > 0)
+const questionsRoute = computed(() => ({
+  name: "ExerciseQuestions",
+  params: { ...route.params, exerciseId: exerciseId.value },
+  query: getContextParams(),
+}))
+const typeOptions = computed(() =>
+  (options.value.typeOptions || []).map((option) => ({
+    value: Number(option.value),
+    label: t(option.label),
+  })),
+)
+const categoryOptions = computed(() => [
+  { value: 0, label: t("No category") },
+  ...(options.value.categoryOptions || []).map((option) => ({
+    value: Number(option.value),
+    label: option.label,
+  })),
+])
+const feedbackOptions = computed(() => mapTranslatedOptions(options.value.feedbackOptions || []))
+const resultOptions = computed(() => mapTranslatedOptions(options.value.resultOptions || []))
+const questionSelectionTypeOptions = computed(() => mapTranslatedOptions(options.value.questionSelectionTypeOptions || []))
+const randomByCategoryOptions = computed(() => mapTranslatedOptions(options.value.randomByCategoryOptions || []))
+const notificationOptions = computed(() => mapTranslatedOptions(options.value.notificationOptions || []))
+const saveCorrectAnswerOptions = computed(() => mapTranslatedOptions(options.value.saveCorrectAnswerOptions || []))
+const showRandomQuestionCount = computed(() => [2, 3, 4, 5, 6].includes(Number(form.questionSelectionType)))
+const showCategorySelectionOptions = computed(() => 3 <= Number(form.questionSelectionType))
+const booleanOptions = computed(() => [
+  { booleanValue: true, label: t("Yes") },
+  { booleanValue: false, label: t("No") },
+])
+
+function mapTranslatedOptions(items) {
+  return items.map((option) => ({
+    value: Number(option.value),
+    label: t(option.label),
+  }))
+}
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function fillForm(data) {
+  form.title = data.title || ""
+  form.description = data.description || ""
+  form.type = Number(data.type || 2)
+  form.categoryId = Number(data.categoryId || 0)
+  form.startTime = data.startTime || ""
+  form.endTime = data.endTime || ""
+  form.enableStartTime = Boolean(data.startTime)
+  form.enableEndTime = Boolean(data.endTime)
+  form.duration = Number(data.duration || 0)
+  form.maxAttempt = Number(data.maxAttempt ?? 0)
+  form.passPercentage = Number(data.passPercentage || 0)
+  form.random = Number(data.random || 0)
+  form.randomByCategory = Number(data.randomByCategory || 0)
+  form.randomAnswers = true === data.randomAnswers
+  form.showPreviousButton = true === data.showPreviousButton
+  form.preventBackwards = true === data.preventBackwards
+  form.hideAttemptsTable = true === data.hideAttemptsTable
+  form.autoLaunch = true === data.autoLaunch
+  form.notifications = normalizeNotificationValues(data.notifications || [])
+  form.accessCondition = data.accessCondition || ""
+  form.sound = data.sound || ""
+  form.feedbackType = Number(data.feedbackType || 0)
+  form.resultsDisabled = Number(data.resultsDisabled || 0)
+  form.questionSelectionType = Number(data.questionSelectionType || 1)
+  form.displayCategoryName = true === data.displayCategoryName
+  form.hideQuestionTitle = true === data.hideQuestionTitle
+  form.hideQuestionNumber = true === data.hideQuestionNumber
+  form.propagateNeg = true === data.propagateNeg
+  form.saveCorrectAnswers = Number(data.saveCorrectAnswers || 0)
+  form.reviewAnswers = true === data.reviewAnswers
+  form.expiredTime = Number(data.expiredTime || 0)
+  form.displayChartDegreeCertainty = Number(data.displayChartDegreeCertainty || 0)
+  form.sendEmailChartDegreeCertainty = Number(data.sendEmailChartDegreeCertainty || 0)
+  form.notDisplayBalancePercentageCategorieQuestion = Number(data.notDisplayBalancePercentageCategorieQuestion || 0)
+  form.displayChartDegreeCertaintyCategory = Number(data.displayChartDegreeCertaintyCategory || 0)
+  form.gatherQuestionsCategories = Number(data.gatherQuestionsCategories || 0)
+  form.enableTimeControl = 0 < form.expiredTime
+  form.pageResultConfiguration = buildPageResultConfiguration(data.pageResultConfiguration || {})
+  form.textWhenFinished = data.textWhenFinished || ""
+  form.textWhenFinishedFailure = data.textWhenFinishedFailure || ""
+  csrfToken.value = data.csrfToken || ""
+  questionsUrl.value = data.questionsUrl || ""
+  settings.value = data.settings || {}
+  options.value = data.options || {}
+}
+
+function normalizeNotificationValues(values) {
+  if (!Array.isArray(values)) {
+    return []
+  }
+
+  return [...new Set(values.map((value) => Number(value)).filter((value) => value > 0))]
+}
+
+function isNotificationSelected(value) {
+  return form.notifications.includes(Number(value))
+}
+
+function toggleNotification(value, checked) {
+  const normalized = Number(value)
+  if (checked && !form.notifications.includes(normalized)) {
+    form.notifications = [...form.notifications, normalized]
+    return
+  }
+
+  if (!checked) {
+    form.notifications = form.notifications.filter((item) => item !== normalized)
+  }
+}
+
+function buildPageResultConfiguration(source) {
+  return {
+    hideExpectedAnswers: true === source.hideExpectedAnswers,
+    hideTotalScore: true === source.hideTotalScore,
+    hideQuestionScore: true === source.hideQuestionScore,
+    hideCategoryTable: true === source.hideCategoryTable,
+    hideCorrectAnsweredQuestions: true === source.hideCorrectAnsweredQuestions,
+  }
+}
+
+function buildPayload() {
+  return {
+    exerciseId: isEditMode.value ? exerciseId.value : null,
+    title: form.title,
+    description: form.description,
+    type: Number(form.type || 2),
+    categoryId: Number(form.categoryId || 0),
+    startTime: form.enableStartTime ? form.startTime || null : null,
+    endTime: form.enableEndTime ? form.endTime || null : null,
+    duration: Number(form.duration || 0),
+    maxAttempt: Number(form.maxAttempt || 0),
+    passPercentage: Number(form.passPercentage || 0),
+    random: Number(form.random || 0),
+    randomByCategory: Number(form.randomByCategory || 0),
+    randomAnswers: form.randomAnswers,
+    showPreviousButton: form.showPreviousButton,
+    preventBackwards: form.preventBackwards,
+    hideAttemptsTable: form.hideAttemptsTable,
+    autoLaunch: form.autoLaunch,
+    notifications: normalizeNotificationValues(form.notifications),
+    accessCondition: form.accessCondition,
+    sound: form.sound,
+    feedbackType: Number(form.feedbackType || 0),
+    resultsDisabled: Number(form.resultsDisabled || 0),
+    questionSelectionType: Number(form.questionSelectionType || 1),
+    displayCategoryName: form.displayCategoryName,
+    hideQuestionTitle: form.hideQuestionTitle,
+    hideQuestionNumber: form.hideQuestionNumber,
+    propagateNeg: form.propagateNeg,
+    saveCorrectAnswers: Number(form.saveCorrectAnswers || 0),
+    reviewAnswers: form.reviewAnswers,
+    expiredTime: form.enableTimeControl ? Number(form.expiredTime || 0) : 0,
+    displayChartDegreeCertainty: Number(form.displayChartDegreeCertainty || 0),
+    sendEmailChartDegreeCertainty: Number(form.sendEmailChartDegreeCertainty || 0),
+    notDisplayBalancePercentageCategorieQuestion: Number(form.notDisplayBalancePercentageCategorieQuestion || 0),
+    displayChartDegreeCertaintyCategory: Number(form.displayChartDegreeCertaintyCategory || 0),
+    gatherQuestionsCategories: Number(form.gatherQuestionsCategories || 0),
+    pageResultConfiguration: buildPageResultConfiguration(form.pageResultConfiguration),
+    textWhenFinished: form.textWhenFinished,
+    textWhenFinishedFailure: form.textWhenFinishedFailure,
+    csrfToken: csrfToken.value,
+  }
+}
+
+async function loadConfiguration() {
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseConfiguration(getContextParams(), isEditMode.value ? exerciseId.value : null)
+    fillForm(response)
+  } catch (error) {
+    console.error("Error loading exercise configuration", error)
+    errorMessage.value = t("Could not load exercise configuration")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+async function saveConfiguration() {
+  formSubmitted.value = true
+  successMessage.value = ""
+  errorMessage.value = ""
+
+  if (!form.title.trim()) {
+    errorMessage.value = t("The exercise title is required.")
+    return
+  }
+
+  isSaving.value = true
+
+  try {
+    const response = await exerciseService.saveExerciseConfiguration(
+      buildPayload(),
+      getContextParams(),
+      isEditMode.value ? exerciseId.value : null,
+    )
+
+    successMessage.value = t("Exercise settings saved.")
+    fillForm(response)
+
+    if (response.exerciseId) {
+      await router.push({
+        name: "ExerciseQuestions",
+        params: { ...route.params, exerciseId: response.exerciseId },
+        query: getContextParams(),
+      })
+    }
+  } catch (error) {
+    console.error("Error saving exercise configuration", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not save exercise")
+  } finally {
+    isSaving.value = false
+  }
+}
+
+watch(
+  () => form.feedbackType,
+  (feedbackType) => {
+    if ([1, 3].includes(Number(feedbackType))) {
+      form.resultsDisabled = 0
+    }
+
+    if (1 === Number(feedbackType)) {
+      form.type = 2
+    }
+  },
+)
+
+watch(
+  () => form.questionSelectionType,
+  (selectionType) => {
+    if (3 > Number(selectionType)) {
+      form.randomByCategory = 0
+    }
+  },
+)
+
+onMounted(loadConfiguration)
+</script>
diff --git a/assets/vue/views/exercise/ExerciseListView.vue b/assets/vue/views/exercise/ExerciseListView.vue
new file mode 100644
index 00000000000..c5f5b624aba
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseListView.vue
@@ -0,0 +1,598 @@
+<template>
+  <section class="space-y-6">
+    <div class="flex flex-wrap items-center gap-2">
+      <div class="exercise-list-toolbar flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+        <BaseButton
+          v-if="canCreate"
+          class="exercise-list-toolbar__button"
+          :label="t('Create exercise')"
+          :route="{ name: 'ExerciseCreate', params: route.params, query: getContextParams() }"
+          icon="plus"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="canCreate"
+          class="exercise-list-toolbar__button"
+          :label="t('Create question')"
+          :to-url="legacyUrl('question_create.php')"
+          icon="help"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="canManage && settings.allowExerciseCategories"
+          class="exercise-list-toolbar__button"
+          :label="t('Exercise categories')"
+          :to-url="legacyUrl('category.php')"
+          icon="folder-generic"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="canManage"
+          class="exercise-list-toolbar__button"
+          :label="t('Question categories')"
+          :to-url="legacyUrl('tests_category.php')"
+          icon="folder-generic"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="canManage"
+          class="exercise-list-toolbar__button"
+          :label="t('Question bank')"
+          :to-url="legacyUrl('question_pool.php')"
+          icon="table"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="canManage"
+          class="exercise-list-toolbar__button"
+          :label="t('Import exercises QTI2')"
+          :to-url="legacyUrl('qti2.php')"
+          icon="import"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="canManage"
+          class="exercise-list-toolbar__button"
+          :label="t('Import Aiken quiz')"
+          :to-url="legacyUrl('aiken.php')"
+          icon="file-text"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="canManage"
+          class="exercise-list-toolbar__button"
+          :label="t('Import quiz from Excel')"
+          :to-url="legacyUrl('upload_exercise.php')"
+          icon="file-excel"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <span
+          class="mx-1 h-6 w-px bg-gray-20"
+          aria-hidden="true"
+        />
+        <BaseButton
+          class="exercise-list-toolbar__button"
+          :label="isSearchVisible ? t('Hide search') : t('Search')"
+          :icon="isSearchVisible ? 'close' : 'search'"
+          only-icon
+          size="small"
+          type="primary-text"
+          @click="toggleSearchForm"
+        />
+      </div>
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <div
+      v-if="activeSearch && !isSearchVisible"
+      class="flex flex-wrap items-center gap-2 rounded-xl border border-gray-20 bg-white px-4 py-3 text-sm text-gray-700 shadow-sm"
+    >
+      <span>{{ t("Showing results for: {0}", [activeSearch]) }}</span>
+      <BaseButton
+        :label="t('Clear search')"
+        icon="close"
+        only-icon
+        size="small"
+        type="secondary-text"
+        @click="clearSearch"
+      />
+    </div>
+
+    <form
+      v-if="isSearchVisible"
+      class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      @submit.prevent="applySearch"
+    >
+      <div class="flex flex-col gap-3 md:flex-row md:items-start">
+        <BaseInputText
+          id="exercise-search"
+          v-model="searchTerm"
+          class="flex-1"
+          :help-text="t('Search by exercise title or description.')"
+          :label="t('Search exercises')"
+          name="search"
+        />
+        <BaseSelect
+          v-if="settings.allowExerciseCategories && categories.length > 0"
+          id="exercise-category-filter"
+          v-model="selectedCategoryId"
+          class="min-w-64"
+          :label="t('Category')"
+          name="categoryId"
+          :options="categoryOptions"
+          option-label="label"
+          option-value="value"
+        />
+        <div class="flex flex-wrap gap-2 md:pt-1">
+          <BaseButton
+            :is-loading="isLoading"
+            :label="t('Search')"
+            icon="search"
+            :is-submit="true"
+            type="primary"
+          />
+          <BaseButton
+            v-if="hasActiveFilters"
+            :label="t('Clear search')"
+            icon="close"
+            type="secondary"
+            @click="clearSearch"
+          />
+          <BaseButton
+            v-else
+            :label="t('Cancel')"
+            icon="close"
+            type="secondary"
+            @click="hideSearchForm"
+          />
+        </div>
+      </div>
+    </form>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="usesLegacyActions"
+      class="rounded-xl border border-blue-100 bg-blue-50 p-4 text-sm text-blue-700"
+    >
+      {{ t("Exercise questions, attempts and reports are still handled by the legacy exercise tool in this batch.") }}
+    </div>
+
+    <BaseTable
+      :is-loading="isLoading"
+      :text-for-empty="t('No exercises found')"
+      :total-items="exercises.length"
+      :values="exercises"
+      data-key="iid"
+    >
+      <Column
+        :header="t('Title')"
+        field="title"
+        sortable
+      >
+        <template #body="{ data }">
+          <div class="min-w-64">
+            <div class="flex items-center gap-2">
+              <span
+                :class="chamiloIconToClass['multiple-marked']"
+                class="ch-tool-icon"
+                aria-hidden="true"
+              />
+              <span class="font-semibold text-gray-90">
+                {{ displayText(data.title, t("Untitled")) }}
+              </span>
+            </div>
+            <p
+              v-if="displayText(data.description)"
+              class="mt-1 text-xs text-gray-500"
+            >
+              {{ displayText(data.description) }}
+            </p>
+            <div class="mt-2 flex flex-wrap gap-2 text-xs">
+              <span
+                v-if="!data.visible"
+                class="rounded-full bg-gray-100 px-2 py-0.5 text-gray-700"
+              >
+                {{ t("Hidden") }}
+              </span>
+              <span
+                v-if="data.duration"
+                class="rounded-full bg-blue-100 px-2 py-0.5 text-blue-700"
+              >
+                {{ t("Duration") }}: {{ formatDuration(data.duration) }}
+              </span>
+              <span
+                v-if="data.maxAttempt"
+                class="rounded-full bg-gray-100 px-2 py-0.5 text-gray-700"
+              >
+                {{ t("Attempts") }}: {{ data.maxAttempt }}
+              </span>
+            </div>
+          </div>
+        </template>
+      </Column>
+
+      <Column
+        v-if="settings.allowExerciseCategories"
+        :header="t('Category')"
+        field="categoryTitle"
+        sortable
+      >
+        <template #body="{ data }">
+          {{ displayText(data.categoryTitle, "-") }}
+        </template>
+      </Column>
+
+      <Column :header="t('Dates')">
+        <template #body="{ data }">
+          <div class="space-y-1 text-xs text-gray-600">
+            <div>
+              <span class="font-semibold text-gray-700">{{ t("Available from") }}:</span>
+              {{ formatDate(data.startTime) }}
+            </div>
+            <div>
+              <span class="font-semibold text-gray-700">{{ t("Until") }}:</span>
+              {{ formatDate(data.endTime) }}
+            </div>
+          </div>
+        </template>
+      </Column>
+
+      <Column :header="t('Status')">
+        <template #body="{ data }">
+          <span :class="['rounded-full px-2 py-1 text-xs font-semibold', availabilityBadgeClass(data.availabilityStatus)]">
+            {{ availabilityLabel(data.availabilityStatus) }}
+          </span>
+        </template>
+      </Column>
+
+      <Column
+        :header="t('Questions')"
+        field="questionCount"
+        sortable
+      >
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-800">{{ data.questionCount ?? 0 }}</span>
+        </template>
+      </Column>
+
+      <Column
+        v-if="canManage"
+        :header="t('Attempts')"
+        field="attemptCount"
+        sortable
+      >
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-800">{{ data.attemptCount ?? 0 }}</span>
+        </template>
+      </Column>
+
+      <Column
+        :header="t('Actions')"
+        class="w-48"
+      >
+        <template #body="{ data }">
+          <div class="flex flex-wrap justify-end gap-1">
+            <BaseButton
+              v-if="data.canOpen"
+              :label="t('Open exercise')"
+              :to-url="legacyUrl('overview.php', { exerciseId: data.iid })"
+              icon="play-box-outline"
+              only-icon
+              size="small"
+              type="primary-text"
+            />
+            <BaseButton
+              v-if="data.canOpen"
+              :label="t('Open Vue player')"
+              :route="{ name: 'ExercisePlayer', params: { ...route.params, exerciseId: data.iid }, query: getContextParams() }"
+              icon="eye-on"
+              only-icon
+              size="small"
+              type="primary-text"
+            />
+            <BaseButton
+              v-if="data.canEdit"
+              :label="t('Edit questions')"
+              :route="{ name: 'ExerciseQuestions', params: { ...route.params, exerciseId: data.iid }, query: getContextParams() }"
+              icon="edit"
+              only-icon
+              size="small"
+              type="secondary-text"
+            />
+            <BaseButton
+              v-if="data.canConfigure"
+              :label="t('Configure')"
+              :route="{ name: 'ExerciseEdit', params: { ...route.params, exerciseId: data.iid }, query: getContextParams() }"
+              icon="settings"
+              only-icon
+              size="small"
+              type="secondary-text"
+            />
+            <BaseButton
+              v-if="data.canReport"
+              :label="t('Results')"
+              :route="{ name: 'ExerciseReport', params: { ...route.params, exerciseId: data.iid }, query: getContextParams() }"
+              icon="tracking"
+              only-icon
+              size="small"
+              type="primary-text"
+            />
+            <BaseButton
+              v-if="data.canExport"
+              :label="t('Export QTI2')"
+              :to-url="legacyUrl('exercise.php', { exerciseId: data.iid, action: 'exportqti2' })"
+              icon="export"
+              only-icon
+              size="small"
+              type="primary-text"
+            />
+          </div>
+        </template>
+      </Column>
+    </BaseTable>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+
+const exercises = ref([])
+const categories = ref([])
+const settings = ref({})
+const canManage = ref(false)
+const canCreate = ref(false)
+const usesLegacyActions = ref(true)
+const isLoading = ref(false)
+const errorMessage = ref("")
+const searchTerm = ref(getSearchQuery())
+const selectedCategoryId = ref(getCategoryQuery())
+const isSearchVisible = ref(Boolean(getSearchQuery() || getCategoryQuery()))
+const activeSearch = computed(() => getSearchQuery())
+const hasActiveFilters = computed(() => Boolean(getSearchQuery() || getCategoryQuery()))
+const categoryOptions = computed(() => [
+  { label: t("All categories"), value: 0 },
+  ...categories.value.map((category) => ({ label: displayText(category.title, t("Untitled")), value: Number(category.id) })),
+])
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function getSearchQuery() {
+  return String(getQueryValue(route.query.search) || "").trim()
+}
+
+function getCategoryQuery() {
+  return Number(getQueryValue(route.query.categoryId) || 0)
+}
+
+function getListParams() {
+  const params = { ...getContextParams() }
+  const search = getSearchQuery()
+  const categoryId = getCategoryQuery()
+
+  if (search) {
+    params.search = search
+  }
+
+  if (categoryId > 0) {
+    params.categoryId = categoryId
+  }
+
+  return params
+}
+
+function buildQueryString(params = {}) {
+  const query = new URLSearchParams()
+
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== undefined && value !== null && String(value) !== "") {
+      query.set(key, String(value))
+    }
+  }
+
+  const queryString = query.toString()
+
+  return queryString ? `?${queryString}` : ""
+}
+
+function legacyUrl(path, params = {}) {
+  return `/main/exercise/${path}${buildQueryString({ ...getContextParams(), ...params })}`
+}
+
+function toggleSearchForm() {
+  isSearchVisible.value = !isSearchVisible.value
+}
+
+function hideSearchForm() {
+  searchTerm.value = getSearchQuery()
+  selectedCategoryId.value = getCategoryQuery()
+  isSearchVisible.value = false
+}
+
+async function applySearch() {
+  const search = searchTerm.value.trim()
+  const categoryId = Number(selectedCategoryId.value || 0)
+  const query = { ...route.query }
+
+  if (search) {
+    query.search = search
+  } else {
+    delete query.search
+  }
+
+  if (categoryId > 0) {
+    query.categoryId = categoryId
+  } else {
+    delete query.categoryId
+  }
+
+  await router.push({
+    name: route.name,
+    params: route.params,
+    query,
+  })
+
+  isSearchVisible.value = false
+}
+
+async function clearSearch() {
+  searchTerm.value = ""
+  selectedCategoryId.value = 0
+  await applySearch()
+}
+
+async function loadExercises() {
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseList(getListParams())
+    exercises.value = Array.isArray(response.items) ? response.items : []
+    categories.value = Array.isArray(response.categories) ? response.categories : []
+    settings.value = response.settings || {}
+    canManage.value = true === response.canManage
+    canCreate.value = true === response.canCreate
+    usesLegacyActions.value = true === response.usesLegacyActions
+  } catch (error) {
+    console.error("Error loading exercises", error)
+    errorMessage.value = t("Could not load exercises")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function formatDate(date) {
+  if (!date) {
+    return t("No date")
+  }
+
+  const parsedDate = new Date(date)
+  if (Number.isNaN(parsedDate.getTime())) {
+    return t("No date")
+  }
+
+  return parsedDate.toLocaleString()
+}
+
+function formatDuration(minutes) {
+  const value = Number(minutes || 0)
+  if (value <= 0) {
+    return t("No limit")
+  }
+
+  return t("{0} min", [value])
+}
+
+function availabilityLabel(status) {
+  switch (status) {
+    case "not_started":
+      return t("Not started")
+    case "closed":
+      return t("Closed")
+    default:
+      return t("Open")
+  }
+}
+
+function availabilityBadgeClass(status) {
+  switch (status) {
+    case "not_started":
+      return "bg-blue-100 text-blue-700"
+    case "closed":
+      return "bg-gray-100 text-gray-700"
+    default:
+      return "bg-green-100 text-green-700"
+  }
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadExercises)
+
+watch(
+  () => route.query,
+  () => {
+    searchTerm.value = getSearchQuery()
+    selectedCategoryId.value = getCategoryQuery()
+    loadExercises()
+  },
+)
+</script>
+
+<style scoped>
+:deep(.exercise-list-toolbar__button) {
+  min-width: 2.25rem;
+  width: 2.25rem;
+  height: 2.25rem;
+}
+
+:deep(.exercise-list-toolbar__button .p-button-icon) {
+  font-size: 1.1rem;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
new file mode 100644
index 00000000000..65ec05ce5f8
--- /dev/null
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -0,0 +1,1204 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+      <BaseButton
+        :label="t('Back to exercises')"
+        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.overview"
+        :label="t('Open legacy exercise')"
+        :to-url="legacyUrls.overview"
+        icon="play-box-outline"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="canManage"
+        :label="t('Results')"
+        :route="{ name: 'ExerciseReport', params: { ...route.params, exerciseId: getExerciseId() }, query: getContextParams() }"
+        icon="tracking"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-4 text-sm text-gray-700 shadow-sm"
+    >
+      {{ t("Loading") }}
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <template v-if="!isLoading && !errorMessage">
+      <header class="space-y-3 rounded-xl border border-gray-20 bg-white p-5 shadow-sm">
+        <div class="space-y-2">
+          <h1 class="text-2xl font-semibold text-gray-90">
+            {{ displayText(title, t("Untitled")) }}
+          </h1>
+          <div
+            v-if="description"
+            class="exercise-runtime-html text-sm text-gray-700"
+            v-html="description"
+          />
+        </div>
+
+        <div class="flex flex-wrap gap-2 text-xs">
+          <span class="rounded-full bg-gray-100 px-2 py-1 text-gray-700">
+            {{ t("Questions") }}: {{ questionCount }}
+          </span>
+          <span class="rounded-full bg-gray-100 px-2 py-1 text-gray-700">
+            {{ t("Total score") }}: {{ totalScore }}
+          </span>
+          <span
+            v-if="settings.duration"
+            class="rounded-full bg-blue-100 px-2 py-1 text-blue-700"
+          >
+            {{ t("Duration") }}: {{ t("{0} min", [settings.duration]) }}
+          </span>
+          <span
+            v-if="settings.maxAttempt"
+            class="rounded-full bg-gray-100 px-2 py-1 text-gray-700"
+          >
+            {{ t("Attempts") }}: {{ settings.maxAttempt }}
+          </span>
+          <span
+            v-if="settings.oneQuestionPerPage"
+            class="rounded-full bg-gray-100 px-2 py-1 text-gray-700"
+          >
+            {{ t("One question per page") }}
+          </span>
+          <span
+            v-if="settings.randomQuestions"
+            class="rounded-full bg-gray-100 px-2 py-1 text-gray-700"
+          >
+            {{ t("Random questions") }}: {{ settings.randomQuestions }}
+          </span>
+          <span
+            v-if="settings.randomAnswers"
+            class="rounded-full bg-gray-100 px-2 py-1 text-gray-700"
+          >
+            {{ t("Random answers") }}
+          </span>
+        </div>
+      </header>
+
+      <div
+        v-if="usesLegacySubmit && activeAttempt"
+        class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
+      >
+        <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+          <p>
+            {{ t("This Vue player can save draft answers for simple question types. Final submission, scoring, results and review still use the legacy exercise runtime in this batch.") }}
+          </p>
+          <BaseButton
+            v-if="legacyUrls.overview"
+            :label="t('Continue in legacy exercise')"
+            :to-url="legacyUrls.overview"
+            icon="play-box-outline"
+            type="primary"
+          />
+        </div>
+      </div>
+
+      <div class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+        <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+          <div class="space-y-1 text-sm text-gray-700">
+            <div class="font-semibold text-gray-90">
+              {{ activeAttempt ? t("Vue attempt started") : t("Vue attempt") }}
+            </div>
+            <div v-if="canManage">
+              {{ t("Teacher preview does not create a tracked attempt.") }}
+            </div>
+            <div v-else-if="activeAttempt">
+              {{ t("Attempt") }} #{{ activeAttempt.attemptId }} · {{ t("Question") }} {{ currentQuestionIndex + 1 }} / {{ visibleQuestionTotal }}
+              <span v-if="activeAttempt.remainingSeconds !== null && activeAttempt.remainingSeconds !== undefined">
+                · {{ t("Time left") }}: {{ formatSeconds(activeAttempt.remainingSeconds) }}
+              </span>
+            </div>
+            <div v-else>
+              {{ t("Start or resume a Vue attempt. Draft answers for simple question types can be saved before final legacy submission.") }}
+            </div>
+            <div v-if="attemptMessage" class="text-support-4">
+              {{ attemptMessage }}
+            </div>
+            <div v-if="attemptError" class="text-danger">
+              {{ attemptError }}
+            </div>
+            <div v-if="answerSaveMessage" class="text-green-700">
+              {{ answerSaveMessage }}
+            </div>
+            <div v-if="answerSaveError" class="text-danger">
+              {{ answerSaveError }}
+            </div>
+            <div v-if="finishMessage" class="text-support-4">
+              {{ finishMessage }}
+            </div>
+            <div v-if="finishError" class="text-danger">
+              {{ finishError }}
+            </div>
+          </div>
+          <div class="flex flex-wrap gap-2">
+            <BaseButton
+              v-if="!canManage && !activeAttempt"
+              :disabled="isStartingAttempt"
+              :label="isStartingAttempt ? t('Starting') : t('Start Vue attempt')"
+              icon="play-box-outline"
+              type="primary"
+              @click="startAttempt"
+            />
+            <BaseButton
+              v-if="legacyUrls.overview"
+              :label="t('Use legacy runtime')"
+              :to-url="legacyUrls.overview"
+              icon="play-box-outline"
+              type="secondary"
+            />
+          </div>
+        </div>
+      </div>
+
+      <form v-if="canManage || activeAttempt" class="space-y-4" @submit.prevent="submitDisabled">
+        <article
+          v-for="(question, index) in visibleQuestions"
+          :key="question.id"
+          class="rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
+        >
+          <div class="mb-4 flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
+            <div class="space-y-1">
+              <div class="text-xs font-semibold uppercase tracking-wide text-gray-500">
+                {{ questionNumberLabel(question, index) }} · {{ t(question.typeLabel) }}
+              </div>
+              <h2
+                v-if="!settings.hideQuestionTitle"
+                class="exercise-runtime-html text-lg font-semibold text-gray-90"
+                v-html="question.title"
+              />
+              <div
+                v-if="question.description && !isReadingQuestion(question)"
+                class="exercise-runtime-html text-sm text-gray-700"
+                v-html="question.description"
+              />
+            </div>
+            <div class="flex flex-wrap gap-2">
+              <span class="rounded-full bg-gray-100 px-2 py-1 text-xs font-semibold text-gray-700">
+                {{ t("Score") }}: {{ question.score }}
+              </span>
+              <span
+                v-if="savedQuestionIds.has(Number(question.id))"
+                class="rounded-full bg-green-100 px-2 py-1 text-xs font-semibold text-green-700"
+              >
+                {{ t("Draft saved") }}
+              </span>
+            </div>
+          </div>
+
+          <div v-if="answers[question.id]" class="space-y-4">
+            <div v-if="isRadioChoice(question)" class="space-y-3">
+              <label
+                v-for="choice in question.choices"
+                :key="choice.id"
+                class="flex items-start gap-3 rounded-lg border border-gray-20 p-3 hover:bg-gray-10"
+              >
+                <input
+                  v-model="answers[question.id].choice"
+                  class="mt-1"
+                  :name="`question_${question.id}`"
+                  type="radio"
+                  :value="choice.id"
+                />
+                <span class="exercise-runtime-html flex-1" v-html="choice.answer" />
+              </label>
+            </div>
+
+            <div v-else-if="isCheckboxChoice(question)" class="space-y-3">
+              <label
+                v-for="choice in question.choices"
+                :key="choice.id"
+                class="flex items-start gap-3 rounded-lg border border-gray-20 p-3 hover:bg-gray-10"
+              >
+                <input
+                  v-model="answers[question.id].choices"
+                  class="mt-1"
+                  :name="`question_${question.id}[]`"
+                  type="checkbox"
+                  :value="choice.id"
+                />
+                <span class="exercise-runtime-html flex-1" v-html="choice.answer" />
+              </label>
+            </div>
+
+            <div v-else-if="isTrueFalseQuestion(question)" class="space-y-3">
+              <div
+                v-for="choice in question.choices"
+                :key="choice.id"
+                class="rounded-lg border border-gray-20 p-3"
+              >
+                <div class="exercise-runtime-html mb-3 font-medium text-gray-90" v-html="choice.answer" />
+                <div class="flex flex-wrap gap-3">
+                  <label
+                    v-for="option in trueFalseOptions(question)"
+                    :key="`${choice.id}-${option.value}`"
+                    class="inline-flex items-center gap-2 text-sm text-gray-700"
+                  >
+                    <input
+                      v-model="answers[question.id].trueFalse[choice.id]"
+                      :name="`question_${question.id}_${choice.id}`"
+                      type="radio"
+                      :value="option.value"
+                    />
+                    <span>{{ option.label }}</span>
+                  </label>
+                </div>
+              </div>
+            </div>
+
+            <div v-else-if="isFillBlanksQuestion(question)" class="rounded-lg border border-gray-20 p-4 text-gray-800">
+              <template
+                v-for="(segment, segmentIndex) in question.fillBlanks.segments"
+                :key="`${question.id}-blank-segment-${segmentIndex}`"
+              >
+                <span
+                  v-if="segment.type === 'text'"
+                  class="exercise-runtime-html inline"
+                  v-html="segment.text"
+                />
+                <input
+                  v-else
+                  v-model="answers[question.id].blanks[segment.position]"
+                  class="mx-1 inline-block rounded border border-gray-30 px-2 py-1 text-sm"
+                  :name="`question_${question.id}_blank_${segment.position}`"
+                  :style="{ width: `${Math.min(Math.max(Number(segment.inputSize || 160), 80), 320)}px` }"
+                  type="text"
+                />
+              </template>
+            </div>
+
+            <div v-else-if="isMatchingQuestion(question)" class="space-y-3">
+              <div
+                v-for="prompt in question.matching.prompts"
+                :key="prompt.id"
+                class="grid gap-3 rounded-lg border border-gray-20 p-3 md:grid-cols-[1fr_16rem] md:items-center"
+              >
+                <div class="exercise-runtime-html" v-html="prompt.answer" />
+                <select
+                  v-model="answers[question.id].matching[prompt.id]"
+                  class="rounded border border-gray-30 px-3 py-2 text-sm"
+                  :name="`question_${question.id}_matching_${prompt.id}`"
+                >
+                  <option value="">{{ t("Select") }}</option>
+                  <option
+                    v-for="option in question.matching.options"
+                    :key="option.id"
+                    :value="option.id"
+                  >
+                    {{ option.label }}. {{ displayText(option.answer) }}
+                  </option>
+                </select>
+              </div>
+            </div>
+
+            <div v-else-if="isDraggableQuestion(question)" class="space-y-3">
+              <div class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800">
+                {{ t("Sequence ordering is displayed here as a temporary list. Drag and drop submission will be migrated in the submit processor batch.") }}
+              </div>
+              <ol class="list-decimal space-y-2 pl-6">
+                <li
+                  v-for="item in question.draggable.items"
+                  :key="item.id"
+                  class="exercise-runtime-html"
+                  v-html="item.answer"
+                />
+              </ol>
+            </div>
+
+            <div v-else-if="isDropdownQuestion(question)" class="space-y-3">
+              <select
+                v-model="answers[question.id].dropdown"
+                class="rounded border border-gray-30 px-3 py-2 text-sm"
+                :name="`question_${question.id}_dropdown`"
+              >
+                <option value="">{{ t("Select") }}</option>
+                <option
+                  v-for="option in question.dropdown.options"
+                  :key="option.id"
+                  :value="option.id"
+                >
+                  {{ displayText(option.answer) }}
+                </option>
+              </select>
+            </div>
+
+            <div v-else-if="isCalculatedQuestion(question)" class="space-y-3">
+              <div
+                v-if="question.calculated.text"
+                class="exercise-runtime-html rounded-lg border border-gray-20 p-3 text-sm text-gray-800"
+                v-html="question.calculated.text"
+              />
+              <input
+                v-model="answers[question.id].calculated"
+                class="w-full rounded border border-gray-30 px-3 py-2 text-sm md:w-80"
+                :name="`question_${question.id}_calculated`"
+                type="text"
+              />
+            </div>
+
+            <div v-else-if="isOpenQuestion(question)" class="space-y-2">
+              <textarea
+                v-model="answers[question.id].text"
+                class="min-h-32 w-full rounded border border-gray-30 px-3 py-2 text-sm"
+                :name="`question_${question.id}_text`"
+              />
+            </div>
+
+            <div v-else-if="isUploadQuestion(question)" class="space-y-2">
+              <input
+                class="block w-full text-sm text-gray-700"
+                :name="`question_${question.id}_file`"
+                type="file"
+                @change="onUploadAnswerFileChange(question, $event)"
+              />
+              <div
+                v-if="answers[question.id]?.uploadFileName"
+                class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+              >
+                {{ t("Selected file") }}: {{ answers[question.id].uploadFileName }}
+              </div>
+              <div
+                v-if="answers[question.id]?.uploadedFiles?.length"
+                class="space-y-2 rounded-lg border border-success/30 bg-success/10 p-3 text-sm text-success"
+              >
+                <div class="font-semibold">{{ t("Uploaded file") }}</div>
+                <div
+                  v-for="file in answers[question.id].uploadedFiles"
+                  :key="file.id || file.name"
+                >
+                  {{ file.name || t("Uploaded file") }}
+                </div>
+              </div>
+            </div>
+
+            <div v-else-if="isOralQuestion(question)" class="space-y-2">
+              <div class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800">
+                {{ t("Audio recording and upload will be connected in the submit processor batch.") }}
+              </div>
+              <input
+                class="block w-full text-sm text-gray-700"
+                :name="`question_${question.id}_audio`"
+                type="file"
+                accept="audio/*"
+              />
+            </div>
+
+            <div v-else-if="isAnnotationQuestion(question)" class="space-y-3">
+              <img
+                v-if="question.annotation.imageUrl"
+                class="max-h-[32rem] max-w-full rounded-lg border border-gray-20 object-contain"
+                :alt="question.annotation.imageName || t('Question image')"
+                :src="question.annotation.imageUrl"
+              />
+              <textarea
+                v-model="answers[question.id].text"
+                class="min-h-28 w-full rounded border border-gray-30 px-3 py-2 text-sm"
+                :name="`question_${question.id}_annotation`"
+              />
+            </div>
+
+            <div v-else-if="isHotspotQuestion(question)" class="space-y-3">
+              <img
+                v-if="question.hotspot.imageUrl"
+                class="max-h-[32rem] max-w-full rounded-lg border border-gray-20 object-contain"
+                :alt="question.hotspot.imageName || t('Question image')"
+                :src="question.hotspot.imageUrl"
+              />
+              <div class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800">
+                {{ t("Hotspot click capture and scoring will be migrated in the submit processor batch.") }}
+              </div>
+            </div>
+
+            <div v-else-if="isReadingQuestion(question)" class="space-y-3">
+              <div class="rounded-lg border border-gray-20 p-3 text-sm text-gray-700">
+                {{ t("Reading speed") }}: {{ question.reading.speed }} {{ t("words per minute") }}
+              </div>
+              <div
+                class="exercise-runtime-html rounded-lg border border-gray-20 p-4 text-gray-800"
+                v-html="question.reading.text || question.description"
+              />
+            </div>
+
+            <div
+              v-else-if="isPageBreak(question)"
+              class="rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm text-gray-700"
+            >
+              {{ t("Page break") }}
+            </div>
+
+            <div
+              v-else
+              class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800"
+            >
+              {{ t("This question type is pending runtime rendering in Vue.") }}
+            </div>
+          </div>
+        </article>
+
+        <div class="flex flex-wrap justify-between gap-2 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+          <BaseButton
+            :disabled="!canMovePrevious || isSavingAnswer"
+            :label="t('Previous question')"
+            icon="back"
+            type="secondary"
+            @click="goToPreviousQuestion"
+          />
+          <div class="flex flex-wrap gap-2">
+            <BaseButton
+              v-if="!canManage && activeAttempt"
+              :disabled="isSavingAnswer || !visibleQuestions.some(isDraftSaveSupported)"
+              :label="isSavingAnswer ? t('Saving') : t('Save draft')"
+              icon="check"
+              type="success"
+              @click="saveVisibleAnswers"
+            />
+            <BaseButton
+              v-if="settings.oneQuestionPerPage"
+              :disabled="!canMoveNext || isSavingAnswer"
+              :label="t('Next question')"
+              type="primary"
+              @click="goToNextQuestion"
+            />
+            <BaseButton
+              v-if="!canManage && activeAttempt"
+              :disabled="!canSubmit || isSavingAnswer || isFinishingAttempt"
+              :label="isFinishingAttempt ? t('Finishing') : t('Finish in Vue')"
+              icon="check"
+              type="primary"
+              @click="finishAttempt"
+            />
+            <BaseButton
+              v-if="legacyUrls.overview"
+              :label="t('Continue in legacy exercise')"
+              :to-url="legacyUrls.overview"
+              icon="play-box-outline"
+              type="secondary"
+            />
+          </div>
+        </div>
+      </form>
+    </template>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+
+const isLoading = ref(false)
+const errorMessage = ref("")
+const title = ref("")
+const description = ref("")
+const settings = ref({})
+const questions = ref([])
+const legacyUrls = ref({})
+const questionCount = ref(0)
+const totalScore = ref(0)
+const canManage = ref(false)
+const canStartAttempt = ref(false)
+const canSubmit = ref(false)
+const usesLegacySubmit = ref(true)
+const answers = ref({})
+const activeAttempt = ref(null)
+const currentQuestionIndex = ref(0)
+const isStartingAttempt = ref(false)
+const attemptMessage = ref("")
+const attemptError = ref("")
+const isSavingAnswer = ref(false)
+const answerSaveError = ref("")
+const answerSaveMessage = ref("")
+const isFinishingAttempt = ref(false)
+const finishError = ref("")
+const finishMessage = ref("")
+const savedQuestionIds = ref(new Set())
+
+const visibleQuestions = computed(() => {
+  if (!settings.value.oneQuestionPerPage) {
+    return questions.value
+  }
+
+  const question = questions.value[currentQuestionIndex.value]
+
+  return question ? [question] : []
+})
+
+const visibleQuestionTotal = computed(() => questions.value.length)
+const canMovePrevious = computed(() => settings.value.oneQuestionPerPage && currentQuestionIndex.value > 0)
+const canMoveNext = computed(() => settings.value.oneQuestionPerPage && currentQuestionIndex.value < questions.value.length - 1)
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+    origin: getQueryValue(route.query.origin),
+    learnpath_id: getQueryValue(route.query.learnpath_id),
+    learnpath_item_id: getQueryValue(route.query.learnpath_item_id),
+    learnpath_item_view_id: getQueryValue(route.query.learnpath_item_view_id),
+  }
+}
+
+function getExerciseId() {
+  return Number(route.params.exerciseId || 0)
+}
+
+async function loadRuntime() {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    errorMessage.value = t("Invalid exercise")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseRuntime(getContextParams(), exerciseId)
+    title.value = response.title || ""
+    description.value = response.description || ""
+    settings.value = response.settings || {}
+    questions.value = Array.isArray(response.questions) ? response.questions : []
+    legacyUrls.value = response.legacyUrls || {}
+    questionCount.value = Number(response.questionCount || questions.value.length)
+    totalScore.value = Number(response.totalScore || 0)
+    canManage.value = true === response.canManage
+    canStartAttempt.value = true === response.canStartAttempt
+    activeAttempt.value = response.attempt || null
+    canSubmit.value = true === response.canSubmit
+    usesLegacySubmit.value = true === response.usesLegacySubmit && Boolean(activeAttempt.value)
+    applyAttemptState(activeAttempt.value)
+    initializeAnswerState()
+    applySavedAnswers(activeAttempt.value?.savedAnswers || {})
+  } catch (error) {
+    console.error("Error loading exercise runtime", error)
+    errorMessage.value = t("Could not load exercise")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+async function startAttempt() {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    attemptError.value = t("Invalid exercise")
+    return
+  }
+
+  isStartingAttempt.value = true
+  attemptMessage.value = ""
+  attemptError.value = ""
+
+  try {
+    const response = await exerciseService.startExerciseAttempt({ exerciseId }, getContextParams(), exerciseId)
+    if (response.success) {
+      activeAttempt.value = response
+      canSubmit.value = true === response.canFinish && true !== response.usesLegacyRuntime
+      usesLegacySubmit.value = true === response.usesLegacyRuntime || false === response.canFinish
+      attemptMessage.value = response.message || t("Attempt started")
+      applyAttemptState(response)
+      reorderQuestionsFromAttempt(response.questionIds || [])
+      initializeAnswerState()
+      applySavedAnswers(response.savedAnswers || {})
+      return
+    }
+
+    if (response.usesLegacyRuntime && response.legacyUrls) {
+      legacyUrls.value = { ...legacyUrls.value, ...response.legacyUrls }
+    }
+
+    canSubmit.value = false
+    usesLegacySubmit.value = true === response.usesLegacyRuntime
+    attemptError.value = response.message || t("Could not start the Vue attempt")
+  } catch (error) {
+    console.error("Error starting exercise attempt", error)
+    attemptError.value = t("Could not start the Vue attempt")
+  } finally {
+    isStartingAttempt.value = false
+  }
+}
+
+function applyAttemptState(attempt) {
+  if (!attempt) {
+    currentQuestionIndex.value = 0
+    return
+  }
+
+  currentQuestionIndex.value = Math.max(0, Number(attempt.currentQuestionIndex || 0))
+  if (Array.isArray(attempt.questionIds) && attempt.questionIds.length > 0) {
+    reorderQuestionsFromAttempt(attempt.questionIds)
+  }
+}
+
+function reorderQuestionsFromAttempt(questionIds = []) {
+  if (!Array.isArray(questionIds) || questionIds.length === 0) {
+    return
+  }
+
+  const questionMap = new Map(questions.value.map((question) => [Number(question.id), question]))
+  const orderedQuestions = []
+
+  for (const questionId of questionIds.map(Number)) {
+    const question = questionMap.get(questionId)
+    if (question) {
+      orderedQuestions.push(question)
+    }
+  }
+
+  if (orderedQuestions.length > 0) {
+    questions.value = orderedQuestions.map((question, index) => ({
+      ...question,
+      position: index + 1,
+    }))
+    questionCount.value = questions.value.length
+  }
+}
+
+async function goToPreviousQuestion() {
+  if (!canMovePrevious.value) {
+    return
+  }
+
+  if (await saveVisibleAnswers()) {
+    currentQuestionIndex.value -= 1
+  }
+}
+
+async function goToNextQuestion() {
+  if (!canMoveNext.value) {
+    return
+  }
+
+  if (await saveVisibleAnswers()) {
+    currentQuestionIndex.value += 1
+  }
+}
+
+async function saveVisibleAnswers() {
+  if (canManage.value || !activeAttempt.value?.attemptId) {
+    return true
+  }
+
+  const saveTargets = visibleQuestions.value.filter(isDraftSaveSupported)
+  if (saveTargets.length === 0) {
+    return true
+  }
+
+  isSavingAnswer.value = true
+  answerSaveError.value = ""
+  answerSaveMessage.value = ""
+
+  try {
+    for (const question of saveTargets) {
+      await saveQuestionDraftAnswer(question)
+    }
+
+    answerSaveMessage.value = t("Draft answer saved")
+
+    return true
+  } catch (error) {
+    console.error("Error saving exercise draft answer", error)
+    answerSaveError.value = t("Could not save draft answer")
+
+    return false
+  } finally {
+    isSavingAnswer.value = false
+  }
+}
+
+async function finishAttempt() {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(activeAttempt.value?.attemptId || 0)
+  if (canManage.value || !exerciseId || !attemptId) {
+    return
+  }
+
+  if (!(await saveVisibleAnswers())) {
+    return
+  }
+
+  isFinishingAttempt.value = true
+  finishError.value = ""
+  finishMessage.value = ""
+
+  try {
+    const response = await exerciseService.finishExerciseRuntimeAttempt(
+      {
+        exerciseId,
+        attemptId,
+      },
+      getContextParams(),
+      exerciseId,
+      attemptId,
+    )
+
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not finish the attempt")
+    }
+
+    activeAttempt.value = {
+      ...activeAttempt.value,
+      status: response.status || "completed",
+    }
+    canSubmit.value = false
+    finishMessage.value = response.message ? t(response.message) : t("Attempt finished")
+
+    await router.push({
+      name: "ExerciseResult",
+      params: {
+        ...route.params,
+        exerciseId,
+        attemptId,
+      },
+      query: getContextParams(),
+    })
+  } catch (error) {
+    console.error("Error finishing exercise attempt", error)
+    finishError.value = t("Could not finish the attempt")
+  } finally {
+    isFinishingAttempt.value = false
+  }
+}
+
+async function saveQuestionDraftAnswer(question) {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(activeAttempt.value?.attemptId || 0)
+  if (!exerciseId || !attemptId || !question?.id) {
+    return
+  }
+
+  const response = isUploadQuestion(question)
+    ? await saveUploadQuestionAnswer(question, exerciseId, attemptId)
+    : await exerciseService.saveExerciseRuntimeAnswer(
+      {
+        exerciseId,
+        attemptId,
+        questionId: Number(question.id),
+        answer: buildAnswerPayload(question),
+        secondsSpent: 0,
+      },
+      getContextParams(),
+      exerciseId,
+      attemptId,
+    )
+
+  if (!response) {
+    return
+  }
+
+  if (!response?.success) {
+    throw new Error(response?.message || "Could not save draft answer")
+  }
+
+  if (Array.isArray(response.answeredQuestionIds)) {
+    savedQuestionIds.value = new Set(response.answeredQuestionIds.map(Number))
+  } else if (Array.isArray(response.savedAnswer) && response.savedAnswer.length > 0) {
+    const nextSavedQuestionIds = new Set(savedQuestionIds.value)
+    nextSavedQuestionIds.add(Number(question.id))
+    savedQuestionIds.value = nextSavedQuestionIds
+  } else {
+    const nextSavedQuestionIds = new Set(savedQuestionIds.value)
+    nextSavedQuestionIds.delete(Number(question.id))
+    savedQuestionIds.value = nextSavedQuestionIds
+  }
+}
+
+
+async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
+  const questionAnswer = answers.value[question.id] || {}
+  if (!questionAnswer.uploadFile) {
+    return null
+  }
+
+  const formData = new FormData()
+  formData.append("questionId", String(Number(question.id)))
+  formData.append("secondsSpent", "0")
+  formData.append("file", questionAnswer.uploadFile)
+
+  const response = await exerciseService.uploadExerciseRuntimeAnswer(
+    formData,
+    getContextParams(),
+    exerciseId,
+    attemptId,
+  )
+
+  if (response?.success) {
+    questionAnswer.uploadFile = null
+    questionAnswer.uploadFileName = ""
+    questionAnswer.uploadedFiles = Array.isArray(response.files) ? response.files : []
+  }
+
+  return response
+}
+
+function buildAnswerPayload(question) {
+  const questionAnswer = answers.value[question.id] || {}
+
+  if (isRadioChoice(question)) {
+    return { choice: questionAnswer.choice }
+  }
+
+  if (isCheckboxChoice(question)) {
+    return { choices: questionAnswer.choices || [] }
+  }
+
+  if (isTrueFalseQuestion(question)) {
+    return { trueFalse: questionAnswer.trueFalse || {} }
+  }
+
+  if (isFillBlanksQuestion(question)) {
+    return { blanks: questionAnswer.blanks || {} }
+  }
+
+  if (isMatchingQuestion(question)) {
+    return { matching: questionAnswer.matching || {} }
+  }
+
+  if (isDropdownQuestion(question)) {
+    return { dropdown: questionAnswer.dropdown }
+  }
+
+  if (isDraftFreeAnswerQuestion(question)) {
+    return { text: questionAnswer.text || "" }
+  }
+
+  return {}
+}
+
+function isDraftSaveSupported(question) {
+  return isRadioChoice(question)
+    || isCheckboxChoice(question)
+    || isDraftTrueFalseQuestion(question)
+    || isFillBlanksQuestion(question)
+    || isMatchingQuestion(question)
+    || isDropdownQuestion(question)
+    || isDraftFreeAnswerQuestion(question)
+    || isUploadQuestion(question)
+}
+
+function isDraftTrueFalseQuestion(question) {
+  return [11, 12].includes(Number(question.type))
+}
+
+function isDraftFreeAnswerQuestion(question) {
+  return Number(question.type) === 5
+}
+
+function applySavedAnswers(savedAnswers = {}) {
+  const savedIds = new Set()
+
+  for (const [questionId, rows] of Object.entries(savedAnswers || {})) {
+    const question = questions.value.find((item) => Number(item.id) === Number(questionId))
+    if (!question || !Array.isArray(rows)) {
+      continue
+    }
+
+    applySavedAnswer(question, rows)
+    if (rows.length > 0) {
+      savedIds.add(Number(questionId))
+    }
+  }
+
+  savedQuestionIds.value = savedIds
+}
+
+function applySavedAnswer(question, rows) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  if (isRadioChoice(question)) {
+    questionAnswer.choice = Number(rows[0]?.answer || 0) || null
+    return
+  }
+
+  if (isCheckboxChoice(question)) {
+    questionAnswer.choices = rows.map((row) => Number(row.answer || 0)).filter((value) => value > 0)
+    return
+  }
+
+  if (isTrueFalseQuestion(question)) {
+    questionAnswer.trueFalse = {}
+    for (const row of rows) {
+      const parts = String(row.answer || "").split(":")
+      const answerId = Number(parts[0] || 0)
+      const optionValue = Number(parts[1] || 0)
+      if (answerId > 0 && optionValue > 0) {
+        questionAnswer.trueFalse[answerId] = optionValue
+      }
+    }
+    return
+  }
+
+  if (isFillBlanksQuestion(question)) {
+    questionAnswer.blanks = extractSavedBlankValues(rows[0]?.answer || "", question.fillBlanks.separator)
+    return
+  }
+
+  if (isMatchingQuestion(question)) {
+    questionAnswer.matching = {}
+    for (const row of rows) {
+      const promptId = Number(row.position || 0)
+      const optionId = Number(row.answer || 0)
+      if (promptId > 0 && optionId > 0) {
+        questionAnswer.matching[promptId] = optionId
+      }
+    }
+    return
+  }
+
+  if (isDropdownQuestion(question)) {
+    questionAnswer.dropdown = Number(rows[0]?.answer || 0) || ""
+    return
+  }
+
+  if (isOpenQuestion(question)) {
+    questionAnswer.text = rows[0]?.answer || ""
+    return
+  }
+
+  if (isUploadQuestion(question)) {
+    questionAnswer.uploadedFiles = rows.length > 0 ? [{ name: t("Uploaded file") }] : []
+  }
+}
+
+function extractSavedBlankValues(savedAnswer, separator = 0) {
+  const [start, end] = getFillBlankSeparators(separator)
+  const pattern = new RegExp(`${escapeRegExp(start)}(.*?)${escapeRegExp(end)}`, "g")
+  const matches = [...String(savedAnswer || "").split("::")[0].matchAll(pattern)]
+  const blanks = {}
+
+  for (let index = 0; index < matches.length; index += 3) {
+    const blankPosition = Math.floor(index / 3) + 1
+    blanks[blankPosition] = decodeHtml(matches[index + 1]?.[1] || "")
+  }
+
+  return blanks
+}
+
+function getFillBlankSeparators(separator = 0) {
+  const separators = [
+    ["[", "]"],
+    ["{", "}"],
+    ["(", ")"],
+    ["*", "*"],
+    ["#", "#"],
+    ["%", "%"],
+    ["$", "$"],
+  ]
+
+  return separators[Number(separator || 0)] || separators[0]
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+}
+
+function formatSeconds(seconds) {
+  const safeSeconds = Math.max(0, Number(seconds || 0))
+  const minutes = Math.floor(safeSeconds / 60)
+  const remainingSeconds = safeSeconds % 60
+
+  return `${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`
+}
+
+function initializeAnswerState() {
+  const nextAnswers = {}
+
+  for (const question of questions.value) {
+    nextAnswers[question.id] = {
+      choice: null,
+      choices: [],
+      trueFalse: {},
+      blanks: {},
+      matching: {},
+      dropdown: "",
+      calculated: "",
+      text: "",
+      uploadFile: null,
+      uploadFileName: "",
+      uploadedFiles: [],
+    }
+  }
+
+  answers.value = nextAnswers
+}
+
+
+function onUploadAnswerFileChange(question, event) {
+  const file = event?.target?.files?.[0] || null
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  questionAnswer.uploadFile = file
+  questionAnswer.uploadFileName = file?.name || ""
+}
+
+function questionNumberLabel(question, index) {
+  if (settings.value.hideQuestionNumber) {
+    return t("Question")
+  }
+
+  return t("Question {0}", [question.position || index + 1])
+}
+
+function isRadioChoice(question) {
+  return [1, 10, 17].includes(Number(question.type))
+}
+
+function isCheckboxChoice(question) {
+  return [2, 9, 14].includes(Number(question.type))
+}
+
+function isTrueFalseQuestion(question) {
+  return [11, 12, 22].includes(Number(question.type))
+}
+
+function isFillBlanksQuestion(question) {
+  return [3, 27].includes(Number(question.type)) && question.fillBlanks && Array.isArray(question.fillBlanks.segments)
+}
+
+function isMatchingQuestion(question) {
+  return [4, 19, 24, 25].includes(Number(question.type)) && question.matching
+}
+
+function isDraggableQuestion(question) {
+  return Number(question.type) === 18 && question.draggable
+}
+
+function isDropdownQuestion(question) {
+  return [28, 29].includes(Number(question.type)) && question.dropdown
+}
+
+function isCalculatedQuestion(question) {
+  return Number(question.type) === 16
+}
+
+function isOpenQuestion(question) {
+  return [5, 15].includes(Number(question.type))
+}
+
+function isUploadQuestion(question) {
+  return Number(question.type) === 23
+}
+
+function isOralQuestion(question) {
+  return Number(question.type) === 13
+}
+
+function isAnnotationQuestion(question) {
+  return Number(question.type) === 20 && question.annotation
+}
+
+function isHotspotQuestion(question) {
+  return [6, 8, 26].includes(Number(question.type)) && question.hotspot
+}
+
+function isReadingQuestion(question) {
+  return Number(question.type) === 21 && question.reading
+}
+
+function isPageBreak(question) {
+  return Number(question.type) === 31
+}
+
+function trueFalseOptions(question) {
+  if (Array.isArray(question.trueFalseOptions) && question.trueFalseOptions.length > 0) {
+    return question.trueFalseOptions.map((option) => ({
+      value: Number(option.position || option.id),
+      label: displayText(option.title),
+    }))
+  }
+
+  return [
+    { value: 1, label: t("True") },
+    { value: 2, label: t("False") },
+    { value: 3, label: t("Don't know") },
+  ]
+}
+
+function submitDisabled() {
+  return false
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadRuntime)
+
+watch(
+  () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid],
+  () => loadRuntime(),
+)
+</script>
+
+<style scoped>
+.exercise-runtime-html :deep(img) {
+  max-width: 100%;
+  height: auto;
+}
+
+.exercise-runtime-html :deep(p) {
+  margin-bottom: 0.5rem;
+}
+
+.exercise-runtime-html :deep(p:last-child) {
+  margin-bottom: 0;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
new file mode 100644
index 00000000000..67abf9129cc
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
@@ -0,0 +1,3426 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <BaseButton
+        :label="t('Back to questions')"
+        :route="questionsRoute"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+    </div>
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-4 text-sm text-gray-700 shadow-sm"
+    >
+      {{ t("Loading") }}
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <form
+      v-if="!isLoading"
+      class="space-y-5"
+      @submit.prevent="saveQuestion"
+    >
+      <div class="space-y-3 border-b border-gray-20 pb-4">
+        <h1 class="text-2xl font-semibold text-gray-90">
+          {{ editorTitle }}
+        </h1>
+
+        <div
+          v-if="summaryText"
+          class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm font-medium text-support-4"
+        >
+          {{ summaryText }}
+        </div>
+
+        <BaseInputText
+          id="exercise-question-title"
+          v-model="form.title"
+          :label="t('* Question')"
+          name="question"
+        />
+      </div>
+
+      <BaseAdvancedSettingsButton
+        v-if="!isStructuralQuestion"
+        v-model="showAdvancedSettings"
+      >
+        <div class="space-y-4">
+          <section class="space-y-3">
+            <h2 class="text-sm font-semibold uppercase tracking-wide text-gray-70">
+              {{ t("Question settings") }}
+            </h2>
+
+            <BaseTinyEditor
+              editor-id="exercise-question-description"
+              v-model="form.description"
+              :editor-config="advancedEditorConfig"
+              :full-page="false"
+              :title="t('Enrich question')"
+            />
+
+            <div class="grid gap-4 md:grid-cols-3">
+              <BaseSelect
+                id="exercise-question-difficulty"
+                v-model="form.difficulty"
+                :label="t('Difficulty')"
+                name="difficulty"
+                :options="difficultyOptions"
+              />
+
+              <BaseSelect
+                id="exercise-question-category"
+                v-model="form.categoryId"
+                :label="t('Category')"
+                name="category_id"
+                :options="categorySelectOptions"
+              />
+
+              <BaseSelect
+                id="exercise-question-media"
+                v-model="form.parentMediaId"
+                :label="t('Attach to media')"
+                name="parent_media_id"
+                :options="mediaSelectOptions"
+              />
+            </div>
+          </section>
+
+          <section class="grid gap-4 md:grid-cols-3">
+            <BaseInputNumber
+              id="exercise-question-duration"
+              v-model="form.duration"
+              :help-text="t('Leave empty or 0 for no time limit.')"
+              :label="t('Time limit in seconds')"
+              name="duration"
+              :min="0"
+            />
+
+            <div class="flex items-end pb-2">
+              <BaseCheckbox
+                id="exercise-question-mandatory"
+                v-model="form.mandatory"
+                :label="t('Mandatory')"
+                name="mandatory"
+              />
+            </div>
+          </section>
+
+          <section
+            v-if="allowQuestionFeedback"
+            class="space-y-3"
+          >
+            <h2 class="text-sm font-semibold uppercase tracking-wide text-gray-70">
+              {{ t("Feedback") }}
+            </h2>
+            <BaseTinyEditor
+              editor-id="exercise-question-feedback"
+              v-model="form.feedback"
+              :editor-config="advancedEditorConfig"
+              :full-page="false"
+              :title="t('Feedback')"
+            />
+          </section>
+        </div>
+      </BaseAdvancedSettingsButton>
+
+      <section
+        v-if="isStructuralQuestion"
+        class="space-y-4 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ structuralQuestionTitle }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ structuralQuestionHelp }}
+          </p>
+        </div>
+
+        <div
+          v-if="isReadingComprehensionQuestion"
+          class="grid gap-4 md:grid-cols-2"
+        >
+          <BaseSelect
+            id="exercise-reading-speed"
+            v-model="form.difficulty"
+            :label="t('Reading speed')"
+            name="reading_speed"
+            :options="readingSpeedOptions"
+          />
+
+          <BaseSelect
+            id="exercise-reading-category"
+            v-model="form.categoryId"
+            :label="t('Category')"
+            name="category_id"
+            :options="categorySelectOptions"
+          />
+        </div>
+
+        <BaseTinyEditor
+          editor-id="exercise-structural-question-description"
+          v-model="form.description"
+          :editor-config="isReadingComprehensionQuestion ? readingComprehensionEditorConfig : structuralEditorConfig"
+          :full-page="false"
+          :title="structuralEditorTitle"
+        />
+      </section>
+
+      <section
+        v-if="isOpenQuestion || isOralExpressionQuestion || isUploadAnswerQuestion"
+        class="grid gap-4 rounded-lg border border-gray-20 bg-white p-4 md:grid-cols-3"
+      >
+        <BaseInputNumber
+          id="exercise-manual-question-score"
+          v-model="form.score"
+          :label="t('Score')"
+          name="score"
+          :min="0"
+          :step="0.1"
+        />
+        <p class="self-end pb-2 text-sm text-gray-70 md:col-span-2">
+          {{ manualCorrectionHelpText }}
+        </p>
+      </section>
+
+      <section
+        v-if="isHotspotQuestion"
+        class="space-y-4 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ hotspotEditorTitle }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Upload image (jpg, png or gif) to apply hotspots.") }}
+          </p>
+        </div>
+
+        <div class="grid gap-4 md:grid-cols-3">
+          <div
+            v-if="!isHotspotCombinationQuestion"
+            class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm text-support-4 md:col-span-3"
+          >
+            {{ t("Total score is calculated as the sum of hotspot scores.") }}
+            <span class="font-semibold">{{ formatScore(hotspotTotalScore) }}</span>
+          </div>
+          <BaseInputNumber
+            v-else
+            id="exercise-hotspot-global-score"
+            v-model="form.globalScore"
+            :label="t('Global score')"
+            name="global_score"
+            :min="0"
+            :step="0.1"
+          />
+        </div>
+
+        <BaseFileUpload
+          v-if="!isEditMode"
+          accept=".jpg,.jpeg,.png,.gif,image/jpeg,image/png,image/gif"
+          :label="t('Image')"
+          size="small"
+          @file-selected="selectHotspotImage"
+        />
+
+        <div
+          v-if="hotspotPreviewUrl"
+          class="space-y-3"
+        >
+          <p
+            v-if="form.hotspotImageName"
+            class="text-sm font-semibold text-gray-80"
+          >
+            {{ form.hotspotImageName }}
+          </p>
+
+          <div
+            ref="hotspotCanvasContainer"
+            class="relative inline-block max-w-full overflow-auto rounded-lg border border-gray-20 bg-white p-2"
+            @dblclick.prevent="finishHotspotPolygon"
+            @mousedown="startHotspotDraw"
+            @mousemove="moveHotspotDraw"
+            @mouseup="finishHotspotDraw"
+            @mouseleave="cancelHotspotDraw"
+          >
+            <img
+              ref="hotspotImageRef"
+              :alt="form.hotspotImageName || t('Image')"
+              class="block max-h-[520px] max-w-full select-none object-contain"
+              draggable="false"
+              :src="hotspotPreviewUrl"
+              @load="updateHotspotImageSize"
+            />
+            <svg
+              v-if="hotspotImageSize.width && hotspotImageSize.height"
+              class="pointer-events-none absolute left-2 top-2"
+              :height="hotspotImageSize.height"
+              :viewBox="`0 0 ${hotspotImageSize.width} ${hotspotImageSize.height}`"
+              :width="hotspotImageSize.width"
+            >
+              <template
+                v-for="(item, index) in form.hotspotItems"
+                :key="`hotspot-shape-${item.localId}`"
+              >
+                <rect
+                  v-if="getHotspotShape(item).kind === 'rect'"
+                  :fill="getHotspotShapeFill(index)"
+                  style="filter: drop-shadow(0 1px 2px rgb(255 255 255 / 0.95)) drop-shadow(0 1px 4px rgb(0 0 0 / 0.9))"
+                  :height="getHotspotShape(item).height"
+                  :stroke="getHotspotShapeStroke(index)"
+                  :stroke-width="index === currentHotspotIndex ? 4 : 3"
+                  vector-effect="non-scaling-stroke"
+                  :width="getHotspotShape(item).width"
+                  :x="getHotspotShape(item).x"
+                  :y="getHotspotShape(item).y"
+                />
+                <ellipse
+                  v-else-if="getHotspotShape(item).kind === 'ellipse'"
+                  :cx="getHotspotShape(item).cx"
+                  :cy="getHotspotShape(item).cy"
+                  :fill="getHotspotShapeFill(index)"
+                  style="filter: drop-shadow(0 1px 2px rgb(255 255 255 / 0.95)) drop-shadow(0 1px 4px rgb(0 0 0 / 0.9))"
+                  :rx="getHotspotShape(item).rx"
+                  :ry="getHotspotShape(item).ry"
+                  :stroke="getHotspotShapeStroke(index)"
+                  :stroke-width="index === currentHotspotIndex ? 4 : 3"
+                  vector-effect="non-scaling-stroke"
+                />
+                <polygon
+                  v-else-if="getHotspotShape(item).kind === 'polygon'"
+                  :fill="getHotspotShapeFill(index)"
+                  style="filter: drop-shadow(0 1px 2px rgb(255 255 255 / 0.95)) drop-shadow(0 1px 4px rgb(0 0 0 / 0.9))"
+                  :points="getHotspotShape(item).points"
+                  :stroke="getHotspotShapeStroke(index)"
+                  stroke-linejoin="round"
+                  :stroke-width="index === currentHotspotIndex ? 4 : 3"
+                  vector-effect="non-scaling-stroke"
+                />
+              </template>
+              <rect
+                v-if="drawingDraft && drawingDraft.kind === 'rect'"
+                fill="rgb(var(--color-success-base) / 0.58)"
+                style="filter: drop-shadow(0 1px 2px rgb(255 255 255 / 0.95)) drop-shadow(0 1px 4px rgb(0 0 0 / 0.9))"
+                :height="drawingDraft.height"
+                stroke="rgb(var(--color-success-base))"
+                stroke-dasharray="4 4"
+                stroke-width="5"
+                vector-effect="non-scaling-stroke"
+                :width="drawingDraft.width"
+                :x="drawingDraft.x"
+                :y="drawingDraft.y"
+              />
+              <ellipse
+                v-if="drawingDraft && drawingDraft.kind === 'ellipse'"
+                :cx="drawingDraft.cx"
+                :cy="drawingDraft.cy"
+                fill="rgb(var(--color-success-base) / 0.58)"
+                style="filter: drop-shadow(0 1px 2px rgb(255 255 255 / 0.95)) drop-shadow(0 1px 4px rgb(0 0 0 / 0.9))"
+                :rx="drawingDraft.rx"
+                :ry="drawingDraft.ry"
+                stroke="rgb(var(--color-success-base))"
+                stroke-dasharray="4 4"
+                stroke-width="5"
+                vector-effect="non-scaling-stroke"
+              />
+              <polygon
+                v-if="hotspotPolygonPoints.length >= 3"
+                fill="rgb(var(--color-success-base) / 0.58)"
+                style="filter: drop-shadow(0 1px 2px rgb(255 255 255 / 0.95)) drop-shadow(0 1px 4px rgb(0 0 0 / 0.9))"
+                :points="hotspotPolygonPoints.map((point) => `${toDisplayX(point.x)},${toDisplayY(point.y)}`).join(' ')"
+                stroke="rgb(var(--color-success-base))"
+                stroke-dasharray="4 4"
+                stroke-linejoin="round"
+                stroke-width="5"
+                vector-effect="non-scaling-stroke"
+              />
+              <polyline
+                v-else-if="hotspotPolygonPoints.length"
+                fill="none"
+                style="filter: drop-shadow(0 1px 2px rgb(255 255 255 / 0.95)) drop-shadow(0 1px 4px rgb(0 0 0 / 0.9))"
+                :points="hotspotPolygonPoints.map((point) => `${toDisplayX(point.x)},${toDisplayY(point.y)}`).join(' ')"
+                stroke="rgb(var(--color-success-base))"
+                stroke-dasharray="4 4"
+                stroke-width="5"
+                vector-effect="non-scaling-stroke"
+              />
+              <circle
+                v-for="(point, index) in hotspotPolygonPoints"
+                :key="`hotspot-polygon-point-${index}`"
+                :cx="toDisplayX(point.x)"
+                :cy="toDisplayY(point.y)"
+                fill="white"
+                r="5"
+                stroke="rgb(var(--color-success-base))"
+                stroke-width="3"
+                vector-effect="non-scaling-stroke"
+              />
+            </svg>
+          </div>
+
+          <p class="text-sm text-gray-70">
+            {{ t("Select a hotspot row, choose its shape, then draw over the image. For polygons, click each point and finish the polygon, or double-click to finish.") }}
+          </p>
+        </div>
+
+        <section
+          v-if="isHotspotDelineationQuestion"
+          class="space-y-3 rounded-lg border border-info/30 bg-support-1 px-4 py-3"
+        >
+          <h3 class="text-sm font-semibold uppercase tracking-wide text-support-4">
+            {{ t("Adaptive behavior (success/failure)") }}
+          </h3>
+          <div class="grid gap-4 md:grid-cols-2">
+            <BaseSelect
+              id="exercise-hotspot-success-destination"
+              v-model="form.hotspotScenarioSuccessType"
+              :label="t('On success')"
+              name="hotspot_success_destination"
+              :options="form.hotspotScenarioOptions"
+            />
+            <BaseInputText
+              v-if="form.hotspotScenarioSuccessType === 'url'"
+              id="exercise-hotspot-success-url"
+              v-model="form.hotspotScenarioSuccessUrl"
+              :label="t('Custom URL')"
+              name="hotspot_success_url"
+            />
+            <BaseSelect
+              id="exercise-hotspot-failure-destination"
+              v-model="form.hotspotScenarioFailureType"
+              :label="t('On failure')"
+              name="hotspot_failure_destination"
+              :options="form.hotspotScenarioOptions"
+            />
+            <BaseInputText
+              v-if="form.hotspotScenarioFailureType === 'url'"
+              id="exercise-hotspot-failure-url"
+              v-model="form.hotspotScenarioFailureUrl"
+              :label="t('Custom URL')"
+              name="hotspot_failure_url"
+            />
+          </div>
+        </section>
+
+        <div class="space-y-3">
+          <div class="flex flex-wrap items-center justify-between gap-2">
+            <h3 class="text-lg font-semibold text-gray-90">{{ t("Hotspots") }}</h3>
+            <div class="flex flex-wrap gap-2">
+              <BaseButton
+                v-if="isPolygonHotspotType(currentHotspotItem?.hotspotType)"
+                :disabled="hotspotPolygonPoints.length < 3"
+                :label="t('Finish polygon')"
+                icon="check"
+                size="small"
+                type="success"
+                @click="finishHotspotPolygon"
+              />
+              <BaseButton
+                :label="addHotspotLabel"
+                icon="plus"
+                size="small"
+                type="success"
+                @click="addHotspotItem"
+              />
+              <BaseButton
+                v-if="isHotspotDelineationQuestion"
+                :label="t('Add area to avoid')"
+                icon="plus"
+                size="small"
+                type="secondary"
+                @click="addHotspotOarItem"
+              />
+            </div>
+          </div>
+
+          <div class="overflow-x-auto">
+            <table class="min-w-full border-collapse bg-white text-sm">
+              <thead class="bg-gray-15 text-gray-90">
+                <tr>
+                  <th class="w-14 border border-gray-20 px-2 py-2 text-left">{{ t("N°") }}</th>
+                  <th class="min-w-[220px] border border-gray-20 px-2 py-2 text-left">{{ t("Answer") }}</th>
+                  <th class="w-40 border border-gray-20 px-2 py-2 text-left">{{ t("Shape") }}</th>
+                  <th class="min-w-[160px] border border-gray-20 px-2 py-2 text-left">{{ t("Coordinates") }}</th>
+                  <th
+                    v-if="!isHotspotCombinationQuestion"
+                    class="w-28 border border-gray-20 px-2 py-2 text-right"
+                  >
+                    {{ t("Score") }}
+                  </th>
+                  <th class="min-w-[220px] border border-gray-20 px-2 py-2 text-left">{{ t("Feedback") }}</th>
+                  <th class="w-28 border border-gray-20 px-2 py-2 text-right">{{ t("Actions") }}</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr
+                  v-for="(item, index) in form.hotspotItems"
+                  :key="item.localId"
+                  :class="index === currentHotspotIndex ? 'bg-primary/5' : ''"
+                >
+                  <td class="border border-gray-20 px-2 py-2 align-top">{{ index + 1 }}</td>
+                  <td class="border border-gray-20 px-2 py-2 align-top">
+                    <BaseInputText
+                      :id="`exercise-hotspot-answer-${item.localId}`"
+                      v-model="item.answer"
+                      :label="t('Answer')"
+                      :name="`hotspot_answer_${index}`"
+                    />
+                  </td>
+                  <td class="border border-gray-20 px-2 py-2 align-top">
+                    <BaseSelect
+                      :id="`exercise-hotspot-type-${item.localId}`"
+                      v-model="item.hotspotType"
+                      :label="t('Shape')"
+                      :name="`hotspot_type_${index}`"
+                      :options="currentHotspotTypeOptions"
+                      @change="selectHotspotItem(index)"
+                    />
+                  </td>
+                  <td class="border border-gray-20 px-2 py-2 align-top">
+                    <BaseInputText
+                      :id="`exercise-hotspot-coordinates-${item.localId}`"
+                      v-model="item.coordinates"
+                      :label="t('Coordinates')"
+                      :name="`hotspot_coordinates_${index}`"
+                    />
+                  </td>
+                  <td
+                    v-if="!isHotspotCombinationQuestion"
+                    class="border border-gray-20 px-2 py-2 align-top"
+                  >
+                    <BaseInputNumber
+                      v-if="item.hotspotType !== 'oar'"
+                      :id="`exercise-hotspot-score-${item.localId}`"
+                      v-model="item.score"
+                      :label="t('Score')"
+                      :name="`hotspot_score_${index}`"
+                      :min="0"
+                      :step="0.1"
+                    />
+                    <div
+                      v-else
+                      class="rounded border border-gray-20 bg-gray-15 px-3 py-2 text-sm text-gray-70"
+                    >
+                      {{ t("Area to avoid") }}: 0
+                    </div>
+                  </td>
+                  <td class="border border-gray-20 px-2 py-2 align-top">
+                    <BaseTextArea
+                      :id="`exercise-hotspot-comment-${item.localId}`"
+                      v-model="item.comment"
+                      :label="t('Feedback')"
+                      :name="`hotspot_comment_${index}`"
+                    />
+                  </td>
+                  <td class="border border-gray-20 px-2 py-2 text-right align-top">
+                    <div class="flex justify-end gap-1">
+                      <BaseButton
+                        :label="t('Select')"
+                        icon="cursor-default-click"
+                        only-icon
+                        size="small"
+                        type="primary-text"
+                        @click="selectHotspotItem(index)"
+                      />
+                      <BaseButton
+                        :disabled="form.hotspotItems.length <= 1"
+                        :label="t('Delete')"
+                        icon="delete"
+                        only-icon
+                        size="small"
+                        type="danger-text"
+                        @click="removeHotspotItem(index)"
+                      />
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </section>
+
+      <section
+        v-if="isAnnotationQuestion"
+        class="space-y-4 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ t("Annotation") }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Upload image (jpg, png or gif) to apply hotspots.") }}
+          </p>
+        </div>
+
+        <div class="grid gap-4 md:grid-cols-3">
+          <BaseInputNumber
+            id="exercise-annotation-score"
+            v-model="form.score"
+            :label="t('Score')"
+            name="score"
+            :min="0"
+            :step="0.1"
+          />
+        </div>
+
+        <div
+          v-if="annotationPreviewUrl"
+          class="space-y-2"
+        >
+          <p class="text-sm font-semibold text-gray-90">{{ t("Image") }}</p>
+          <img
+            :alt="form.annotationImageName || t('Image')"
+            class="max-h-80 max-w-full rounded-lg border border-gray-20 object-contain"
+            :src="annotationPreviewUrl"
+          />
+          <p
+            v-if="form.annotationImageName"
+            class="text-sm text-gray-70"
+          >
+            {{ form.annotationImageName }}
+          </p>
+        </div>
+
+        <BaseFileUpload
+          v-if="!isEditMode"
+          accept=".jpg,.jpeg,.png,.gif,image/jpeg,image/png,image/gif"
+          :label="t('Image')"
+          size="small"
+          @file-selected="selectAnnotationImage"
+        />
+      </section>
+
+      <section
+        v-if="isCalculatedAnswerQuestion"
+        class="space-y-4 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ t("Calculated answer") }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Please type your text below and use square brackets [...] to define one or more blanks.") }}
+          </p>
+        </div>
+
+        <BaseTinyEditor
+          editor-id="exercise-calculated-text"
+          v-model="form.calculatedText"
+          :editor-config="calculatedEditorConfig"
+          :full-page="false"
+          :title="t('Answer')"
+          @update:model-value="syncCalculatedRanges"
+        />
+
+        <div class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm text-support-4">
+          {{ t("If you want only integer values write both limits without decimals.") }}
+        </div>
+
+        <div
+          v-if="form.calculatedRanges.length"
+          class="overflow-x-auto rounded-lg border border-gray-20"
+        >
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Variable ranges") }}</th>
+                <th class="w-40 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Lowest value") }}</th>
+                <th class="w-40 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Highest value") }}</th>
+                <th class="w-44 px-3 py-2 font-semibold">{{ t("Range value") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="(range, index) in form.calculatedRanges"
+                :key="`calculated-range-${range.token}-${index}`"
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-blue-50'"
+              >
+                <td class="border-r border-t border-gray-20 px-3 py-3">
+                  <code class="rounded bg-gray-15 px-2 py-1 text-gray-90">{{ range.token }}</code>
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-3">
+                  <BaseInputText
+                    :id="`exercise-calculated-low-${index}`"
+                    v-model="range.low"
+                    :label="t('Lowest value')"
+                    :name="`lowestValue_${index}`"
+                    @blur="refreshCalculatedRandom(range)"
+                  />
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-3">
+                  <BaseInputText
+                    :id="`exercise-calculated-high-${index}`"
+                    v-model="range.high"
+                    :label="t('Highest value')"
+                    :name="`highestValue_${index}`"
+                    @blur="refreshCalculatedRandom(range)"
+                  />
+                </td>
+                <td class="border-t border-gray-20 px-3 py-3 text-gray-80">
+                  {{ t("Range value") }}: {{ range.random }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <div class="grid gap-4 md:grid-cols-3">
+          <BaseInputText
+            id="exercise-calculated-formula"
+            v-model="form.calculatedFormula"
+            :help-text="t('Formula sample: sqrt( [x] / [y] ) * ( e ^ ( ln(pi) ) )')"
+            :label="t('Formula')"
+            name="formula"
+          />
+
+          <BaseInputNumber
+            id="exercise-calculated-score"
+            v-model="form.score"
+            :label="t('Score')"
+            name="weighting"
+            :min="0"
+            :step="0.1"
+          />
+
+          <BaseInputNumber
+            id="exercise-calculated-variations"
+            v-model="form.calculatedVariations"
+            :label="t('Question variations')"
+            name="answerVariations"
+            :min="1"
+            :step="1"
+          />
+        </div>
+
+        <a
+          class="inline-flex w-fit items-center rounded-lg border border-info/30 bg-support-1 px-3 py-2 text-sm font-medium text-support-4 hover:bg-primary/10"
+          href="/main/exercise/evalmathnotation.php"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          {{ t("Formula notation") }}
+        </a>
+
+        <BaseTinyEditor
+          editor-id="exercise-calculated-comment"
+          v-model="form.calculatedComment"
+          :editor-config="matchingCommentEditorConfig"
+          :full-page="false"
+          :title="t('Comment')"
+        />
+      </section>
+
+      <section
+        v-if="isFillBlanksQuestion"
+        class="space-y-4 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ t("Fill in blanks") }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Use the selected markers to define blanks. Example: The capital of Peru is [Lima].") }}
+          </p>
+        </div>
+
+        <BaseTinyEditor
+          editor-id="exercise-fill-blanks-text"
+          v-model="form.fillBlanksText"
+          :editor-config="advancedEditorConfig"
+          :full-page="false"
+          :title="t('Answer')"
+        />
+
+        <div class="grid gap-4 md:grid-cols-3">
+          <BaseSelect
+            id="exercise-fill-blanks-separator"
+            v-model="form.fillBlanksSeparator"
+            :label="t('Select a blanks marker')"
+            name="fill_blanks_separator"
+            :options="fillBlanksSeparatorOptions"
+          />
+
+          <div class="flex items-end pb-2">
+            <BaseCheckbox
+              id="exercise-fill-blanks-switchable"
+              v-model="form.fillBlanksSwitchable"
+              :label="t('Switchable blanks')"
+              name="fill_blanks_switchable"
+            />
+          </div>
+
+          <div class="flex items-end pb-2">
+            <BaseCheckbox
+              id="exercise-fill-blanks-case-insensitive"
+              v-model="form.fillBlanksCaseInsensitive"
+              :label="t('Case insensitive')"
+              name="fill_blanks_case_insensitive"
+            />
+          </div>
+        </div>
+
+        <div
+          v-if="isFillBlanksCombination"
+          class="grid gap-4 md:grid-cols-3"
+        >
+          <BaseInputNumber
+            id="exercise-fill-blanks-global-score"
+            v-model="form.globalScore"
+            :label="t('Score')"
+            name="fill_blanks_global_score"
+            :min="0"
+            :step="0.1"
+          />
+        </div>
+
+        <BaseTinyEditor
+          editor-id="exercise-fill-blanks-comment"
+          v-model="form.fillBlanksComment"
+          :editor-config="answerEditorConfig"
+          :full-page="false"
+          :title="t('Comment')"
+        />
+
+        <div class="flex flex-wrap items-center gap-2">
+          <BaseButton
+            :label="t('Refresh terms')"
+            type="secondary"
+            @click="syncFillBlankItems"
+          />
+          <span class="text-sm text-gray-70">
+            {{ t("Detected blanks: {0}", [form.fillBlankItems.length]) }}
+          </span>
+        </div>
+
+        <div
+          v-if="form.fillBlankItems.length"
+          class="overflow-x-auto rounded-lg border border-gray-20"
+        >
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
+                <th class="border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Blank") }}</th>
+                <th
+                  v-if="!isFillBlanksCombination"
+                  class="w-40 border-r border-gray-25 px-3 py-2 font-semibold"
+                >
+                  {{ t("Score") }}
+                </th>
+                <th class="w-44 px-3 py-2 font-semibold">{{ t("Input width") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="(blank, index) in form.fillBlankItems"
+                :key="`blank-${index}`"
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-blue-50'"
+              >
+                <td class="border-r border-t border-gray-20 px-3 py-3 font-semibold text-gray-90">
+                  {{ index + 1 }}
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-3">
+                  <code class="rounded bg-gray-15 px-2 py-1 text-gray-90">{{ blank.answer }}</code>
+                </td>
+                <td
+                  v-if="!isFillBlanksCombination"
+                  class="border-r border-t border-gray-20 px-3 py-3"
+                >
+                  <BaseInputNumber
+                    :id="`exercise-fill-blank-score-${index}`"
+                    v-model="blank.score"
+                    :label="t('Score')"
+                    :name="`fill_blank_score_${index}`"
+                    :min="0"
+                    :step="0.1"
+                  />
+                </td>
+                <td class="border-t border-gray-20 px-3 py-3">
+                  <BaseInputNumber
+                    :id="`exercise-fill-blank-size-${index}`"
+                    v-model="blank.inputSize"
+                    :label="t('Input width')"
+                    :name="`fill_blank_input_size_${index}`"
+                    :min="40"
+                    :max="800"
+                    :step="10"
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <div
+          v-else
+          class="rounded-lg border border-yellow-100 bg-yellow-50 px-4 py-3 text-sm text-yellow-800"
+        >
+          {{ t("Please define at least one blank with the selected marker") }}
+        </div>
+      </section>
+
+      <section
+        v-if="isDropdownQuestion"
+        class="space-y-5 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ t("Answer list") }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Enter the dropdown options, one answer by line. Then mark the expected answers below, like the legacy tool.") }}
+          </p>
+        </div>
+
+        <BaseTextArea
+          id="exercise-dropdown-answer-list"
+          v-model="form.dropdownListText"
+          :label="t('Answer list')"
+          name="dropdown_answer_list"
+          rows="8"
+        />
+
+        <div class="flex flex-wrap items-center gap-2">
+          <BaseButton
+            :label="t('Refresh answers')"
+            type="secondary"
+            @click="syncDropdownAnswersFromList"
+          />
+          <span class="text-sm text-gray-70">
+            {{ formatTranslatedText("Options: {0}", [dropdownOptionCount]) }}
+          </span>
+        </div>
+
+        <div
+          v-if="isDropdownCombinationQuestion"
+          class="grid gap-4 rounded-lg border border-gray-20 bg-white p-4 md:grid-cols-3"
+        >
+          <BaseInputNumber
+            id="exercise-dropdown-global-score"
+            v-model="form.globalScore"
+            :label="t('Score')"
+            name="dropdown_global_score"
+            :min="0"
+            :step="0.1"
+          />
+          <p class="self-end pb-2 text-sm text-gray-70 md:col-span-2">
+            {{ t('This dropdown combination question uses one global score, like legacy.') }}
+          </p>
+        </div>
+
+        <div
+          v-if="form.answers.length"
+          class="overflow-x-auto rounded-lg border border-gray-20 bg-white shadow-sm"
+        >
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
+                <th class="w-24 border-r border-gray-25 px-3 py-2 text-center font-semibold">{{ t("Expected") }}</th>
+                <th class="border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Answer") }}</th>
+                <th
+                  v-if="!isDropdownCombinationQuestion"
+                  class="w-40 px-3 py-2 font-semibold"
+                >
+                  {{ t("Score") }}
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="(answer, index) in form.answers"
+                :key="answer.localId"
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-support-2'"
+              >
+                <td class="border-r border-t border-gray-20 px-3 py-3 font-semibold text-gray-90">
+                  {{ index + 1 }}
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-3 text-center">
+                  <input
+                    v-model="answer.correct"
+                    class="h-4 w-4 rounded border-gray-25 text-primary focus:ring-primary"
+                    :name="`dropdown_correct_${index}`"
+                    type="checkbox"
+                  />
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-3 text-gray-90">
+                  {{ displayText(answer.answer, t('Untitled')) }}
+                </td>
+                <td
+                  v-if="!isDropdownCombinationQuestion"
+                  class="border-t border-gray-20 px-3 py-3"
+                >
+                  <BaseInputNumber
+                    :id="`exercise-dropdown-score-${index}`"
+                    v-model="answer.score"
+                    :disabled="!answer.correct"
+                    :label="t('Score')"
+                    :name="`dropdown_score_${index}`"
+                    :min="0"
+                    :step="0.1"
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <div
+          v-else
+          class="rounded-lg border border-warning/30 bg-warning/10 px-4 py-3 text-sm text-warning"
+        >
+          {{ t("Please enter at least two dropdown options.") }}
+        </div>
+      </section>
+
+      <section
+        v-if="isMatchingQuestion"
+        class="space-y-5 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ t("Match them") }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Create destination options first, then link each item to the correct option.") }}
+          </p>
+        </div>
+
+        <div class="overflow-x-auto rounded-lg border border-gray-20">
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
+                <th class="min-w-[380px] border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Answer") }}</th>
+                <th class="w-72 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Matches to") }}</th>
+                <th
+                  v-if="!isMatchingCombinationQuestion"
+                  class="w-36 border-r border-gray-25 px-3 py-2 font-semibold"
+                >
+                  {{ t("Score") }}
+                </th>
+                <th class="min-w-[320px] px-3 py-2 font-semibold">{{ t("Comment") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="(pair, index) in form.matchingPairs"
+                :key="pair.localId"
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-blue-50'"
+              >
+                <td class="border-r border-t border-gray-20 px-3 py-3 align-middle font-semibold text-gray-90">
+                  {{ index + 1 }}
+                </td>
+                <td class="border-r border-t border-gray-20 px-2 py-3 align-top">
+                  <BaseTinyEditor
+                    :editor-id="`exercise-matching-pair-${pair.localId}`"
+                    v-model="pair.answer"
+                    :editor-config="matchingEditorConfig"
+                    :full-page="false"
+                    :title="t('Answer')"
+                  />
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-3 align-middle">
+                  <BaseSelect
+                    :id="`exercise-matching-pair-option-${pair.localId}`"
+                    v-model="pair.optionLocalId"
+                    :label="t('Matches to')"
+                    :name="`matching_pair_option_${index}`"
+                    :options="matchingOptionSelectOptions"
+                  />
+                </td>
+                <td
+                  v-if="!isMatchingCombinationQuestion"
+                  class="border-r border-t border-gray-20 px-3 py-3 align-middle"
+                >
+                  <BaseInputNumber
+                    :id="`exercise-matching-score-${pair.localId}`"
+                    v-model="pair.score"
+                    :label="t('Score')"
+                    :name="`matching_pair_score_${index}`"
+                    :min="0"
+                    :step="0.1"
+                  />
+                </td>
+                <td class="border-t border-gray-20 px-2 py-3 align-top">
+                  <BaseTinyEditor
+                    :editor-id="`exercise-matching-comment-${pair.localId}`"
+                    v-model="pair.comment"
+                    :editor-config="matchingCommentEditorConfig"
+                    :full-page="false"
+                    :title="t('Comment')"
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <div class="overflow-x-auto rounded-lg border border-gray-20">
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
+                <th class="min-w-[520px] px-3 py-2 font-semibold">{{ t("Answer") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="(option, index) in form.matchingOptions"
+                :key="option.localId"
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-blue-50'"
+              >
+                <td class="border-r border-t border-gray-20 px-3 py-3 align-middle font-semibold text-gray-90">
+                  {{ getMatchingOptionLabel(index + 1) }}
+                </td>
+                <td class="border-t border-gray-20 px-2 py-3 align-top">
+                  <BaseTinyEditor
+                    :editor-id="`exercise-matching-option-${option.localId}`"
+                    v-model="option.answer"
+                    :editor-config="matchingEditorConfig"
+                    :full-page="false"
+                    :title="t('Answer')"
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <div
+          v-if="isMatchingCombinationQuestion"
+          class="grid gap-4 rounded-lg border border-gray-20 bg-white p-4 md:grid-cols-3"
+        >
+          <BaseInputNumber
+            id="exercise-matching-global-score"
+            v-model="form.globalScore"
+            :label="t('Score')"
+            name="matching_global_score"
+            :min="0"
+            :step="0.1"
+          />
+          <p class="self-end pb-2 text-sm text-gray-70 md:col-span-2">
+            {{ t('This matching combination question uses one global score, like legacy.') }}
+          </p>
+        </div>
+
+        <div class="flex flex-wrap items-center gap-2">
+          <BaseButton
+            :disabled="form.matchingOptions.length <= 2 || form.matchingPairs.length <= 2"
+            :label="t('Remove element')"
+            icon="delete"
+            type="danger"
+            @click="removeMatchingElement"
+          />
+          <BaseButton
+            :label="t('Add element')"
+            icon="plus"
+            type="success"
+            @click="addMatchingElement"
+          />
+          <BaseButton
+            :is-loading="isSaving"
+            :label="t('Add this question to the test')"
+            icon="check"
+            :is-submit="true"
+            type="primary"
+          />
+        </div>
+      </section>
+
+
+      <section
+        v-if="isDraggableOrderingQuestion"
+        class="space-y-5 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ t("Sequence ordering") }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Create the steps and choose the expected position for each one, like legacy Draggable.") }}
+          </p>
+        </div>
+
+        <div class="grid gap-4 md:grid-cols-3">
+          <BaseSelect
+            id="exercise-draggable-orientation"
+            v-model="form.matchingOrientation"
+            :label="t('Choose orientation')"
+            name="draggable_orientation"
+            :options="matchingOrientationOptions"
+          />
+        </div>
+
+        <div class="overflow-x-auto rounded-lg border border-gray-20">
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
+                <th class="min-w-[520px] border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Answer") }}</th>
+                <th class="w-52 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Matches to") }}</th>
+                <th class="w-36 px-3 py-2 font-semibold">{{ t("Score") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="(item, index) in form.draggableItems"
+                :key="item.localId"
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-blue-50'"
+              >
+                <td class="border-r border-t border-gray-20 px-3 py-3 align-middle font-semibold text-gray-90">
+                  {{ index + 1 }}
+                </td>
+                <td class="border-r border-t border-gray-20 px-2 py-3 align-top">
+                  <BaseTinyEditor
+                    :editor-id="`exercise-draggable-item-${item.localId}`"
+                    v-model="item.answer"
+                    :editor-config="matchingEditorConfig"
+                    :full-page="false"
+                    :title="t('Answer')"
+                  />
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-3 align-middle">
+                  <BaseSelect
+                    :id="`exercise-draggable-target-${item.localId}`"
+                    v-model="item.targetPosition"
+                    :label="t('Matches to')"
+                    :name="`draggable_target_${index}`"
+                    :options="draggablePositionSelectOptions"
+                  />
+                </td>
+                <td class="border-t border-gray-20 px-3 py-3 align-middle">
+                  <BaseInputNumber
+                    :id="`exercise-draggable-score-${item.localId}`"
+                    v-model="item.score"
+                    :label="t('Score')"
+                    :name="`draggable_score_${index}`"
+                    :min="0"
+                    :step="0.1"
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <div class="flex flex-wrap items-center gap-2">
+          <BaseButton
+            :disabled="form.draggableItems.length <= 2"
+            :label="t('Remove element')"
+            icon="delete"
+            type="danger"
+            @click="removeDraggableItem"
+          />
+          <BaseButton
+            :label="t('Add element')"
+            icon="plus"
+            type="success"
+            @click="addDraggableItem"
+          />
+          <BaseButton
+            :is-loading="isSaving"
+            :label="t('Add this question to the test')"
+            icon="check"
+            :is-submit="true"
+            type="primary"
+          />
+        </div>
+      </section>
+
+      <div
+        v-if="!isMatchingQuestion && !isDraggableOrderingQuestion"
+        class="flex flex-wrap items-center gap-2"
+      >
+        <BaseButton
+          :is-loading="isSaving"
+          :label="t('Save the question')"
+          icon="check"
+          :is-submit="true"
+          type="success"
+        />
+        <BaseButton
+          v-if="canConvertAnswerType && isUniqueAnswer"
+          :label="t('Convert to multiple answer')"
+          icon="arrows-left-right"
+          type="black"
+          @click="convertToMultipleAnswer"
+        />
+        <BaseButton
+          v-if="canConvertAnswerType && !isUniqueAnswer"
+          :label="t('Convert to unique answer')"
+          icon="arrows-left-right"
+          type="black"
+          @click="convertToUniqueAnswer"
+        />
+      </div>
+
+      <section
+        v-if="hasAnswerOptions"
+        class="space-y-4"
+      >
+        <h2 class="text-2xl font-semibold text-gray-90">{{ t("Answers") }}</h2>
+        <div class="border-b border-gray-20" />
+
+        <div
+          v-if="isUniqueAnswerImage"
+          class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm text-support-4"
+        >
+          <p>
+            {{ t("Images will be resized (up or down) to 200x150 pixels. For a better rendering of the question, we recommend you upload only images of this size.") }}
+          </p>
+          <p
+            v-if="imageZoomEnabled"
+            class="mt-1"
+          >
+            {{ t("Add image with zoom") }}
+          </p>
+        </div>
+
+        <div
+          v-if="usesGlobalScore"
+          class="grid gap-4 rounded-lg border border-gray-20 bg-white p-4 md:grid-cols-3"
+        >
+          <BaseInputNumber
+            id="exercise-question-global-score"
+            v-model="form.globalScore"
+            :label="t('Score')"
+            name="global_score"
+            :min="0"
+            :step="0.1"
+          />
+
+          <div
+            v-if="isGlobalMultipleAnswer"
+            class="flex items-end pb-2"
+          >
+            <BaseCheckbox
+              id="exercise-question-no-negative-score"
+              v-model="form.noNegativeScore"
+              :label="t('No negative score')"
+              name="no_negative_score"
+            />
+          </div>
+        </div>
+
+        <div
+          v-if="usesTrueFalseScores"
+          class="grid gap-4 rounded-lg border border-gray-20 bg-white p-4 md:grid-cols-3"
+        >
+          <BaseInputNumber
+            id="exercise-question-correct-score"
+            v-model="form.correctScore"
+            :label="t('Correct')"
+            name="correct_score"
+            :step="0.1"
+          />
+          <BaseInputNumber
+            id="exercise-question-wrong-score"
+            v-model="form.wrongScore"
+            :label="t('Wrong')"
+            name="wrong_score"
+            :step="0.1"
+          />
+          <BaseInputNumber
+            v-if="usesUnknownScore"
+            id="exercise-question-unknown-score"
+            v-model="form.unknownScore"
+            :label="t('Don\'t know')"
+            name="unknown_score"
+            :step="0.1"
+          />
+        </div>
+
+        <div
+          v-if="isDegreeCertaintyQuestion"
+          class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm text-support-4"
+        >
+          {{ t("Learners will choose True or False and then select their degree of certainty during the attempt. The editor stores the same Correct/Wrong scores and certainty levels as legacy.") }}
+        </div>
+
+        <div class="overflow-x-auto rounded-lg border border-gray-20 bg-white shadow-sm">
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
+                <th class="w-20 border-r border-gray-25 px-3 py-2 text-center font-semibold">{{ t("True") }}</th>
+                <th
+                  v-if="isTrueFalseQuestion"
+                  class="w-20 border-r border-gray-25 px-3 py-2 text-center font-semibold"
+                >
+                  {{ t("False") }}
+                </th>
+                <th class="min-w-[360px] border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Answer") }}</th>
+                <th class="min-w-[360px] border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Comment") }}</th>
+                <th
+                  v-if="!usesGlobalScore && !usesTrueFalseScores"
+                  class="w-40 px-3 py-2 font-semibold"
+                >
+                  {{ t("Score") }}
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="(answer, index) in form.answers"
+                :key="answer.localId"
+                :class="index % 2 === 0 ? 'bg-white' : 'bg-blue-50'"
+              >
+                <td class="border-r border-t border-gray-20 px-3 py-4 align-middle font-semibold text-gray-90">
+                  {{ index + 1 }}
+                </td>
+                <td class="border-r border-t border-gray-20 px-3 py-4 text-center align-middle">
+                  <input
+                    v-if="isTrueFalseQuestion"
+                    v-model="answer.correctChoice"
+                    class="h-4 w-4"
+                    :name="`correct_choice_${index}`"
+                    type="radio"
+                    :value="1"
+                  />
+                  <input
+                    v-else-if="isSingleCorrectAnswer"
+                    :checked="answer.correct"
+                    class="h-4 w-4"
+                    :disabled="answer.isUnknown"
+                    :name="'correct_answer'"
+                    type="radio"
+                    @change="setUniqueCorrectAnswer(index)"
+                  />
+                  <input
+                    v-else
+                    v-model="answer.correct"
+                    class="h-4 w-4"
+                    :name="`correct_answer_${index}`"
+                    type="checkbox"
+                  />
+                </td>
+                <td
+                  v-if="isTrueFalseQuestion"
+                  class="border-r border-t border-gray-20 px-3 py-4 text-center align-middle"
+                >
+                  <input
+                    v-model="answer.correctChoice"
+                    class="h-4 w-4"
+                    :name="`correct_choice_${index}`"
+                    type="radio"
+                    :value="2"
+                  />
+                </td>
+                <td class="border-r border-t border-gray-20 px-2 py-3 align-top">
+                  <BaseTinyEditor
+                    :editor-id="`exercise-answer-${answer.localId}`"
+                    v-model="answer.answer"
+                    :editor-config="isUniqueAnswerImage ? imageAnswerEditorConfig : answerEditorConfig"
+                    :full-page="false"
+                    :title="t('Answer')"
+                    :use-file-manager="isUniqueAnswerImage"
+                  />
+                </td>
+                <td class="border-r border-t border-gray-20 px-2 py-3 align-top">
+                  <BaseTinyEditor
+                    :editor-id="`exercise-answer-comment-${answer.localId}`"
+                    v-model="answer.comment"
+                    :editor-config="answerEditorConfig"
+                    :full-page="false"
+                    :title="t('Comment')"
+                  />
+                </td>
+                <td
+                  v-if="!usesGlobalScore && !usesTrueFalseScores"
+                  class="border-t border-gray-20 px-3 py-4 align-middle"
+                >
+                  <BaseInputNumber
+                    :id="`exercise-answer-score-${index}`"
+                    v-model="answer.score"
+                    :disabled="answer.isUnknown"
+                    :label="t('Score')"
+                    :name="`answer_score_${index}`"
+                    :step="0.1"
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </section>
+
+      <div
+        v-if="hasAnswerOptions"
+        class="flex flex-wrap items-center gap-2 pt-2"
+      >
+        <BaseButton
+          :disabled="regularAnswerCount <= 2"
+          :label="t('Remove answer option')"
+          icon="delete"
+          type="danger"
+          @click="removeLastAnswer"
+        />
+        <BaseButton
+          :label="t('Add answer option')"
+          icon="plus"
+          type="success"
+          @click="addAnswer"
+        />
+        <BaseButton
+          :is-loading="isSaving"
+          :label="t('Add this question to the test')"
+          icon="check"
+          :is-submit="true"
+          type="primary"
+        />
+      </div>
+
+      <p class="text-sm text-gray-70">* {{ t("Required field") }}</p>
+    </form>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseAdvancedSettingsButton from "../../components/basecomponents/BaseAdvancedSettingsButton.vue"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseCheckbox from "../../components/basecomponents/BaseCheckbox.vue"
+import BaseFileUpload from "../../components/basecomponents/BaseFileUpload.vue"
+import BaseInputNumber from "../../components/basecomponents/BaseInputNumber.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import BaseTextArea from "../../components/basecomponents/BaseTextArea.vue"
+import BaseTinyEditor from "../../components/basecomponents/BaseTinyEditor.vue"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+
+const UNIQUE_ANSWER = 1
+const MULTIPLE_ANSWER = 2
+const FILL_IN_BLANKS = 3
+const MATCHING = 4
+const FREE_ANSWER = 5
+const HOT_SPOT = 6
+const HOT_SPOT_DELINEATION = 8
+const MULTIPLE_ANSWER_COMBINATION = 9
+const UNIQUE_ANSWER_NO_OPTION = 10
+const MULTIPLE_ANSWER_TRUE_FALSE = 11
+const MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE = 12
+const ORAL_EXPRESSION = 13
+const GLOBAL_MULTIPLE_ANSWER = 14
+const MEDIA_QUESTION = 15
+const CALCULATED_ANSWER = 16
+const UNIQUE_ANSWER_IMAGE = 17
+const ANNOTATION = 20
+const READING_COMPREHENSION = 21
+const DRAGGABLE = 18
+const MATCHING_DRAGGABLE = 19
+const MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY = 22
+const MATCHING_COMBINATION = 24
+const UPLOAD_ANSWER = 23
+const MATCHING_DRAGGABLE_COMBINATION = 25
+const HOT_SPOT_COMBINATION = 26
+const FILL_IN_BLANKS_COMBINATION = 27
+const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28
+const MULTIPLE_ANSWER_DROPDOWN = 29
+const PAGE_BREAK = 31
+const UNKNOWN_ANSWER_POSITION = 666
+
+const isLoading = ref(false)
+const isSaving = ref(false)
+const errorMessage = ref("")
+const csrfToken = ref("")
+const typeLabel = ref("")
+const questionCount = ref(0)
+const totalScore = ref(0)
+const categoryOptions = ref([])
+const mediaOptions = ref([])
+const showAdvancedSettings = ref(false)
+const allowQuestionFeedback = ref(false)
+const imageZoomEnabled = ref(false)
+let answerCounter = 0
+let matchingOptionCounter = 0
+let matchingPairCounter = 0
+let hotspotItemCounter = 0
+
+const hotspotImageRef = ref(null)
+const hotspotCanvasContainer = ref(null)
+const hotspotImageSize = reactive({ width: 0, height: 0, naturalWidth: 0, naturalHeight: 0 })
+const currentHotspotIndex = ref(0)
+const drawingDraft = ref(null)
+const hotspotPolygonPoints = ref([])
+
+const minimalEditorToolbar =
+  "undo redo | bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media table | code fullscreen"
+
+const minimalEditorPlugins = "lists link image media table code fullscreen charmap emoticons"
+
+const advancedEditorConfig = {
+  height: 240,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+}
+
+const structuralEditorConfig = {
+  height: 260,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+}
+
+const readingComprehensionEditorConfig = {
+  height: 420,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+}
+
+const answerEditorConfig = {
+  height: 220,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+}
+
+const calculatedEditorConfig = {
+  height: 350,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+}
+
+const imageAnswerEditorConfig = {
+  height: 260,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+  file_picker_types: "image",
+  image_dimensions: true,
+  image_advtab: true,
+}
+
+const matchingEditorConfig = {
+  height: 200,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+}
+
+const matchingCommentEditorConfig = {
+  height: 170,
+  menubar: false,
+  plugins: minimalEditorPlugins,
+  toolbar: minimalEditorToolbar,
+  toolbar_mode: "sliding",
+}
+
+const difficultyOptions = [
+  { label: "1", value: 1 },
+  { label: "2", value: 2 },
+  { label: "3", value: 3 },
+  { label: "4", value: 4 },
+  { label: "5", value: 5 },
+]
+
+const readingSpeedOptions = computed(() => [
+  { label: t("{0} words per minute", [50]), value: 1 },
+  { label: t("{0} words per minute", [100]), value: 2 },
+  { label: t("{0} words per minute", [175]), value: 3 },
+  { label: t("{0} words per minute", [300]), value: 4 },
+  { label: t("{0} words per minute", [600]), value: 5 },
+])
+
+const fillBlanksSeparatorOptions = [
+  { label: "[...]", value: 0 },
+  { label: "{...}", value: 1 },
+  { label: "(...)", value: 2 },
+  { label: "*...*", value: 3 },
+  { label: "#...#", value: 4 },
+  { label: "%...%", value: 5 },
+  { label: "$...$", value: 6 },
+]
+
+const form = reactive({
+  type: UNIQUE_ANSWER,
+  title: "",
+  description: "",
+  feedback: "",
+  fillBlanksText: "",
+  fillBlankItems: [],
+  fillBlanksSeparator: 0,
+  fillBlanksSwitchable: false,
+  fillBlanksCaseInsensitive: false,
+  fillBlanksComment: "",
+  calculatedText: "",
+  calculatedFormula: "",
+  calculatedRanges: [],
+  calculatedVariations: 1,
+  calculatedComment: "",
+  annotationImageUrl: "",
+  annotationImageData: "",
+  annotationImageName: "",
+  annotationImageMimeType: "",
+  hotspotImageUrl: "",
+  hotspotImageData: "",
+  hotspotImageName: "",
+  hotspotImageMimeType: "",
+  hotspotItems: [],
+  hotspotScenarioOptions: [],
+  hotspotScenarioSuccessType: "",
+  hotspotScenarioSuccessUrl: "",
+  hotspotScenarioFailureType: "",
+  hotspotScenarioFailureUrl: "",
+  score: 1,
+  globalScore: 0,
+  correctScore: 1,
+  wrongScore: -0.5,
+  unknownScore: 0,
+  noNegativeScore: false,
+  mandatory: false,
+  duration: null,
+  difficulty: 1,
+  categoryId: 0,
+  parentMediaId: 0,
+  answers: [],
+  dropdownListText: "",
+  matchingOptions: [],
+  matchingPairs: [],
+  draggableItems: [],
+  matchingOrientation: 'h',
+})
+
+const exerciseId = computed(() => Number(getQueryValue(route.params.exerciseId) || 0))
+const questionId = computed(() => Number(getQueryValue(route.params.questionId) || 0))
+const questionType = computed(() => Number(getQueryValue(route.params.questionType) || UNIQUE_ANSWER))
+const isEditMode = computed(() => questionId.value > 0)
+const isUniqueAnswer = computed(() => UNIQUE_ANSWER === Number(form.type))
+const isUniqueAnswerNoOption = computed(() => UNIQUE_ANSWER_NO_OPTION === Number(form.type))
+const isUniqueAnswerImage = computed(() => UNIQUE_ANSWER_IMAGE === Number(form.type))
+const isAnnotationQuestion = computed(() => ANNOTATION === Number(form.type))
+const isHotspotQuestion = computed(() => [HOT_SPOT, HOT_SPOT_DELINEATION, HOT_SPOT_COMBINATION].includes(Number(form.type)))
+const isHotspotDelineationQuestion = computed(() => HOT_SPOT_DELINEATION === Number(form.type))
+const isHotspotCombinationQuestion = computed(() => HOT_SPOT_COMBINATION === Number(form.type))
+const isCalculatedAnswerQuestion = computed(() => CALCULATED_ANSWER === Number(form.type))
+const isOpenQuestion = computed(() => FREE_ANSWER === Number(form.type))
+const isOralExpressionQuestion = computed(() => ORAL_EXPRESSION === Number(form.type))
+const isUploadAnswerQuestion = computed(() => UPLOAD_ANSWER === Number(form.type))
+const isMediaQuestion = computed(() => MEDIA_QUESTION === Number(form.type))
+const isReadingComprehensionQuestion = computed(() => READING_COMPREHENSION === Number(form.type))
+const isPageBreakQuestion = computed(() => PAGE_BREAK === Number(form.type))
+const isStructuralQuestion = computed(() => isMediaQuestion.value || isReadingComprehensionQuestion.value || isPageBreakQuestion.value)
+const isFillBlanksQuestion = computed(() => [FILL_IN_BLANKS, FILL_IN_BLANKS_COMBINATION].includes(Number(form.type)))
+const isFillBlanksCombination = computed(() => FILL_IN_BLANKS_COMBINATION === Number(form.type))
+const isDropdownQuestion = computed(() => [MULTIPLE_ANSWER_DROPDOWN, MULTIPLE_ANSWER_DROPDOWN_COMBINATION].includes(Number(form.type)))
+const isDropdownCombinationQuestion = computed(() => MULTIPLE_ANSWER_DROPDOWN_COMBINATION === Number(form.type))
+const isMatchingQuestion = computed(() => [MATCHING, MATCHING_COMBINATION, MATCHING_DRAGGABLE, MATCHING_DRAGGABLE_COMBINATION].includes(Number(form.type)))
+const isMatchingCombinationQuestion = computed(() => [MATCHING_COMBINATION, MATCHING_DRAGGABLE_COMBINATION].includes(Number(form.type)))
+const isDraggableOrderingQuestion = computed(() => DRAGGABLE === Number(form.type))
+const hasAnswerOptions = computed(() => !isOpenQuestion.value && !isOralExpressionQuestion.value && !isAnnotationQuestion.value && !isHotspotQuestion.value && !isUploadAnswerQuestion.value && !isCalculatedAnswerQuestion.value && !isStructuralQuestion.value && !isFillBlanksQuestion.value && !isDropdownQuestion.value && !isMatchingQuestion.value && !isDraggableOrderingQuestion.value)
+const isGlobalMultipleAnswer = computed(() => GLOBAL_MULTIPLE_ANSWER === Number(form.type))
+const isDegreeCertaintyQuestion = computed(() => MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY === Number(form.type))
+const isTrueFalseQuestion = computed(() => [MULTIPLE_ANSWER_TRUE_FALSE, MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE, MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY].includes(Number(form.type)))
+const usesTrueFalseScores = computed(() => [MULTIPLE_ANSWER_TRUE_FALSE, MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY].includes(Number(form.type)))
+const usesUnknownScore = computed(() => MULTIPLE_ANSWER_TRUE_FALSE === Number(form.type))
+const usesGlobalScore = computed(() => [MULTIPLE_ANSWER_COMBINATION, MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE, GLOBAL_MULTIPLE_ANSWER, MATCHING_COMBINATION, MATCHING_DRAGGABLE_COMBINATION, HOT_SPOT_COMBINATION, FILL_IN_BLANKS_COMBINATION, MULTIPLE_ANSWER_DROPDOWN_COMBINATION].includes(Number(form.type)))
+const isSingleCorrectAnswer = computed(() => [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION, UNIQUE_ANSWER_IMAGE].includes(Number(form.type)))
+const canConvertAnswerType = computed(() => [UNIQUE_ANSWER, MULTIPLE_ANSWER].includes(Number(form.type)))
+const annotationPreviewUrl = computed(() => form.annotationImageData || form.annotationImageUrl || "")
+const hotspotPreviewUrl = computed(() => form.hotspotImageData || form.hotspotImageUrl || "")
+const currentHotspotItem = computed(() => form.hotspotItems[currentHotspotIndex.value] || null)
+const hotspotTotalScore = computed(() =>
+  form.hotspotItems.reduce((total, item) => total + (item.hotspotType === "oar" ? 0 : Number(item.score || 0)), 0),
+)
+const hotspotEditorTitle = computed(() => {
+  if (isHotspotDelineationQuestion.value) {
+    return t("Hotspot delineation")
+  }
+
+  return isHotspotCombinationQuestion.value ? t("Hotspot combination") : t("Hotspot")
+})
+const addHotspotLabel = computed(() => isHotspotDelineationQuestion.value ? t("Add delineation") : t("Add hotspot"))
+const regularAnswerCount = computed(() => form.answers.filter((answer) => !answer.isUnknown).length)
+const dropdownOptionCount = computed(() => form.answers.length)
+const editorTitle = computed(() => {
+  const label = typeLabel.value || getTypeLabel(Number(form.type))
+
+  return isEditMode.value
+    ? formatTranslatedText("Edit question: {0}", [t(label)])
+    : formatTranslatedText("Add this question to the test: {0}", [t(label)])
+})
+const summaryText = computed(() =>
+  formatTranslatedText("{0} questions, for a total score (all questions) of {1}.", [questionCount.value, totalScore.value]),
+)
+const manualCorrectionHelpText = computed(() => {
+  if (isUploadAnswerQuestion.value) {
+    return t("This upload question has no answer options. Its score is assigned during correction/results review.")
+  }
+
+  if (isOralExpressionQuestion.value) {
+    return t("This oral expression question has no answer options. Its score is assigned during correction/results review.")
+  }
+
+  return t("This open question has no answer options. Its score is assigned during correction/results review.")
+})
+const structuralQuestionTitle = computed(() => {
+  if (isReadingComprehensionQuestion.value) {
+    return t("Reading comprehension")
+  }
+
+  return isMediaQuestion.value ? t("Media question") : t("Page break")
+})
+const structuralQuestionHelp = computed(() => {
+  if (isReadingComprehensionQuestion.value) {
+    return t("Add a reading text with scrolling speed settings.")
+  }
+
+  return isMediaQuestion.value
+    ? t("Add content, media or reading context without adding score.")
+    : t("Insert a page break without adding score.")
+})
+const structuralEditorTitle = computed(() => {
+  if (isReadingComprehensionQuestion.value) {
+    return t("Text")
+  }
+
+  return isMediaQuestion.value ? t("Content") : t("Description")
+})
+const categorySelectOptions = computed(() => [
+  { label: t("No category selected"), value: 0 },
+  ...categoryOptions.value,
+])
+const mediaSelectOptions = computed(() => [
+  { label: t("Not linked to media"), value: 0 },
+  ...mediaOptions.value,
+])
+const matchingOptionSelectOptions = computed(() =>
+  form.matchingOptions.map((option, index) => ({
+    label: `${getMatchingOptionLabel(index + 1)} - ${displayText(option.answer, t("Option"))}`,
+    value: option.localId,
+  })),
+)
+const questionsRoute = computed(() => ({
+  name: "ExerciseQuestions",
+  params: { node: route.params.node, exerciseId: exerciseId.value },
+  query: getContextParams(),
+}))
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function formatTranslatedText(key, replacements = []) {
+  return replacements.reduce(
+    (text, value, index) => String(text).split(`{${index}}`).join(String(value)),
+    t(key),
+  )
+}
+
+function formatScore(value) {
+  const numberValue = Number(value || 0)
+
+  return Number.isInteger(numberValue) ? String(numberValue) : numberValue.toFixed(2).replace(/\.?0+$/, "")
+}
+
+function getTypeLabel(type) {
+  if (UNIQUE_ANSWER === type) {
+    return "Unique answer"
+  }
+
+  if (MULTIPLE_ANSWER === type) {
+    return "Multiple answer"
+  }
+
+  if (FILL_IN_BLANKS === type) {
+    return "Fill in blanks"
+  }
+
+  if (MATCHING === type) {
+    return "Matching"
+  }
+
+  if (FREE_ANSWER === type) {
+    return "Open question"
+  }
+
+  if (HOT_SPOT === type) {
+    return "Hotspot"
+  }
+
+  if (HOT_SPOT_DELINEATION === type) {
+    return "Hotspot delineation"
+  }
+
+  if (MULTIPLE_ANSWER_COMBINATION === type) {
+    return "Exact Selection"
+  }
+
+  if (UNIQUE_ANSWER_NO_OPTION === type) {
+    return "Unique answer with unknown"
+  }
+
+  if (MULTIPLE_ANSWER_TRUE_FALSE === type) {
+    return "Multiple answer true/false"
+  }
+
+  if (MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE === type) {
+    return "Multiple answer combination true/false"
+  }
+
+  if (GLOBAL_MULTIPLE_ANSWER === type) {
+    return "Global multiple answer"
+  }
+
+  if (MEDIA_QUESTION === type) {
+    return "Media question"
+  }
+
+  if (READING_COMPREHENSION === type) {
+    return "Reading comprehension"
+  }
+
+  if (UNIQUE_ANSWER_IMAGE === type) {
+    return "Unique answer with images"
+  }
+
+  if (ANNOTATION === type) {
+    return "Annotation"
+  }
+
+  if (MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY === type) {
+    return "Multiple answer true/false with degree of certainty"
+  }
+
+  if (UPLOAD_ANSWER === type) {
+    return "Upload answer"
+  }
+
+  if (DRAGGABLE === type) {
+    return "Draggable"
+  }
+
+  if (MATCHING_DRAGGABLE === type) {
+    return "Matching draggable"
+  }
+
+  if (MATCHING_DRAGGABLE_COMBINATION === type) {
+    return "Matching draggable combination"
+  }
+
+  if (HOT_SPOT_COMBINATION === type) {
+    return "Hotspot combination"
+  }
+
+  if (FILL_IN_BLANKS_COMBINATION === type) {
+    return "Fill in blanks combination"
+  }
+
+  if (MULTIPLE_ANSWER_DROPDOWN_COMBINATION === type) {
+    return "Multiple answer dropdown combination"
+  }
+
+  if (MULTIPLE_ANSWER_DROPDOWN === type) {
+    return "Multiple answer dropdown"
+  }
+
+  if (PAGE_BREAK === type) {
+    return "Page break"
+  }
+
+  return "Question"
+}
+
+function createEmptyAnswer(index = 0, isUnknown = false) {
+  answerCounter += 1
+
+  return {
+    localId: `answer-${Date.now()}-${answerCounter}`,
+    answer: isUnknown ? t("Don't know") : "",
+    correct: isSingleCorrectAnswer.value && !isUnknown ? 0 === index : false,
+    correctChoice: isTrueFalseQuestion.value ? 1 : null,
+    comment: "",
+    score: usesGlobalScore.value || usesTrueFalseScores.value || isUnknown ? 0 : (0 === index ? 1 : 0),
+    position: isUnknown ? UNKNOWN_ANSWER_POSITION : index + 1,
+    isUnknown,
+  }
+}
+
+function getMatchingOptionLabel(position) {
+  const value = Number(position || 0)
+
+  if (value >= 1 && value <= 26) {
+    return String.fromCharCode(64 + value)
+  }
+
+  return String(value || "")
+}
+
+function createEmptyMatchingOption(index = 0) {
+  matchingOptionCounter += 1
+
+  return {
+    localId: `option-${Date.now()}-${matchingOptionCounter}`,
+    label: getMatchingOptionLabel(index + 1),
+    answer: "",
+    position: index + 1,
+  }
+}
+
+function createEmptyMatchingPair(index = 0) {
+  matchingPairCounter += 1
+
+  return {
+    localId: `pair-${Date.now()}-${matchingPairCounter}`,
+    answer: "",
+    optionLocalId: form.matchingOptions[index]?.localId || form.matchingOptions[0]?.localId || "",
+    comment: "",
+    score: 10,
+    position: form.matchingOptions.length + index + 1,
+  }
+}
+
+function createEmptyDraggableItem(index = 0) {
+  matchingPairCounter += 1
+
+  return {
+    localId: `draggable-${Date.now()}-${matchingPairCounter}`,
+    answer: "",
+    targetPosition: index + 1,
+    score: 10,
+    position: index + 1,
+  }
+}
+
+const draggablePositionSelectOptions = computed(() =>
+  form.draggableItems.map((_item, index) => ({
+    label: String(index + 1),
+    value: index + 1,
+  })),
+)
+
+const matchingOrientationOptions = [
+  { label: "Horizontal", value: "h" },
+  { label: "Vertical", value: "v" },
+]
+
+const hotspotTypeOptions = [
+  { label: "Square", value: "square" },
+  { label: "Ellipse", value: "circle" },
+  { label: "Polygon", value: "poly" },
+]
+
+const hotspotDelineationTypeOptions = [
+  { label: "Delineation", value: "delineation" },
+  { label: "Area to avoid", value: "oar" },
+]
+
+const currentHotspotTypeOptions = computed(() =>
+  isHotspotDelineationQuestion.value ? hotspotDelineationTypeOptions : hotspotTypeOptions,
+)
+
+function normalizeDraggableItems(items = []) {
+  const sourceItems = Array.isArray(items) && items.length ? items : [createEmptyDraggableItem(0), createEmptyDraggableItem(1)]
+
+  return sourceItems.map((item, index) => ({
+    localId: item.localId || `draggable-${Date.now()}-${index + 1}`,
+    answer: item.answer || "",
+    targetPosition: Number(item.targetPosition || index + 1),
+    score: Number(item.score ?? 10),
+    position: index + 1,
+  }))
+}
+
+function addDraggableItem() {
+  form.draggableItems.push(createEmptyDraggableItem(form.draggableItems.length))
+}
+
+function removeDraggableItem() {
+  if (form.draggableItems.length <= 2) {
+    return
+  }
+
+  form.draggableItems.pop()
+  form.draggableItems.forEach((item, index) => {
+    if (Number(item.targetPosition || 0) > form.draggableItems.length) {
+      item.targetPosition = form.draggableItems.length
+    }
+    item.position = index + 1
+  })
+}
+
+
+function normalizeMatchingOptions(items = []) {
+  const sourceItems = Array.isArray(items) && items.length ? items : [createEmptyMatchingOption(0), createEmptyMatchingOption(1)]
+
+  return sourceItems.map((item, index) => ({
+    localId: item.localId || `option-${Date.now()}-${index + 1}`,
+    label: getMatchingOptionLabel(index + 1),
+    answer: item.answer || "",
+    position: index + 1,
+  }))
+}
+
+function normalizeMatchingPairs(items = []) {
+  const sourceItems = Array.isArray(items) && items.length ? items : [createEmptyMatchingPair(0), createEmptyMatchingPair(1)]
+  const firstOptionLocalId = form.matchingOptions[0]?.localId || ""
+  const optionLocalIds = form.matchingOptions.map((option) => option.localId)
+
+  return sourceItems.map((item, index) => {
+    const optionLocalId = optionLocalIds.includes(item.optionLocalId) ? item.optionLocalId : firstOptionLocalId
+
+    return {
+      localId: item.localId || `pair-${Date.now()}-${index + 1}`,
+      answer: item.answer || "",
+      optionLocalId,
+      comment: item.comment || "",
+      score: Number(item.score ?? 10),
+      position: form.matchingOptions.length + index + 1,
+    }
+  })
+}
+
+function relabelMatchingOptions() {
+  form.matchingOptions.forEach((option, index) => {
+    option.label = getMatchingOptionLabel(index + 1)
+    option.position = index + 1
+  })
+}
+
+function repositionMatchingPairs() {
+  form.matchingPairs.forEach((pair, index) => {
+    pair.position = form.matchingOptions.length + index + 1
+  })
+}
+
+function addMatchingOption() {
+  form.matchingOptions.push(createEmptyMatchingOption(form.matchingOptions.length))
+  relabelMatchingOptions()
+  repositionMatchingPairs()
+}
+
+function removeMatchingOption(index) {
+  if (form.matchingOptions.length <= 2) {
+    return
+  }
+
+  const removedOption = form.matchingOptions[index]
+  form.matchingOptions.splice(index, 1)
+  relabelMatchingOptions()
+
+  const fallbackOptionLocalId = form.matchingOptions[0]?.localId || ""
+  form.matchingPairs.forEach((pair) => {
+    if (pair.optionLocalId === removedOption?.localId) {
+      pair.optionLocalId = fallbackOptionLocalId
+    }
+  })
+
+  repositionMatchingPairs()
+}
+
+function addMatchingPair() {
+  form.matchingPairs.push(createEmptyMatchingPair(form.matchingPairs.length))
+  repositionMatchingPairs()
+}
+
+function removeMatchingPair(index) {
+  if (form.matchingPairs.length <= 2) {
+    return
+  }
+
+  form.matchingPairs.splice(index, 1)
+  repositionMatchingPairs()
+}
+
+function addMatchingElement() {
+  addMatchingOption()
+  addMatchingPair()
+}
+
+function removeMatchingElement() {
+  if (form.matchingOptions.length <= 2 || form.matchingPairs.length <= 2) {
+    return
+  }
+
+  removeMatchingPair(form.matchingPairs.length - 1)
+  removeMatchingOption(form.matchingOptions.length - 1)
+}
+
+function normalizeOption(option) {
+  return {
+    label: option.label || option.title || "",
+    value: Number(option.value ?? option.id ?? 0),
+  }
+}
+
+function fillForm(data) {
+  form.type = Number(data.type || questionType.value || UNIQUE_ANSWER)
+  typeLabel.value = data.typeLabel || getTypeLabel(form.type)
+  form.title = data.title || ""
+  form.description = data.description || ""
+  form.feedback = data.feedback || ""
+  form.dropdownListText = data.dropdownListText || ""
+  form.fillBlanksText = data.fillBlanksText || ""
+  form.fillBlankItems = Array.isArray(data.fillBlankItems) ? normalizeFillBlankItems(data.fillBlankItems) : []
+  form.fillBlanksSeparator = Number(data.fillBlanksSeparator || 0)
+  form.fillBlanksSwitchable = true === data.fillBlanksSwitchable
+  form.fillBlanksCaseInsensitive = true === data.fillBlanksCaseInsensitive
+  form.fillBlanksComment = data.fillBlanksComment || ""
+  form.calculatedText = data.calculatedText || ""
+  form.calculatedFormula = data.calculatedFormula || ""
+  form.calculatedRanges = normalizeCalculatedRanges(data.calculatedRanges || [], form.calculatedText)
+  form.calculatedVariations = Number(data.calculatedVariations || 1)
+  form.calculatedComment = data.calculatedComment || ""
+  form.annotationImageUrl = data.annotationImageUrl || ""
+  form.annotationImageData = ""
+  form.annotationImageName = data.annotationImageName || ""
+  form.annotationImageMimeType = ""
+  form.hotspotImageUrl = data.hotspotImageUrl || ""
+  form.hotspotImageData = ""
+  form.hotspotImageName = data.hotspotImageName || ""
+  form.hotspotImageMimeType = ""
+  form.hotspotItems = normalizeHotspotItems(data.hotspotItems || [])
+  form.hotspotScenarioOptions = Array.isArray(data.hotspotScenarioOptions) ? normalizeScenarioOptions(data.hotspotScenarioOptions) : []
+  form.hotspotScenarioSuccessType = data.hotspotScenarioSuccessType || ""
+  form.hotspotScenarioSuccessUrl = data.hotspotScenarioSuccessUrl || ""
+  form.hotspotScenarioFailureType = data.hotspotScenarioFailureType || ""
+  form.hotspotScenarioFailureUrl = data.hotspotScenarioFailureUrl || ""
+  currentHotspotIndex.value = 0
+  hotspotPolygonPoints.value = []
+  form.score = Number(data.score || 0)
+  form.globalScore = Number(data.globalScore || 0)
+  form.correctScore = Number(data.correctScore ?? 1)
+  form.wrongScore = Number(data.wrongScore ?? -0.5)
+  form.unknownScore = Number(data.unknownScore ?? 0)
+  form.noNegativeScore = true === data.noNegativeScore
+  form.mandatory = true === data.mandatory
+  form.duration = data.duration || null
+  form.difficulty = Number(data.difficulty || 1)
+  form.categoryId = Number(data.categoryId || 0)
+  form.parentMediaId = Number(data.parentMediaId || 0)
+  questionCount.value = Number(data.questionCount || 0)
+  totalScore.value = Number(data.totalScore || 0)
+  categoryOptions.value = Array.isArray(data.categoryOptions) ? data.categoryOptions.map(normalizeOption) : []
+  mediaOptions.value = Array.isArray(data.mediaOptions) ? data.mediaOptions.map(normalizeOption) : []
+  csrfToken.value = data.csrfToken || ""
+  allowQuestionFeedback.value = true === data.allowQuestionFeedback
+  imageZoomEnabled.value = true === data.imageZoomEnabled
+
+  if (isDropdownQuestion.value) {
+    form.matchingOptions = []
+    form.matchingPairs = []
+    form.draggableItems = []
+    form.matchingOrientation = data.matchingOrientation || "h"
+    const answers = Array.isArray(data.answers) ? data.answers : []
+    form.answers = answers.map((answer, index) => ({
+      localId: `dropdown-${answer.id || index}-${Date.now()}`,
+      answer: answer.answer || "",
+      correct: true === answer.correct,
+      correctChoice: null,
+      comment: "",
+      score: isDropdownCombinationQuestion.value ? 0 : Number(answer.score || 0),
+      position: Number(answer.position || index + 1),
+      isUnknown: false,
+    }))
+    syncDropdownListTextFromAnswers()
+    return
+  }
+
+  if (isHotspotQuestion.value) {
+    form.answers = []
+    form.matchingOptions = []
+    form.matchingPairs = []
+    form.draggableItems = []
+    return
+  }
+
+  if (isMatchingQuestion.value) {
+    form.answers = []
+    form.matchingOptions = normalizeMatchingOptions(data.matchingOptions)
+    form.matchingPairs = normalizeMatchingPairs(data.matchingPairs)
+    form.draggableItems = []
+    form.matchingOrientation = data.matchingOrientation || 'h'
+    return
+  }
+
+  if (isDraggableOrderingQuestion.value) {
+    form.answers = []
+    form.matchingOptions = []
+    form.matchingPairs = []
+    form.draggableItems = normalizeDraggableItems(data.draggableItems)
+    form.matchingOrientation = ['h', 'v'].includes(data.matchingOrientation) ? data.matchingOrientation : 'h'
+    return
+  }
+
+  if (!hasAnswerOptions.value) {
+    form.answers = []
+    form.matchingOptions = []
+    form.matchingPairs = []
+    form.draggableItems = []
+    form.matchingOrientation = data.matchingOrientation || 'h'
+    if (isFillBlanksQuestion.value && !form.fillBlankItems.length) {
+      syncFillBlankItems()
+    }
+    return
+  }
+
+  form.matchingOptions = []
+  form.matchingPairs = []
+  form.draggableItems = []
+  form.matchingOrientation = data.matchingOrientation || 'h'
+
+  const answers = Array.isArray(data.answers) && data.answers.length ? data.answers : [createEmptyAnswer(0), createEmptyAnswer(1)]
+  form.answers = answers.map((answer, index) => ({
+    localId: `answer-${answer.id || index}-${Date.now()}`,
+    answer: answer.answer || "",
+    correct: true === answer.correct,
+    correctChoice: Number(answer.correctChoice || (true === answer.correct ? 1 : 2)),
+    comment: answer.comment || "",
+    score: Number(answer.score || 0),
+    position: Number(answer.position || index + 1),
+    isUnknown: true === answer.isUnknown || UNKNOWN_ANSWER_POSITION === Number(answer.position || 0),
+  }))
+
+  ensureUnknownAnswer()
+
+  if (isSingleCorrectAnswer.value && !form.answers.some((answer) => answer.correct && !answer.isUnknown)) {
+    const firstRegularAnswer = form.answers.find((answer) => !answer.isUnknown)
+    if (firstRegularAnswer) {
+      firstRegularAnswer.correct = true
+    }
+  }
+}
+
+
+
+function extractCalculatedTokens(text) {
+  const matches = String(text || "").match(/\[[^\]]+\]/g) || []
+  return [...new Set(matches.map((token) => token.trim()).filter((token) => token !== ""))]
+}
+
+function normalizeCalculatedRanges(ranges = [], text = form.calculatedText) {
+  const previousByToken = new Map()
+  for (const range of Array.isArray(ranges) ? ranges : []) {
+    if (range?.token) {
+      previousByToken.set(String(range.token), range)
+    }
+  }
+
+  return extractCalculatedTokens(text).map((token, index) => {
+    const previous = previousByToken.get(token) || {}
+    const low = String(previous.low ?? "1")
+    const high = String(previous.high ?? "20")
+
+    return {
+      token,
+      low,
+      high,
+      random: previous.random || buildCalculatedRandomPreview(low, high),
+      position: index + 1,
+    }
+  })
+}
+
+function buildCalculatedRandomPreview(low, high) {
+  let minimum = Number(low || 0)
+  let maximum = Number(high || 0)
+
+  if (Number.isNaN(minimum)) {
+    minimum = 1
+  }
+
+  if (Number.isNaN(maximum)) {
+    maximum = 20
+  }
+
+  if (maximum < minimum) {
+    const oldMinimum = minimum
+    minimum = maximum
+    maximum = oldMinimum
+  }
+
+  const hasDecimal = String(low).includes(".") || String(high).includes(".")
+  const randomValue = Math.random() * (maximum - minimum) + minimum
+
+  return hasDecimal ? randomValue.toFixed(2) : String(Math.floor(randomValue))
+}
+
+function refreshCalculatedRandom(range) {
+  range.random = buildCalculatedRandomPreview(range.low, range.high)
+}
+
+function syncCalculatedRanges() {
+  form.calculatedRanges = normalizeCalculatedRanges(form.calculatedRanges, form.calculatedText)
+}
+
+function normalizeFillBlankItems(items = []) {
+  return items.map((item, index) => ({
+    answer: item.answer || "",
+    score: Number(item.score ?? 1),
+    inputSize: Number(item.inputSize ?? 200),
+    position: Number(item.position || index + 1),
+  }))
+}
+
+function getFillBlankSeparators(separator) {
+  const value = Number(separator || 0)
+
+  if (1 === value) {
+    return ["{", "}"]
+  }
+
+  if (2 === value) {
+    return ["(", ")"]
+  }
+
+  if (3 === value) {
+    return ["*", "*"]
+  }
+
+  if (4 === value) {
+    return ["#", "#"]
+  }
+
+  if (5 === value) {
+    return ["%", "%"]
+  }
+
+  if (6 === value) {
+    return ["$", "$"]
+  }
+
+  return ["[", "]"]
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+}
+
+function extractFillBlankAnswers(text, separator) {
+  const [start, end] = getFillBlankSeparators(separator)
+  const regex = new RegExp(`${escapeRegExp(start)}(.*?)${escapeRegExp(end)}`, "gs")
+  const items = []
+  let match
+
+  while ((match = regex.exec(String(text || ""))) !== null) {
+    items.push(String(match[1] || "").trim())
+  }
+
+  return items
+}
+
+function syncFillBlankItems() {
+  const previousItems = [...form.fillBlankItems]
+  const blanks = extractFillBlankAnswers(form.fillBlanksText, form.fillBlanksSeparator)
+
+  form.fillBlankItems = blanks.map((blank, index) => {
+    const previous = previousItems[index] || {}
+
+    return {
+      answer: blank,
+      score: Number(previous.score ?? 1),
+      inputSize: Number(previous.inputSize ?? 200),
+      position: index + 1,
+    }
+  })
+}
+
+function normalizeDropdownLines(value) {
+  return String(value || "")
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line !== "")
+}
+
+function syncDropdownListTextFromAnswers() {
+  form.dropdownListText = form.answers
+    .filter((answer) => !answer.isUnknown)
+    .map((answer) => displayText(answer.answer, ""))
+    .filter((answer) => answer !== "")
+    .join("\n")
+}
+
+function syncDropdownAnswersFromList() {
+  const previousAnswers = [...form.answers]
+  const lines = normalizeDropdownLines(form.dropdownListText)
+
+  form.answers = lines.map((line, index) => {
+    const previous = previousAnswers.find((answer) => displayText(answer.answer, "") === line) || previousAnswers[index] || {}
+
+    return {
+      localId: previous.localId || `dropdown-${Date.now()}-${index + 1}`,
+      answer: line,
+      correct: true === previous.correct,
+      correctChoice: null,
+      comment: "",
+      score: isDropdownCombinationQuestion.value ? 0 : Number(previous.score || 0),
+      position: index + 1,
+      isUnknown: false,
+    }
+  })
+}
+
+function addAnswer() {
+  const unknownIndex = form.answers.findIndex((answer) => answer.isUnknown)
+  const nextAnswer = createEmptyAnswer(regularAnswerCount.value)
+
+  if (unknownIndex >= 0) {
+    form.answers.splice(unknownIndex, 0, nextAnswer)
+  } else {
+    form.answers.push(nextAnswer)
+  }
+}
+
+function removeLastAnswer() {
+  const lastRegularIndex = form.answers.map((answer, index) => ({ answer, index })).reverse().find((item) => !item.answer.isUnknown)?.index
+  if (lastRegularIndex !== undefined) {
+    removeAnswer(lastRegularIndex)
+  }
+}
+
+function removeAnswer(index) {
+  if (regularAnswerCount.value <= 2 || form.answers[index]?.isUnknown) {
+    return
+  }
+
+  const wasCorrect = form.answers[index].correct
+  form.answers.splice(index, 1)
+
+  if (isSingleCorrectAnswer.value && wasCorrect && form.answers.length) {
+    const firstRegularAnswer = form.answers.find((answer) => !answer.isUnknown)
+    if (firstRegularAnswer) {
+      firstRegularAnswer.correct = true
+    }
+  }
+}
+
+function setUniqueCorrectAnswer(index) {
+  if (form.answers[index]?.isUnknown) {
+    return
+  }
+
+  form.answers.forEach((answer, answerIndex) => {
+    answer.correct = !answer.isUnknown && answerIndex === index
+  })
+}
+
+function ensureUnknownAnswer() {
+  if (!isUniqueAnswerNoOption.value) {
+    form.answers = form.answers.filter((answer) => !answer.isUnknown)
+    return
+  }
+
+  const unknownAnswers = form.answers.filter((answer) => answer.isUnknown)
+  if (!unknownAnswers.length) {
+    form.answers.push(createEmptyAnswer(form.answers.length, true))
+  }
+
+  form.answers.forEach((answer) => {
+    if (answer.isUnknown) {
+      answer.correct = false
+      answer.score = 0
+      answer.position = UNKNOWN_ANSWER_POSITION
+      if (!stripHtml(answer.answer)) {
+        answer.answer = t("Don't know")
+      }
+    }
+  })
+}
+
+function convertToMultipleAnswer() {
+  form.type = MULTIPLE_ANSWER
+  typeLabel.value = getTypeLabel(MULTIPLE_ANSWER)
+}
+
+function convertToUniqueAnswer() {
+  form.type = UNIQUE_ANSWER
+  typeLabel.value = getTypeLabel(UNIQUE_ANSWER)
+
+  const firstCorrectIndex = form.answers.findIndex((answer) => answer.correct && !answer.isUnknown)
+  form.answers.forEach((answer, index) => {
+    answer.correct = !answer.isUnknown && (firstCorrectIndex >= 0 ? index === firstCorrectIndex : 0 === index)
+  })
+}
+
+function getAnnotationMimeTypeFromExtension(fileName) {
+  const extension = String(fileName || "").split(".").pop()?.toLowerCase() || ""
+
+  if (["jpg", "jpeg"].includes(extension)) {
+    return "image/jpeg"
+  }
+
+  if ("png" === extension) {
+    return "image/png"
+  }
+
+  if ("gif" === extension) {
+    return "image/gif"
+  }
+
+  return ""
+}
+
+function isAllowedAnnotationImage(file) {
+  const mimeType = file?.type || getAnnotationMimeTypeFromExtension(file?.name)
+
+  return ["image/jpeg", "image/png", "image/gif"].includes(mimeType)
+}
+
+function selectAnnotationImage(file) {
+  if (!file) {
+    return
+  }
+
+  if (!isAllowedAnnotationImage(file)) {
+    errorMessage.value = t("Only PNG, JPG or GIF images allowed")
+    form.annotationImageData = ""
+    form.annotationImageName = ""
+    form.annotationImageMimeType = ""
+    return
+  }
+
+  const reader = new FileReader()
+  reader.onload = () => {
+    form.annotationImageData = String(reader.result || "")
+    form.annotationImageName = file.name || "annotation_image"
+    form.annotationImageMimeType = file.type || getAnnotationMimeTypeFromExtension(file.name)
+    errorMessage.value = ""
+  }
+  reader.onerror = () => {
+    errorMessage.value = t("Could not save question")
+  }
+  reader.readAsDataURL(file)
+}
+
+function normalizeHotspotItems(items = []) {
+  const sourceItems = Array.isArray(items) && items.length ? items : [createEmptyHotspotItem(0)]
+
+  return sourceItems.map((item, index) => {
+    const hotspotType = normalizeHotspotTypeValue(item.hotspotType)
+
+    return {
+      localId: item.localId || `hotspot-${Date.now()}-${index + 1}`,
+      answer: item.answer || getDefaultHotspotAnswer(hotspotType),
+      comment: item.comment || "",
+      score: hotspotType === "oar" || isHotspotCombinationQuestion.value ? 0 : Number(item.score || 10),
+      position: index + 1,
+      hotspotType,
+      coordinates: item.coordinates || "0;0|0|0",
+    }
+  })
+}
+
+function normalizeScenarioOptions(options = []) {
+  return options
+    .filter((option) => option && option.value !== undefined)
+    .map((option) => ({ label: t(option.label || String(option.value)), value: String(option.value) }))
+}
+
+function normalizeHotspotTypeValue(type) {
+  const value = String(type || "")
+  if (["square", "circle", "poly"].includes(value) && !isHotspotDelineationQuestion.value) {
+    return value
+  }
+
+  if (["delineation", "oar"].includes(value) && isHotspotDelineationQuestion.value) {
+    return value
+  }
+
+  return isHotspotDelineationQuestion.value ? "delineation" : "square"
+}
+
+function isPolygonHotspotType(type) {
+  return ["poly", "delineation", "oar"].includes(String(type || ""))
+}
+
+function getDefaultHotspotAnswer(type) {
+  if ("delineation" === type) {
+    return "delineation"
+  }
+
+  if ("oar" === type) {
+    return t("Area to avoid")
+  }
+
+  return ""
+}
+
+function createEmptyHotspotItem(index = 0, forcedType = "") {
+  hotspotItemCounter += 1
+  const hotspotType = normalizeHotspotTypeValue(forcedType || (isHotspotDelineationQuestion.value ? "delineation" : "square"))
+
+  return {
+    localId: `hotspot-${Date.now()}-${hotspotItemCounter}`,
+    answer: getDefaultHotspotAnswer(hotspotType),
+    comment: "",
+    score: isHotspotCombinationQuestion.value || hotspotType === "oar" ? 0 : 10,
+    position: index + 1,
+    hotspotType,
+    coordinates: "0;0|0|0",
+  }
+}
+
+function addHotspotItem() {
+  form.hotspotItems.push(createEmptyHotspotItem(form.hotspotItems.length))
+  currentHotspotIndex.value = form.hotspotItems.length - 1
+  hotspotPolygonPoints.value = []
+}
+
+function addHotspotOarItem() {
+  form.hotspotItems.push(createEmptyHotspotItem(form.hotspotItems.length, "oar"))
+  currentHotspotIndex.value = form.hotspotItems.length - 1
+  hotspotPolygonPoints.value = []
+}
+
+function removeHotspotItem(index) {
+  if (form.hotspotItems.length <= 1) {
+    return
+  }
+
+  form.hotspotItems.splice(index, 1)
+  currentHotspotIndex.value = Math.max(0, Math.min(currentHotspotIndex.value, form.hotspotItems.length - 1))
+  hotspotPolygonPoints.value = []
+}
+
+function selectHotspotItem(index) {
+  currentHotspotIndex.value = index
+  hotspotPolygonPoints.value = []
+}
+
+function selectHotspotImage(file) {
+  selectQuestionImage(file, "hotspot")
+}
+
+function selectQuestionImage(file, target) {
+  if (!file) {
+    return
+  }
+
+  if (!isAllowedAnnotationImage(file)) {
+    errorMessage.value = t("Only PNG, JPG or GIF images allowed")
+    if (target === "hotspot") {
+      form.hotspotImageData = ""
+      form.hotspotImageName = ""
+      form.hotspotImageMimeType = ""
+    }
+    return
+  }
+
+  const reader = new FileReader()
+  reader.onload = () => {
+    if (target === "hotspot") {
+      form.hotspotImageData = String(reader.result || "")
+      form.hotspotImageName = file.name || "hotspot_image"
+      form.hotspotImageMimeType = file.type || getAnnotationMimeTypeFromExtension(file.name)
+    }
+    errorMessage.value = ""
+  }
+  reader.onerror = () => {
+    errorMessage.value = t("Could not save question")
+  }
+  reader.readAsDataURL(file)
+}
+
+function updateHotspotImageSize() {
+  const image = hotspotImageRef.value
+  if (!image) {
+    return
+  }
+
+  hotspotImageSize.width = image.clientWidth || 0
+  hotspotImageSize.height = image.clientHeight || 0
+  hotspotImageSize.naturalWidth = image.naturalWidth || hotspotImageSize.width
+  hotspotImageSize.naturalHeight = image.naturalHeight || hotspotImageSize.height
+}
+
+function toDisplayX(value) {
+  const naturalWidth = hotspotImageSize.naturalWidth || hotspotImageSize.width || 1
+  return Number(value || 0) * (hotspotImageSize.width || naturalWidth) / naturalWidth
+}
+
+function toDisplayY(value) {
+  const naturalHeight = hotspotImageSize.naturalHeight || hotspotImageSize.height || 1
+  return Number(value || 0) * (hotspotImageSize.height || naturalHeight) / naturalHeight
+}
+
+function toNaturalPoint(event) {
+  const image = hotspotImageRef.value
+  if (!image) {
+    return { x: 0, y: 0 }
+  }
+
+  const rect = image.getBoundingClientRect()
+  const displayX = Math.max(0, Math.min(event.clientX - rect.left, rect.width))
+  const displayY = Math.max(0, Math.min(event.clientY - rect.top, rect.height))
+  const naturalWidth = hotspotImageSize.naturalWidth || rect.width || 1
+  const naturalHeight = hotspotImageSize.naturalHeight || rect.height || 1
+
+  return {
+    x: Math.round(displayX * naturalWidth / Math.max(1, rect.width)),
+    y: Math.round(displayY * naturalHeight / Math.max(1, rect.height)),
+  }
+}
+
+function startHotspotDraw(event) {
+  if (!isHotspotQuestion.value || !currentHotspotItem.value || !hotspotPreviewUrl.value) {
+    return
+  }
+
+  event.preventDefault()
+  const point = toNaturalPoint(event)
+  if (isPolygonHotspotType(currentHotspotItem.value.hotspotType)) {
+    addHotspotPolygonPoint(point)
+    return
+  }
+
+  drawingDraft.value = {
+    startX: point.x,
+    startY: point.y,
+    currentX: point.x,
+    currentY: point.y,
+    type: currentHotspotItem.value.hotspotType,
+    ...buildDraftShape(point.x, point.y, point.x, point.y, currentHotspotItem.value.hotspotType),
+  }
+}
+
+function moveHotspotDraw(event) {
+  if (!drawingDraft.value) {
+    return
+  }
+
+  const point = toNaturalPoint(event)
+  Object.assign(
+    drawingDraft.value,
+    buildDraftShape(drawingDraft.value.startX, drawingDraft.value.startY, point.x, point.y, drawingDraft.value.type),
+    { currentX: point.x, currentY: point.y },
+  )
+}
+
+function finishHotspotDraw() {
+  if (!drawingDraft.value || !currentHotspotItem.value) {
+    return
+  }
+
+  const x = Math.round(Math.min(drawingDraft.value.startX, drawingDraft.value.currentX))
+  const y = Math.round(Math.min(drawingDraft.value.startY, drawingDraft.value.currentY))
+  const width = Math.round(Math.abs(drawingDraft.value.currentX - drawingDraft.value.startX))
+  const height = Math.round(Math.abs(drawingDraft.value.currentY - drawingDraft.value.startY))
+  if (width >= 4 && height >= 4) {
+    currentHotspotItem.value.coordinates = `${x};${y}|${width}|${height}`
+  }
+  drawingDraft.value = null
+}
+
+function addHotspotPolygonPoint(point) {
+  const points = hotspotPolygonPoints.value
+  const lastPoint = points[points.length - 1] || null
+
+  if (lastPoint && isNearHotspotPoint(point, lastPoint)) {
+    return
+  }
+
+  if (points.length >= 3 && isNearHotspotPoint(point, points[0])) {
+    finishHotspotPolygon()
+    return
+  }
+
+  points.push(point)
+}
+
+function isNearHotspotPoint(point, target) {
+  const threshold = Math.max(8, Math.round((hotspotImageSize.naturalWidth || hotspotImageSize.width || 600) / 100))
+  const distance = Math.hypot(
+    Number(point.x || 0) - Number(target.x || 0),
+    Number(point.y || 0) - Number(target.y || 0),
+  )
+
+  return distance <= threshold
+}
+
+function cancelHotspotDraw() {
+  drawingDraft.value = null
+}
+
+function finishHotspotPolygon() {
+  if (!currentHotspotItem.value || hotspotPolygonPoints.value.length < 3) {
+    return
+  }
+
+  currentHotspotItem.value.coordinates = hotspotPolygonPoints.value.map((point) => `${point.x};${point.y}`).join("|")
+  hotspotPolygonPoints.value = []
+}
+
+function buildDraftShape(startX, startY, currentX, currentY, type) {
+  const x = Math.min(startX, currentX)
+  const y = Math.min(startY, currentY)
+  const width = Math.abs(currentX - startX)
+  const height = Math.abs(currentY - startY)
+
+  if (type === "circle") {
+    return {
+      kind: "ellipse",
+      cx: toDisplayX(x + width / 2),
+      cy: toDisplayY(y + height / 2),
+      rx: Math.abs(toDisplayX(width) - toDisplayX(0)) / 2,
+      ry: Math.abs(toDisplayY(height) - toDisplayY(0)) / 2,
+    }
+  }
+
+  return {
+    kind: "rect",
+    x: toDisplayX(x),
+    y: toDisplayY(y),
+    width: Math.abs(toDisplayX(width) - toDisplayX(0)),
+    height: Math.abs(toDisplayY(height) - toDisplayY(0)),
+  }
+}
+
+function getHotspotShapeFill(index) {
+  if (form.hotspotItems[index]?.hotspotType === "oar") {
+    return index === currentHotspotIndex.value
+      ? "rgb(var(--color-danger-base) / 0.58)"
+      : "rgb(var(--color-danger-base) / 0.46)"
+  }
+
+  return index === currentHotspotIndex.value
+    ? "rgb(var(--color-primary-base) / 0.58)"
+    : "rgb(var(--color-primary-base) / 0.46)"
+}
+
+function getHotspotShapeStroke(index) {
+  if (form.hotspotItems[index]?.hotspotType === "oar") {
+    return "rgb(var(--color-danger-base))"
+  }
+
+  return index === currentHotspotIndex.value ? "rgb(var(--color-primary-base))" : "#244d67"
+}
+
+function getHotspotShape(item) {
+  const type = item.hotspotType || "square"
+  const coordinates = String(item.coordinates || "")
+  if (!hasValidHotspotCoordinates(coordinates)) {
+    return { kind: "none" }
+  }
+
+  if (isPolygonHotspotType(type)) {
+    const points = coordinates
+      .split("|")
+      .map((pair) => pair.split(";"))
+      .filter((pair) => pair.length === 2)
+      .map(([x, y]) => `${toDisplayX(Number(x))},${toDisplayY(Number(y))}`)
+      .join(" ")
+
+    return points ? { kind: "polygon", points } : { kind: "none" }
+  }
+
+  const [position, width = "0", height = "0"] = coordinates.split("|")
+  const [x = "0", y = "0"] = position.split(";")
+  const naturalX = Number(x || 0)
+  const naturalY = Number(y || 0)
+  const naturalWidth = Number(width || 0)
+  const naturalHeight = Number(height || 0)
+
+  if (type === "circle") {
+    return {
+      kind: "ellipse",
+      cx: toDisplayX(naturalX + naturalWidth / 2),
+      cy: toDisplayY(naturalY + naturalHeight / 2),
+      rx: Math.abs(toDisplayX(naturalWidth) - toDisplayX(0)) / 2,
+      ry: Math.abs(toDisplayY(naturalHeight) - toDisplayY(0)) / 2,
+    }
+  }
+
+  return {
+    kind: "rect",
+    x: toDisplayX(naturalX),
+    y: toDisplayY(naturalY),
+    width: Math.abs(toDisplayX(naturalWidth) - toDisplayX(0)),
+    height: Math.abs(toDisplayY(naturalHeight) - toDisplayY(0)),
+  }
+}
+
+function hasValidHotspotCoordinates(value) {
+  const coordinates = String(value || "").trim()
+  return Boolean(coordinates && coordinates !== "0;0|0|0")
+}
+
+function stripHtml(value) {
+  return String(value || "")
+    .replace(/<[^>]*>/g, " ")
+    .replace(/&nbsp;/g, " ")
+    .trim()
+}
+
+function htmlHasImage(value) {
+  return /<img\b[^>]*>/i.test(String(value || ""))
+}
+
+function hasAnswerContent(value) {
+  return Boolean(stripHtml(value) || htmlHasImage(value))
+}
+
+function decodeHtml(value) {
+  if (null === value || undefined === value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+function buildPayload() {
+  return {
+    exerciseId: exerciseId.value,
+    questionId: isEditMode.value ? questionId.value : null,
+    type: Number(form.type),
+    title: form.title,
+    description: form.description,
+    feedback: form.feedback,
+    dropdownListText: form.dropdownListText,
+    fillBlanksText: form.fillBlanksText,
+    fillBlankItems: form.fillBlankItems.map((item, index) => ({
+      answer: item.answer,
+      score: Number(item.score || 0),
+      inputSize: Number(item.inputSize || 200),
+      position: index + 1,
+    })),
+    fillBlanksSeparator: Number(form.fillBlanksSeparator || 0),
+    fillBlanksSwitchable: true === form.fillBlanksSwitchable,
+    fillBlanksCaseInsensitive: true === form.fillBlanksCaseInsensitive,
+    fillBlanksComment: form.fillBlanksComment,
+    calculatedText: form.calculatedText,
+    calculatedFormula: form.calculatedFormula,
+    calculatedRanges: form.calculatedRanges.map((range, index) => ({
+      token: range.token,
+      low: String(range.low ?? "1"),
+      high: String(range.high ?? "20"),
+      position: index + 1,
+    })),
+    calculatedVariations: Number(form.calculatedVariations || 1),
+    calculatedComment: form.calculatedComment,
+    annotationImageData: isAnnotationQuestion.value && !isEditMode.value ? form.annotationImageData : "",
+    annotationImageName: isAnnotationQuestion.value && !isEditMode.value ? form.annotationImageName : "",
+    annotationImageMimeType: isAnnotationQuestion.value && !isEditMode.value ? form.annotationImageMimeType : "",
+    hotspotImageData: isHotspotQuestion.value && !isEditMode.value ? form.hotspotImageData : "",
+    hotspotImageName: isHotspotQuestion.value && !isEditMode.value ? form.hotspotImageName : "",
+    hotspotImageMimeType: isHotspotQuestion.value && !isEditMode.value ? form.hotspotImageMimeType : "",
+    hotspotItems: isHotspotQuestion.value
+      ? form.hotspotItems.map((item, index) => ({
+          answer: item.answer,
+          comment: item.comment,
+          score: isHotspotCombinationQuestion.value || item.hotspotType === "oar" ? 0 : Number(item.score || 0),
+          position: index + 1,
+          hotspotType: normalizeHotspotTypeValue(item.hotspotType),
+          coordinates: item.coordinates || "",
+        }))
+      : [],
+    hotspotScenarioSuccessType: isHotspotDelineationQuestion.value ? form.hotspotScenarioSuccessType : "",
+    hotspotScenarioSuccessUrl: isHotspotDelineationQuestion.value ? form.hotspotScenarioSuccessUrl : "",
+    hotspotScenarioFailureType: isHotspotDelineationQuestion.value ? form.hotspotScenarioFailureType : "",
+    hotspotScenarioFailureUrl: isHotspotDelineationQuestion.value ? form.hotspotScenarioFailureUrl : "",
+    score: Number(form.score || 0),
+    globalScore: Number(form.globalScore || 0),
+    correctScore: Number(form.correctScore || 0),
+    wrongScore: Number(form.wrongScore || 0),
+    unknownScore: isDegreeCertaintyQuestion.value ? 0 : Number(form.unknownScore || 0),
+    noNegativeScore: true === form.noNegativeScore,
+    mandatory: isStructuralQuestion.value ? false : form.mandatory,
+    duration: isStructuralQuestion.value ? null : (form.duration ? Number(form.duration) : null),
+    difficulty: Number(form.difficulty || 1),
+    categoryId: isStructuralQuestion.value ? 0 : Number(form.categoryId || 0),
+    parentMediaId: isStructuralQuestion.value ? 0 : Number(form.parentMediaId || 0),
+    matchingOptions: isMatchingQuestion.value
+      ? form.matchingOptions.map((option, index) => ({
+          localId: option.localId,
+          answer: option.answer,
+          position: index + 1,
+        }))
+      : [],
+    matchingPairs: isMatchingQuestion.value
+      ? form.matchingPairs.map((pair, index) => ({
+          answer: pair.answer,
+          optionLocalId: pair.optionLocalId,
+          comment: pair.comment,
+          score: isMatchingCombinationQuestion.value ? 0 : Number(pair.score || 0),
+          position: form.matchingOptions.length + index + 1,
+        }))
+      : [],
+    draggableItems: isDraggableOrderingQuestion.value
+      ? form.draggableItems.map((item, index) => ({
+          answer: item.answer,
+          targetPosition: Number(item.targetPosition || index + 1),
+          score: Number(item.score || 0),
+          position: index + 1,
+        }))
+      : [],
+    matchingOrientation: form.matchingOrientation || 'h',
+    answers: (hasAnswerOptions.value || isDropdownQuestion.value)
+      ? form.answers.map((answer, index) => ({
+          answer: answer.answer,
+          correct: true === answer.correct,
+          correctChoice: Number(answer.correctChoice || 0),
+          comment: answer.comment,
+          score: Number(answer.score || 0),
+          position: answer.isUnknown ? UNKNOWN_ANSWER_POSITION : index + 1,
+          isUnknown: true === answer.isUnknown,
+        }))
+      : [],
+    submittedCsrfToken: csrfToken.value,
+  }
+}
+
+function validateForm() {
+  if (!stripHtml(form.title)) {
+    errorMessage.value = t("The question title is required.")
+    return false
+  }
+
+  if (isStructuralQuestion.value) {
+    return true
+  }
+
+  if (isOpenQuestion.value || isOralExpressionQuestion.value || isUploadAnswerQuestion.value) {
+    if (Number(form.score || 0) <= 0) {
+      errorMessage.value = t("Required field")
+      return false
+    }
+
+    return true
+  }
+
+  if (isHotspotQuestion.value) {
+    if (!isEditMode.value && !form.hotspotImageData) {
+      errorMessage.value = t("Please select an image")
+      return false
+    }
+
+    const filledItems = form.hotspotItems.filter((item) => stripHtml(item.answer) && hasValidHotspotCoordinates(item.coordinates))
+    if (!filledItems.length) {
+      errorMessage.value = t("Please draw at least one hotspot.")
+      return false
+    }
+
+    if (isHotspotCombinationQuestion.value) {
+      if (Number(form.globalScore || 0) <= 0) {
+        errorMessage.value = t("Required field")
+        return false
+      }
+
+      return true
+    }
+
+    if (isHotspotDelineationQuestion.value) {
+      const hasDelineation = filledItems.some((item) => item.hotspotType === "delineation")
+      if (!hasDelineation) {
+        errorMessage.value = t("Please draw at least one delineation.")
+        return false
+      }
+
+      const invalidDelineationScore = filledItems.some(
+        (item) => item.hotspotType !== "oar" && Number(item.score || 0) <= 0,
+      )
+      if (invalidDelineationScore) {
+        errorMessage.value = t("You must give a positive score for each hotspots")
+        return false
+      }
+
+      return true
+    }
+
+    const invalidScore = filledItems.some((item) => Number(item.score || 0) <= 0)
+    if (invalidScore) {
+      errorMessage.value = t("You must give a positive score for each hotspots")
+      return false
+    }
+
+    return true
+  }
+
+  if (isAnnotationQuestion.value) {
+    if (Number(form.score || 0) <= 0) {
+      errorMessage.value = t("Required field")
+      return false
+    }
+
+    if (!isEditMode.value && !form.annotationImageData) {
+      errorMessage.value = t("Please select an image")
+      return false
+    }
+
+    return true
+  }
+
+  if (isCalculatedAnswerQuestion.value) {
+    syncCalculatedRanges()
+    if (!stripHtml(form.calculatedText)) {
+      errorMessage.value = t("Please type the text")
+      return false
+    }
+
+    if (!extractCalculatedTokens(form.calculatedText).length) {
+      errorMessage.value = t("Please define at least one blank with the selected marker")
+      return false
+    }
+
+    if (!String(form.calculatedFormula || "").trim()) {
+      errorMessage.value = t("Please, write the formula")
+      return false
+    }
+
+    if (Number(form.score || 0) <= 0 || Number(form.calculatedVariations || 0) < 1) {
+      errorMessage.value = t("Required field")
+      return false
+    }
+
+    return true
+  }
+
+  if (isFillBlanksQuestion.value) {
+    syncFillBlankItems()
+    if (!stripHtml(form.fillBlanksText)) {
+      errorMessage.value = t("The fill in blanks text is required.")
+      return false
+    }
+
+    if (!form.fillBlankItems.length) {
+      errorMessage.value = t("Please define at least one blank with the selected marker")
+      return false
+    }
+
+    if (isFillBlanksCombination.value) {
+      if (Number(form.globalScore || 0) <= 0) {
+        errorMessage.value = t("Required field")
+        return false
+      }
+
+      return true
+    }
+
+    const score = form.fillBlankItems.reduce((total, item) => total + Number(item.score || 0), 0)
+    if (score <= 0) {
+      errorMessage.value = t("Required field")
+      return false
+    }
+
+    return true
+  }
+
+  if (isDropdownQuestion.value) {
+    syncDropdownAnswersFromList()
+    const filledAnswers = form.answers.filter((answer) => stripHtml(answer.answer))
+    if (filledAnswers.length < 2) {
+      errorMessage.value = t("Please enter at least two dropdown options.")
+      return false
+    }
+
+    const correctAnswers = filledAnswers.filter((answer) => true === answer.correct)
+    if (correctAnswers.length < 1) {
+      errorMessage.value = t("At least one expected answer is required.")
+      return false
+    }
+
+    if (isDropdownCombinationQuestion.value) {
+      if (Number(form.globalScore || 0) <= 0) {
+        errorMessage.value = t("Required field")
+        return false
+      }
+
+      return true
+    }
+
+    const score = correctAnswers.reduce((total, answer) => total + Number(answer.score || 0), 0)
+    if (score <= 0) {
+      errorMessage.value = t("Required field")
+      return false
+    }
+
+    return true
+  }
+
+  if (isDraggableOrderingQuestion.value) {
+    const filledItems = form.draggableItems.filter((item) => stripHtml(item.answer))
+
+    if (filledItems.length < 2) {
+      errorMessage.value = t("At least two draggable items are required.")
+      return false
+    }
+
+    const validTargetPositions = form.draggableItems.map((_item, index) => index + 1)
+    const invalidTarget = filledItems.some((item) => !validTargetPositions.includes(Number(item.targetPosition || 0)))
+    if (invalidTarget) {
+      errorMessage.value = t("Each draggable item must be linked to a valid target position.")
+      return false
+    }
+
+    const score = filledItems.reduce((total, item) => total + Math.max(0, Number(item.score || 0)), 0)
+    if (score <= 0) {
+      errorMessage.value = t("Required field.")
+      return false
+    }
+
+    return true
+  }
+
+  if (isHotspotQuestion.value) {
+    form.answers = []
+    form.matchingOptions = []
+    form.matchingPairs = []
+    form.draggableItems = []
+    return
+  }
+
+  if (isMatchingQuestion.value) {
+    const filledOptions = form.matchingOptions.filter((option) => stripHtml(option.answer))
+    const filledPairs = form.matchingPairs.filter((pair) => stripHtml(pair.answer))
+
+    if (filledOptions.length < 2) {
+      errorMessage.value = t("At least two matching options are required.")
+      return false
+    }
+
+    if (filledPairs.length < 2) {
+      errorMessage.value = t("At least two matching pairs are required.")
+      return false
+    }
+
+    const validOptionLocalIds = filledOptions.map((option) => option.localId)
+    const hasInvalidPair = filledPairs.some((pair) => !validOptionLocalIds.includes(pair.optionLocalId))
+    if (hasInvalidPair) {
+      errorMessage.value = t("Each matching pair must be linked to a valid option.")
+      return false
+    }
+
+    const score = isMatchingCombinationQuestion.value
+      ? Number(form.globalScore || 0)
+      : filledPairs.reduce((total, pair) => total + Number(pair.score || 0), 0)
+    if (score <= 0) {
+      errorMessage.value = t("Required field")
+      return false
+    }
+
+    return true
+  }
+
+  ensureUnknownAnswer()
+
+  const filledAnswers = form.answers.filter((answer) => hasAnswerContent(answer.answer))
+  const filledRegularAnswers = filledAnswers.filter((answer) => !answer.isUnknown)
+  if (filledRegularAnswers.length < 2) {
+    errorMessage.value = t("At least two answers are required.")
+    return false
+  }
+
+  if (isTrueFalseQuestion.value) {
+    const missingTrueFalseChoice = filledRegularAnswers.some((answer) => ![1, 2].includes(Number(answer.correctChoice || 0)))
+    if (missingTrueFalseChoice) {
+      errorMessage.value = t("Each true/false answer must have True or False selected.")
+      return false
+    }
+  } else {
+    const correctAnswers = filledRegularAnswers.filter((answer) => answer.correct)
+    if (isSingleCorrectAnswer.value && correctAnswers.length !== 1) {
+      errorMessage.value = t("A unique answer question must have exactly one correct answer.")
+      return false
+    }
+
+    if (!isSingleCorrectAnswer.value && correctAnswers.length < 1) {
+      errorMessage.value = t("At least one correct answer is required.")
+      return false
+    }
+  }
+
+  if (usesGlobalScore.value && Number(form.globalScore || 0) <= 0) {
+    errorMessage.value = t("Required field")
+    return false
+  }
+
+  if (usesTrueFalseScores.value && Number(form.correctScore || 0) <= 0) {
+    errorMessage.value = t("Required field")
+    return false
+  }
+
+  return true
+}
+
+async function loadQuestionEditor() {
+  if (!exerciseId.value) {
+    errorMessage.value = t("A valid exercise id is required.")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseQuestionEditor(
+      getContextParams(),
+      exerciseId.value,
+      isEditMode.value ? questionId.value : null,
+      isEditMode.value ? null : questionType.value,
+    )
+    fillForm(response)
+  } catch (error) {
+    console.error("Error loading exercise question editor", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not load question")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+async function saveQuestion() {
+  errorMessage.value = ""
+
+  if (!validateForm()) {
+    return
+  }
+
+  isSaving.value = true
+
+  try {
+    await exerciseService.saveExerciseQuestion(
+      buildPayload(),
+      getContextParams(),
+      exerciseId.value,
+      isEditMode.value ? questionId.value : null,
+    )
+    await router.push(questionsRoute.value)
+  } catch (error) {
+    console.error("Error saving exercise question", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not save question")
+  } finally {
+    isSaving.value = false
+  }
+}
+
+watch(() => form.calculatedText, () => {
+  if (isCalculatedAnswerQuestion.value) {
+    syncCalculatedRanges()
+  }
+})
+
+onMounted(loadQuestionEditor)
+</script>
diff --git a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
new file mode 100644
index 00000000000..188e952a5a0
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
@@ -0,0 +1,1008 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+      <BaseButton
+        :label="t('Back to exercises')"
+        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.preview"
+        :label="t('Preview')"
+        :to-url="legacyUrls.preview"
+        icon="eye-on"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        :label="t('Results')"
+        :route="{ name: 'ExerciseReport', params: { ...route.params, exerciseId }, query: getContextParams() }"
+        icon="tracking"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.configure"
+        :label="t('Edit test name and settings')"
+        :route="{ name: 'ExerciseEdit', params: { ...route.params, exerciseId }, query: getContextParams() }"
+        icon="settings"
+        only-icon
+        size="small"
+        type="secondary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-4 text-sm text-gray-700 shadow-sm"
+    >
+      {{ t("Loading") }}
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <template v-if="!isLoading && !errorMessage">
+      <section class="space-y-3">
+        <div class="flex flex-wrap items-center justify-between gap-3">
+          <div class="space-y-1">
+            <h1 class="text-xl font-semibold text-gray-90">
+              {{ displayText(title, t("Questions")) }}
+            </h1>
+            <p class="text-sm text-gray-600">
+              {{ t("Select a question type to create a question.") }}
+            </p>
+          </div>
+          <BaseButton
+            v-if="legacyUrls.questionPool"
+            :label="t('Question bank')"
+            :to-url="legacyUrls.questionPool"
+            icon="table"
+            type="primary"
+          />
+        </div>
+
+        <div class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm font-medium text-support-4">
+          {{ summaryText }}
+        </div>
+
+        <div class="rounded-xl border border-gray-20 bg-white px-3 py-3 shadow-sm">
+          <div class="flex flex-wrap items-center gap-3">
+            <a
+              v-for="questionType in questionTypes"
+              :key="`question-type-${questionType.type}`"
+              :aria-disabled="!questionType.enabled"
+              :aria-label="questionTypeTitle(questionType)"
+              :class="questionTypeCardClass(questionType)"
+              :href="questionTypeHref(questionType)"
+              :title="questionTypeTitle(questionType)"
+              @click="openQuestionType(questionType, $event)"
+            >
+              <span :class="questionTypeIconClass(questionType)">
+                <img
+                  :alt="t(questionType.label)"
+                  class="h-16 w-16 object-contain"
+                  :src="questionIconUrl(questionType)"
+                  @error="useFallbackIcon"
+                />
+              </span>
+              <span class="sr-only">
+                {{ t(questionType.label) }}
+              </span>
+            </a>
+          </div>
+        </div>
+      </section>
+
+      <section class="space-y-3">
+        <div
+          v-if="0 === questions.length"
+          class="rounded-lg border border-yellow-100 bg-yellow-50 px-4 py-3 text-sm text-yellow-800"
+        >
+          {{ t("Questions list (there is no question so far).") }}
+        </div>
+
+        <div
+          v-else
+          class="overflow-x-auto rounded-lg border border-gray-20 bg-white shadow-sm"
+        >
+          <table class="min-w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-gray-90">
+              <tr>
+                <th class="w-14 px-3 py-3 text-left font-semibold">{{ t("Order") }}</th>
+                <th class="px-3 py-3 text-left font-semibold">{{ t("Question") }}</th>
+                <th class="w-32 px-3 py-3 text-center font-semibold">{{ t("Type") }}</th>
+                <th class="w-40 px-3 py-3 text-center font-semibold">{{ t("Category") }}</th>
+                <th class="w-28 px-3 py-3 text-center font-semibold">{{ t("Difficulty") }}</th>
+                <th class="w-24 px-3 py-3 text-center font-semibold">{{ t("Score") }}</th>
+                <th class="w-44 px-3 py-3 text-right font-semibold">{{ t("Detail") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <template
+                v-for="question in questions"
+                :key="question.id"
+              >
+                <tr
+                  :class="[
+                    'border-t border-gray-20 transition hover:bg-gray-10',
+                    expandedQuestionId === question.id ? 'bg-gray-10' : 'bg-white',
+                    draggedQuestionId === question.id ? 'opacity-50' : '',
+                  ]"
+                  draggable="true"
+                  @dragstart="startDrag(question)"
+                  @dragover.prevent
+                  @drop="dropQuestion(question)"
+                >
+                  <td class="px-3 py-3 align-middle">
+                    <button
+                      class="cursor-move text-gray-70 hover:text-primary"
+                      :title="t('Drag to reorder')"
+                      type="button"
+                      @click.stop
+                    >
+                      <BaseIcon
+                        icon="cursor-move"
+                        size="normal"
+                      />
+                    </button>
+                  </td>
+                  <td
+                    class="cursor-pointer px-3 py-3 align-middle"
+                    @click="togglePreview(question.id)"
+                  >
+                    <div class="space-y-1">
+                      <div class="font-semibold text-gray-90">
+                        {{ displayText(question.title, t("Untitled")) }}
+                      </div>
+                      <div class="text-xs text-gray-500">
+                        {{ t("Click to preview") }}
+                      </div>
+                    </div>
+                  </td>
+                  <td class="px-3 py-3 text-center align-middle">
+                    <span
+                      class="inline-flex items-center justify-center"
+                      :title="t(question.typeLabel)"
+                    >
+                      <img
+                        v-if="question.typeIcon"
+                        :alt="t(question.typeLabel)"
+                        class="h-10 w-10 object-contain"
+                        :src="`/img/icons/64/${question.typeIcon}`"
+                        @error="useSmallFallbackIcon"
+                      />
+                      <span
+                        v-else
+                        class="sr-only"
+                      >{{ t(question.typeLabel) }}</span>
+                    </span>
+                  </td>
+                  <td class="px-3 py-3 text-center align-middle">
+                    {{ displayText(question.categoryLabel, "-") }}
+                  </td>
+                  <td class="px-3 py-3 text-center align-middle">
+                    {{ question.difficulty || 1 }}
+                  </td>
+                  <td class="px-3 py-3 text-center align-middle">
+                    {{ formatScore(question.score) }}
+                  </td>
+                  <td class="px-3 py-3 align-middle">
+                    <div class="flex justify-end gap-1" @click.stop>
+                      <BaseButton
+                        :label="expandedQuestionId === question.id ? t('Hide preview') : t('Preview')"
+                        :icon="expandedQuestionId === question.id ? 'fold' : 'eye-on'"
+                        only-icon
+                        size="small"
+                        type="primary-text"
+                        @click="togglePreview(question.id)"
+                      />
+                      <BaseButton
+                        v-if="isVueQuestionType(question.type)"
+                        :label="t('Edit')"
+                        :route="questionEditRoute(question)"
+                        icon="edit"
+                        only-icon
+                        size="small"
+                        type="secondary-text"
+                      />
+                      <BaseButton
+                        v-else
+                        :label="t('Edit')"
+                        :to-url="legacyQuestionEditUrl(question.id)"
+                        icon="edit"
+                        only-icon
+                        size="small"
+                        type="secondary-text"
+                      />
+                      <BaseButton
+                        :disabled="isActionSaving"
+                        :label="t('Copy')"
+                        icon="copy"
+                        only-icon
+                        size="small"
+                        type="warning"
+                        @click="duplicateQuestion(question)"
+                      />
+                      <BaseButton
+                        :disabled="isActionSaving"
+                        :label="t('Delete')"
+                        icon="delete"
+                        only-icon
+                        size="small"
+                        type="danger"
+                        @click="confirmDeleteQuestion(question)"
+                      />
+                    </div>
+                  </td>
+                </tr>
+                <tr
+                  v-if="expandedQuestionId === question.id"
+                  class="border-t border-gray-20 bg-white"
+                >
+                  <td colspan="7" class="px-6 py-4">
+                    <article class="space-y-4 rounded-lg border border-gray-20 bg-gray-5 p-4">
+                      <div class="flex flex-wrap items-start justify-between gap-3">
+                        <div>
+                          <h3 class="text-lg font-semibold text-gray-90">
+                            {{ t(question.typeLabel) }}
+                          </h3>
+                          <div
+                            class="prose prose-sm max-w-none text-gray-90"
+                            v-html="question.title"
+                          />
+                        </div>
+                        <div class="text-sm font-semibold text-gray-70">
+                          {{ t("Score") }}: {{ formatScore(question.score) }}
+                        </div>
+                      </div>
+
+                      <div
+                        v-if="hasHtmlContent(question.description)"
+                        class="prose prose-sm max-w-none rounded bg-white p-3 text-gray-80"
+                        v-html="question.description"
+                      />
+
+                      <div
+                        v-if="isAnnotationQuestionType(question.type) && question.annotation?.imageUrl"
+                        class="space-y-3"
+                      >
+                        <p
+                          v-if="question.annotation?.imageName"
+                          class="text-sm font-semibold text-gray-80"
+                        >
+                          {{ question.annotation.imageName }}
+                        </p>
+                        <img
+                          :alt="question.annotation?.imageName || t('Image')"
+                          class="max-h-80 max-w-full rounded-lg border border-gray-20 bg-white object-contain p-2"
+                          :src="question.annotation.imageUrl"
+                        />
+                      </div>
+
+                      <div
+                        v-else-if="isHotspotQuestionType(question.type) && question.hotspot"
+                        class="space-y-3"
+                      >
+                        <p
+                          v-if="question.hotspot?.imageName"
+                          class="text-sm font-semibold text-gray-80"
+                        >
+                          {{ question.hotspot.imageName }}
+                        </p>
+                        <img
+                          v-if="question.hotspot?.imageUrl"
+                          :alt="question.hotspot?.imageName || t('Image')"
+                          class="max-h-80 max-w-full rounded-lg border border-gray-20 bg-white object-contain p-2"
+                          :src="question.hotspot.imageUrl"
+                        />
+                        <div
+                          v-if="Array.isArray(question.hotspot.items) && question.hotspot.items.length"
+                          class="overflow-x-auto"
+                        >
+                          <table class="min-w-full border-collapse bg-white text-sm">
+                            <thead class="bg-gray-15 text-gray-90">
+                              <tr>
+                                <th class="w-16 border border-gray-20 px-2 py-2 text-left">{{ t("N°") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Answer") }}</th>
+                                <th class="w-32 border border-gray-20 px-2 py-2 text-left">{{ t("Shape") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Coordinates") }}</th>
+                                <th
+                                  v-if="!isHotspotCombinationQuestionType(question.type)"
+                                  class="w-24 border border-gray-20 px-2 py-2 text-right"
+                                >
+                                  {{ t("Score") }}
+                                </th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              <tr
+                                v-for="(item, itemIndex) in question.hotspot.items"
+                                :key="`${question.id}-hotspot-${item.position}`"
+                              >
+                                <td class="border border-gray-20 px-2 py-2 align-top">{{ itemIndex + 1 }}</td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">
+                                  <div
+                                    class="prose prose-sm max-w-none"
+                                    v-html="item.answer"
+                                  />
+                                </td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">{{ t(item.hotspotTypeLabel || item.hotspotType) }}</td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">{{ item.coordinates }}</td>
+                                <td
+                                  v-if="!isHotspotCombinationQuestionType(question.type)"
+                                  class="border border-gray-20 px-2 py-2 text-right align-top"
+                                >
+                                  {{ formatScore(item.score) }}
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                      </div>
+
+                      <div
+                        v-else-if="isFillBlanksQuestionType(question.type) && question.fillBlanks"
+                        class="space-y-3"
+                      >
+                        <div
+                          class="prose prose-sm max-w-none rounded bg-white p-3 text-gray-80"
+                          v-html="question.fillBlanks.text"
+                        />
+                        <div class="flex flex-wrap gap-2 text-xs font-semibold">
+                          <span class="rounded-full bg-gray-15 px-2 py-1 text-gray-80">
+                            {{ t("Blanks") }}: {{ question.fillBlanks.items?.length || 0 }}
+                          </span>
+                          <span
+                            v-if="question.fillBlanks.switchable"
+                            class="rounded-full bg-blue-50 px-2 py-1 text-blue-800"
+                          >
+                            {{ t("Switchable blanks") }}
+                          </span>
+                          <span
+                            v-if="question.fillBlanks.caseInsensitive"
+                            class="rounded-full bg-blue-50 px-2 py-1 text-blue-800"
+                          >
+                            {{ t("Case insensitive") }}
+                          </span>
+                        </div>
+                        <div
+                          v-if="Array.isArray(question.fillBlanks.items) && question.fillBlanks.items.length"
+                          class="overflow-x-auto"
+                        >
+                          <table class="min-w-full border-collapse bg-white text-sm">
+                            <thead class="bg-gray-15 text-gray-90">
+                              <tr>
+                                <th class="w-16 border border-gray-20 px-2 py-2 text-left">{{ t("N°") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Blank") }}</th>
+                                <th class="w-24 border border-gray-20 px-2 py-2 text-right">{{ t("Score") }}</th>
+                                <th class="w-32 border border-gray-20 px-2 py-2 text-right">{{ t("Input width") }}</th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              <tr
+                                v-for="(blank, blankIndex) in question.fillBlanks.items"
+                                :key="`${question.id}-blank-${blankIndex}`"
+                              >
+                                <td class="border border-gray-20 px-2 py-2 align-top">{{ blankIndex + 1 }}</td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">
+                                  <code class="rounded bg-gray-15 px-2 py-1 text-gray-90">{{ blank.answer }}</code>
+                                </td>
+                                <td class="border border-gray-20 px-2 py-2 text-right align-top">
+                                  {{ formatScore(blank.score) }}
+                                </td>
+                                <td class="border border-gray-20 px-2 py-2 text-right align-top">
+                                  {{ blank.inputSize || 200 }}
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <div
+                          v-if="hasHtmlContent(question.fillBlanks.comment)"
+                          class="prose prose-sm max-w-none rounded bg-white p-3 text-gray-80"
+                          v-html="question.fillBlanks.comment"
+                        />
+                      </div>
+
+                      <div
+                        v-else-if="isMatchingQuestionType(question.type) && question.matching"
+                        class="space-y-3"
+                      >
+                        <div
+                          v-if="Array.isArray(question.matching.options) && question.matching.options.length"
+                          class="flex flex-wrap gap-2 text-xs font-semibold"
+                        >
+                          <span
+                            v-for="option in question.matching.options"
+                            :key="`${question.id}-matching-option-${option.position}`"
+                            class="rounded-full bg-gray-15 px-2 py-1 text-gray-80"
+                          >
+                            {{ option.label }}: {{ displayText(option.answer, t("Option")) }}
+                          </span>
+                        </div>
+
+                        <div
+                          v-if="Array.isArray(question.matching.pairs) && question.matching.pairs.length"
+                          class="overflow-x-auto"
+                        >
+                          <table class="min-w-full border-collapse bg-white text-sm">
+                            <thead class="bg-gray-15 text-gray-90">
+                              <tr>
+                                <th class="w-16 border border-gray-20 px-2 py-2 text-left">{{ t("N°") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Question") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Matches to") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Feedback") }}</th>
+                                <th
+                                  v-if="!isMatchingCombinationQuestionType(question.type)"
+                                  class="w-24 border border-gray-20 px-2 py-2 text-right"
+                                >
+                                  {{ t("Score") }}
+                                </th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              <tr
+                                v-for="(pair, pairIndex) in question.matching.pairs"
+                                :key="`${question.id}-matching-pair-${pair.position}`"
+                              >
+                                <td class="border border-gray-20 px-2 py-2 align-top">{{ pairIndex + 1 }}</td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">
+                                  <div
+                                    class="prose prose-sm max-w-none"
+                                    v-html="pair.answer"
+                                  />
+                                </td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">
+                                  <span class="font-semibold text-gray-90">{{ pair.optionLabel }}</span>
+                                  <div
+                                    class="prose prose-sm max-w-none"
+                                    v-html="pair.optionAnswer"
+                                  />
+                                </td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">
+                                  <div
+                                    class="prose prose-sm max-w-none"
+                                    v-html="pair.comment"
+                                  />
+                                </td>
+                                <td
+                                  v-if="!isMatchingCombinationQuestionType(question.type)"
+                                  class="border border-gray-20 px-2 py-2 text-right align-top"
+                                >
+                                  {{ formatScore(pair.score) }}
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                      </div>
+
+                      <div
+                        v-else-if="isDraggableQuestionType(question.type) && question.draggable"
+                        class="space-y-3"
+                      >
+                        <div class="flex flex-wrap gap-2 text-xs font-semibold">
+                          <span class="rounded-full bg-gray-15 px-2 py-1 text-gray-80">
+                            {{ t("Orientation") }}: {{ question.draggable.orientation === 'v' ? t("Vertical") : t("Horizontal") }}
+                          </span>
+                        </div>
+
+                        <div
+                          v-if="Array.isArray(question.draggable.items) && question.draggable.items.length"
+                          class="overflow-x-auto"
+                        >
+                          <table class="min-w-full border-collapse bg-white text-sm">
+                            <thead class="bg-gray-15 text-gray-90">
+                              <tr>
+                                <th class="w-16 border border-gray-20 px-2 py-2 text-left">{{ t("N°") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Answer") }}</th>
+                                <th class="w-32 border border-gray-20 px-2 py-2 text-center">{{ t("Matches to") }}</th>
+                                <th class="w-24 border border-gray-20 px-2 py-2 text-right">{{ t("Score") }}</th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              <tr
+                                v-for="(item, itemIndex) in question.draggable.items"
+                                :key="`${question.id}-draggable-${item.position}`"
+                              >
+                                <td class="border border-gray-20 px-2 py-2 align-top">{{ itemIndex + 1 }}</td>
+                                <td class="border border-gray-20 px-2 py-2 align-top">
+                                  <div
+                                    class="prose prose-sm max-w-none"
+                                    v-html="item.answer"
+                                  />
+                                </td>
+                                <td class="border border-gray-20 px-2 py-2 text-center align-top">
+                                  {{ item.targetPosition }}
+                                </td>
+                                <td class="border border-gray-20 px-2 py-2 text-right align-top">
+                                  {{ formatScore(item.score) }}
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                      </div>
+
+                      <div
+                        v-else-if="Array.isArray(question.answers) && question.answers.length"
+                        class="overflow-x-auto"
+                      >
+                        <table class="min-w-full border-collapse bg-white text-sm">
+                          <thead class="bg-gray-15 text-gray-90">
+                            <tr>
+                              <th class="w-28 border border-gray-20 px-2 py-2 text-left">
+                                {{ isTrueFalseQuestionType(question.type) ? t("Expected choice") : t("True") }}
+                              </th>
+                              <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Options") }}</th>
+                              <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Feedback") }}</th>
+                              <th class="w-24 border border-gray-20 px-2 py-2 text-right">{{ t("Score") }}</th>
+                            </tr>
+                          </thead>
+                          <tbody>
+                            <tr
+                              v-for="answer in question.answers"
+                              :key="`${question.id}-${answer.position}`"
+                            >
+                              <td class="border border-gray-20 px-2 py-2 align-top">
+                                <span
+                                  v-if="isTrueFalseQuestionType(question.type)"
+                                  class="rounded-full bg-gray-15 px-2 py-1 text-xs font-semibold text-gray-80"
+                                >
+                                  {{ trueFalseChoiceLabel(answer) }}
+                                </span>
+                                <input
+                                  v-else
+                                  :checked="answer.correct"
+                                  disabled
+                                  :type="isSingleCorrectAnswerQuestion(question.type) ? 'radio' : 'checkbox'"
+                                />
+                              </td>
+                              <td class="border border-gray-20 px-2 py-2 align-top">
+                                <div
+                                  class="prose prose-sm max-w-none"
+                                  v-html="answer.answer"
+                                />
+                              </td>
+                              <td class="border border-gray-20 px-2 py-2 align-top">
+                                <div
+                                  class="prose prose-sm max-w-none"
+                                  v-html="answer.comment"
+                                />
+                              </td>
+                              <td class="border border-gray-20 px-2 py-2 text-right align-top">
+                                {{ formatScore(answer.score) }}
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </div>
+                    </article>
+                  </td>
+                </tr>
+              </template>
+            </tbody>
+          </table>
+        </div>
+      </section>
+    </template>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, ref } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseIcon from "../../components/basecomponents/BaseIcon.vue"
+import exerciseService from "../../services/exerciseService"
+import { useConfirmation } from "../../composables/useConfirmation"
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+const { requireConfirmation } = useConfirmation()
+
+const isLoading = ref(false)
+const isActionSaving = ref(false)
+const errorMessage = ref("")
+const title = ref("")
+const questionCount = ref(0)
+const totalScore = ref(0)
+const questionTypes = ref([])
+const questions = ref([])
+const legacyUrls = ref({})
+const csrfToken = ref("")
+const expandedQuestionId = ref(null)
+const draggedQuestionId = ref(null)
+
+const exerciseId = Number(getQueryValue(route.params.exerciseId) || 0)
+const summaryText = computed(() =>
+  formatTranslatedText("{0} questions, for a total score (all questions) of {1}.", [questionCount.value, formatScore(totalScore.value)]),
+)
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function buildQueryString(params = {}) {
+  const query = new URLSearchParams()
+
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== undefined && value !== null && String(value) !== "") {
+      query.set(key, String(value))
+    }
+  }
+
+  const queryString = query.toString()
+
+  return queryString ? `?${queryString}` : ""
+}
+
+function formatTranslatedText(key, replacements = []) {
+  return replacements.reduce(
+    (text, value, index) => String(text).split(`{${index}}`).join(String(value)),
+    t(key),
+  )
+}
+
+function legacyUrl(path, params = {}) {
+  return `/main/exercise/${path}${buildQueryString({ ...getContextParams(), ...params })}`
+}
+
+function buildLegacyCreateQuestionUrl(answerType) {
+  return legacyUrl("admin.php", {
+    exerciseId,
+    newQuestion: "yes",
+    isContent: 1,
+    answerType,
+  })
+}
+
+function getQuestionTypeId(questionTypeOrId) {
+  return Number(typeof questionTypeOrId === "object" ? questionTypeOrId?.type : questionTypeOrId)
+}
+
+function isVueQuestionType(questionTypeOrId) {
+  if (typeof questionTypeOrId === "object" && questionTypeOrId?.migratedToVue === true) {
+    return true
+  }
+
+  return [1, 2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31].includes(getQuestionTypeId(questionTypeOrId))
+}
+
+function questionTypeHelp(questionTypeOrId) {
+  const type = getQuestionTypeId(questionTypeOrId)
+
+  return {
+    1: "Choose one correct answer.",
+    2: "Select one or more correct answers.",
+    3: "Complete missing words inside a text.",
+    4: "Match each item with the correct option. Score per item.",
+    5: "Learners write a free text answer.",
+    6: "Select areas in an image.",
+    9: "Score only when the exact selection is correct.",
+    10: "Single choice with a fixed Don't know option.",
+    11: "Mark each statement as True, False or Don't know.",
+    12: "Full True/False combination must be correct.",
+    13: "Record or evaluate an oral answer.",
+    14: "Multiple answer with one global score.",
+    15: "Add content, media or reading context without score.",
+    16: "Calculated question with formulas and variables.",
+    17: "Single choice question using images.",
+    18: "Put items in the expected order.",
+    19: "Drag items to match them with options. Score per item.",
+    20: "Annotation question with an image upload.",
+    21: "Add a reading text with scrolling speed settings.",
+    22: "True/False answer with certainty percentage selected during the attempt.",
+    23: "Learners upload a file as their answer. The teacher assigns the score during correction.",
+    24: "Matching with one global combination score.",
+    25: "Full draggable matching combination with one global score.",
+    26: "Hotspot with one global combination score.",
+    27: "Fill blanks with one global combination score.",
+    28: "Dropdown options with one global combination score.",
+    29: "Dropdown options where selected answers can have their own score.",
+    31: "Insert a page break inside the test without score.",
+  }[type] || "Question type"
+}
+
+function questionTypeHref(questionType) {
+  if (!questionType.enabled) {
+    return undefined
+  }
+
+  if (isVueQuestionType(questionType)) {
+    return router.resolve(questionCreateRoute(questionType)).href
+  }
+
+  return buildLegacyCreateQuestionUrl(questionType.type)
+}
+
+function questionTypeTitle(questionType) {
+  const label = t(questionType.label)
+
+  return `${label} - ${t(questionTypeHelp(questionType))}`
+}
+
+function questionTypeCardClass(questionType) {
+  return [
+    "group inline-flex h-20 w-20 items-center justify-center rounded-lg border bg-white p-1 text-center shadow-none transition duration-150 focus:outline-none focus:ring-2 focus:ring-info/20",
+    questionType.enabled
+      ? "border-gray-25 hover:border-info/50 hover:bg-support-2 hover:shadow-sm"
+      : "pointer-events-none border-gray-20 bg-gray-10 opacity-60",
+  ]
+}
+
+function questionTypeIconClass(questionType) {
+  return [
+    "relative flex h-16 w-16 items-center justify-center rounded-md transition duration-150 group-hover:scale-105",
+  ]
+}
+
+function isSingleCorrectAnswerQuestion(type) {
+  return [1, 10].includes(Number(type))
+}
+
+function isTrueFalseQuestionType(type) {
+  return [11, 12, 22].includes(Number(type))
+}
+
+function isFillBlanksQuestionType(type) {
+  return [3, 27].includes(Number(type))
+}
+
+function isAnnotationQuestionType(type) {
+  return 20 === Number(type)
+}
+
+function isHotspotQuestionType(type) {
+  return [6, 26].includes(Number(type))
+}
+
+function isHotspotCombinationQuestionType(type) {
+  return 26 === Number(type)
+}
+
+function isMatchingQuestionType(type) {
+  return [4, 19, 24, 25].includes(Number(type))
+}
+
+function isMatchingCombinationQuestionType(type) {
+  return [24, 25].includes(Number(type))
+}
+
+function isDraggableQuestionType(type) {
+  return 18 === Number(type)
+}
+
+function trueFalseChoiceLabel(answer) {
+  const choice = Number(answer.correctChoice || 0)
+
+  if (1 === choice) {
+    return t("True")
+  }
+
+  if (2 === choice) {
+    return t("False")
+  }
+
+  return t("Don't know")
+}
+
+function questionCreateRoute(questionType) {
+  return {
+    name: "ExerciseQuestionCreate",
+    params: { ...route.params, exerciseId, questionType: Number(questionType.type) },
+    query: getContextParams(),
+  }
+}
+
+function questionEditRoute(question) {
+  return {
+    name: "ExerciseQuestionEdit",
+    params: { ...route.params, exerciseId, questionId: Number(question.id) },
+    query: getContextParams(),
+  }
+}
+
+async function openQuestionType(questionType, event) {
+  if (!questionType.enabled) {
+    event.preventDefault()
+    return
+  }
+
+  if (!isVueQuestionType(questionType)) {
+    return
+  }
+
+  event.preventDefault()
+  await router.push(questionCreateRoute(questionType))
+}
+
+function legacyQuestionEditUrl(questionId) {
+  return legacyUrl("admin.php", {
+    exerciseId,
+    editQuestion: questionId,
+  })
+}
+
+function questionIconUrl(questionType) {
+  return `/img/icons/64/${questionType.icon || "new_question.png"}`
+}
+
+function useFallbackIcon(event) {
+  event.target.src = "/img/icons/64/new_question.png"
+}
+
+function useSmallFallbackIcon(event) {
+  event.target.src = "/img/icons/64/new_question.png"
+}
+
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+function hasHtmlContent(value) {
+  return displayText(value).length > 0
+}
+
+function formatScore(score) {
+  const value = Number(score || 0)
+
+  return Number.isInteger(value) ? String(value) : value.toFixed(2)
+}
+
+function togglePreview(questionId) {
+  expandedQuestionId.value = expandedQuestionId.value === questionId ? null : questionId
+}
+
+function startDrag(question) {
+  draggedQuestionId.value = Number(question.id)
+}
+
+async function dropQuestion(targetQuestion) {
+  const draggedId = Number(draggedQuestionId.value || 0)
+  const targetId = Number(targetQuestion.id || 0)
+  draggedQuestionId.value = null
+
+  if (!draggedId || !targetId || draggedId === targetId) {
+    return
+  }
+
+  const fromIndex = questions.value.findIndex((question) => Number(question.id) === draggedId)
+  const toIndex = questions.value.findIndex((question) => Number(question.id) === targetId)
+
+  if (fromIndex < 0 || toIndex < 0) {
+    return
+  }
+
+  const nextQuestions = [...questions.value]
+  const [movedQuestion] = nextQuestions.splice(fromIndex, 1)
+  nextQuestions.splice(toIndex, 0, movedQuestion)
+  questions.value = nextQuestions.map((question, index) => ({ ...question, position: index + 1 }))
+
+  await runQuestionAction({
+    action: "reorder",
+    questionIds: questions.value.map((question) => Number(question.id)),
+  })
+}
+
+function confirmDeleteQuestion(question) {
+  requireConfirmation({
+    title: t("Delete question"),
+    message: t("Are you sure you want to delete this question?"),
+    accept: () => deleteQuestion(question),
+  })
+}
+
+async function deleteQuestion(question) {
+  await runQuestionAction({
+    action: "delete",
+    questionId: Number(question.id),
+  })
+}
+
+async function duplicateQuestion(question) {
+  await runQuestionAction({
+    action: "duplicate",
+    questionId: Number(question.id),
+  })
+}
+
+async function runQuestionAction(payload) {
+  if (isActionSaving.value) {
+    return
+  }
+
+  isActionSaving.value = true
+  errorMessage.value = ""
+
+  try {
+    await exerciseService.saveExerciseQuestionAction(
+      {
+        exerciseId,
+        submittedCsrfToken: csrfToken.value,
+        ...payload,
+      },
+      getContextParams(),
+      exerciseId,
+    )
+    await loadQuestionSelector()
+  } catch (error) {
+    console.error("Error processing exercise question action", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not update exercise questions")
+    await loadQuestionSelector()
+  } finally {
+    isActionSaving.value = false
+  }
+}
+
+async function loadQuestionSelector() {
+  if (!exerciseId) {
+    errorMessage.value = t("A valid exercise id is required.")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseQuestions(getContextParams(), exerciseId)
+    title.value = response.title || ""
+    questionCount.value = Number(response.questionCount || 0)
+    totalScore.value = Number(response.totalScore || 0)
+    questionTypes.value = Array.isArray(response.questionTypes) ? response.questionTypes : []
+    questions.value = Array.isArray(response.questions) ? response.questions : []
+    legacyUrls.value = response.legacyUrls || {}
+    csrfToken.value = response.csrfToken || ""
+  } catch (error) {
+    console.error("Error loading exercise questions", error)
+    errorMessage.value = t("Could not load exercise questions")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+onMounted(loadQuestionSelector)
+</script>
diff --git a/assets/vue/views/exercise/ExerciseReportView.vue b/assets/vue/views/exercise/ExerciseReportView.vue
new file mode 100644
index 00000000000..28686b5d12a
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseReportView.vue
@@ -0,0 +1,608 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <BaseButton
+        :label="t('Back to exercises')"
+        :route="{ name: 'ExerciseList', params: getBaseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('back')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        :label="t('Edit questions')"
+        :route="{ name: 'ExerciseQuestions', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('edit')"
+        only-icon
+        size="small"
+        type="secondary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.liveStats"
+        :label="t('Live results')"
+        :to-url="legacyUrls.liveStats"
+        :icon="safeIcon('table', 'information')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.questionReport"
+        :label="t('Report by question')"
+        :to-url="legacyUrls.questionReport"
+        :icon="safeIcon('table', 'information')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.export"
+        :label="t('Export')"
+        :to-url="legacyUrls.export"
+        :icon="safeIcon('file-excel', 'information')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.recalculateAll"
+        :label="t('Recalculate results')"
+        :to-url="legacyUrls.recalculateAll"
+        :icon="safeIcon('refresh', 'information')"
+        only-icon
+        size="small"
+        type="secondary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.exportAllPdf"
+        :label="t('Export all attempts')"
+        :to-url="legacyUrls.exportAllPdf"
+        :icon="safeIcon('file-excel', 'information')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.sendAllEmails"
+        :label="t('Send all results/corrections by email')"
+        :to-url="legacyUrls.sendAllEmails"
+        :icon="safeIcon('information')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.questionStats"
+        :label="t('Question stats')"
+        :to-url="legacyUrls.questionStats"
+        :icon="safeIcon('table', 'information')"
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.legacyReport"
+        :label="t('Open legacy report')"
+        :to-url="legacyUrls.legacyReport"
+        :icon="safeIcon('table', 'information')"
+        only-icon
+        size="small"
+        type="secondary-text"
+      />
+      <BaseButton
+        :label="isSearchVisible ? t('Hide search') : t('Search')"
+        :icon="isSearchVisible ? safeIcon('close', 'information') : safeIcon('search')"
+        only-icon
+        size="small"
+        type="primary-text"
+        @click="toggleSearch"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <header class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm">
+      <div class="border-l-4 border-l-primary p-5">
+        <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
+          <div class="space-y-2">
+            <h1 class="text-2xl font-semibold text-gray-90">
+              {{ displayText(title, t('Learner score')) }}
+            </h1>
+            <div
+              v-if="description"
+              class="exercise-report-html text-sm text-gray-700"
+              v-html="description"
+            />
+          </div>
+          <div class="flex flex-wrap gap-2">
+            <span class="rounded-full bg-info/10 px-3 py-1 text-sm font-semibold text-info">
+              {{ t('Attempts') }}: {{ attempts.length }}
+            </span>
+            <span
+              v-if="pendingCorrectionCount > 0"
+              class="rounded-full bg-warning/10 px-3 py-1 text-sm font-semibold text-warning"
+            >
+              {{ t('Pending corrections') }}: {{ pendingCorrectionCount }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </header>
+
+    <form
+      v-if="isSearchVisible"
+      class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      @submit.prevent="applyFilters"
+    >
+      <div class="grid gap-3 md:grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_auto] md:items-end">
+        <BaseInputText
+          id="exercise-report-first-name"
+          v-model="filterForm.firstName"
+          :label="t('First name')"
+          name="firstName"
+        />
+        <BaseInputText
+          id="exercise-report-last-name"
+          v-model="filterForm.lastName"
+          :label="t('Last name')"
+          name="lastName"
+        />
+        <BaseSelect
+          id="exercise-report-status"
+          v-model="filterForm.status"
+          :label="t('Status')"
+          name="status"
+          :options="statusOptions"
+          option-label="label"
+          option-value="value"
+        />
+        <div class="flex min-h-[42px] flex-wrap items-end gap-2 md:self-end">
+          <BaseButton
+            :is-loading="isLoading"
+            :label="t('Search')"
+            :icon="safeIcon('search')"
+            :is-submit="true"
+            type="primary"
+          />
+          <BaseButton
+            v-if="hasFilters"
+            :label="t('Clear search')"
+            :icon="safeIcon('close', 'information')"
+            type="secondary"
+            @click="clearFilters"
+          />
+        </div>
+      </div>
+    </form>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="successMessage"
+      class="rounded-xl border border-success/30 bg-success/10 p-4 text-sm text-success"
+    >
+      {{ successMessage }}
+    </div>
+
+    <BaseTable
+      :is-loading="isLoading"
+      :text-for-empty="t('No attempts found')"
+      :total-items="attempts.length"
+      :values="attempts"
+      data-key="id"
+    >
+      <Column :header="t('First name')" field="firstName" sortable>
+        <template #body="{ data }">
+          <div class="font-semibold text-gray-90">{{ displayText(data.firstName, '-') }}</div>
+          <div class="text-xs text-gray-500">{{ data.username }}</div>
+        </template>
+      </Column>
+      <Column :header="t('Last name')" field="lastName" sortable>
+        <template #body="{ data }">
+          {{ displayText(data.lastName, '-') }}
+        </template>
+      </Column>
+      <Column :header="t('Group')" field="groupName">
+        <template #body="{ data }">
+          {{ displayText(data.groupName, '-') }}
+        </template>
+      </Column>
+      <Column :header="t('Duration')" field="duration" sortable>
+        <template #body="{ data }">
+          {{ formatSeconds(data.duration) }}
+        </template>
+      </Column>
+      <Column :header="t('Start Date')" field="startedAt" sortable>
+        <template #body="{ data }">
+          {{ formatDate(data.startedAt) }}
+        </template>
+      </Column>
+      <Column :header="t('End Date')" field="completedAt" sortable>
+        <template #body="{ data }">
+          {{ formatDate(data.completedAt) }}
+        </template>
+      </Column>
+      <Column :header="t('Score')" field="score" sortable>
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-90">
+            {{ formatNumber(data.percentage) }} % ({{ formatNumber(data.score) }} / {{ formatNumber(data.maxScore) }})
+          </span>
+        </template>
+      </Column>
+      <Column :header="t('IP')" field="ip">
+        <template #body="{ data }">
+          {{ displayText(data.ip, '-') }}
+        </template>
+      </Column>
+      <Column :header="t('Status')" field="status" sortable>
+        <template #body="{ data }">
+          <span
+            class="rounded-full px-3 py-1 text-xs font-semibold"
+            :class="statusClass(data.status)"
+          >
+            {{ t(data.statusLabel || 'Completed') }}
+          </span>
+        </template>
+      </Column>
+      <Column :header="t('Learning path')" field="learningPath">
+        <template #body="{ data }">
+          {{ displayText(data.learningPath, '-') }}
+        </template>
+      </Column>
+      <Column :header="t('Detail')">
+        <template #body="{ data }">
+          <div class="flex flex-wrap justify-end gap-1">
+            <BaseButton
+              v-if="data.canReview"
+              :label="data.pendingCorrection ? t('Review / Correct') : t('Review attempt')"
+              :route="{ name: 'ExerciseResult', params: { ...getExerciseRouteParams(), attemptId: data.attemptId }, query: getContextParams() }"
+              :icon="data.pendingCorrection ? safeIcon('edit') : safeIcon('information')"
+              only-icon
+              size="small"
+              :type="data.pendingCorrection ? 'secondary-text' : 'primary-text'"
+            />
+            <BaseButton
+              v-if="data.legacyUrls?.result"
+              :label="t('Open legacy result')"
+              :to-url="data.legacyUrls.result"
+              :icon="safeIcon('information')"
+              only-icon
+              size="small"
+              type="primary-text"
+            />
+            <BaseButton
+              v-if="data.legacyUrls?.recalculate"
+              :label="t('Recalculate results')"
+              :to-url="data.legacyUrls.recalculate"
+              :icon="safeIcon('refresh', 'information')"
+              only-icon
+              size="small"
+              type="secondary-text"
+            />
+            <BaseButton
+              v-if="data.legacyUrls?.pdf"
+              :label="t('Export to PDF')"
+              :to-url="data.legacyUrls.pdf"
+              :icon="safeIcon('file-excel', 'information')"
+              only-icon
+              size="small"
+              type="primary-text"
+            />
+            <BaseButton
+              v-if="data.legacyUrls?.sendEmail"
+              :label="t('Send by e-mail')"
+              :to-url="data.legacyUrls.sendEmail"
+              :icon="safeIcon('information')"
+              only-icon
+              size="small"
+              type="primary-text"
+            />
+            <BaseButton
+              v-if="data.canDelete"
+              :label="t('Delete attempt')"
+              :icon="safeIcon('delete', 'information')"
+              only-icon
+              size="small"
+              type="danger-text"
+              @click="confirmDeleteAttempt(data)"
+            />
+          </div>
+        </template>
+      </Column>
+    </BaseTable>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
+import { useConfirmation } from "../../composables/useConfirmation"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+const { requireConfirmation } = useConfirmation()
+
+const isLoading = ref(false)
+const errorMessage = ref("")
+const successMessage = ref("")
+const title = ref("")
+const description = ref("")
+const attempts = ref([])
+const legacyUrls = ref({})
+const filterForm = reactive({
+  firstName: getQueryValue(route.query.firstName) || "",
+  lastName: getQueryValue(route.query.lastName) || "",
+  status: getQueryValue(route.query.status) || "",
+})
+const isSearchVisible = ref(Boolean(filterForm.firstName || filterForm.lastName || filterForm.status))
+
+const statusOptions = computed(() => [
+  { label: t("All"), value: "" },
+  { label: t("Completed"), value: "completed" },
+  { label: t("Pending correction"), value: "pending_correction" },
+  { label: t("Ongoing"), value: "incomplete" },
+])
+const pendingCorrectionCount = computed(() => attempts.value.filter((attempt) => attempt.pendingCorrection).length)
+const hasFilters = computed(() => Boolean(getQueryValue(route.query.firstName) || getQueryValue(route.query.lastName) || getQueryValue(route.query.status)))
+const availableIcons = Object.keys(chamiloIconToClass)
+
+function safeIcon(icon, fallback = "information") {
+  if (icon && availableIcons.includes(icon)) {
+    return icon
+  }
+
+  if (fallback && availableIcons.includes(fallback)) {
+    return fallback
+  }
+
+  return availableIcons[0] || "information"
+}
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function getBaseRouteParams() {
+  return {
+    node: route.params.node,
+  }
+}
+
+function getExerciseRouteParams() {
+  return {
+    ...getBaseRouteParams(),
+    exerciseId: route.params.exerciseId,
+  }
+}
+
+function getExerciseId() {
+  return Number(route.params.exerciseId || 0)
+}
+
+function getReportParams() {
+  return {
+    ...getContextParams(),
+    firstName: getQueryValue(route.query.firstName),
+    lastName: getQueryValue(route.query.lastName),
+    status: getQueryValue(route.query.status),
+  }
+}
+
+async function loadReport() {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    errorMessage.value = t("Invalid exercise")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseRuntimeReport(getReportParams(), exerciseId)
+    title.value = response.title || ""
+    description.value = response.description || ""
+    attempts.value = Array.isArray(response.attempts) ? response.attempts : []
+    legacyUrls.value = response.legacyUrls || {}
+  } catch (error) {
+    console.error("Error loading exercise report", error)
+    errorMessage.value = t("Could not load exercise report")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function toggleSearch() {
+  isSearchVisible.value = !isSearchVisible.value
+}
+
+function applyFilters() {
+  const query = { ...route.query }
+
+  if (filterForm.firstName.trim()) {
+    query.firstName = filterForm.firstName.trim()
+  } else {
+    delete query.firstName
+  }
+
+  if (filterForm.lastName.trim()) {
+    query.lastName = filterForm.lastName.trim()
+  } else {
+    delete query.lastName
+  }
+
+  if (filterForm.status) {
+    query.status = filterForm.status
+  } else {
+    delete query.status
+  }
+
+  router.push({ name: route.name, params: route.params, query })
+}
+
+function clearFilters() {
+  filterForm.firstName = ""
+  filterForm.lastName = ""
+  filterForm.status = ""
+  const query = { ...route.query }
+  delete query.firstName
+  delete query.lastName
+  delete query.status
+  router.push({ name: route.name, params: route.params, query })
+}
+
+function confirmDeleteAttempt(attempt) {
+  requireConfirmation({
+    message: t("Delete attempt?"),
+    accept: () => deleteAttempt(attempt),
+  })
+}
+
+async function deleteAttempt(attempt) {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(attempt.attemptId || 0)
+  if (!exerciseId || !attemptId) {
+    return
+  }
+
+  errorMessage.value = ""
+  successMessage.value = ""
+  try {
+    const response = await exerciseService.deleteExerciseRuntimeAttempt({}, getContextParams(), exerciseId, attemptId)
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not delete attempt")
+    }
+
+    successMessage.value = t("Attempt deleted")
+    await loadReport()
+  } catch (error) {
+    console.error("Error deleting exercise attempt", error)
+    errorMessage.value = t("Could not delete attempt")
+  }
+}
+
+function statusClass(status) {
+  if (status === "pending_correction") {
+    return "bg-warning/10 text-warning"
+  }
+
+  if (status === "incomplete") {
+    return "bg-danger/10 text-danger"
+  }
+
+  return "bg-success/10 text-success"
+}
+
+function formatNumber(value) {
+  if (value === null || value === undefined || value === "") {
+    return "—"
+  }
+
+  const number = Number(value)
+  if (Number.isNaN(number)) {
+    return "—"
+  }
+
+  return number.toFixed(2).replace(/\.00$/, "")
+}
+
+function formatSeconds(seconds) {
+  const safeSeconds = Math.max(0, Number(seconds || 0))
+  const hours = Math.floor(safeSeconds / 3600)
+  const minutes = Math.floor((safeSeconds % 3600) / 60)
+  const remainingSeconds = safeSeconds % 60
+
+  if (hours > 0) {
+    return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`
+  }
+
+  return `${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`
+}
+
+function formatDate(value) {
+  if (!value) {
+    return ""
+  }
+
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) {
+    return ""
+  }
+
+  return date.toLocaleString()
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadReport)
+
+watch(
+  () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid, route.query.firstName, route.query.lastName, route.query.status],
+  () => {
+    filterForm.firstName = getQueryValue(route.query.firstName) || ""
+    filterForm.lastName = getQueryValue(route.query.lastName) || ""
+    filterForm.status = getQueryValue(route.query.status) || ""
+    if (filterForm.firstName || filterForm.lastName || filterForm.status) {
+      isSearchVisible.value = true
+    }
+    loadReport()
+  },
+)
+</script>
+
+<style scoped>
+.exercise-report-html :deep(img) {
+  max-width: 100%;
+  height: auto;
+}
+
+.exercise-report-html :deep(p) {
+  margin-bottom: 0.25rem;
+}
+
+.exercise-report-html :deep(p:last-child) {
+  margin-bottom: 0;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
new file mode 100644
index 00000000000..c2653638fcf
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -0,0 +1,1008 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <BaseButton
+        :label="t('Back to exercises')"
+        :route="{ name: 'ExerciseList', params: getBaseRouteParams(), query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        :label="t('Open exercise player')"
+        :route="{ name: 'ExercisePlayer', params: getPlayerRouteParams(), query: getContextParams() }"
+        icon="play-box-outline"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="legacyUrls.legacyResult"
+        :label="t('Open legacy result')"
+        :to-url="legacyUrls.legacyResult"
+        icon="tracking"
+        only-icon
+        size="small"
+        type="secondary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-4 text-sm text-gray-700 shadow-sm"
+    >
+      {{ t("Loading") }}
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="correctionError"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ correctionError }}
+    </div>
+
+    <div
+      v-if="correctionMessage"
+      class="rounded-xl border border-success/30 bg-success/10 p-4 text-sm text-success"
+    >
+      {{ correctionMessage }}
+    </div>
+
+    <template v-if="!isLoading && !errorMessage">
+      <header class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm">
+        <div class="border-l-4 border-l-primary p-5">
+          <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
+            <div class="space-y-2">
+              <h1 class="text-2xl font-semibold text-gray-90">
+                {{ displayText(title, t("Exercise result")) }}
+              </h1>
+              <div
+                v-if="description"
+                class="exercise-result-html text-sm text-gray-700"
+                v-html="description"
+              />
+            </div>
+
+            <div
+              v-if="visibility.showTotalScore && attempt.passed !== null && attempt.passed !== undefined"
+              class="inline-flex w-fit items-center gap-2 rounded-full px-3 py-1 text-sm font-semibold"
+              :class="attempt.passed ? 'bg-success/10 text-success' : 'bg-danger/10 text-danger'"
+            >
+              <span
+                class="mdi"
+                :class="attempt.passed ? 'mdi-check-circle' : 'mdi-alert-circle'"
+              />
+              {{ attempt.passed ? t("Passed") : t("Failed") }}
+            </div>
+          </div>
+
+          <div
+            v-if="attempt.textWhenFinished"
+            class="exercise-result-html mt-4 rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+            v-html="attempt.textWhenFinished"
+          />
+
+          <div class="mt-4 grid gap-3 md:grid-cols-2 xl:grid-cols-4">
+            <div class="rounded-lg border border-gray-20 bg-gray-10 p-4">
+              <div class="flex items-center justify-between gap-3">
+                <div>
+                  <div class="text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Attempt") }}
+                  </div>
+                  <div class="mt-1 text-xl font-semibold text-gray-90">#{{ attempt.attemptId }}</div>
+                  <div class="text-xs text-gray-600">{{ t(attempt.status || "completed") }}</div>
+                </div>
+                <span class="mdi mdi-clipboard-check-outline text-2xl text-primary" />
+              </div>
+            </div>
+
+            <div class="rounded-lg border border-gray-20 bg-gray-10 p-4">
+              <div class="flex items-center justify-between gap-3">
+                <div>
+                  <div class="text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Score") }}
+                  </div>
+                  <div
+                    v-if="visibility.showTotalScore"
+                    class="mt-1 text-xl font-semibold text-gray-90"
+                  >
+                    {{ formatNumber(attempt.score) }} / {{ formatNumber(attempt.maxScore) }}
+                  </div>
+                  <div
+                    v-else
+                    class="mt-1 text-sm text-gray-600"
+                  >
+                    {{ t("The score is hidden for this exercise.") }}
+                  </div>
+                </div>
+                <span class="mdi mdi-counter text-2xl text-primary" />
+              </div>
+            </div>
+
+            <div class="rounded-lg border border-gray-20 bg-gray-10 p-4">
+              <div class="flex items-center justify-between gap-3">
+                <div>
+                  <div class="text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Percentage") }}
+                  </div>
+                  <div
+                    v-if="visibility.showTotalScore"
+                    class="mt-1 text-xl font-semibold text-gray-90"
+                  >
+                    {{ formatNumber(attempt.percentage) }}%
+                  </div>
+                  <div
+                    v-else
+                    class="mt-1 text-sm text-gray-600"
+                  >
+                    —
+                  </div>
+                </div>
+                <span class="mdi mdi-percent-outline text-2xl text-primary" />
+              </div>
+            </div>
+
+            <div class="rounded-lg border border-gray-20 bg-gray-10 p-4">
+              <div class="flex items-center justify-between gap-3">
+                <div>
+                  <div class="text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Duration") }}
+                  </div>
+                  <div class="mt-1 text-xl font-semibold text-gray-90">
+                    {{ formatSeconds(attempt.duration) }}
+                  </div>
+                  <div
+                    v-if="attempt.completedAt"
+                    class="text-xs text-gray-600"
+                  >
+                    {{ formatDate(attempt.completedAt) }}
+                  </div>
+                </div>
+                <span class="mdi mdi-clock-outline text-2xl text-primary" />
+              </div>
+            </div>
+          </div>
+
+          <div
+            v-if="!visibility.showCorrections"
+            class="mt-4 rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning"
+          >
+            {{ t("Corrections are hidden according to the exercise result settings.") }}
+          </div>
+        </div>
+      </header>
+
+      <div class="space-y-4">
+        <article
+          v-for="question in questions"
+          :key="question.id"
+          class="overflow-hidden rounded-xl border bg-white shadow-sm"
+          :class="questionCardClass(question)"
+        >
+          <div class="border-b border-gray-20 bg-gray-10 p-4">
+            <div class="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
+              <div class="flex gap-3">
+                <span
+                  class="mdi mt-1 text-xl"
+                  :class="questionStatusIconClass(question)"
+                />
+                <div class="space-y-1">
+                  <div class="flex flex-wrap items-center gap-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    <span>{{ questionLabel(question.position) }}</span>
+                    <span>·</span>
+                    <span>{{ t(question.typeLabel) }}</span>
+                  </div>
+                  <h2
+                    class="exercise-result-html text-lg font-semibold text-gray-90"
+                    v-html="question.title"
+                  />
+                  <div
+                    v-if="question.description"
+                    class="exercise-result-html text-sm text-gray-700"
+                    v-html="question.description"
+                  />
+                </div>
+              </div>
+
+              <div class="flex flex-wrap items-center gap-2 md:justify-end">
+                <span
+                  v-if="visibility.showQuestionScore"
+                  class="rounded-full border px-3 py-1 text-xs font-semibold"
+                  :class="questionScoreClass(question)"
+                >
+                  {{ t("Score") }}: {{ formatNumber(question.score) }} / {{ formatNumber(question.maxScore) }}
+                </span>
+                <span
+                  v-if="visibility.showQuestionScore && questionResultBadgeLabel(question)"
+                  class="rounded-full px-3 py-1 text-xs font-semibold"
+                  :class="questionResultBadgeClass(question)"
+                >
+                  {{ questionResultBadgeLabel(question) }}
+                </span>
+                <span
+                  v-if="question.pendingCorrection"
+                  class="rounded-full bg-warning/10 px-3 py-1 text-xs font-semibold text-warning"
+                >
+                  {{ t("Pending correction") }}
+                </span>
+              </div>
+            </div>
+          </div>
+
+          <div class="space-y-3 p-4">
+            <template v-if="question.answer.kind === 'choice' || question.answer.kind === 'dropdown'">
+              <div
+                v-for="choice in question.answer.choices || question.answer.options"
+                :key="choice.id"
+                class="rounded-lg border p-3 text-sm"
+                :class="choiceClass(choice)"
+              >
+                <div class="flex flex-col gap-2 md:flex-row md:items-start md:justify-between">
+                  <div class="flex flex-1 gap-2">
+                    <span
+                      class="mdi mt-0.5 text-base"
+                      :class="choiceIconClass(choice)"
+                    />
+                    <div class="exercise-result-html flex-1" v-html="choice.answer" />
+                  </div>
+                  <div class="flex flex-wrap gap-2 text-xs font-semibold">
+                    <span
+                      v-if="choice.selected"
+                      class="rounded-full bg-info/10 px-2 py-1 text-info"
+                    >
+                      {{ t("Your answer") }}
+                    </span>
+                    <span
+                      v-if="choice.correct"
+                      class="rounded-full bg-success/10 px-2 py-1 text-success"
+                    >
+                      {{ t("Correct answer") }}
+                    </span>
+                  </div>
+                </div>
+                <div
+                  v-if="choice.comment"
+                  class="exercise-result-html mt-2 rounded bg-white/70 p-2 text-xs text-gray-700"
+                  v-html="choice.comment"
+                />
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'true_false'">
+              <div
+                v-for="choice in question.answer.choices"
+                :key="choice.id"
+                class="rounded-lg border p-3 text-sm"
+                :class="trueFalseClass(choice)"
+              >
+                <div class="flex flex-col gap-2 md:flex-row md:items-start md:justify-between">
+                  <div class="exercise-result-html font-medium text-gray-90" v-html="choice.answer" />
+                  <span
+                    class="mdi text-base"
+                    :class="trueFalseIconClass(choice)"
+                  />
+                </div>
+                <div class="mt-2 flex flex-wrap gap-2 text-xs font-semibold">
+                  <span class="rounded-full bg-info/10 px-2 py-1 text-info">
+                    {{ t("Your answer") }}: {{ choice.selectedOptionLabel || t("No answer") }}
+                  </span>
+                  <span
+                    v-if="choice.correctOptionLabel"
+                    class="rounded-full bg-success/10 px-2 py-1 text-success"
+                  >
+                    {{ t("Correct answer") }}: {{ choice.correctOptionLabel }}
+                  </span>
+                </div>
+                <div
+                  v-if="choice.comment"
+                  class="exercise-result-html mt-2 rounded bg-white/70 p-2 text-xs text-gray-700"
+                  v-html="choice.comment"
+                />
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'fill_blanks'">
+              <div class="space-y-2 rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm">
+                <div
+                  v-for="blank in question.answer.blanks"
+                  :key="blank.position"
+                  class="flex flex-col gap-2 rounded border bg-white p-3 md:flex-row md:items-center md:justify-between"
+                  :class="blankClass(blank)"
+                >
+                  <div class="flex items-center gap-2">
+                    <span
+                      class="mdi text-base"
+                      :class="blankIconClass(blank)"
+                    />
+                    <div>
+                      <span class="font-semibold">{{ t("Blank {0}", [blank.position]) }}:</span>
+                      {{ blank.studentAnswer || t("No answer") }}
+                    </div>
+                  </div>
+                  <div
+                    v-if="blank.correctAnswer"
+                    class="text-sm font-semibold text-success"
+                  >
+                    {{ t("Correct answer") }}: {{ blank.correctAnswer }}
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'matching'">
+              <div
+                v-for="prompt in question.answer.prompts"
+                :key="prompt.id"
+                class="rounded-lg border p-3 text-sm"
+                :class="matchingClass(prompt)"
+              >
+                <div class="flex flex-col gap-2 md:flex-row md:items-start md:justify-between">
+                  <div class="exercise-result-html font-medium text-gray-90" v-html="prompt.answer" />
+                  <span
+                    class="mdi text-base"
+                    :class="matchingIconClass(prompt)"
+                  />
+                </div>
+                <div class="mt-2 grid gap-2 text-sm md:grid-cols-2">
+                  <div class="rounded bg-info/10 p-2 text-info">
+                    <span class="font-semibold">{{ t("Your answer") }}:</span>
+                    {{ displayText(prompt.selectedOptionAnswer, t("No answer")) }}
+                  </div>
+                  <div
+                    v-if="prompt.correctOptionAnswer"
+                    class="rounded bg-success/10 p-2 text-success"
+                  >
+                    <span class="font-semibold">{{ t("Correct answer") }}:</span>
+                    {{ displayText(prompt.correctOptionAnswer) }}
+                  </div>
+                </div>
+                <div
+                  v-if="prompt.comment"
+                  class="exercise-result-html mt-2 rounded bg-white/70 p-2 text-xs text-gray-700"
+                  v-html="prompt.comment"
+                />
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'upload_answer'">
+              <div class="space-y-3">
+                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                  <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Learner file") }}
+                  </div>
+                  <div
+                    v-if="question.answer.files?.length"
+                    class="space-y-2"
+                  >
+                    <a
+                      v-for="file in question.answer.files"
+                      :key="file.id || file.name"
+                      class="inline-flex items-center gap-2 rounded border border-primary/30 bg-white px-3 py-2 text-sm font-semibold text-primary hover:bg-support-1"
+                      :href="file.url"
+                      rel="noopener noreferrer"
+                      target="_blank"
+                    >
+                      <BaseIcon icon="download" size="small" />
+                      {{ file.name || t("Download file") }}
+                    </a>
+                  </div>
+                  <div
+                    v-else
+                    class="text-sm text-gray-600"
+                  >
+                    {{ t("No uploaded file") }}
+                  </div>
+                </div>
+
+                <div
+                  v-if="question.pendingCorrection"
+                  class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning"
+                >
+                  {{ t("This answer is pending teacher correction.") }}
+                </div>
+
+                <div
+                  v-if="question.answer.teacherComment"
+                  class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+                >
+                  <div class="mb-1 text-xs font-semibold uppercase tracking-wide">
+                    {{ t("Teacher comment") }}
+                  </div>
+                  {{ question.answer.teacherComment }}
+                </div>
+
+                <div
+                  v-if="question.canCorrect && correctionForms[question.id]"
+                  class="rounded-lg border border-gray-20 bg-white p-4"
+                >
+                  <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
+                    <BaseIcon icon="edit" size="small" />
+                    {{ t("Teacher correction") }}
+                  </div>
+                  <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
+                    <BaseInputNumber
+                      v-model="correctionForms[question.id].marks"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionScoreInputId(question)"
+                      :label="t('Correction score')"
+                      :max="Number(question.maxScore || 0)"
+                      :min="0"
+                      :step="0.5"
+                      name="correction_score"
+                    />
+                    <BaseTextArea
+                      v-model="correctionForms[question.id].teacherComment"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionCommentInputId(question)"
+                      :label="t('Teacher comment')"
+                      name="teacher_comment"
+                      rows="3"
+                    />
+                    <BaseButton
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :is-loading="correctionSavingQuestionId === question.id"
+                      :label="t('Save correction')"
+                      icon="content-save"
+                      type="success"
+                      @click="saveManualCorrection(question)"
+                    />
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'free_answer'">
+              <div class="space-y-3">
+                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                  <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Learner answer") }}
+                  </div>
+                  <div class="whitespace-pre-wrap text-sm text-gray-800">
+                    {{ question.answer.studentAnswer || t("No answer") }}
+                  </div>
+                </div>
+
+                <div
+                  v-if="question.pendingCorrection"
+                  class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning"
+                >
+                  {{ t("This answer is pending teacher correction.") }}
+                </div>
+
+                <div
+                  v-if="question.answer.teacherComment"
+                  class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+                >
+                  <div class="mb-1 text-xs font-semibold uppercase tracking-wide">
+                    {{ t("Teacher comment") }}
+                  </div>
+                  {{ question.answer.teacherComment }}
+                </div>
+
+                <div
+                  v-if="question.canCorrect && correctionForms[question.id]"
+                  class="rounded-lg border border-gray-20 bg-white p-4"
+                >
+                  <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
+                    <BaseIcon icon="edit" size="small" />
+                    {{ t("Teacher correction") }}
+                  </div>
+                  <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
+                    <BaseInputNumber
+                      v-model="correctionForms[question.id].marks"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionScoreInputId(question)"
+                      :label="t('Correction score')"
+                      :max="Number(question.maxScore || 0)"
+                      :min="0"
+                      :step="0.5"
+                      name="correction_score"
+                    />
+                    <BaseTextArea
+                      v-model="correctionForms[question.id].teacherComment"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionCommentInputId(question)"
+                      :label="t('Teacher comment')"
+                      name="teacher_comment"
+                      rows="3"
+                    />
+                    <BaseButton
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :is-loading="correctionSavingQuestionId === question.id"
+                      :label="t('Save correction')"
+                      icon="content-save"
+                      type="success"
+                      @click="saveManualCorrection(question)"
+                    />
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else>
+              <div class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning">
+                {{ t("This question type is not available in the Vue result review yet.") }}
+              </div>
+            </template>
+
+            <div
+              v-if="question.feedback"
+              class="exercise-result-html rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+              v-html="question.feedback"
+            />
+          </div>
+        </article>
+      </div>
+    </template>
+  </section>
+</template>
+
+<script setup>
+import { onMounted, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseIcon from "../../components/basecomponents/BaseIcon.vue"
+import BaseInputNumber from "../../components/basecomponents/BaseInputNumber.vue"
+import BaseTextArea from "../../components/basecomponents/BaseTextArea.vue"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+
+const isLoading = ref(false)
+const errorMessage = ref("")
+const title = ref("")
+const description = ref("")
+const attempt = ref({})
+const visibility = ref({})
+const questions = ref([])
+const legacyUrls = ref({})
+const correctionForms = ref({})
+const correctionSavingQuestionId = ref(null)
+const correctionError = ref("")
+const correctionMessage = ref("")
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+    origin: getQueryValue(route.query.origin),
+    learnpath_id: getQueryValue(route.query.learnpath_id),
+    learnpath_item_id: getQueryValue(route.query.learnpath_item_id),
+    learnpath_item_view_id: getQueryValue(route.query.learnpath_item_view_id),
+  }
+}
+
+function getBaseRouteParams() {
+  return {
+    node: route.params.node,
+  }
+}
+
+function getPlayerRouteParams() {
+  return {
+    ...getBaseRouteParams(),
+    exerciseId: route.params.exerciseId,
+  }
+}
+
+function getExerciseId() {
+  return Number(route.params.exerciseId || 0)
+}
+
+function getAttemptId() {
+  return Number(route.params.attemptId || 0)
+}
+
+async function loadResult() {
+  const exerciseId = getExerciseId()
+  const attemptId = getAttemptId()
+  if (!exerciseId || !attemptId) {
+    errorMessage.value = t("Invalid exercise attempt")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseRuntimeResult(getContextParams(), exerciseId, attemptId)
+    title.value = response.title || ""
+    description.value = response.description || ""
+    attempt.value = response.attempt || {}
+    visibility.value = response.visibility || {}
+    questions.value = Array.isArray(response.questions) ? response.questions : []
+    legacyUrls.value = response.legacyUrls || {}
+    initializeCorrectionForms()
+  } catch (error) {
+    console.error("Error loading exercise result", error)
+    errorMessage.value = t("Could not load exercise result")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function questionLabel(position) {
+  const safePosition = Number(position || 0)
+
+  return safePosition > 0 ? `${t("Question")} ${safePosition}` : t("Question")
+}
+
+function isManualCorrectionQuestion(question) {
+  return ["free_answer", "upload_answer"].includes(question?.answer?.kind)
+}
+
+function hasPartialManualScore(question) {
+  if (!isManualCorrectionQuestion(question) || question?.pendingCorrection) {
+    return false
+  }
+
+  const score = Number(question?.score ?? 0)
+  const maxScore = Number(question?.maxScore ?? 0)
+
+  return maxScore > 0 && score > 0 && score < maxScore
+}
+
+function questionCardClass(question) {
+  if (question.pendingCorrection) {
+    return "border-warning/40"
+  }
+
+  if (question.isCorrect === true) {
+    return "border-success/40"
+  }
+
+  if (hasPartialManualScore(question)) {
+    return "border-warning/40"
+  }
+
+  if (question.isCorrect === false) {
+    return "border-danger/40"
+  }
+
+  return "border-gray-20"
+}
+
+function questionStatusIconClass(question) {
+  if (question.pendingCorrection) {
+    return "mdi-help-circle-outline text-warning"
+  }
+
+  if (question.isCorrect === true) {
+    return "mdi-check-circle text-success"
+  }
+
+  if (hasPartialManualScore(question)) {
+    return "mdi-progress-check text-warning"
+  }
+
+  if (question.isCorrect === false) {
+    return "mdi-alert-circle text-danger"
+  }
+
+  return "mdi-help-circle-outline text-primary"
+}
+
+function questionScoreClass(question) {
+  if (question.pendingCorrection) {
+    return "border-warning/30 bg-warning/10 text-warning"
+  }
+
+  if (question.isCorrect === true) {
+    return "border-success/30 bg-success/10 text-success"
+  }
+
+  if (hasPartialManualScore(question)) {
+    return "border-warning/30 bg-warning/10 text-warning"
+  }
+
+  if (question.isCorrect === false) {
+    return "border-danger/30 bg-danger/10 text-danger"
+  }
+
+  return "border-gray-20 bg-white text-gray-700"
+}
+
+function questionResultBadgeLabel(question) {
+  if (question.pendingCorrection) {
+    return ""
+  }
+
+  if (question.isCorrect === true) {
+    return t("Correct")
+  }
+
+  if (hasPartialManualScore(question)) {
+    return t("Partially correct")
+  }
+
+  if (question.isCorrect === false) {
+    return t("Incorrect")
+  }
+
+  return ""
+}
+
+function questionResultBadgeClass(question) {
+  if (question.isCorrect === true) {
+    return "bg-success/10 text-success"
+  }
+
+  if (hasPartialManualScore(question)) {
+    return "bg-warning/10 text-warning"
+  }
+
+  if (question.isCorrect === false) {
+    return "bg-danger/10 text-danger"
+  }
+
+  return "bg-gray-20 text-gray-700"
+}
+
+function choiceClass(choice) {
+  if (choice.correct) {
+    return "border-success/40 bg-success/10"
+  }
+
+  if (choice.selected) {
+    return "border-info/40 bg-support-1"
+  }
+
+  return "border-gray-20 bg-white"
+}
+
+function choiceIconClass(choice) {
+  if (choice.correct) {
+    return "mdi-check-circle text-success"
+  }
+
+  if (choice.selected) {
+    return "mdi-radiobox-marked text-info"
+  }
+
+  return "mdi-circle-outline text-gray-50"
+}
+
+function trueFalseClass(choice) {
+  if (isTrueFalseChoiceCorrect(choice)) {
+    return "border-success/40 bg-success/10"
+  }
+
+  if (choice.selectedOptionLabel) {
+    return "border-danger/40 bg-danger/10"
+  }
+
+  return "border-gray-20 bg-white"
+}
+
+function trueFalseIconClass(choice) {
+  if (isTrueFalseChoiceCorrect(choice)) {
+    return "mdi-check-circle text-success"
+  }
+
+  if (choice.selectedOptionLabel) {
+    return "mdi-alert-circle text-danger"
+  }
+
+  return "mdi-help-circle-outline text-gray-50"
+}
+
+function isTrueFalseChoiceCorrect(choice) {
+  return Boolean(choice.correctOptionLabel && choice.selectedOptionLabel === choice.correctOptionLabel)
+}
+
+function blankClass(blank) {
+  if (isBlankCorrect(blank)) {
+    return "border-success/30"
+  }
+
+  return "border-danger/30"
+}
+
+function blankIconClass(blank) {
+  return isBlankCorrect(blank) ? "mdi-check-circle text-success" : "mdi-alert-circle text-danger"
+}
+
+function isBlankCorrect(blank) {
+  return String(blank.studentScore || "") === "1"
+}
+
+function matchingClass(prompt) {
+  if (isMatchingCorrect(prompt)) {
+    return "border-success/40 bg-success/10"
+  }
+
+  if (prompt.selectedOptionAnswer) {
+    return "border-danger/40 bg-danger/10"
+  }
+
+  return "border-gray-20 bg-white"
+}
+
+function matchingIconClass(prompt) {
+  if (isMatchingCorrect(prompt)) {
+    return "mdi-check-circle text-success"
+  }
+
+  if (prompt.selectedOptionAnswer) {
+    return "mdi-alert-circle text-danger"
+  }
+
+  return "mdi-help-circle-outline text-gray-50"
+}
+
+function isMatchingCorrect(prompt) {
+  return Boolean(prompt.correctOptionAnswer && prompt.selectedOptionAnswer === prompt.correctOptionAnswer)
+}
+
+
+function initializeCorrectionForms() {
+  const forms = {}
+  for (const question of questions.value) {
+    if (!question.canCorrect) {
+      continue
+    }
+
+    forms[question.id] = {
+      marks: Number(question.score ?? question.answer?.marks ?? 0),
+      teacherComment: question.answer?.teacherComment || "",
+    }
+  }
+
+  correctionForms.value = forms
+}
+
+function correctionScoreInputId(question) {
+  return `correction_score_${Number(question.id || 0)}`
+}
+
+function correctionCommentInputId(question) {
+  return `teacher_comment_${Number(question.id || 0)}`
+}
+
+async function saveManualCorrection(question) {
+  const form = correctionForms.value[question.id]
+  const exerciseId = getExerciseId()
+  const attemptId = getAttemptId()
+  const questionId = Number(question.id || 0)
+  if (!form || !exerciseId || !attemptId || !questionId) {
+    return
+  }
+
+  correctionSavingQuestionId.value = questionId
+  correctionError.value = ""
+  correctionMessage.value = ""
+
+  try {
+    const response = await exerciseService.saveExerciseRuntimeCorrection(
+      {
+        exerciseId,
+        attemptId,
+        questionId,
+        marks: Number(form.marks || 0),
+        teacherComment: form.teacherComment || "",
+      },
+      getContextParams(),
+      exerciseId,
+      attemptId,
+    )
+
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not save correction")
+    }
+
+    correctionMessage.value = t("Correction saved")
+    await loadResult()
+  } catch (error) {
+    console.error("Error saving exercise correction", error)
+    correctionError.value = t("Could not save correction")
+  } finally {
+    correctionSavingQuestionId.value = null
+  }
+}
+
+function formatNumber(value) {
+  if (value === null || value === undefined || value === "") {
+    return "—"
+  }
+
+  const number = Number(value)
+  if (Number.isNaN(number)) {
+    return "—"
+  }
+
+  return number.toFixed(2).replace(/\.00$/, "")
+}
+
+function formatSeconds(seconds) {
+  const safeSeconds = Math.max(0, Number(seconds || 0))
+  const hours = Math.floor(safeSeconds / 3600)
+  const minutes = Math.floor((safeSeconds % 3600) / 60)
+  const remainingSeconds = safeSeconds % 60
+
+  if (hours > 0) {
+    return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`
+  }
+
+  return `${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`
+}
+
+function formatDate(value) {
+  if (!value) {
+    return ""
+  }
+
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) {
+    return ""
+  }
+
+  return date.toLocaleString()
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadResult)
+
+watch(
+  () => [route.params.exerciseId, route.params.attemptId, route.query.cid, route.query.sid, route.query.gid],
+  () => loadResult(),
+)
+</script>
+
+<style scoped>
+.exercise-result-html :deep(img) {
+  max-width: 100%;
+  height: auto;
+}
+
+.exercise-result-html :deep(.tiny-content) {
+  display: block;
+}
+
+.exercise-result-html :deep(p) {
+  margin-bottom: 0.25rem;
+}
+
+.exercise-result-html :deep(p:last-child) {
+  margin-bottom: 0;
+}
+</style>
diff --git a/public/main/exercise/answer.class.php b/public/main/exercise/answer.class.php
index ca2c350bf9b..4017eae7295 100644
--- a/public/main/exercise/answer.class.php
+++ b/public/main/exercise/answer.class.php
@@ -273,9 +273,9 @@ public function readOrderedBy($field, $order = 'ASC')
             $this->comment[$i] = $doubt_data->comment;
             $this->weighting[$i] = $doubt_data->ponderation;
             $this->position[$i] = $doubt_data->position;
-            $this->hotspot_coordinates[$i] = isset($object->hotspot_coordinates) ? $object->hotspot_coordinates : 0;
-            $this->hotspot_type[$i] = isset($object->hotspot_type) ? $object->hotspot_type : 0;
-            $this->destination[$i] = $doubt_data->destination;
+            $this->hotspot_coordinates[$i] = isset($doubt_data->hotspot_coordinates) ? $doubt_data->hotspot_coordinates : 0;
+            $this->hotspot_type[$i] = isset($doubt_data->hotspot_type) ? $doubt_data->hotspot_type : 0;
+            $this->destination[$i] = isset($doubt_data->destination) ? $doubt_data->destination : 0;
             $this->autoId[$i] = $doubt_data->iid;
             $this->iid[$i] = $doubt_data->iid;
             $i++;
diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php
index 0234d56623b..d21683e36ba 100644
--- a/public/main/exercise/exercise.class.php
+++ b/public/main/exercise/exercise.class.php
@@ -3596,10 +3596,10 @@ public function manage_answer(
             && !empty($extra)
         ) {
             $extra = explode(':', $extra);
-            // Fixes problems with negatives values using intval
-            $true_score = (float) trim($extra[0]);
-            $false_score = (float) trim($extra[1]);
-            $doubt_score = (float) trim($extra[2]);
+            // Fixes problems with negatives values using intval and keeps older questions compatible.
+            $true_score = isset($extra[0]) ? (float) trim($extra[0]) : 1.0;
+            $false_score = isset($extra[1]) ? (float) trim($extra[1]) : -0.5;
+            $doubt_score = isset($extra[2]) ? (float) trim($extra[2]) : 0.0;
         }
 
         // Construction of the Answer object
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php b/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
new file mode 100644
index 00000000000..82c76040476
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
@@ -0,0 +1,242 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\Metadata\Put;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseConfigurationProcessor;
+use Chamilo\CoreBundle\State\Exercise\ExerciseConfigurationProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseConfiguration',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/configuration',
+            openapi: new Operation(
+                summary: 'Exercise configuration defaults for creation',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_configuration_create',
+            provider: ExerciseConfigurationProvider::class,
+        ),
+        new Get(
+            uriTemplate: '/exercise/configuration/{exerciseId}',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise configuration for edition',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_configuration_edit',
+            provider: ExerciseConfigurationProvider::class,
+        ),
+        new Post(
+            uriTemplate: '/exercise/configuration',
+            openapi: new Operation(
+                summary: 'Create an exercise configuration',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_configuration',
+            processor: ExerciseConfigurationProcessor::class,
+        ),
+        new Put(
+            uriTemplate: '/exercise/configuration/{exerciseId}',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Update an exercise configuration',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            read: false,
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'put_exercise_configuration',
+            processor: ExerciseConfigurationProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_configuration:read']],
+    denormalizationContext: ['groups' => ['exercise_configuration:write']],
+)]
+final class ExerciseConfiguration
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_configuration:read'])]
+    public string $mode = 'create';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $title = '';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $description = '';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $type = 2;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public ?int $categoryId = null;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public ?string $startTime = null;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public ?string $endTime = null;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public ?int $duration = null;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $maxAttempt = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $passPercentage = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $random = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $randomByCategory = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $randomAnswers = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $showPreviousButton = true;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $preventBackwards = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $hideAttemptsTable = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $autoLaunch = false;
+
+    /**
+     * Legacy comma-separated notification ids stored as an array for Vue.
+     *
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public array $notifications = [];
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $accessCondition = '';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $sound = '';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $feedbackType = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $resultsDisabled = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $questionSelectionType = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $displayCategoryName = true;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $hideQuestionTitle = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $hideQuestionNumber = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $propagateNeg = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $saveCorrectAnswers = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $reviewAnswers = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $expiredTime = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $displayChartDegreeCertainty = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $sendEmailChartDegreeCertainty = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $notDisplayBalancePercentageCategorieQuestion = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $displayChartDegreeCertaintyCategory = 0;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $gatherQuestionsCategories = 0;
+
+    /**
+     * @var array<string, bool>
+     */
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public array $pageResultConfiguration = [];
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $textWhenFinished = '';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $textWhenFinishedFailure = '';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $csrfToken = '';
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_configuration:read'])]
+    public array $settings = [];
+
+    /**
+     * @var array<string, array<int, array<string, mixed>>>
+     */
+    #[Groups(['exercise_configuration:read'])]
+    public array $options = [];
+
+    #[Groups(['exercise_configuration:read'])]
+    public bool $canEdit = false;
+
+    #[Groups(['exercise_configuration:read'])]
+    public bool $canCreate = false;
+
+    #[Groups(['exercise_configuration:read'])]
+    public string $listUrl = '';
+
+    #[Groups(['exercise_configuration:read'])]
+    public string $questionsUrl = '';
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseList.php b/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
new file mode 100644
index 00000000000..f035e534e2f
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
@@ -0,0 +1,79 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseListProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseList',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/list',
+            openapi: new Operation(
+                summary: 'Exercise list for a course',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'search', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'categoryId', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT') or is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_list',
+            provider: ExerciseListProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_list:read']],
+)]
+final class ExerciseList
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_list:read'])]
+    public string $id = 'exercise_list';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_list:read'])]
+    public array $items = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_list:read'])]
+    public array $categories = [];
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_list:read'])]
+    public array $settings = [];
+
+    #[Groups(['exercise_list:read'])]
+    public int $totalItems = 0;
+
+    #[Groups(['exercise_list:read'])]
+    public bool $canManage = false;
+
+    #[Groups(['exercise_list:read'])]
+    public bool $canCreate = false;
+
+    #[Groups(['exercise_list:read'])]
+    public bool $usesLegacyActions = true;
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
new file mode 100644
index 00000000000..fb9182fa401
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
@@ -0,0 +1,85 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseQuestion',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/questions/{exerciseId}',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise question type selector and current questions',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_questions',
+            provider: ExerciseQuestionProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_question:read']],
+)]
+final class ExerciseQuestion
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_question:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_question:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_question:read'])]
+    public int $questionCount = 0;
+
+    #[Groups(['exercise_question:read'])]
+    public float $totalScore = 0.0;
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question:read'])]
+    public array $questionTypes = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question:read'])]
+    public array $questions = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_question:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_question:read'])]
+    public bool $canManage = false;
+
+    #[Groups(['exercise_question:read'])]
+    public bool $usesLegacyQuestionEditors = true;
+
+    #[Groups(['exercise_question:read'])]
+    public string $csrfToken = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionAction.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionAction.php
new file mode 100644
index 00000000000..d6c89f57683
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionAction.php
@@ -0,0 +1,71 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionActionProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseQuestionAction',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/questions/{exerciseId}/action',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Run an exercise question action',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_question_action',
+            processor: ExerciseQuestionActionProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_question_action:read']],
+    denormalizationContext: ['groups' => ['exercise_question_action:write']],
+)]
+final class ExerciseQuestionAction
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_question_action:read', 'exercise_question_action:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_question_action:read', 'exercise_question_action:write'])]
+    public string $action = '';
+
+    #[Groups(['exercise_question_action:read', 'exercise_question_action:write'])]
+    public ?int $questionId = null;
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_question_action:read', 'exercise_question_action:write'])]
+    public array $questionIds = [];
+
+    #[Groups(['exercise_question_action:write'])]
+    public string $submittedCsrfToken = '';
+
+    #[Groups(['exercise_question_action:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_question_action:read'])]
+    public string $message = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
new file mode 100644
index 00000000000..0599c3ffd86
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
@@ -0,0 +1,313 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionEditorProcessor;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionEditorProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseQuestionEditor',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/questions/{exerciseId}/editor',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise question editor for a new question',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'type', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_question_editor_create',
+            provider: ExerciseQuestionEditorProvider::class,
+        ),
+        new Get(
+            uriTemplate: '/exercise/questions/{exerciseId}/editor/{questionId}',
+            requirements: ['exerciseId' => '\\d+', 'questionId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise question editor for an existing choice question',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'questionId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_question_editor_edit',
+            provider: ExerciseQuestionEditorProvider::class,
+        ),
+        new Post(
+            uriTemplate: '/exercise/questions/{exerciseId}/editor',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Create an exercise question',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_question_editor_create',
+            processor: ExerciseQuestionEditorProcessor::class,
+        ),
+        new Post(
+            uriTemplate: '/exercise/questions/{exerciseId}/editor/{questionId}',
+            requirements: ['exerciseId' => '\\d+', 'questionId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Update an exercise question',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'questionId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_question_editor_update',
+            processor: ExerciseQuestionEditorProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_question_editor:read']],
+    denormalizationContext: ['groups' => ['exercise_question_editor:write']],
+)]
+final class ExerciseQuestionEditor
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public ?int $questionId = null;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public int $type = 1;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $typeLabel = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $title = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $description = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $feedback = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $dropdownListText = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $fillBlanksText = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public array $fillBlankItems = [];
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public int $fillBlanksSeparator = 0;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public bool $fillBlanksSwitchable = false;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public bool $fillBlanksCaseInsensitive = false;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $fillBlanksComment = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $calculatedText = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $calculatedFormula = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public array $calculatedRanges = [];
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public int $calculatedVariations = 1;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $calculatedComment = '';
+
+    #[Groups(['exercise_question_editor:read'])]
+    public string $annotationImageUrl = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $annotationImageData = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $annotationImageName = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $annotationImageMimeType = '';
+
+    #[Groups(['exercise_question_editor:read'])]
+    public string $hotspotImageUrl = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $hotspotImageData = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $hotspotImageName = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $hotspotImageMimeType = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public array $hotspotItems = [];
+
+    /**
+     * @var array<int, array{label: string, value: string}>
+     */
+    #[Groups(['exercise_question_editor:read'])]
+    public array $hotspotScenarioOptions = [];
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $hotspotScenarioSuccessType = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $hotspotScenarioSuccessUrl = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $hotspotScenarioFailureType = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $hotspotScenarioFailureUrl = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public float $score = 0.0;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public float $globalScore = 0.0;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public float $correctScore = 1.0;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public float $wrongScore = -0.5;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public float $unknownScore = 0.0;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public bool $noNegativeScore = false;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public bool $mandatory = false;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public ?int $duration = null;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public int $difficulty = 1;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public int $categoryId = 0;
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public int $parentMediaId = 0;
+
+    #[Groups(['exercise_question_editor:read'])]
+    public int $questionCount = 0;
+
+    #[Groups(['exercise_question_editor:read'])]
+    public float $totalScore = 0.0;
+
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $usesGlobalScore = false;
+
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $hasFixedUnknownAnswer = false;
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read'])]
+    public array $categoryOptions = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read'])]
+    public array $mediaOptions = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public array $answers = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public array $matchingOptions = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public array $matchingPairs = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public array $draggableItems = [];
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $matchingOrientation = 'h';
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_question_editor:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_question_editor:read'])]
+    public string $csrfToken = '';
+
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $allowQuestionFeedback = false;
+
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $imageZoomEnabled = false;
+
+    #[Groups(['exercise_question_editor:write'])]
+    public string $submittedCsrfToken = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntime.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntime.php
new file mode 100644
index 00000000000..ce0ecd05572
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntime.php
@@ -0,0 +1,98 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntime',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/runtime/{exerciseId}',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise runtime player data',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT') or is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_runtime',
+            provider: ExerciseRuntimeProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime:read']],
+)]
+final class ExerciseRuntime
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_runtime:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_runtime:read'])]
+    public string $description = '';
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime:read'])]
+    public array $settings = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_runtime:read'])]
+    public array $questions = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_runtime:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_runtime:read'])]
+    public int $questionCount = 0;
+
+    #[Groups(['exercise_runtime:read'])]
+    public float $totalScore = 0.0;
+
+    #[Groups(['exercise_runtime:read'])]
+    public bool $canManage = false;
+
+
+    /**
+     * @var array<string, mixed>|null
+     */
+    #[Groups(['exercise_runtime:read'])]
+    public ?array $attempt = null;
+
+    #[Groups(['exercise_runtime:read'])]
+    public bool $canStartAttempt = false;
+
+    #[Groups(['exercise_runtime:read'])]
+    public bool $canSubmit = false;
+
+    #[Groups(['exercise_runtime:read'])]
+    public bool $usesLegacySubmit = true;
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
new file mode 100644
index 00000000000..517fb86e7a8
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
@@ -0,0 +1,91 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeAnswerProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeAnswer',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/answer',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Save a Vue exercise runtime draft answer',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT')",
+            name: 'post_exercise_runtime_answer',
+            processor: ExerciseRuntimeAnswerProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_answer:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_answer:write']],
+)]
+final class ExerciseRuntimeAnswer
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_answer:read', 'exercise_runtime_answer:write'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_answer:read', 'exercise_runtime_answer:write'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_answer:read', 'exercise_runtime_answer:write'])]
+    public ?int $questionId = null;
+
+    #[Groups(['exercise_runtime_answer:write'])]
+    public mixed $answer = null;
+
+    #[Groups(['exercise_runtime_answer:read', 'exercise_runtime_answer:write'])]
+    public int $secondsSpent = 0;
+
+    #[Groups(['exercise_runtime_answer:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_answer:read'])]
+    public string $message = '';
+
+    /**
+     * @var array<int, array{answer: string, position: int|null}>
+     */
+    #[Groups(['exercise_runtime_answer:read'])]
+    public array $savedAnswer = [];
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_runtime_answer:read'])]
+    public array $answeredQuestionIds = [];
+
+    #[Groups(['exercise_runtime_answer:read'])]
+    public int $answeredCount = 0;
+
+    #[Groups(['exercise_runtime_answer:read'])]
+    public bool $canFinish = false;
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php
new file mode 100644
index 00000000000..78830947e33
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php
@@ -0,0 +1,117 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeAttemptProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeAttempt',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Start or resume a Vue exercise runtime attempt',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'origin', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'learnpath_id', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'learnpath_item_id', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'learnpath_item_view_id', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT') or is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_attempt',
+            processor: ExerciseRuntimeAttemptProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_attempt:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_attempt:write']],
+)]
+final class ExerciseRuntimeAttempt
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt:read', 'exercise_runtime_attempt:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public string $status = '';
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public bool $preview = false;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public bool $usesLegacyRuntime = false;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public int $currentQuestionIndex = 0;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public ?int $currentQuestionId = null;
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public array $questionIds = [];
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public int $totalQuestions = 0;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public ?string $startedAt = null;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public ?string $expiredAt = null;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public ?int $remainingSeconds = null;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public bool $canNavigatePrevious = false;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public bool $canNavigateNext = false;
+
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public bool $canFinish = false;
+
+    /**
+     * @var array<int|string, array<int, array{answer: string, position: int|null}>>
+     */
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public array $savedAnswers = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public array $legacyUrls = [];
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptDelete.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptDelete.php
new file mode 100644
index 00000000000..0faaf25e2e3
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptDelete.php
@@ -0,0 +1,64 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeAttemptDeleteProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeAttemptDelete',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/delete',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Delete an exercise attempt from the migrated report',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_attempt_delete',
+            processor: ExerciseRuntimeAttemptDeleteProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_attempt_delete:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_attempt_delete:write']],
+)]
+final class ExerciseRuntimeAttemptDelete
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_delete:read', 'exercise_runtime_attempt_delete:write'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_delete:read', 'exercise_runtime_attempt_delete:write'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_attempt_delete:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_attempt_delete:read'])]
+    public string $message = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php
new file mode 100644
index 00000000000..9d6a0fbe427
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php
@@ -0,0 +1,85 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeCorrectionProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeCorrection',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/correction',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Correct a manual Vue exercise runtime answer',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_correction',
+            processor: ExerciseRuntimeCorrectionProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_correction:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_correction:write']],
+)]
+final class ExerciseRuntimeCorrection
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_correction:read', 'exercise_runtime_correction:write'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_correction:read', 'exercise_runtime_correction:write'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_correction:read', 'exercise_runtime_correction:write'])]
+    public ?int $questionId = null;
+
+    #[Groups(['exercise_runtime_correction:read', 'exercise_runtime_correction:write'])]
+    public float $marks = 0.0;
+
+    #[Groups(['exercise_runtime_correction:read', 'exercise_runtime_correction:write'])]
+    public string $teacherComment = '';
+
+    #[Groups(['exercise_runtime_correction:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_correction:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_runtime_correction:read'])]
+    public float $score = 0.0;
+
+    #[Groups(['exercise_runtime_correction:read'])]
+    public float $maxScore = 0.0;
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_runtime_correction:read'])]
+    public array $questionsToCheck = [];
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php
new file mode 100644
index 00000000000..ca96b43f938
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php
@@ -0,0 +1,83 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeFinishProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeFinish',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/finish',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Finish a Vue exercise runtime attempt using native migrated scoring',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'origin', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'learnpath_id', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'learnpath_item_id', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'learnpath_item_view_id', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT')",
+            name: 'post_exercise_runtime_finish',
+            processor: ExerciseRuntimeFinishProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_finish:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_finish:write']],
+)]
+final class ExerciseRuntimeFinish
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_finish:read', 'exercise_runtime_finish:write'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_finish:read', 'exercise_runtime_finish:write'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_finish:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_finish:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_runtime_finish:read'])]
+    public string $status = '';
+
+    #[Groups(['exercise_runtime_finish:read'])]
+    public float $score = 0.0;
+
+    #[Groups(['exercise_runtime_finish:read'])]
+    public float $maxScore = 0.0;
+
+    #[Groups(['exercise_runtime_finish:read'])]
+    public ?string $completedAt = null;
+
+    #[Groups(['exercise_runtime_finish:read'])]
+    public string $resultUrl = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
new file mode 100644
index 00000000000..6cce54254a7
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
@@ -0,0 +1,82 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeReportProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeReport',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempts',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise learner attempts report',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'firstName', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'lastName', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'status', in: 'query', required: false, schema: ['type' => 'string']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_runtime_report',
+            provider: ExerciseRuntimeReportProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_report:read']],
+)]
+final class ExerciseRuntimeReport
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_report:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public string $description = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_runtime_report:read'])]
+    public array $attempts = [];
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_report:read'])]
+    public array $filters = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_runtime_report:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public int $totalItems = 0;
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public bool $canManage = true;
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
new file mode 100644
index 00000000000..a2c82347e55
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
@@ -0,0 +1,90 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeResultProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeResult',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/result',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Exercise runtime attempt result and review data',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT') or is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_runtime_result',
+            provider: ExerciseRuntimeResultProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_result:read']],
+)]
+final class ExerciseRuntimeResult
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_result:read'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_result:read'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_result:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_runtime_result:read'])]
+    public string $description = '';
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $attempt = [];
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $visibility = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $questions = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_runtime_result:read'])]
+    public bool $canManage = false;
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
new file mode 100644
index 00000000000..a68350923fb
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
@@ -0,0 +1,114 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use ApiPlatform\OpenApi\Model\RequestBody;
+use ArrayObject;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeUploadAnswerProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeUploadAnswer',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/upload-answer',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Upload a file as a Vue exercise runtime answer',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+                requestBody: new RequestBody(
+                    content: new ArrayObject([
+                        'multipart/form-data' => [
+                            'schema' => [
+                                'type' => 'object',
+                                'properties' => [
+                                    'questionId' => ['type' => 'integer'],
+                                    'secondsSpent' => ['type' => 'integer'],
+                                    'file' => [
+                                        'type' => 'string',
+                                        'format' => 'binary',
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ]),
+                ),
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT')",
+            deserialize: false,
+            name: 'post_exercise_runtime_upload_answer',
+            processor: ExerciseRuntimeUploadAnswerProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_upload_answer:read']],
+)]
+final class ExerciseRuntimeUploadAnswer
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public ?int $questionId = null;
+
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public string $message = '';
+
+    /**
+     * @var array<int, array{id: int, name: string, size: int, mimeType: string, url: string}>
+     */
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public array $files = [];
+
+    /**
+     * @var array<int, array{answer: string, position: int|null}>
+     */
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public array $savedAnswer = [];
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public array $answeredQuestionIds = [];
+
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public int $answeredCount = 0;
+
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public bool $canFinish = false;
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+
+    public function getAttemptId(): ?int
+    {
+        return $this->attemptId;
+    }
+}
diff --git a/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php b/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php
new file mode 100644
index 00000000000..feebf2838b7
--- /dev/null
+++ b/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php
@@ -0,0 +1,212 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_USER')]
+final class ExerciseRuntimeAttemptFileDownloadAction extends AbstractController
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly ResourceNodeRepository $resourceNodeRepository,
+        private readonly Security $security,
+    ) {}
+
+    #[Route(
+        '/api/exercise/runtime/{exerciseId}/attempt/{attemptId}/file/{resourceNodeId}/download',
+        name: 'chamilo_core_exercise_runtime_attempt_file_download',
+        requirements: [
+            'exerciseId' => '\\d+',
+            'attemptId' => '\\d+',
+            'resourceNodeId' => '\\d+',
+        ],
+        methods: ['GET']
+    )]
+    public function __invoke(int $exerciseId, int $attemptId, int $resourceNodeId, Request $request): Response
+    {
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('A valid authenticated user is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $attemptRow = $this->getAttemptRowWithFile($exerciseId, $attemptId, $resourceNodeId, $course, $session);
+        $attempt = $attemptRow->getTrackEExercise();
+
+        if (!$this->canDownloadAttemptFile($attempt, $user)) {
+            throw new AccessDeniedHttpException('You are not allowed to download this exercise attempt file.');
+        }
+
+        $resourceNode = $this->getAttachedResourceNode($attemptRow, $resourceNodeId);
+        if (!$resourceNode instanceof ResourceNode) {
+            throw new NotFoundHttpException('The requested exercise attempt file was not found.');
+        }
+
+        $resourceFile = $resourceNode->getResourceFiles()->first();
+        if (!$resourceFile instanceof ResourceFile) {
+            throw new NotFoundHttpException('The requested exercise attempt file was not found.');
+        }
+
+        $stream = $this->resourceNodeRepository->getResourceNodeFileStream($resourceNode, $resourceFile);
+        if (!\is_resource($stream)) {
+            throw new NotFoundHttpException('The requested exercise attempt file could not be opened.');
+        }
+
+        $fileName = $resourceFile->getOriginalName() ?: $resourceNode->getTitle() ?: 'answer-file';
+        $response = new StreamedResponse(static function () use ($stream): void {
+            fpassthru($stream);
+            if (\is_resource($stream)) {
+                fclose($stream);
+            }
+        });
+
+        $response->headers->set('Content-Type', $resourceFile->getMimeType() ?: 'application/octet-stream');
+        if (0 < (int) $resourceFile->getSize()) {
+            $response->headers->set('Content-Length', (string) $resourceFile->getSize());
+        }
+        $response->headers->set(
+            'Content-Disposition',
+            $response->headers->makeDisposition(
+                ResponseHeaderBag::DISPOSITION_ATTACHMENT,
+                $fileName,
+                $this->getAsciiFileName($fileName)
+            )
+        );
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getAttemptRowWithFile(
+        int $exerciseId,
+        int $attemptId,
+        int $resourceNodeId,
+        Course $course,
+        ?Session $session,
+    ): TrackEAttempt {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attemptRow')
+            ->addSelect('attempt', 'attemptFile', 'resourceNode', 'resourceFile')
+            ->from(TrackEAttempt::class, 'attemptRow')
+            ->innerJoin('attemptRow.trackExercise', 'attempt')
+            ->innerJoin('attemptRow.attemptFiles', 'attemptFile')
+            ->innerJoin('attemptFile.resourceNode', 'resourceNode')
+            ->leftJoin('resourceNode.resourceFiles', 'resourceFile')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('resourceNode.id = :resourceNodeId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('resourceNodeId', $resourceNodeId, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attemptRow = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attemptRow instanceof TrackEAttempt) {
+            throw new NotFoundHttpException('The requested exercise attempt file was not found.');
+        }
+
+        return $attemptRow;
+    }
+
+    private function canDownloadAttemptFile(TrackEExercise $attempt, User $user): bool
+    {
+        if ((int) $attempt->getUser()->getId() === (int) $user->getId()) {
+            return true;
+        }
+
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER')
+            || $this->security->isGranted('ROLE_ADMIN');
+    }
+
+    private function getAttachedResourceNode(TrackEAttempt $attemptRow, int $resourceNodeId): ?ResourceNode
+    {
+        foreach ($attemptRow->getAttemptFiles() as $attemptFile) {
+            $resourceNode = $attemptFile->getResourceNode();
+            if ($resourceNode instanceof ResourceNode && (int) $resourceNode->getId() === $resourceNodeId) {
+                return $resourceNode;
+            }
+        }
+
+        return null;
+    }
+
+    private function getAsciiFileName(string $fileName): string
+    {
+        $asciiFileName = preg_replace('/[^A-Za-z0-9._-]+/', '_', $fileName);
+        if (!\is_string($asciiFileName)) {
+            return 'answer-file';
+        }
+
+        $asciiFileName = trim($asciiFileName, '._-');
+
+        return '' !== $asciiFileName ? $asciiFileName : 'answer-file';
+    }
+}
diff --git a/src/CoreBundle/Controller/IndexController.php b/src/CoreBundle/Controller/IndexController.php
index 061b21f44b2..1d4010aca9e 100644
--- a/src/CoreBundle/Controller/IndexController.php
+++ b/src/CoreBundle/Controller/IndexController.php
@@ -33,6 +33,7 @@ class IndexController extends BaseController
     #[Route('/resources/lp/{node}/advanced-access', name: 'resources_lp_advanced_access', methods: ['GET'])]
     #[Route('/resources/forum/{vueRouting}', name: 'resources_forum_vue_entrypoint', requirements: ['vueRouting' => '.+'], methods: ['GET'])]
     #[Route('/resources/survey/{vueRouting}', name: 'resources_survey_vue_entrypoint', requirements: ['vueRouting' => '.+'], methods: ['GET'])]
+    #[Route('/resources/exercise/{vueRouting}', name: 'resources_exercise_vue_entrypoint', requirements: ['vueRouting' => '.+'], methods: ['GET'])]
     #[Route('/resources/accessurl/{id}/delete', name: 'access_url_delete', methods: ['GET'])]
     #[Route('/account/home', name: 'chamilo_core_account_home', options: ['expose' => true])]
     #[Route('/social', name: 'chamilo_core_socialnetwork', options: ['expose' => true])]
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
new file mode 100644
index 00000000000..329d48c1133
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
@@ -0,0 +1,510 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseConfiguration;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizCategory;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTime;
+use DateTimeInterface;
+use DateTimeZone;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProcessorInterface<ExerciseConfiguration, ExerciseConfiguration>
+ */
+final readonly class ExerciseConfigurationProcessor implements ProcessorInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_configuration';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseConfiguration
+    {
+        if (!$data instanceof ExerciseConfiguration) {
+            throw new BadRequestHttpException('Invalid exercise configuration payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $this->validateCsrfToken($data->csrfToken);
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercises in this context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        if (0 < $exerciseId) {
+            $quiz = $this->updateExercise($exerciseId, $data, $course, $session);
+        } else {
+            $quiz = $this->createExercise($data, $course, $session);
+        }
+
+        $this->entityManager->flush();
+
+        return $this->buildResponse($quiz, $course, $session);
+    }
+
+    private function createExercise(ExerciseConfiguration $data, Course $course, ?Session $session): CQuiz
+    {
+        $this->validatePayload($data);
+
+        $quiz = new CQuiz();
+        $this->applyCommonFields($quiz, $data, $course);
+        $quiz
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        $this->quizRepository->create($quiz);
+
+        return $quiz;
+    }
+
+    private function updateExercise(int $exerciseId, ExerciseConfiguration $data, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $this->validatePayload($data);
+        $this->applyCommonFields($quiz, $data, $course);
+        $this->entityManager->persist($quiz);
+
+        return $quiz;
+    }
+
+    private function applyCommonFields(CQuiz $quiz, ExerciseConfiguration $data, Course $course): void
+    {
+        $startTime = $this->parseOptionalDate($data->startTime, 'startTime');
+        $endTime = $this->parseOptionalDate($data->endTime, 'endTime');
+
+        if (null !== $startTime && null !== $endTime && $startTime > $endTime) {
+            throw new BadRequestHttpException('The first date should be before the end date.');
+        }
+
+        $feedbackType = $this->normalizeFeedbackType($data->feedbackType);
+        $resultsDisabled = $this->normalizeResultsDisabled($data->resultsDisabled);
+        if (\in_array($feedbackType, [1, 3], true)) {
+            $resultsDisabled = 0;
+        }
+
+        $type = $data->type;
+        if (!\in_array($type, [CQuiz::ALL_ON_ONE_PAGE, CQuiz::ONE_PER_PAGE], true)) {
+            $type = CQuiz::ONE_PER_PAGE;
+        }
+
+        if (1 === $feedbackType) {
+            $type = CQuiz::ONE_PER_PAGE;
+        }
+
+        $quiz
+            ->setTitle(trim($data->title))
+            ->setDescription((string) $data->description)
+            ->setType($type)
+            ->setStartTime($startTime)
+            ->setEndTime($endTime)
+            ->setDuration($this->normalizeNullablePositiveInteger($data->duration))
+            ->setMaxAttempt(max(0, $data->maxAttempt))
+            ->setPassPercentage(max(0, min(100, $data->passPercentage)))
+            ->setRandom($this->normalizeRandomQuestionCount($data->random))
+            ->setRandomByCategory($this->normalizeRandomByCategory($data->randomByCategory))
+            ->setRandomAnswers($data->randomAnswers)
+            ->setShowPreviousButton($data->showPreviousButton)
+            ->setPreventBackwards($data->preventBackwards ? 1 : 0)
+            ->setHideAttemptsTable($data->hideAttemptsTable)
+            ->setAutoLaunch($data->autoLaunch)
+            ->setNotifications($this->normalizeNotifications($data->notifications))
+            ->setAccessCondition((string) $data->accessCondition)
+            ->setSound((string) $data->sound)
+            ->setFeedbackType($feedbackType)
+            ->setResultsDisabled($resultsDisabled)
+            ->setQuestionSelectionType($this->normalizeQuestionSelectionType($data->questionSelectionType))
+            ->setDisplayCategoryName($data->displayCategoryName ? 1 : 0)
+            ->setHideQuestionTitle($data->hideQuestionTitle)
+            ->setHideQuestionNumber($data->hideQuestionNumber ? 1 : 0)
+            ->setPropagateNeg($data->propagateNeg ? 1 : 0)
+            ->setSaveCorrectAnswers(max(0, $data->saveCorrectAnswers))
+            ->setReviewAnswers($data->reviewAnswers ? 1 : 0)
+            ->setExpiredTime(max(0, $data->expiredTime))
+            ->setDisplayChartDegreeCertainty($this->normalizeBinaryInteger($data->displayChartDegreeCertainty))
+            ->setSendEmailChartDegreeCertainty($this->normalizeBinaryInteger($data->sendEmailChartDegreeCertainty))
+            ->setNotDisplayBalancePercentageCategorieQuestion($this->normalizeBinaryInteger($data->notDisplayBalancePercentageCategorieQuestion))
+            ->setDisplayChartDegreeCertaintyCategory($this->normalizeBinaryInteger($data->displayChartDegreeCertaintyCategory))
+            ->setGatherQuestionsCategories($this->normalizeBinaryInteger($data->gatherQuestionsCategories))
+            ->setTextWhenFinished((string) $data->textWhenFinished)
+            ->setTextWhenFinishedFailure((string) $data->textWhenFinishedFailure)
+        ;
+
+        if ($this->isSettingEnabled('exercise.allow_quiz_results_page_config')) {
+            $quiz->setPageResultConfiguration($this->normalizePageResultConfigurationForStorage($data->pageResultConfiguration));
+        }
+
+        $category = $this->getCategory($data->categoryId, $course);
+        if ($category instanceof CQuizCategory) {
+            $quiz->setQuizCategory($category);
+        }
+    }
+
+
+    /**
+     * @param array<string, mixed> $configuration
+     *
+     * @return array<string, bool>
+     */
+    private function normalizePageResultConfiguration(array $configuration): array
+    {
+        return [
+            'hideExpectedAnswers' => $this->isEnabledPageResultFlag($configuration, 'hideExpectedAnswers', 'hide_expected_answer'),
+            'hideTotalScore' => $this->isEnabledPageResultFlag($configuration, 'hideTotalScore', 'hide_total_score'),
+            'hideQuestionScore' => $this->isEnabledPageResultFlag($configuration, 'hideQuestionScore', 'hide_question_score'),
+            'hideCategoryTable' => $this->isEnabledPageResultFlag($configuration, 'hideCategoryTable', 'hide_category_table'),
+            'hideCorrectAnsweredQuestions' => $this->isEnabledPageResultFlag($configuration, 'hideCorrectAnsweredQuestions', 'hide_correct_answered_questions'),
+        ];
+    }
+
+    /**
+     * Stores the same keys as legacy Exercise::setPageResultConfiguration().
+     *
+     * @param array<string, mixed> $configuration
+     *
+     * @return array<string, string>
+     */
+    private function normalizePageResultConfigurationForStorage(array $configuration): array
+    {
+        return [
+            'hide_expected_answer' => $this->isEnabledPageResultFlag($configuration, 'hideExpectedAnswers', 'hide_expected_answer') ? 'on' : '',
+            'hide_question_score' => $this->isEnabledPageResultFlag($configuration, 'hideQuestionScore', 'hide_question_score') ? 'on' : '',
+            'hide_total_score' => $this->isEnabledPageResultFlag($configuration, 'hideTotalScore', 'hide_total_score') ? 'on' : '',
+            'hide_category_table' => $this->isEnabledPageResultFlag($configuration, 'hideCategoryTable', 'hide_category_table') ? 'on' : '',
+            'hide_correct_answered_questions' => $this->isEnabledPageResultFlag($configuration, 'hideCorrectAnsweredQuestions', 'hide_correct_answered_questions') ? 'on' : '',
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $configuration
+     */
+    private function isEnabledPageResultFlag(array $configuration, string $camelKey, string $legacyKey): bool
+    {
+        $value = $configuration[$camelKey] ?? $configuration[$legacyKey] ?? false;
+
+        return true === $value || 1 === $value || '1' === (string) $value || 'on' === strtolower((string) $value);
+    }
+
+    private function normalizeFeedbackType(int $feedbackType): int
+    {
+        return \in_array($feedbackType, [0, 1, 2, 3], true) ? $feedbackType : 0;
+    }
+
+    private function normalizeResultsDisabled(int $resultsDisabled): int
+    {
+        return 0 <= $resultsDisabled && 10 >= $resultsDisabled ? $resultsDisabled : 0;
+    }
+
+    private function normalizeQuestionSelectionType(int $questionSelectionType): int
+    {
+        return 1 <= $questionSelectionType && 10 >= $questionSelectionType ? $questionSelectionType : 1;
+    }
+
+    private function normalizeRandomByCategory(int $randomByCategory): int
+    {
+        return \in_array($randomByCategory, [0, 1, 2], true) ? $randomByCategory : 0;
+    }
+
+    private function normalizeRandomQuestionCount(int $random): int
+    {
+        if (-1 === $random) {
+            return -1;
+        }
+
+        return max(0, $random);
+    }
+
+    private function normalizeBinaryInteger(int $value): int
+    {
+        return 1 === $value ? 1 : 0;
+    }
+
+    /**
+     * @param array<int, mixed> $notifications
+     */
+    private function normalizeNotifications(array $notifications): string
+    {
+        $allowed = [1, 2, 3, 4];
+        $normalized = [];
+        foreach ($notifications as $notification) {
+            $value = (int) $notification;
+            if (\in_array($value, $allowed, true)) {
+                $normalized[$value] = $value;
+            }
+        }
+
+        return implode(',', array_values($normalized));
+    }
+
+    private function validatePayload(ExerciseConfiguration $data): void
+    {
+        if ('' === trim(strip_tags($data->title))) {
+            throw new BadRequestHttpException('The exercise title is required.');
+        }
+    }
+
+    private function getCategory(?int $categoryId, Course $course): ?CQuizCategory
+    {
+        if (null === $categoryId || 0 >= $categoryId) {
+            return null;
+        }
+
+        $category = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizCategory::class, 'category')
+            ->andWhere('category.id = :categoryId')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('categoryId', $categoryId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$category instanceof CQuizCategory) {
+            throw new BadRequestHttpException('The selected exercise category is invalid.');
+        }
+
+        return $category;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function parseOptionalDate(?string $value, string $field): ?DateTime
+    {
+        if (null === $value || '' === trim($value)) {
+            return null;
+        }
+
+        try {
+            $date = new DateTime($value);
+        } catch (\Throwable) {
+            throw new BadRequestHttpException('The '.$field.' field contains an invalid date.');
+        }
+
+        $date->setTimezone(new DateTimeZone('UTC'));
+
+        return $date;
+    }
+
+    private function normalizeNullablePositiveInteger(?int $value): ?int
+    {
+        if (null === $value || 0 >= $value) {
+            return null;
+        }
+
+        return $value;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        $value = $this->settingsManager->getSetting($name, true);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
+    private function validateCsrfToken(string $token): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(self::CSRF_TOKEN_ID, $token))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+
+    private function buildResponse(CQuiz $quiz, Course $course, ?Session $session): ExerciseConfiguration
+    {
+        $configuration = new ExerciseConfiguration();
+        $configuration->exerciseId = (int) $quiz->getIid();
+        $configuration->mode = 'edit';
+        $configuration->title = $quiz->getTitle();
+        $configuration->description = (string) $quiz->getDescription();
+        $configuration->type = $quiz->getType();
+        $configuration->startTime = $this->formatDateForInput($quiz->getStartTime());
+        $configuration->endTime = $this->formatDateForInput($quiz->getEndTime());
+        $configuration->duration = $quiz->getDuration();
+        $configuration->maxAttempt = $quiz->getMaxAttempt();
+        $configuration->passPercentage = (int) ($quiz->getPassPercentage() ?? 0);
+        $configuration->random = (int) $quiz->getRandom();
+        $configuration->randomByCategory = (int) $quiz->getRandomByCategory();
+        $configuration->randomAnswers = $quiz->getRandomAnswers();
+        $configuration->showPreviousButton = $quiz->isShowPreviousButton();
+        $configuration->preventBackwards = 1 === $quiz->getPreventBackwards();
+        $configuration->hideAttemptsTable = $quiz->isHideAttemptsTable();
+        $configuration->autoLaunch = $quiz->isAutoLaunch();
+        $configuration->notifications = $this->parseNotifications($quiz->getNotifications());
+        $configuration->accessCondition = (string) $quiz->getAccessCondition();
+        $configuration->sound = (string) ($quiz->getSound() ?? '');
+        $configuration->feedbackType = $quiz->getFeedbackType();
+        $configuration->resultsDisabled = $quiz->getResultsDisabled();
+        $configuration->questionSelectionType = (int) ($quiz->getQuestionSelectionType() ?? 1);
+        $configuration->displayCategoryName = 1 === $quiz->getDisplayCategoryName();
+        $configuration->hideQuestionTitle = $quiz->isHideQuestionTitle();
+        $configuration->hideQuestionNumber = 1 === (int) $quiz->getHideQuestionNumber();
+        $configuration->propagateNeg = 1 === $quiz->getPropagateNeg();
+        $configuration->saveCorrectAnswers = (int) ($quiz->getSaveCorrectAnswers() ?? 0);
+        $configuration->reviewAnswers = 1 === $quiz->getReviewAnswers();
+        $configuration->expiredTime = $quiz->getExpiredTime();
+        $configuration->displayChartDegreeCertainty = (int) $quiz->getDisplayChartDegreeCertainty();
+        $configuration->sendEmailChartDegreeCertainty = (int) $quiz->getSendEmailChartDegreeCertainty();
+        $configuration->notDisplayBalancePercentageCategorieQuestion = (int) $quiz->getNotDisplayBalancePercentageCategorieQuestion();
+        $configuration->displayChartDegreeCertaintyCategory = (int) $quiz->getDisplayChartDegreeCertaintyCategory();
+        $configuration->gatherQuestionsCategories = (int) $quiz->getGatherQuestionsCategories();
+        $configuration->pageResultConfiguration = $this->normalizePageResultConfiguration($quiz->getPageResultConfiguration());
+        $configuration->textWhenFinished = (string) $quiz->getTextWhenFinished();
+        $configuration->textWhenFinishedFailure = (string) $quiz->getTextWhenFinishedFailure();
+        $configuration->questionsUrl = $this->buildLegacyQuestionsUrl($quiz, $course, $session);
+        $configuration->csrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
+
+        return $configuration;
+    }
+
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseNotifications(?string $notifications): array
+    {
+        if (null === $notifications || '' === trim($notifications)) {
+            return [];
+        }
+
+        return array_values(array_filter(
+            array_map(
+                static fn (string $value): int => (int) trim($value),
+                explode(',', $notifications)
+            ),
+            static fn (int $value): bool => 0 < $value
+        ));
+    }
+
+    private function formatDateForInput(?DateTimeInterface $date): ?string
+    {
+        if (null === $date) {
+            return null;
+        }
+
+        return $date->format('Y-m-d\TH:i');
+    }
+
+    private function buildLegacyQuestionsUrl(CQuiz $quiz, Course $course, ?Session $session): string
+    {
+        return '/main/exercise/admin.php?'.http_build_query([
+            'exerciseId' => (int) $quiz->getIid(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+        ]);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
new file mode 100644
index 00000000000..9e989c9fcb3
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
@@ -0,0 +1,422 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseConfiguration;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizCategory;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeInterface;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProviderInterface<ExerciseConfiguration>
+ */
+final readonly class ExerciseConfigurationProvider implements ProviderInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_configuration';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseConfiguration
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercises in this context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 < $exerciseId) {
+            $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+
+            return $this->buildEditConfiguration($quiz, $course, $session);
+        }
+
+        return $this->buildCreateConfiguration($course, $session);
+    }
+
+    private function buildCreateConfiguration(Course $course, ?Session $session): ExerciseConfiguration
+    {
+        $configuration = new ExerciseConfiguration();
+        $configuration->mode = 'create';
+        $configuration->canCreate = true;
+        $configuration->canEdit = false;
+        $configuration->csrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
+        $configuration->settings = $this->getSettings();
+        $configuration->options = $this->getOptions($course);
+        $configuration->listUrl = '';
+        $configuration->questionsUrl = '';
+        $configuration->maxAttempt = 0;
+        $configuration->displayCategoryName = true;
+        $configuration->hideAttemptsTable = $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page');
+        $configuration->feedbackType = 0;
+        $configuration->resultsDisabled = 0;
+        $configuration->questionSelectionType = 1;
+        $configuration->randomByCategory = 0;
+        $configuration->displayCategoryName = true;
+        $configuration->pageResultConfiguration = $this->getDefaultPageResultConfiguration();
+        $configuration->notifications = [];
+        $configuration->accessCondition = '';
+        $configuration->sound = '';
+
+        return $configuration;
+    }
+
+    private function buildEditConfiguration(CQuiz $quiz, Course $course, ?Session $session): ExerciseConfiguration
+    {
+        $category = $quiz->getQuizCategory();
+        $configuration = new ExerciseConfiguration();
+        $configuration->exerciseId = (int) $quiz->getIid();
+        $configuration->mode = 'edit';
+        $configuration->title = $quiz->getTitle();
+        $configuration->description = (string) $quiz->getDescription();
+        $configuration->type = $quiz->getType();
+        $configuration->categoryId = null !== $category && null !== $category->getId() ? (int) $category->getId() : null;
+        $configuration->startTime = $this->formatDateForInput($quiz->getStartTime());
+        $configuration->endTime = $this->formatDateForInput($quiz->getEndTime());
+        $configuration->duration = $quiz->getDuration();
+        $configuration->maxAttempt = $quiz->getMaxAttempt();
+        $configuration->passPercentage = (int) ($quiz->getPassPercentage() ?? 0);
+        $configuration->random = (int) $quiz->getRandom();
+        $configuration->randomByCategory = (int) $quiz->getRandomByCategory();
+        $configuration->randomAnswers = $quiz->getRandomAnswers();
+        $configuration->showPreviousButton = $quiz->isShowPreviousButton();
+        $configuration->preventBackwards = 1 === $quiz->getPreventBackwards();
+        $configuration->hideAttemptsTable = $quiz->isHideAttemptsTable();
+        $configuration->autoLaunch = $quiz->isAutoLaunch();
+        $configuration->notifications = $this->normalizeNotifications($quiz->getNotifications());
+        $configuration->accessCondition = (string) $quiz->getAccessCondition();
+        $configuration->sound = (string) ($quiz->getSound() ?? '');
+        $configuration->feedbackType = $quiz->getFeedbackType();
+        $configuration->resultsDisabled = $quiz->getResultsDisabled();
+        $configuration->questionSelectionType = (int) ($quiz->getQuestionSelectionType() ?? 1);
+        $configuration->displayCategoryName = 1 === $quiz->getDisplayCategoryName();
+        $configuration->hideQuestionTitle = $quiz->isHideQuestionTitle();
+        $configuration->hideQuestionNumber = 1 === (int) $quiz->getHideQuestionNumber();
+        $configuration->propagateNeg = 1 === $quiz->getPropagateNeg();
+        $configuration->saveCorrectAnswers = (int) ($quiz->getSaveCorrectAnswers() ?? 0);
+        $configuration->reviewAnswers = 1 === $quiz->getReviewAnswers();
+        $configuration->expiredTime = $quiz->getExpiredTime();
+        $configuration->displayChartDegreeCertainty = (int) $quiz->getDisplayChartDegreeCertainty();
+        $configuration->sendEmailChartDegreeCertainty = (int) $quiz->getSendEmailChartDegreeCertainty();
+        $configuration->notDisplayBalancePercentageCategorieQuestion = (int) $quiz->getNotDisplayBalancePercentageCategorieQuestion();
+        $configuration->displayChartDegreeCertaintyCategory = (int) $quiz->getDisplayChartDegreeCertaintyCategory();
+        $configuration->gatherQuestionsCategories = (int) $quiz->getGatherQuestionsCategories();
+        $configuration->pageResultConfiguration = $this->normalizePageResultConfiguration($quiz->getPageResultConfiguration());
+        $configuration->textWhenFinished = (string) $quiz->getTextWhenFinished();
+        $configuration->textWhenFinishedFailure = (string) $quiz->getTextWhenFinishedFailure();
+        $configuration->canCreate = true;
+        $configuration->canEdit = true;
+        $configuration->csrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
+        $configuration->settings = $this->getSettings();
+        $configuration->options = $this->getOptions($course);
+        $configuration->listUrl = '';
+        $configuration->questionsUrl = $this->buildLegacyQuestionsUrl($quiz, $course, $session);
+
+        return $configuration;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getSettings(): array
+    {
+        return [
+            'allowExerciseCategories' => $this->isSettingEnabled('exercise.allow_exercise_categories'),
+            'allowShowPreviousButtonSetting' => $this->isSettingEnabled('exercise.allow_quiz_show_previous_button_setting'),
+            'allowQuizResultsPageConfig' => $this->isSettingEnabled('exercise.allow_quiz_results_page_config'),
+            'disableNewAttempts' => $this->isSettingEnabled('exercise.exercises_disable_new_attempts'),
+            'hideAttemptsTableOnStartPage' => $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page'),
+            'limitTeacherAccess' => $this->isSettingEnabled('exercise.limit_exercise_teacher_access'),
+            'allowNotificationSettingPerExercise' => $this->isSettingEnabled('exercise.allow_notification_setting_per_exercise'),
+            'allowHideQuestionNumberSetting' => $this->isSettingEnabled('exercise.quiz_hide_question_number'),
+        ];
+    }
+
+    /**
+     * @return array<string, array<int, array<string, mixed>>>
+     */
+    private function getOptions(Course $course): array
+    {
+        return [
+            'typeOptions' => [
+                ['value' => CQuiz::ALL_ON_ONE_PAGE, 'label' => 'All questions on one page'],
+                ['value' => CQuiz::ONE_PER_PAGE, 'label' => 'One question per page'],
+            ],
+            'categoryOptions' => $this->getCategoryOptions($course),
+            'feedbackOptions' => [
+                ['value' => 0, 'label' => 'At end of test'],
+                ['value' => 1, 'label' => 'Adaptative test with immediate feedback'],
+                ['value' => 2, 'label' => 'Exam (no feedback)'],
+                ['value' => 3, 'label' => 'Direct pop-up mode'],
+            ],
+            'resultOptions' => [
+                ['value' => 0, 'label' => 'Auto-evaluation mode: show score and expected answers'],
+                ['value' => 1, 'label' => 'Exam mode: Do not show score nor answers'],
+                ['value' => 2, 'label' => 'Practice mode: Show score only, by category if at least one is used'],
+                ['value' => 4, 'label' => 'Show score on every attempt, show correct answers only on last attempt (only works with an attempts limit)'],
+                ['value' => 5, 'label' => 'Do not show the score (only when user finishes all attempts) but show feedback for each attempt.'],
+                ['value' => 6, 'label' => 'Ranking mode: Do not show results details question by question and show a table with the ranking of all other users.'],
+                ['value' => 7, 'label' => 'Show only global score (not question score) and show only the correct answers, do not show incorrect answers at all'],
+                ['value' => 8, 'label' => 'Auto-evaluation mode and ranking'],
+                ['value' => 9, 'label' => 'Show score by category on a radar/spiderweb chart'],
+                ['value' => 10, 'label' => 'Show the result to the learner: Show the score, the learner choice and his feedback on each attempt, add the correct answer and his feedback when the chosen limit of attempts is reached.'],
+            ],
+            'questionSelectionTypeOptions' => [
+                ['value' => 1, 'label' => 'Ordered by user'],
+                ['value' => 2, 'label' => 'Random'],
+                ['value' => 3, 'label' => 'Ordered categories alphabetically with questions ordered'],
+                ['value' => 4, 'label' => 'Random categories with questions ordered'],
+                ['value' => 5, 'label' => 'Ordered categories alphabetically with random questions'],
+                ['value' => 6, 'label' => 'Random categories with random questions'],
+            ],
+            'randomByCategoryOptions' => [
+                ['value' => 0, 'label' => 'No'],
+                ['value' => 1, 'label' => 'Random shuffled categories'],
+                ['value' => 2, 'label' => 'Random ordered categories'],
+            ],
+            'notificationOptions' => [
+                ['value' => 2, 'label' => 'Paranoid: E-mail teacher when a student starts an exercise'],
+                ['value' => 1, 'label' => 'Aware: E-mail teacher when a student ends an exercise'],
+                ['value' => 3, 'label' => 'Relaxed open: E-mail teacher when a student ends an exercise, only if an open question is answered'],
+                ['value' => 4, 'label' => 'Relaxed audio: E-mail teacher when a student ends an exercise, only if an oral question is answered'],
+            ],
+            'saveCorrectAnswerOptions' => [
+                ['value' => 0, 'label' => 'Please select an option'],
+                ['value' => 1, 'label' => 'Save the correct answer for the next attempt'],
+                ['value' => 2, 'label' => 'Pre-fill with answers from previous attempt'],
+            ],
+        ];
+    }
+
+
+    /**
+     * @return array<string, bool>
+     */
+    private function getDefaultPageResultConfiguration(): array
+    {
+        return [
+            'hideExpectedAnswers' => false,
+            'hideTotalScore' => false,
+            'hideQuestionScore' => false,
+            'hideCategoryTable' => false,
+            'hideCorrectAnsweredQuestions' => false,
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $configuration
+     *
+     * @return array<string, bool>
+     */
+    private function normalizePageResultConfiguration(array $configuration): array
+    {
+        return [
+            'hideExpectedAnswers' => $this->isEnabledPageResultFlag($configuration, 'hideExpectedAnswers', 'hide_expected_answer'),
+            'hideTotalScore' => $this->isEnabledPageResultFlag($configuration, 'hideTotalScore', 'hide_total_score'),
+            'hideQuestionScore' => $this->isEnabledPageResultFlag($configuration, 'hideQuestionScore', 'hide_question_score'),
+            'hideCategoryTable' => $this->isEnabledPageResultFlag($configuration, 'hideCategoryTable', 'hide_category_table'),
+            'hideCorrectAnsweredQuestions' => $this->isEnabledPageResultFlag($configuration, 'hideCorrectAnsweredQuestions', 'hide_correct_answered_questions'),
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $configuration
+     */
+    private function isEnabledPageResultFlag(array $configuration, string $camelKey, string $legacyKey): bool
+    {
+        $value = $configuration[$camelKey] ?? $configuration[$legacyKey] ?? false;
+
+        return true === $value || 1 === $value || '1' === (string) $value || 'on' === strtolower((string) $value);
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCategoryOptions(Course $course): array
+    {
+        if (!$this->isSettingEnabled('exercise.allow_exercise_categories')) {
+            return [];
+        }
+
+        $categories = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizCategory::class, 'category')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.position', 'ASC')
+            ->addOrderBy('category.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($categories as $category) {
+            if (!$category instanceof CQuizCategory || null === $category->getId()) {
+                continue;
+            }
+
+            $items[] = [
+                'value' => (int) $category->getId(),
+                'label' => $category->getTitle(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function normalizeNotifications(?string $notifications): array
+    {
+        if (null === $notifications || '' === trim($notifications)) {
+            return [];
+        }
+
+        return array_values(array_filter(
+            array_map(
+                static fn (string $value): int => (int) trim($value),
+                explode(',', $notifications)
+            ),
+            static fn (int $value): bool => 0 < $value
+        ));
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        $value = $this->settingsManager->getSetting($name, true);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
+    private function formatDateForInput(?DateTimeInterface $date): ?string
+    {
+        if (null === $date) {
+            return null;
+        }
+
+        return $date->format('Y-m-d\\TH:i');
+    }
+
+    private function buildLegacyQuestionsUrl(CQuiz $quiz, Course $course, ?Session $session): string
+    {
+        return '/main/exercise/admin.php?'.http_build_query([
+            'exerciseId' => (int) $quiz->getIid(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+        ]);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseListProvider.php b/src/CoreBundle/State/Exercise/ExerciseListProvider.php
new file mode 100644
index 00000000000..7e9b37b238e
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseListProvider.php
@@ -0,0 +1,410 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseList;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizCategory;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * @implements ProviderInterface<ExerciseList>
+ */
+final readonly class ExerciseListProvider implements ProviderInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+        private SettingsManager $settingsManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseList
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $canManage = $this->canManageExercises();
+        $canCreate = $canManage;
+
+        if (!$canManage && !$this->canViewExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to view exercises in this context.');
+        }
+
+        $items = $this->getItems($request, $course, $session, $canManage);
+
+        $response = new ExerciseList();
+        $response->items = $items;
+        $response->categories = $this->getCategories($course);
+        $response->settings = $this->getSettings();
+        $response->totalItems = \count($items);
+        $response->canManage = $canManage;
+        $response->canCreate = $canCreate;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canViewExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getItems(Request $request, Course $course, ?Session $session, bool $canManage): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz')
+            ->addSelect('category')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->leftJoin('quiz.quizCategory', 'category')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('quiz.title', 'ASC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $search = trim((string) $request->query->get('search', ''));
+        if ('' !== $search) {
+            $queryBuilder
+                ->andWhere('LOWER(quiz.title) LIKE :search OR LOWER(quiz.description) LIKE :search')
+                ->setParameter('search', '%'.mb_strtolower($search).'%', Types::STRING)
+            ;
+        }
+
+        $categoryId = $request->query->getInt('categoryId');
+        if (0 < $categoryId) {
+            $queryBuilder
+                ->andWhere('IDENTITY(quiz.quizCategory) = :categoryId')
+                ->setParameter('categoryId', $categoryId, Types::INTEGER)
+            ;
+        }
+
+        if (!$canManage) {
+            $now = new DateTimeImmutable();
+            $queryBuilder
+                ->andWhere('links.visibility = :visibility')
+                ->andWhere('quiz.startTime IS NULL OR quiz.startTime <= :now')
+                ->andWhere('quiz.endTime IS NULL OR quiz.endTime >= :now')
+                ->setParameter('visibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+                ->setParameter('now', $now, Types::DATETIME_IMMUTABLE)
+            ;
+        }
+
+        $rows = $queryBuilder->getQuery()->getResult();
+        $quizzes = [];
+        $linkVisibilityByQuiz = [];
+
+        foreach ($rows as $row) {
+            $quiz = null;
+            $linkVisibility = self::VISIBILITY_PUBLISHED;
+
+            if ($row instanceof CQuiz) {
+                $quiz = $row;
+            } elseif (\is_array($row)) {
+                $candidate = $row[0] ?? $row['quiz'] ?? null;
+                if ($candidate instanceof CQuiz) {
+                    $quiz = $candidate;
+                }
+
+                if (isset($row['linkVisibility'])) {
+                    $linkVisibility = (int) $row['linkVisibility'];
+                }
+            }
+
+            if (!$quiz instanceof CQuiz || null === $quiz->getIid()) {
+                continue;
+            }
+
+            $quizId = (int) $quiz->getIid();
+            $quizzes[$quizId] = $quiz;
+            $linkVisibilityByQuiz[$quizId] = $linkVisibility;
+        }
+
+        $quizIds = array_keys($quizzes);
+        $questionCounts = $this->getQuestionCounts($quizIds);
+        $attemptCounts = $this->getAttemptCounts($quizIds, $course, $session);
+        $items = [];
+
+        foreach ($quizzes as $quizId => $quiz) {
+            $visible = self::VISIBILITY_PUBLISHED === ($linkVisibilityByQuiz[$quizId] ?? self::VISIBILITY_PUBLISHED);
+            $items[] = $this->normalizeQuiz(
+                $quiz,
+                $visible,
+                $questionCounts[$quizId] ?? 0,
+                $attemptCounts[$quizId] ?? 0,
+                $canManage,
+            );
+        }
+
+        return $items;
+    }
+
+    /**
+     * @param array<int, int> $quizIds
+     *
+     * @return array<int, int>
+     */
+    private function getQuestionCounts(array $quizIds): array
+    {
+        if ([] === $quizIds) {
+            return [];
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('IDENTITY(relQuestion.quiz) AS quizId')
+            ->addSelect('COUNT(relQuestion.iid) AS questionCount')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) IN (:quizIds)')
+            ->setParameter('quizIds', $quizIds, ArrayParameterType::INTEGER)
+            ->groupBy('relQuestion.quiz')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $counts = [];
+        foreach ($rows as $row) {
+            $counts[(int) $row['quizId']] = (int) $row['questionCount'];
+        }
+
+        return $counts;
+    }
+
+    /**
+     * @param array<int, int> $quizIds
+     *
+     * @return array<int, int>
+     */
+    private function getAttemptCounts(array $quizIds, Course $course, ?Session $session): array
+    {
+        if ([] === $quizIds) {
+            return [];
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('IDENTITY(attempt.quiz) AS quizId')
+            ->addSelect('COUNT(attempt.exeId) AS attemptCount')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) IN (:quizIds)')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('quizIds', $quizIds, ArrayParameterType::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->groupBy('attempt.quiz')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $rows = $queryBuilder->getQuery()->getArrayResult();
+        $counts = [];
+        foreach ($rows as $row) {
+            $counts[(int) $row['quizId']] = (int) $row['attemptCount'];
+        }
+
+        return $counts;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCategories(Course $course): array
+    {
+        if (!$this->isSettingEnabled('exercise.allow_exercise_categories')) {
+            return [];
+        }
+
+        $categories = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizCategory::class, 'category')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.position', 'ASC')
+            ->addOrderBy('category.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($categories as $category) {
+            if (!$category instanceof CQuizCategory || null === $category->getId()) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $category->getId(),
+                'title' => $category->getTitle(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getSettings(): array
+    {
+        return [
+            'allowExerciseCategories' => $this->isSettingEnabled('exercise.allow_exercise_categories'),
+            'disableCleanResultsForTeachers' => $this->isSettingEnabled('exercise.disable_clean_exercise_results_for_teachers'),
+            'disableNewAttempts' => $this->isSettingEnabled('exercise.exercises_disable_new_attempts'),
+            'hideAttemptsTableOnStartPage' => $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page'),
+            'limitTeacherAccess' => $this->isSettingEnabled('exercise.limit_exercise_teacher_access'),
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeQuiz(
+        CQuiz $quiz,
+        bool $visible,
+        int $questionCount,
+        int $attemptCount,
+        bool $canManage,
+    ): array {
+        $category = $quiz->getQuizCategory();
+        $startTime = $quiz->getStartTime();
+        $endTime = $quiz->getEndTime();
+        $availabilityStatus = $this->getAvailabilityStatus($startTime, $endTime);
+
+        return [
+            'iid' => (int) $quiz->getIid(),
+            'title' => $quiz->getTitle(),
+            'description' => (string) $quiz->getDescription(),
+            'categoryId' => null !== $category && null !== $category->getId() ? (int) $category->getId() : 0,
+            'categoryTitle' => null !== $category ? $category->getTitle() : '',
+            'visible' => $visible,
+            'availabilityStatus' => $availabilityStatus,
+            'startTime' => $this->formatDate($startTime),
+            'endTime' => $this->formatDate($endTime),
+            'duration' => $quiz->getDuration(),
+            'maxAttempt' => $quiz->getMaxAttempt(),
+            'passPercentage' => $quiz->getPassPercentage(),
+            'questionCount' => $questionCount,
+            'attemptCount' => $attemptCount,
+            'canOpen' => $visible || $canManage,
+            'canEdit' => $canManage,
+            'canConfigure' => $canManage,
+            'canReport' => $canManage,
+            'canExport' => $canManage,
+        ];
+    }
+
+    private function getAvailabilityStatus(?DateTimeInterface $startTime, ?DateTimeInterface $endTime): string
+    {
+        $now = new DateTimeImmutable();
+
+        if (null !== $startTime && $startTime > $now) {
+            return 'not_started';
+        }
+
+        if (null !== $endTime && $endTime < $now) {
+            return 'closed';
+        }
+
+        return 'open';
+    }
+
+    private function formatDate(?DateTimeInterface $date): ?string
+    {
+        if (null === $date) {
+            return null;
+        }
+
+        return $date->format(DateTimeInterface::ATOM);
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php
new file mode 100644
index 00000000000..6e55c1fa876
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php
@@ -0,0 +1,508 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionAction;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProcessorInterface<ExerciseQuestionAction, ExerciseQuestionAction>
+ */
+final readonly class ExerciseQuestionActionProcessor implements ProcessorInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_question_action';
+    private const ACTION_DELETE = 'delete';
+    private const ACTION_DUPLICATE = 'duplicate';
+    private const ACTION_REORDER = 'reorder';
+    private const MATCHING = 4;
+    private const MATCHING_DRAGGABLE = 19;
+    private const MATCHING_DRAGGABLE_COMBINATION = 25;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private CQuizQuestionRepository $questionRepository,
+        private Security $security,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionAction
+    {
+        if (!$data instanceof ExerciseQuestionAction) {
+            throw new BadRequestHttpException('Invalid exercise question action payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $this->validateCsrfToken($data->submittedCsrfToken);
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercise questions in this context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $action = strtolower(trim($data->action));
+
+        $message = match ($action) {
+            self::ACTION_DELETE => $this->deleteQuestion($quiz, (int) $data->questionId),
+            self::ACTION_DUPLICATE => $this->duplicateQuestion($quiz, (int) $data->questionId, $course, $session),
+            self::ACTION_REORDER => $this->reorderQuestions($quiz, $data->questionIds),
+            default => throw new BadRequestHttpException('Unsupported exercise question action.'),
+        };
+
+        $this->entityManager->flush();
+
+        $response = new ExerciseQuestionAction();
+        $response->exerciseId = $exerciseId;
+        $response->action = $action;
+        $response->questionId = $data->questionId;
+        $response->questionIds = $data->questionIds;
+        $response->success = true;
+        $response->message = $message;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function getQuestionRelation(CQuiz $quiz, int $questionId): CQuizRelQuestion
+    {
+        if (0 >= $questionId) {
+            throw new BadRequestHttpException('A valid question id is required.');
+        }
+
+        $relation = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$relation instanceof CQuizRelQuestion) {
+            throw new NotFoundHttpException('The requested question was not found in this exercise.');
+        }
+
+        return $relation;
+    }
+
+    private function deleteQuestion(CQuiz $quiz, int $questionId): string
+    {
+        $relation = $this->getQuestionRelation($quiz, $questionId);
+        $question = $relation->getQuestion();
+        $relationCount = $this->countQuestionRelations($question);
+
+        $this->entityManager->remove($relation);
+
+        if (1 >= $relationCount) {
+            foreach ($this->getAnswers($question) as $answer) {
+                $this->entityManager->remove($answer);
+            }
+            $this->entityManager->remove($question);
+        }
+
+        $this->normalizeQuestionOrder($quiz);
+
+        return 'Question deleted';
+    }
+
+    private function duplicateQuestion(CQuiz $quiz, int $questionId, Course $course, ?Session $session): string
+    {
+        $relation = $this->getQuestionRelation($quiz, $questionId);
+        $sourceQuestion = $relation->getQuestion();
+        $nextOrder = $this->getNextQuestionOrder($quiz);
+
+        $newQuestion = new CQuizQuestion();
+        $newQuestion
+            ->setQuestion(trim($sourceQuestion->getQuestion()).' - Copy')
+            ->setDescription($sourceQuestion->getDescription())
+            ->setFeedback($sourceQuestion->getFeedback())
+            ->setType((int) $sourceQuestion->getType())
+            ->setLevel(max(1, (int) $sourceQuestion->getLevel()))
+            ->setPosition($nextOrder)
+            ->setPonderation((float) $sourceQuestion->getPonderation())
+            ->setMandatory((int) $sourceQuestion->getMandatory())
+            ->setDuration($sourceQuestion->getDuration())
+            ->setParentMediaId($sourceQuestion->getParentMediaId())
+            ->setExtra($sourceQuestion->getExtra())
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        foreach ($sourceQuestion->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                $newQuestion->addCategory($category);
+            }
+        }
+
+        $this->questionRepository->create($newQuestion);
+
+        if ($this->isMatchingQuestion((int) $sourceQuestion->getType())) {
+            $this->copyMatchingAnswers($sourceQuestion, $newQuestion);
+        } else {
+            $optionIidMap = $this->copyQuestionOptions($sourceQuestion, $newQuestion);
+
+            foreach ($this->getAnswers($sourceQuestion) as $sourceAnswer) {
+                $sourceCorrect = (int) $sourceAnswer->getCorrect();
+                $answer = new CQuizAnswer();
+                $answer
+                    ->setQuestion($newQuestion)
+                    ->setAnswer($sourceAnswer->getAnswer())
+                    ->setCorrect((int) ($optionIidMap[$sourceCorrect] ?? $sourceCorrect))
+                    ->setComment((string) $sourceAnswer->getComment())
+                    ->setPonderation((float) $sourceAnswer->getPonderation())
+                    ->setPosition((int) $sourceAnswer->getPosition())
+                ;
+
+                if (null !== $sourceAnswer->getHotspotCoordinates()) {
+                    $answer->setHotspotCoordinates($sourceAnswer->getHotspotCoordinates());
+                }
+
+                if (null !== $sourceAnswer->getHotspotType()) {
+                    $answer->setHotspotType($sourceAnswer->getHotspotType());
+                }
+
+                if (null !== $sourceAnswer->getAnswerCode()) {
+                    $answer->setAnswerCode($sourceAnswer->getAnswerCode());
+                }
+
+                $this->entityManager->persist($answer);
+            }
+        }
+
+        $newRelation = new CQuizRelQuestion();
+        $newRelation
+            ->setQuiz($quiz)
+            ->setQuestion($newQuestion)
+            ->setQuestionOrder($nextOrder)
+        ;
+        $this->entityManager->persist($newRelation);
+
+        return 'Question copied';
+    }
+
+    private function isMatchingQuestion(int $type): bool
+    {
+        return \in_array($type, [self::MATCHING, self::MATCHING_DRAGGABLE, self::MATCHING_DRAGGABLE_COMBINATION], true);
+    }
+
+    private function copyMatchingAnswers(CQuizQuestion $sourceQuestion, CQuizQuestion $newQuestion): void
+    {
+        $sourceAnswers = $this->getAnswers($sourceQuestion);
+        $optionIidMap = [];
+
+        foreach ($sourceAnswers as $sourceAnswer) {
+            if (0 < (int) $sourceAnswer->getCorrect()) {
+                continue;
+            }
+
+            $newOption = $this->cloneAnswer($sourceAnswer, $newQuestion, 0);
+            $this->entityManager->persist($newOption);
+            $this->entityManager->flush();
+
+            if (null !== $sourceAnswer->getIid() && null !== $newOption->getIid()) {
+                $optionIidMap[(int) $sourceAnswer->getIid()] = (int) $newOption->getIid();
+            }
+        }
+
+        foreach ($sourceAnswers as $sourceAnswer) {
+            $sourceCorrect = (int) $sourceAnswer->getCorrect();
+            if (0 >= $sourceCorrect) {
+                continue;
+            }
+
+            $mappedCorrect = (int) ($optionIidMap[$sourceCorrect] ?? 0);
+            $newPair = $this->cloneAnswer($sourceAnswer, $newQuestion, $mappedCorrect);
+            $this->entityManager->persist($newPair);
+        }
+    }
+
+    private function cloneAnswer(CQuizAnswer $sourceAnswer, CQuizQuestion $newQuestion, int $correct): CQuizAnswer
+    {
+        $answer = new CQuizAnswer();
+        $answer
+            ->setQuestion($newQuestion)
+            ->setAnswer($sourceAnswer->getAnswer())
+            ->setCorrect($correct)
+            ->setComment((string) $sourceAnswer->getComment())
+            ->setPonderation((float) $sourceAnswer->getPonderation())
+            ->setPosition((int) $sourceAnswer->getPosition())
+        ;
+
+        if (null !== $sourceAnswer->getHotspotCoordinates()) {
+            $answer->setHotspotCoordinates($sourceAnswer->getHotspotCoordinates());
+        }
+
+        if (null !== $sourceAnswer->getHotspotType()) {
+            $answer->setHotspotType($sourceAnswer->getHotspotType());
+        }
+
+        if (null !== $sourceAnswer->getAnswerCode()) {
+            $answer->setAnswerCode($sourceAnswer->getAnswerCode());
+        }
+
+        return $answer;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function copyQuestionOptions(CQuizQuestion $sourceQuestion, CQuizQuestion $newQuestion): array
+    {
+        $optionIidMap = [];
+        foreach ($sourceQuestion->getOptions() as $sourceOption) {
+            if (!$sourceOption instanceof CQuizQuestionOption) {
+                continue;
+            }
+
+            $newOption = new CQuizQuestionOption();
+            $newOption
+                ->setQuestion($newQuestion)
+                ->setTitle((string) $sourceOption->getTitle())
+                ->setPosition((int) $sourceOption->getPosition())
+            ;
+            $this->entityManager->persist($newOption);
+            $this->entityManager->flush();
+
+            if (null !== $sourceOption->getIid() && null !== $newOption->getIid()) {
+                $optionIidMap[(int) $sourceOption->getIid()] = (int) $newOption->getIid();
+            }
+        }
+
+        return $optionIidMap;
+    }
+
+    /**
+     * @param array<int, mixed> $questionIds
+     */
+    private function reorderQuestions(CQuiz $quiz, array $questionIds): string
+    {
+        $orderedQuestionIds = array_values(array_unique(array_map('intval', $questionIds)));
+        if (empty($orderedQuestionIds)) {
+            throw new BadRequestHttpException('Question order is required.');
+        }
+
+        $relations = $this->getQuestionRelations($quiz);
+        $relationsByQuestionId = [];
+        foreach ($relations as $relation) {
+            $relationsByQuestionId[(int) $relation->getQuestion()->getIid()] = $relation;
+        }
+
+        $position = 1;
+        foreach ($orderedQuestionIds as $questionId) {
+            if (!isset($relationsByQuestionId[$questionId])) {
+                throw new BadRequestHttpException('Question order contains a question outside this exercise.');
+            }
+
+            $relationsByQuestionId[$questionId]->setQuestionOrder($position);
+            $relationsByQuestionId[$questionId]->getQuestion()->setPosition($position);
+            unset($relationsByQuestionId[$questionId]);
+            ++$position;
+        }
+
+        foreach ($relationsByQuestionId as $relation) {
+            $relation->setQuestionOrder($position);
+            $relation->getQuestion()->setPosition($position);
+            ++$position;
+        }
+
+        return 'Question order updated';
+    }
+
+    /**
+     * @return array<int, CQuizRelQuestion>
+     */
+    private function getQuestionRelations(CQuiz $quiz): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    private function normalizeQuestionOrder(CQuiz $quiz): void
+    {
+        $position = 1;
+        foreach ($this->getQuestionRelations($quiz) as $relation) {
+            $relation->setQuestionOrder($position);
+            $relation->getQuestion()->setPosition($position);
+            ++$position;
+        }
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getAnswers(CQuizQuestion $question): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    private function countQuestionRelations(CQuizQuestion $question): int
+    {
+        return (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(relQuestion.iid)')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+    }
+
+    private function getNextQuestionOrder(CQuiz $quiz): int
+    {
+        $result = $this->entityManager->createQueryBuilder()
+            ->select('MAX(relQuestion.questionOrder)')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return (int) $result + 1;
+    }
+
+    private function validateCsrfToken(string $token): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(self::CSRF_TOKEN_ID, $token))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
new file mode 100644
index 00000000000..252b0d151df
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
@@ -0,0 +1,2551 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionEditor;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+use Webit\Util\EvalMath\EvalMath;
+
+/**
+ * @implements ProcessorInterface<ExerciseQuestionEditor, ExerciseQuestionEditor>
+ */
+final readonly class ExerciseQuestionEditorProcessor implements ProcessorInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_question_editor';
+    private const UNIQUE_ANSWER = 1;
+    private const MULTIPLE_ANSWER = 2;
+    private const FILL_IN_BLANKS = 3;
+    private const MATCHING = 4;
+    private const FREE_ANSWER = 5;
+    private const HOT_SPOT = 6;
+    private const HOT_SPOT_DELINEATION = 8;
+    private const MULTIPLE_ANSWER_COMBINATION = 9;
+    private const UNIQUE_ANSWER_NO_OPTION = 10;
+    private const MULTIPLE_ANSWER_TRUE_FALSE = 11;
+    private const MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE = 12;
+    private const ORAL_EXPRESSION = 13;
+    private const GLOBAL_MULTIPLE_ANSWER = 14;
+    private const MEDIA_QUESTION = 15;
+    private const CALCULATED_ANSWER = 16;
+    private const UNIQUE_ANSWER_IMAGE = 17;
+    private const ANNOTATION = 20;
+    private const READING_COMPREHENSION = 21;
+    private const MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY = 22;
+    private const UPLOAD_ANSWER = 23;
+    private const PAGE_BREAK = 31;
+    private const DRAGGABLE = 18;
+    private const MATCHING_DRAGGABLE = 19;
+    private const MATCHING_COMBINATION = 24;
+    private const MATCHING_DRAGGABLE_COMBINATION = 25;
+    private const HOT_SPOT_COMBINATION = 26;
+    private const FILL_IN_BLANKS_COMBINATION = 27;
+    private const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28;
+    private const MULTIPLE_ANSWER_DROPDOWN = 29;
+    private const UNKNOWN_ANSWER_POSITION = 666;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private CQuizQuestionRepository $questionRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionEditor
+    {
+        if (!$data instanceof ExerciseQuestionEditor) {
+            throw new BadRequestHttpException('Invalid exercise question payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $this->validateCsrfToken($data->submittedCsrfToken);
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercise questions in this context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $questionId = isset($uriVariables['questionId']) ? (int) $uriVariables['questionId'] : (int) ($data->questionId ?? 0);
+        $this->validatePayload($data);
+        $this->validateAnnotationImageOnCreate($data, 0 >= $questionId);
+        $this->validateHotspotImageOnCreate($data, 0 >= $questionId);
+
+        if (0 < $questionId) {
+            $question = $this->updateQuestion($quiz, $questionId, $data, $course, $session);
+        } else {
+            $question = $this->createQuestion($quiz, $data, $course, $session);
+        }
+
+        $this->entityManager->flush();
+
+        return $this->buildResponse($quiz, $question, $course, $session);
+    }
+
+    private function createQuestion(CQuiz $quiz, ExerciseQuestionEditor $data, Course $course, ?Session $session): CQuizQuestion
+    {
+        $question = new CQuizQuestion();
+        $this->applyQuestionFields($quiz, $question, $data, $this->getNextQuestionOrder($quiz));
+        $question
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        $this->questionRepository->create($question);
+        $this->addAnnotationImageOnCreate($question, $data);
+        $this->addHotspotImageOnCreate($question, $data);
+        $this->replaceAnswers($question, $data);
+        $this->updateQuestionCategory($question, $data, $course, $session);
+
+        $relation = new CQuizRelQuestion();
+        $relation
+            ->setQuiz($quiz)
+            ->setQuestion($question)
+            ->setQuestionOrder($this->getNextQuestionOrder($quiz))
+        ;
+        $this->applyHotspotDelineationDestination($relation, $data);
+        $this->entityManager->persist($relation);
+
+        return $question;
+    }
+
+    private function updateQuestion(CQuiz $quiz, int $questionId, ExerciseQuestionEditor $data, Course $course, ?Session $session): CQuizQuestion
+    {
+        $question = $this->getQuestionFromExercise($quiz, $questionId);
+        $this->applyQuestionFields($quiz, $question, $data, (int) $question->getPosition());
+        $this->replaceAnswers($question, $data);
+        $this->updateQuestionCategory($question, $data, $course, $session);
+        $relation = $this->getQuestionRelation($quiz, $question);
+        if ($relation instanceof CQuizRelQuestion) {
+            $this->applyHotspotDelineationDestination($relation, $data);
+        }
+        $this->entityManager->persist($question);
+
+        return $question;
+    }
+
+    private function applyQuestionFields(CQuiz $quiz, CQuizQuestion $question, ExerciseQuestionEditor $data, int $position): void
+    {
+        $type = (int) $data->type;
+        if (!$this->isVueSupportedQuestionType($type)) {
+            throw new BadRequestHttpException('This question type is still managed by the legacy exercise tool.');
+        }
+
+        $score = $this->calculateQuestionScore($data);
+        $question
+            ->setQuestion(trim($data->title))
+            ->setDescription((string) $data->description)
+            ->setFeedback($this->isQuestionFeedbackEnabled() ? (string) $data->feedback : $question->getFeedback())
+            ->setExtra($this->buildQuestionExtra($type, $data, $question))
+            ->setType($type)
+            ->setLevel($this->normalizeDifficulty($data->difficulty))
+            ->setPosition($position)
+            ->setPonderation($score)
+            ->setMandatory($this->isStructuralQuestionType($type) ? 0 : ($data->mandatory ? 1 : 0))
+            ->setDuration($this->isStructuralQuestionType($type) ? null : $this->normalizeNullablePositiveInteger($data->duration))
+            ->setParentMediaId($this->isStructuralQuestionType($type) ? null : $this->normalizeParentMediaId($quiz, $data, $question))
+        ;
+    }
+
+    private function replaceAnswers(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            $this->entityManager->remove($answer);
+        }
+
+        $type = (int) $data->type;
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER], true) || $this->isStructuralQuestionType($type)) {
+            return;
+        }
+
+        if ($this->usesHotspot($type)) {
+            $this->persistHotspotAnswers($question, $data);
+
+            return;
+        }
+
+        if ($this->usesFillBlanks($type)) {
+            $this->persistFillBlanksAnswer($question, $data);
+
+            return;
+        }
+
+        if (self::CALCULATED_ANSWER === $type) {
+            $this->persistCalculatedAnswers($question, $data);
+
+            return;
+        }
+
+        if ($this->usesDraggableOrdering($type)) {
+            $this->persistDraggableAnswers($question, $data);
+
+            return;
+        }
+
+        if ($this->usesMatching($type)) {
+            $this->persistMatchingAnswers($question, $data);
+
+            return;
+        }
+
+        $optionIidsByPosition = $this->usesTrueFalseOptions($type)
+            ? $this->ensureTrueFalseOptions($question, $type)
+            : [];
+
+        $answers = $this->normalizeAnswersForType($data, $optionIidsByPosition);
+        $position = 1;
+        foreach ($answers as $answerData) {
+            $answerPosition = true === ($answerData['isUnknown'] ?? false) ? self::UNKNOWN_ANSWER_POSITION : $position;
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) $answerData['answer'])
+                ->setCorrect((int) $answerData['correct'])
+                ->setComment((string) $answerData['comment'])
+                ->setPonderation((float) $answerData['score'])
+                ->setPosition($answerPosition)
+            ;
+            $this->entityManager->persist($answer);
+
+            if (self::UNKNOWN_ANSWER_POSITION !== $answerPosition) {
+                ++$position;
+            }
+        }
+    }
+
+    private function validatePayload(ExerciseQuestionEditor $data): void
+    {
+        if ('' === trim(strip_tags($data->title))) {
+            throw new BadRequestHttpException('The question title is required.');
+        }
+
+        if (!$this->isVueSupportedQuestionType((int) $data->type)) {
+            throw new BadRequestHttpException('This question type is still managed by the legacy exercise tool.');
+        }
+
+        $type = (int) $data->type;
+        if ($this->usesHotspot($type)) {
+            $this->validateHotspotPayload($data);
+
+            return;
+        }
+
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER], true)) {
+            if (0 >= (float) $data->score) {
+                throw new BadRequestHttpException('Required field.');
+            }
+
+            return;
+        }
+
+        if (self::CALCULATED_ANSWER === $type) {
+            $this->validateCalculatedPayload($data);
+
+            return;
+        }
+
+        if ($this->isStructuralQuestionType($type)) {
+            return;
+        }
+
+        if ($this->usesFillBlanks($type)) {
+            $this->validateFillBlanksPayload($data);
+
+            return;
+        }
+
+        if ($this->usesDraggableOrdering($type)) {
+            $this->validateDraggablePayload($data);
+
+            return;
+        }
+
+        if ($this->usesMatching($type)) {
+            $this->validateMatchingPayload($data);
+
+            return;
+        }
+
+        $answers = $this->getCleanAnswers($data);
+        $regularAnswers = array_filter($answers, static fn (array $answer): bool => true !== ($answer['isUnknown'] ?? false));
+        if (2 > \count($regularAnswers)) {
+            throw new BadRequestHttpException('At least two answers are required.');
+        }
+
+        if ($this->usesTrueFalseOptions($type)) {
+            foreach ($regularAnswers as $answer) {
+                if (!\in_array((int) ($answer['correctChoice'] ?? 0), [1, 2], true)) {
+                    throw new BadRequestHttpException('Each true/false answer must have True or False selected.');
+                }
+            }
+        } else {
+            $correctAnswers = array_filter($regularAnswers, static fn (array $answer): bool => true === $answer['correct']);
+            if ($this->usesSingleCorrectAnswer($type) && 1 !== \count($correctAnswers)) {
+                throw new BadRequestHttpException('A unique answer question must have exactly one correct answer.');
+            }
+
+            if (!$this->usesSingleCorrectAnswer($type) && 0 === \count($correctAnswers)) {
+                throw new BadRequestHttpException('At least one correct answer is required.');
+            }
+        }
+
+        if (self::MULTIPLE_ANSWER_DROPDOWN === $type) {
+            $dropdownScore = 0.0;
+            foreach ($regularAnswers as $answer) {
+                if (true === ($answer['correct'] ?? false)) {
+                    $dropdownScore += max(0.0, (float) ($answer['score'] ?? 0.0));
+                }
+            }
+
+            if (0 >= $dropdownScore) {
+                throw new BadRequestHttpException('Required field.');
+            }
+        }
+
+        if ($this->usesGlobalScore($type) && 0 >= (float) $data->globalScore) {
+            throw new BadRequestHttpException('Required field.');
+        }
+
+        if ($this->usesTrueFalseScoreOptions($type) && 0 >= (float) $data->correctScore) {
+            throw new BadRequestHttpException('Required field.');
+        }
+    }
+
+    private function validateAnnotationImageOnCreate(ExerciseQuestionEditor $data, bool $isCreate): void
+    {
+        if (self::ANNOTATION !== (int) $data->type || !$isCreate) {
+            return;
+        }
+
+        if ('' === trim($data->annotationImageData)) {
+            throw new BadRequestHttpException('Please select an image');
+        }
+
+        $this->decodeAnnotationImage($data);
+    }
+
+    private function addAnnotationImageOnCreate(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        if (self::ANNOTATION !== (int) $data->type) {
+            return;
+        }
+
+        $image = $this->decodeAnnotationImage($data);
+        $this->questionRepository->addFileFromString(
+            $question,
+            $image['fileName'],
+            $image['mimeType'],
+            $image['content'],
+            true
+        );
+    }
+
+    private function validateHotspotImageOnCreate(ExerciseQuestionEditor $data, bool $isCreate): void
+    {
+        if (!$this->usesHotspot((int) $data->type) || !$isCreate) {
+            return;
+        }
+
+        if ('' === trim($data->hotspotImageData)) {
+            throw new BadRequestHttpException('Please select an image');
+        }
+
+        $this->decodeHotspotImage($data);
+    }
+
+    private function addHotspotImageOnCreate(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        if (!$this->usesHotspot((int) $data->type)) {
+            return;
+        }
+
+        $image = $this->decodeHotspotImage($data);
+        $this->questionRepository->addFileFromString(
+            $question,
+            $image['fileName'],
+            $image['mimeType'],
+            $image['content'],
+            true
+        );
+    }
+
+    /**
+     * @return array{fileName: string, mimeType: string, content: string}
+     */
+    private function decodeAnnotationImage(ExerciseQuestionEditor $data): array
+    {
+        return $this->decodeQuestionImage(
+            $data->annotationImageData,
+            $data->annotationImageMimeType,
+            $data->annotationImageName,
+            'annotation_image'
+        );
+    }
+
+    /**
+     * @return array{fileName: string, mimeType: string, content: string}
+     */
+    private function decodeHotspotImage(ExerciseQuestionEditor $data): array
+    {
+        return $this->decodeQuestionImage(
+            $data->hotspotImageData,
+            $data->hotspotImageMimeType,
+            $data->hotspotImageName,
+            'hotspot_image'
+        );
+    }
+
+    /**
+     * @return array{fileName: string, mimeType: string, content: string}
+     */
+    private function decodeQuestionImage(string $rawData, string $submittedMimeType, string $submittedFileName, string $defaultBaseName): array
+    {
+        $rawData = trim($rawData);
+        $mimeType = strtolower(trim($submittedMimeType));
+        $encodedContent = $rawData;
+
+        if (preg_match('/^data:(image\/(?:jpeg|png|gif));base64,(.+)$/i', $rawData, $matches)) {
+            $mimeType = strtolower($matches[1]);
+            $encodedContent = $matches[2];
+        }
+
+        $allowedMimeTypes = ['image/jpeg', 'image/png', 'image/gif'];
+        if (!\in_array($mimeType, $allowedMimeTypes, true)) {
+            throw new BadRequestHttpException('Only PNG, JPG or GIF images allowed');
+        }
+
+        $content = base64_decode($encodedContent, true);
+        if (false === $content || '' === $content) {
+            throw new BadRequestHttpException('Only PNG, JPG or GIF images allowed');
+        }
+
+        if (false === getimagesizefromstring($content)) {
+            throw new BadRequestHttpException('Only PNG, JPG or GIF images allowed');
+        }
+
+        $fileName = basename(trim($submittedFileName));
+        if ('' === $fileName) {
+            $fileName = $defaultBaseName.'.'.$this->getExtensionFromMimeType($mimeType);
+        }
+
+        $extension = strtolower((string) pathinfo($fileName, PATHINFO_EXTENSION));
+        if ('jpg' === $extension) {
+            $extension = 'jpeg';
+        }
+
+        if (!\in_array($extension, ['jpeg', 'png', 'gif'], true)) {
+            throw new BadRequestHttpException('Only PNG, JPG or GIF images allowed');
+        }
+
+        return [
+            'fileName' => $fileName,
+            'mimeType' => $mimeType,
+            'content' => $content,
+        ];
+    }
+
+    private function getExtensionFromMimeType(string $mimeType): string
+    {
+        return match ($mimeType) {
+            'image/jpeg' => 'jpg',
+            'image/png' => 'png',
+            'image/gif' => 'gif',
+            default => 'png',
+        };
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function getQuestionFromExercise(CQuiz $quiz, int $questionId): CQuizQuestion
+    {
+        $relation = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$relation instanceof CQuizRelQuestion) {
+            throw new NotFoundHttpException('The requested question was not found in this exercise.');
+        }
+
+        return $relation->getQuestion();
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getExistingAnswers(CQuizQuestion $question): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    private function hasAnswerContent(string $answer): bool
+    {
+        if ('' === trim($answer)) {
+            return false;
+        }
+
+        if (1 === preg_match('/<img\b[^>]*>/i', $answer)) {
+            return true;
+        }
+
+        return '' !== trim(strip_tags(html_entity_decode($answer, ENT_QUOTES, 'UTF-8')));
+    }
+
+    /**
+     * @return array<int, array{answer: string, correct: bool, comment: string, score: float, position: int, isUnknown: bool}>
+     */
+    private function getCleanAnswers(ExerciseQuestionEditor $data): array
+    {
+        $answers = [];
+        foreach ($data->answers as $answer) {
+            if (!\is_array($answer)) {
+                continue;
+            }
+
+            $position = (int) ($answer['position'] ?? 0);
+            $isUnknown = true === ($answer['isUnknown'] ?? false) || self::UNKNOWN_ANSWER_POSITION === $position;
+            $answerText = trim((string) ($answer['answer'] ?? ''));
+            if (!$this->hasAnswerContent($answerText) && !$isUnknown) {
+                continue;
+            }
+
+            if ($isUnknown && '' === $answerText) {
+                $answerText = 'Don\'t know';
+            }
+
+            $score = (float) ($answer['score'] ?? 0.0);
+            $answers[] = [
+                'answer' => $answerText,
+                'correct' => !$isUnknown && true === ($answer['correct'] ?? false),
+                'correctChoice' => (int) ($answer['correctChoice'] ?? 0),
+                'comment' => (string) ($answer['comment'] ?? ''),
+                'score' => $isUnknown ? 0.0 : $score,
+                'position' => $isUnknown ? self::UNKNOWN_ANSWER_POSITION : $position,
+                'isUnknown' => $isUnknown,
+            ];
+        }
+
+        return $answers;
+    }
+
+    private function updateQuestionCategory(
+        CQuizQuestion $question,
+        ExerciseQuestionEditor $data,
+        ?Course $course,
+        ?Session $session,
+    ): void {
+        $categories = $question->getCategories();
+        foreach ($categories as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                $question->removeCategory($category);
+            }
+        }
+
+        $categoryId = (int) $data->categoryId;
+        if (0 >= $categoryId) {
+            return;
+        }
+
+        $category = $this->getQuestionCategory($categoryId, $course, $session);
+        $question->addCategory($category);
+    }
+
+    private function getQuestionCategory(int $categoryId, ?Course $course, ?Session $session): CQuizQuestionCategory
+    {
+        $category = $this->entityManager->getRepository(CQuizQuestionCategory::class)->find($categoryId);
+        if (!$category instanceof CQuizQuestionCategory) {
+            throw new BadRequestHttpException('The requested question category was not found.');
+        }
+
+        if (null === $course) {
+            return $category;
+        }
+
+        if ($this->isQuestionCategoryInContext($categoryId, $course, $session)) {
+            return $category;
+        }
+
+        throw new AccessDeniedHttpException('The requested question category does not belong to the current course context.');
+    }
+
+    private function isQuestionCategoryInContext(int $categoryId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('category.iid')
+            ->from(CQuizQuestionCategory::class, 'category')
+            ->innerJoin('category.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('category.iid = :categoryId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('categoryId', $categoryId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function normalizeDifficulty(int $difficulty): int
+    {
+        if (1 > $difficulty) {
+            return 1;
+        }
+
+        if (5 < $difficulty) {
+            return 5;
+        }
+
+        return $difficulty;
+    }
+
+    private function normalizeParentMediaId(CQuiz $quiz, ExerciseQuestionEditor $data, CQuizQuestion $question): ?int
+    {
+        $mediaId = (int) $data->parentMediaId;
+        if (0 >= $mediaId) {
+            return null;
+        }
+
+        if (null !== $question->getIid() && $mediaId === (int) $question->getIid()) {
+            throw new BadRequestHttpException('A question cannot be attached to itself as media.');
+        }
+
+        $mediaQuestion = $this->questionRepository->find($mediaId);
+        if (!$mediaQuestion instanceof CQuizQuestion || self::MEDIA_QUESTION !== (int) $mediaQuestion->getType()) {
+            throw new BadRequestHttpException('The selected media question is not valid.');
+        }
+
+        if (!$this->isQuestionInExercise($quiz, $mediaId)) {
+            throw new AccessDeniedHttpException('The selected media question does not belong to this exercise.');
+        }
+
+        return $mediaId;
+    }
+
+    private function isQuestionInExercise(CQuiz $quiz, int $questionId): bool
+    {
+        $result = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion.iid')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $result;
+    }
+
+    private function getFirstCategoryId(CQuizQuestion $question): int
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory && null !== $category->getIid()) {
+                return (int) $category->getIid();
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getResponseAnswers(CQuizQuestion $question): array
+    {
+        $items = [];
+        $type = (int) $question->getType();
+        if ($this->usesFillBlanks($type)) {
+            return [];
+        }
+
+        $optionPositionsByIid = $this->getQuestionOptionPositionsByIid($question);
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            $correctValue = (int) $answer->getCorrect();
+            $correctChoice = $this->usesTrueFalseOptions($type)
+                ? (int) ($optionPositionsByIid[$correctValue] ?? $correctValue)
+                : null;
+
+            $items[] = [
+                'id' => $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'correct' => $this->usesTrueFalseOptions($type) ? 1 === $correctChoice : 1 === $correctValue,
+                'correctChoice' => $this->usesTrueFalseOptions($type) ? $correctChoice : null,
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+                'isUnknown' => self::UNKNOWN_ANSWER_POSITION === (int) $answer->getPosition(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array{questionCount: int, totalScore: float}
+     */
+    private function getQuestionSummary(CQuiz $quiz): array
+    {
+        $questions = $this->entityManager->createQueryBuilder()
+            ->select('question.ponderation')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $totalScore = 0.0;
+        foreach ($questions as $question) {
+            $totalScore += (float) ($question['ponderation'] ?? 0.0);
+        }
+
+        return [
+            'questionCount' => \count($questions),
+            'totalScore' => $totalScore,
+        ];
+    }
+
+    private function calculateQuestionScore(ExerciseQuestionEditor $data): float
+    {
+        $type = (int) $data->type;
+        if ($this->isStructuralQuestionType($type)) {
+            return 0.0;
+        }
+
+        if ($this->usesHotspot($type)) {
+            if (self::HOT_SPOT_COMBINATION === $type) {
+                return max(0.0, (float) $data->globalScore);
+            }
+
+            $score = 0.0;
+            foreach ($this->getCleanHotspotItems($data) as $item) {
+                $score += max(0.0, (float) ($item['score'] ?? 0.0));
+            }
+
+            return $score;
+        }
+
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::CALCULATED_ANSWER], true)) {
+            return max(0.0, (float) $data->score);
+        }
+
+        if (self::FILL_IN_BLANKS === $type) {
+            return $this->calculateFillBlanksScore($data);
+        }
+
+        if (self::FILL_IN_BLANKS_COMBINATION === $type) {
+            return max(0.0, (float) $data->globalScore);
+        }
+
+        if ($this->usesDraggableOrdering($type)) {
+            $score = 0.0;
+            foreach ($this->getCleanDraggableItems($data) as $item) {
+                $score += max(0.0, (float) ($item['score'] ?? 0.0));
+            }
+
+            return $score;
+        }
+
+        if ($this->usesMatching($type)) {
+            if (\in_array($type, [self::MATCHING_COMBINATION, self::MATCHING_DRAGGABLE_COMBINATION], true)) {
+                return max(0.0, (float) $data->globalScore);
+            }
+
+            $score = 0.0;
+            foreach ($this->getCleanMatchingPairs($data) as $pair) {
+                $score += max(0.0, (float) ($pair['score'] ?? 0.0));
+            }
+
+            return $score;
+        }
+
+        if (\in_array($type, [self::MULTIPLE_ANSWER_TRUE_FALSE, self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY], true)) {
+            $regularAnswerCount = \count(array_filter(
+                $this->getCleanAnswers($data),
+                static fn (array $answer): bool => true !== ($answer['isUnknown'] ?? false)
+            ));
+
+            return max(0.0, (float) $data->correctScore) * max(1, $regularAnswerCount);
+        }
+
+        if ($this->usesGlobalScore($type)) {
+            return max(0.0, (float) $data->globalScore);
+        }
+
+        $score = 0.0;
+        foreach ($this->getCleanAnswers($data) as $answer) {
+            if (true === $answer['correct'] && 0 < $answer['score']) {
+                $score += $answer['score'];
+            }
+        }
+
+        if (0 < $score) {
+            return $score;
+        }
+
+        return max(0.0, (float) $data->score);
+    }
+
+    private function getNextQuestionOrder(CQuiz $quiz): int
+    {
+        $result = $this->entityManager->createQueryBuilder()
+            ->select('MAX(relQuestion.questionOrder)')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return (int) $result + 1;
+    }
+
+    private function normalizeNullablePositiveInteger(?int $value): ?int
+    {
+        if (null === $value || 0 >= $value) {
+            return null;
+        }
+
+        return $value;
+    }
+
+    private function validateCsrfToken(string $token): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(self::CSRF_TOKEN_ID, $token))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+
+    private function isVueSupportedQuestionType(int $type): bool
+    {
+        return \in_array($type, [
+            self::UNIQUE_ANSWER,
+            self::MULTIPLE_ANSWER,
+            self::FILL_IN_BLANKS,
+            self::MATCHING,
+            self::FREE_ANSWER,
+            self::HOT_SPOT,
+            self::ORAL_EXPRESSION,
+            self::MULTIPLE_ANSWER_COMBINATION,
+            self::UNIQUE_ANSWER_NO_OPTION,
+            self::MULTIPLE_ANSWER_TRUE_FALSE,
+            self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE,
+            self::GLOBAL_MULTIPLE_ANSWER,
+            self::MEDIA_QUESTION,
+            self::CALCULATED_ANSWER,
+            self::UNIQUE_ANSWER_IMAGE,
+            self::ANNOTATION,
+            self::READING_COMPREHENSION,
+            self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY,
+            self::UPLOAD_ANSWER,
+            self::DRAGGABLE,
+            self::MATCHING_DRAGGABLE,
+            self::MATCHING_COMBINATION,
+            self::MATCHING_DRAGGABLE_COMBINATION,
+            self::HOT_SPOT_COMBINATION,
+            self::FILL_IN_BLANKS_COMBINATION,
+            self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION,
+            self::MULTIPLE_ANSWER_DROPDOWN,
+            self::PAGE_BREAK,
+        ], true);
+    }
+
+    private function getQuestionTypeLabel(int $type): string
+    {
+        return match ($type) {
+            self::UNIQUE_ANSWER => 'Unique answer',
+            self::MULTIPLE_ANSWER => 'Multiple answer',
+            self::FILL_IN_BLANKS => 'Fill in blanks',
+            self::MATCHING => 'Matching',
+            self::FREE_ANSWER => 'Open question',
+            self::HOT_SPOT => 'Hotspot',
+            self::HOT_SPOT_DELINEATION => 'Hotspot delineation',
+            self::ORAL_EXPRESSION => 'Oral expression',
+            self::MULTIPLE_ANSWER_COMBINATION => 'Exact Selection',
+            self::UNIQUE_ANSWER_NO_OPTION => 'Unique answer with unknown',
+            self::MULTIPLE_ANSWER_TRUE_FALSE => 'Multiple answer true/false',
+            self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => 'Multiple answer combination true/false',
+            self::GLOBAL_MULTIPLE_ANSWER => 'Global multiple answer',
+            self::MEDIA_QUESTION => 'Media question',
+            self::CALCULATED_ANSWER => 'Calculated answer',
+            self::UNIQUE_ANSWER_IMAGE => 'Unique answer with images',
+            self::ANNOTATION => 'Annotation',
+            self::READING_COMPREHENSION => 'Reading comprehension',
+            self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => 'Multiple answer true/false with degree of certainty',
+            self::UPLOAD_ANSWER => 'Upload answer',
+            self::DRAGGABLE => 'Draggable',
+            self::MATCHING_DRAGGABLE => 'Matching draggable',
+            self::MATCHING_COMBINATION => 'Matching combination',
+            self::MATCHING_DRAGGABLE_COMBINATION => 'Matching draggable combination',
+            self::HOT_SPOT_COMBINATION => 'Hotspot combination',
+            self::FILL_IN_BLANKS_COMBINATION => 'Fill in blanks combination',
+            self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => 'Multiple answer dropdown combination',
+            self::MULTIPLE_ANSWER_DROPDOWN => 'Multiple answer dropdown',
+            self::PAGE_BREAK => 'Page break',
+            default => 'Question',
+        };
+    }
+
+    private function usesSingleCorrectAnswer(int $type): bool
+    {
+        return \in_array($type, [self::UNIQUE_ANSWER, self::UNIQUE_ANSWER_NO_OPTION, self::UNIQUE_ANSWER_IMAGE], true);
+    }
+
+    private function usesGlobalScore(int $type): bool
+    {
+        return \in_array($type, [self::MULTIPLE_ANSWER_COMBINATION, self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE, self::GLOBAL_MULTIPLE_ANSWER, self::FILL_IN_BLANKS_COMBINATION, self::MATCHING_COMBINATION, self::MATCHING_DRAGGABLE_COMBINATION, self::HOT_SPOT_COMBINATION, self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION], true);
+    }
+
+    private function usesTrueFalseOptions(int $type): bool
+    {
+        return \in_array($type, [self::MULTIPLE_ANSWER_TRUE_FALSE, self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE, self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY], true);
+    }
+
+    private function usesTrueFalseScoreOptions(int $type): bool
+    {
+        return \in_array($type, [self::MULTIPLE_ANSWER_TRUE_FALSE, self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY], true);
+    }
+
+    private function buildTrueFalseExtra(ExerciseQuestionEditor $data): string
+    {
+        return implode(':', [
+            (string) (float) $data->correctScore,
+            (string) (float) $data->wrongScore,
+            (string) (float) $data->unknownScore,
+        ]);
+    }
+
+    /**
+     * @return array<int, array{answer: string, correct: bool, comment: string, score: float, position: int, isUnknown: bool}>
+     */
+    private function normalizeAnswersForType(ExerciseQuestionEditor $data, array $optionIidsByPosition = []): array
+    {
+        $type = (int) $data->type;
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::CALCULATED_ANSWER], true) || $this->isStructuralQuestionType($type) || $this->usesHotspot($type) || $this->usesFillBlanks($type) || $this->usesMatching($type) || $this->usesDraggableOrdering($type)) {
+            return [];
+        }
+
+        $answers = $this->getCleanAnswers($data);
+
+        if (self::UNIQUE_ANSWER_NO_OPTION === $type) {
+            $hasUnknownAnswer = false;
+            foreach ($answers as &$answer) {
+                if (true === $answer['isUnknown']) {
+                    $answer['correct'] = false;
+                    $answer['score'] = 0.0;
+                    $answer['position'] = self::UNKNOWN_ANSWER_POSITION;
+                    $hasUnknownAnswer = true;
+                }
+            }
+            unset($answer);
+
+            if (!$hasUnknownAnswer) {
+                $answers[] = [
+                    'answer' => 'Don\'t know',
+                    'correct' => false,
+                    'correctChoice' => 0,
+                    'comment' => '',
+                    'score' => 0.0,
+                    'position' => self::UNKNOWN_ANSWER_POSITION,
+                    'isUnknown' => true,
+                ];
+            }
+        }
+
+        if ($this->usesTrueFalseOptions($type)) {
+            foreach ($answers as $index => &$answer) {
+                $choicePosition = (int) ($answer['correctChoice'] ?? 1);
+                if (!\in_array($choicePosition, [1, 2], true)) {
+                    $choicePosition = 1;
+                }
+
+                $answer['correct'] = (int) ($optionIidsByPosition[$choicePosition] ?? $choicePosition);
+                $answer['score'] = self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE === $type && 0 === $index
+                    ? max(0.0, (float) $data->globalScore)
+                    : 0.0;
+            }
+            unset($answer);
+        }
+
+        if (self::MULTIPLE_ANSWER_COMBINATION === $type) {
+            $globalScore = max(0.0, (float) $data->globalScore);
+            foreach ($answers as $index => &$answer) {
+                $answer['score'] = 0 === $index ? $globalScore : 0.0;
+            }
+            unset($answer);
+        }
+
+        if (self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION === $type) {
+            foreach ($answers as &$answer) {
+                $answer['score'] = 0.0;
+            }
+            unset($answer);
+        }
+
+        if (self::MULTIPLE_ANSWER_DROPDOWN === $type) {
+            foreach ($answers as &$answer) {
+                if (true !== $answer['correct']) {
+                    $answer['score'] = 0.0;
+                }
+            }
+            unset($answer);
+        }
+
+        if (self::GLOBAL_MULTIPLE_ANSWER === $type) {
+            $correctCount = 0;
+            foreach ($answers as $answer) {
+                if (true === $answer['correct']) {
+                    ++$correctCount;
+                }
+            }
+
+            $correctScore = 0 < $correctCount ? max(0.0, (float) $data->globalScore) / $correctCount : 0.0;
+            foreach ($answers as &$answer) {
+                $answer['score'] = true === $answer['correct']
+                    ? abs($correctScore)
+                    : (true === $data->noNegativeScore ? 0.0 : -abs($correctScore));
+            }
+            unset($answer);
+        }
+
+        return $answers;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function ensureTrueFalseOptions(CQuizQuestion $question, int $type): array
+    {
+        $expectedTitles = self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY === $type
+            ? [1 => 'True', 2 => 'False', 3 => '50%', 4 => '60%', 5 => '70%', 6 => '80%', 7 => '90%', 8 => '100%']
+            : [1 => 'True', 2 => 'False', 3 => 'Don\'t know'];
+
+        $optionIidsByPosition = [];
+        foreach ($question->getOptions() as $option) {
+            if (!$option instanceof CQuizQuestionOption || null === $option->getIid()) {
+                continue;
+            }
+
+            $optionIidsByPosition[(int) $option->getPosition()] = (int) $option->getIid();
+        }
+
+        foreach ($expectedTitles as $position => $title) {
+            if (isset($optionIidsByPosition[$position])) {
+                continue;
+            }
+
+            $option = new CQuizQuestionOption();
+            $option
+                ->setQuestion($question)
+                ->setTitle($title)
+                ->setPosition((int) $position)
+            ;
+            $this->entityManager->persist($option);
+            $this->entityManager->flush();
+            $optionIidsByPosition[$position] = (int) $option->getIid();
+        }
+
+        ksort($optionIidsByPosition);
+
+        return $optionIidsByPosition;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getQuestionOptionPositionsByIid(CQuizQuestion $question): array
+    {
+        $items = [];
+        foreach ($question->getOptions() as $option) {
+            if (!$option instanceof CQuizQuestionOption || null === $option->getIid()) {
+                continue;
+            }
+
+            $items[(int) $option->getIid()] = (int) $option->getPosition();
+        }
+
+        return $items;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $answers
+     */
+    private function hasNoNegativeScore(array $answers): bool
+    {
+        foreach ($answers as $answer) {
+            if (true === ($answer['correct'] ?? false)) {
+                continue;
+            }
+
+            if (0.0 === (float) ($answer['score'] ?? 0.0)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function isQuestionFeedbackEnabled(): bool
+    {
+        $value = $this->settingsManager->getSetting('exercise.allow_quiz_question_feedback', true);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
+    /**
+     * @return array{0: float, 1: float, 2: float}
+     */
+    private function getTrueFalseScores(CQuizQuestion $question): array
+    {
+        $scores = explode(':', (string) $question->getExtra());
+
+        return [
+            (float) ($scores[0] ?? 1.0),
+            (float) ($scores[1] ?? -0.5),
+            (float) ($scores[2] ?? 0.0),
+        ];
+    }
+
+
+    private function buildQuestionExtra(int $type, ExerciseQuestionEditor $data, CQuizQuestion $question): ?string
+    {
+        if ($this->usesTrueFalseScoreOptions($type)) {
+            if (self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY === $type) {
+                return implode(':', [
+                    (string) (float) $data->correctScore,
+                    (string) (float) $data->wrongScore,
+                    '0',
+                ]);
+            }
+
+            return $this->buildTrueFalseExtra($data);
+        }
+
+        if ($this->usesFillBlanks($type)) {
+            return $data->fillBlanksCaseInsensitive ? 'case:false' : null;
+        }
+
+        if ($this->usesDraggableOrdering($type)) {
+            return \in_array($data->matchingOrientation, ['h', 'v'], true) ? $data->matchingOrientation : 'h';
+        }
+
+        return $question->getExtra();
+    }
+
+
+    private function validateDraggablePayload(ExerciseQuestionEditor $data): void
+    {
+        $items = $this->getCleanDraggableItems($data);
+
+        if (2 > \count($items)) {
+            throw new BadRequestHttpException('At least two draggable items are required.');
+        }
+
+        $validPositions = range(1, \count($items));
+        foreach ($items as $item) {
+            if (!\in_array((int) ($item['targetPosition'] ?? 0), $validPositions, true)) {
+                throw new BadRequestHttpException('Each draggable item must be linked to a valid target position.');
+            }
+        }
+
+        if (0 >= $this->calculateQuestionScore($data)) {
+            throw new BadRequestHttpException('Required field.');
+        }
+    }
+
+    private function persistDraggableAnswers(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        $items = $this->getCleanDraggableItems($data);
+        $position = 1;
+
+        foreach ($items as $index => $_item) {
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) ($index + 1))
+                ->setCorrect(0)
+                ->setComment('')
+                ->setPonderation(0.0)
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+            ++$position;
+        }
+
+        foreach ($items as $item) {
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) $item['answer'])
+                ->setCorrect((int) $item['targetPosition'])
+                ->setComment('')
+                ->setPonderation((float) $item['score'])
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+            ++$position;
+        }
+    }
+
+    /**
+     * @return array<int, array{answer: string, targetPosition: int, score: float, position: int}>
+     */
+    private function getCleanDraggableItems(ExerciseQuestionEditor $data): array
+    {
+        $items = [];
+        foreach ($data->draggableItems as $index => $item) {
+            if (!\is_array($item)) {
+                continue;
+            }
+
+            $answer = trim((string) ($item['answer'] ?? ''));
+            if ('' === $answer) {
+                continue;
+            }
+
+            $items[] = [
+                'answer' => $answer,
+                'targetPosition' => max(1, (int) ($item['targetPosition'] ?? ($index + 1))),
+                'score' => max(0.0, (float) ($item['score'] ?? 0.0)),
+                'position' => \count($items) + 1,
+            ];
+        }
+
+        return $items;
+    }
+
+    private function validateMatchingPayload(ExerciseQuestionEditor $data): void
+    {
+        $options = $this->getCleanMatchingOptions($data);
+        $pairs = $this->getCleanMatchingPairs($data);
+
+        if (2 > \count($options)) {
+            throw new BadRequestHttpException('At least two matching options are required.');
+        }
+
+        if (2 > \count($pairs)) {
+            throw new BadRequestHttpException('At least two matching pairs are required.');
+        }
+
+        $optionLocalIds = array_column($options, 'localId');
+        foreach ($pairs as $pair) {
+            if (!\in_array((string) ($pair['optionLocalId'] ?? ''), $optionLocalIds, true)) {
+                throw new BadRequestHttpException('Each matching pair must be linked to a valid option.');
+            }
+        }
+
+        if (0 >= $this->calculateQuestionScore($data)) {
+            throw new BadRequestHttpException('Required field.');
+        }
+    }
+
+    private function persistMatchingAnswers(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        $options = $this->getCleanMatchingOptions($data);
+        $pairs = $this->getCleanMatchingPairs($data);
+        $optionIidsByLocalId = [];
+        $position = 1;
+
+        foreach ($options as $index => $optionData) {
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) $optionData['answer'])
+                ->setCorrect(0)
+                ->setComment('')
+                ->setPonderation(0.0)
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+            $optionIidsByLocalId[(string) $optionData['localId']] = $answer;
+            ++$position;
+        }
+
+        $this->entityManager->flush();
+
+        $optionIids = [];
+        foreach ($optionIidsByLocalId as $localId => $answer) {
+            if ($answer instanceof CQuizAnswer && null !== $answer->getIid()) {
+                $optionIids[$localId] = (int) $answer->getIid();
+            }
+        }
+
+        foreach ($pairs as $pairData) {
+            $optionLocalId = (string) ($pairData['optionLocalId'] ?? '');
+            $correctOptionIid = (int) ($optionIids[$optionLocalId] ?? 0);
+            if (0 >= $correctOptionIid) {
+                throw new BadRequestHttpException('Each matching pair must be linked to a valid option.');
+            }
+
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) $pairData['answer'])
+                ->setCorrect($correctOptionIid)
+                ->setComment((string) $pairData['comment'])
+                ->setPonderation(\in_array((int) $data->type, [self::MATCHING_COMBINATION, self::MATCHING_DRAGGABLE_COMBINATION], true) ? 0.0 : (float) $pairData['score'])
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+            ++$position;
+        }
+    }
+
+    /**
+     * @return array<int, array{localId: string, answer: string, position: int}>
+     */
+    private function getCleanMatchingOptions(ExerciseQuestionEditor $data): array
+    {
+        $options = [];
+        foreach ($data->matchingOptions as $index => $option) {
+            if (!\is_array($option)) {
+                continue;
+            }
+
+            $answer = trim((string) ($option['answer'] ?? ''));
+            if ('' === $answer) {
+                continue;
+            }
+
+            $localId = trim((string) ($option['localId'] ?? ''));
+            if ('' === $localId) {
+                $localId = 'option-'.($index + 1);
+            }
+
+            $options[] = [
+                'localId' => $localId,
+                'answer' => $answer,
+                'position' => \count($options) + 1,
+            ];
+        }
+
+        return $options;
+    }
+
+    /**
+     * @return array<int, array{answer: string, optionLocalId: string, comment: string, score: float, position: int}>
+     */
+    private function getCleanMatchingPairs(ExerciseQuestionEditor $data): array
+    {
+        $pairs = [];
+        foreach ($data->matchingPairs as $index => $pair) {
+            if (!\is_array($pair)) {
+                continue;
+            }
+
+            $answer = trim((string) ($pair['answer'] ?? ''));
+            if ('' === $answer) {
+                continue;
+            }
+
+            $pairs[] = [
+                'answer' => $answer,
+                'optionLocalId' => (string) ($pair['optionLocalId'] ?? ''),
+                'comment' => (string) ($pair['comment'] ?? ''),
+                'score' => max(0.0, (float) ($pair['score'] ?? 0.0)),
+                'position' => \count($pairs) + 1,
+            ];
+        }
+
+        return $pairs;
+    }
+
+    private function addMatchingData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        $type = (int) $question->getType();
+        if (!$this->usesMatching($type)) {
+            return;
+        }
+
+        $data = $this->buildMatchingData($question);
+        $response->matchingOptions = $data['options'];
+        $response->matchingPairs = $data['pairs'];
+        $response->answers = [];
+        $response->score = (float) $question->getPonderation();
+    }
+
+    /**
+     * @return array{options: array<int, array<string, mixed>>, pairs: array<int, array<string, mixed>>}
+     */
+    private function buildMatchingData(CQuizQuestion $question): array
+    {
+        $options = [];
+        $optionsByIid = [];
+        $pairs = [];
+
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            $correct = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correct) {
+                $option = [
+                    'id' => (int) $answer->getIid(),
+                    'localId' => 'option-'.(int) $answer->getPosition(),
+                    'label' => $this->getMatchingOptionLabel(\count($options) + 1),
+                    'answer' => $answer->getAnswer(),
+                    'position' => (int) $answer->getPosition(),
+                ];
+                $options[] = $option;
+                $optionsByIid[(int) $answer->getIid()] = $option;
+
+                continue;
+            }
+
+            $pairs[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'optionId' => $correct,
+                'optionLocalId' => '',
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        foreach ($pairs as &$pair) {
+            $optionId = (int) ($pair['optionId'] ?? 0);
+            if (isset($optionsByIid[$optionId])) {
+                $pair['optionLocalId'] = (string) $optionsByIid[$optionId]['localId'];
+            }
+        }
+        unset($pair);
+
+        return ['options' => $options, 'pairs' => $pairs];
+    }
+
+    private function getMatchingOptionLabel(int $position): string
+    {
+        if (1 <= $position && 26 >= $position) {
+            return chr(64 + $position);
+        }
+
+        return (string) $position;
+    }
+
+
+    private function validateCalculatedPayload(ExerciseQuestionEditor $data): void
+    {
+        if ('' === trim(strip_tags((string) $data->calculatedText))) {
+            throw new BadRequestHttpException('Please type the text.');
+        }
+
+        if (0 === \count($this->extractCalculatedTokens((string) $data->calculatedText))) {
+            throw new BadRequestHttpException('Please define at least one blank with the selected marker.');
+        }
+
+        if ('' === trim((string) $data->calculatedFormula)) {
+            throw new BadRequestHttpException('Please, write the formula.');
+        }
+
+        if (0 >= (float) $data->score) {
+            throw new BadRequestHttpException('Required field.');
+        }
+
+        if (1 > (int) $data->calculatedVariations) {
+            throw new BadRequestHttpException('Question variations.');
+        }
+    }
+
+    private function persistCalculatedAnswers(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        $variations = max(1, (int) $data->calculatedVariations);
+        $ranges = $this->normalizeCalculatedRanges($data);
+
+        for ($position = 1; $position <= $variations; ++$position) {
+            $answerText = (string) $data->calculatedText;
+            $formula = (string) $data->calculatedFormula;
+
+            foreach ($this->extractCalculatedTokens($answerText) as $token) {
+                $range = $ranges[$token] ?? ['low' => '1', 'high' => '20'];
+                $value = $this->generateCalculatedValue((string) $range['low'], (string) $range['high']);
+                $answerText = str_replace($token, (string) $value, $answerText);
+                $formula = str_replace($token, (string) $value, $formula);
+            }
+
+            $result = $this->evaluateCalculatedFormula($formula);
+            $encodedAnswer = $answerText.' ['.$result.']@@'.(string) $data->calculatedFormula;
+
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer($encodedAnswer)
+                ->setCorrect(1)
+                ->setComment((string) $data->calculatedComment)
+                ->setPonderation((float) $data->score)
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+        }
+    }
+
+    /**
+     * @return array<string, array{low: string, high: string}>
+     */
+    private function normalizeCalculatedRanges(ExerciseQuestionEditor $data): array
+    {
+        $submittedRanges = [];
+        foreach ($data->calculatedRanges as $range) {
+            if (!\is_array($range)) {
+                continue;
+            }
+
+            $token = (string) ($range['token'] ?? '');
+            if ('' === $token) {
+                continue;
+            }
+
+            $submittedRanges[$token] = [
+                'low' => (string) ($range['low'] ?? '1'),
+                'high' => (string) ($range['high'] ?? '20'),
+            ];
+        }
+
+        $ranges = [];
+        foreach ($this->extractCalculatedTokens((string) $data->calculatedText) as $token) {
+            $ranges[$token] = $submittedRanges[$token] ?? ['low' => '1', 'high' => '20'];
+        }
+
+        return $ranges;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private function extractCalculatedTokens(string $text): array
+    {
+        preg_match_all('/\[[^\]]+\]/', $text, $matches);
+        $tokens = [];
+        foreach ($matches[0] ?? [] as $token) {
+            $token = trim((string) $token);
+            if ('' !== $token && !\in_array($token, $tokens, true)) {
+                $tokens[] = $token;
+            }
+        }
+
+        return $tokens;
+    }
+
+    private function generateCalculatedValue(string $low, string $high): string
+    {
+        $minimum = (float) $low;
+        $maximum = (float) $high;
+        if ($maximum < $minimum) {
+            [$minimum, $maximum] = [$maximum, $minimum];
+        }
+
+        $hasDecimal = str_contains($low, '.') || str_contains($high, '.');
+        if (!$hasDecimal) {
+            return (string) random_int((int) $minimum, (int) $maximum);
+        }
+
+        $value = random_int((int) round($minimum * 100), (int) round($maximum * 100)) / 100;
+
+        return rtrim(rtrim(number_format($value, 2, '.', ''), '0'), '.');
+    }
+
+    private function evaluateCalculatedFormula(string $formula): string
+    {
+        $math = new EvalMath();
+        $result = (float) $math->evaluate($formula);
+
+        return rtrim(rtrim(number_format($result, 2, '.', ''), '0'), '.');
+    }
+
+    private function addHotspotData(ExerciseQuestionEditor $response, CQuiz $quiz, CQuizQuestion $question, Course $course, ?Session $session): void
+    {
+        if (!$this->usesHotspot((int) $question->getType())) {
+            return;
+        }
+
+        $resourceNode = $question->getResourceNode();
+        if (null !== $resourceNode) {
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            if ($resourceFile instanceof ResourceFile) {
+                $response->hotspotImageName = (string) $resourceFile->getOriginalName();
+                $response->hotspotImageUrl = $this->appendCourseContextToUrl(
+                    $this->questionRepository->getHotSpotImageUrl($question),
+                    $course,
+                    $session
+                );
+            }
+        }
+
+        $items = [];
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            if ('noerror' === (string) $answer->getHotspotType()) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+                'hotspotType' => (string) ($answer->getHotspotType() ?: 'square'),
+                'coordinates' => (string) ($answer->getHotspotCoordinates() ?: '0;0|0|0'),
+            ];
+        }
+
+        $response->hotspotItems = [] !== $items ? $items : $this->getDefaultHotspotItems((int) $question->getType());
+        if (self::HOT_SPOT_DELINEATION === (int) $question->getType()) {
+            $this->addHotspotScenarioData($response, $quiz, $question);
+        }
+        $response->answers = [];
+    }
+
+    private function addHotspotScenarioData(ExerciseQuestionEditor $response, CQuiz $quiz, ?CQuizQuestion $question): void
+    {
+        $response->hotspotScenarioOptions = [
+            ['label' => 'Select destination', 'value' => ''],
+            ['label' => 'Repeat question', 'value' => 'repeat'],
+            ['label' => 'End of test', 'value' => '-1'],
+            ['label' => 'Other (custom URL)', 'value' => 'url'],
+        ];
+
+        foreach ($this->getScenarioQuestionOptions($quiz) as $option) {
+            $response->hotspotScenarioOptions[] = $option;
+        }
+
+        if (null === $question) {
+            return;
+        }
+
+        $relation = $this->getQuestionRelation($quiz, $question);
+        if (!$relation instanceof CQuizRelQuestion || '' === (string) $relation->getDestination()) {
+            return;
+        }
+
+        $destination = json_decode((string) $relation->getDestination(), true);
+        if (!\is_array($destination)) {
+            return;
+        }
+
+        $success = \is_array($destination['success'] ?? null) ? $destination['success'] : [];
+        $failure = \is_array($destination['failure'] ?? null) ? $destination['failure'] : [];
+
+        $response->hotspotScenarioSuccessType = (string) ($success['type'] ?? '');
+        $response->hotspotScenarioSuccessUrl = (string) ($success['url'] ?? '');
+        $response->hotspotScenarioFailureType = (string) ($failure['type'] ?? '');
+        $response->hotspotScenarioFailureUrl = (string) ($failure['url'] ?? '');
+    }
+
+    /**
+     * @return array<int, array{label: string, value: string}>
+     */
+    private function getScenarioQuestionOptions(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relation', 'question')
+            ->from(CQuizRelQuestion::class, 'relation')
+            ->innerJoin('relation.question', 'question')
+            ->andWhere('IDENTITY(relation.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relation.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $options = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (null === $question->getIid()) {
+                continue;
+            }
+
+            $options[] = [
+                'label' => 'Q'.(int) $relation->getQuestionOrder().': '.$this->plainText($question->getQuestion()),
+                'value' => (string) $question->getIid(),
+            ];
+        }
+
+        return $options;
+    }
+
+    private function getQuestionRelation(CQuiz $quiz, CQuizQuestion $question): ?CQuizRelQuestion
+    {
+        $relation = $this->entityManager->getRepository(CQuizRelQuestion::class)->findOneBy([
+            'quiz' => $quiz,
+            'question' => $question,
+        ]);
+
+        return $relation instanceof CQuizRelQuestion ? $relation : null;
+    }
+
+    private function applyHotspotDelineationDestination(CQuizRelQuestion $relation, ExerciseQuestionEditor $data): void
+    {
+        if (self::HOT_SPOT_DELINEATION !== (int) $data->type) {
+            $relation->setDestination(null);
+
+            return;
+        }
+
+        $destination = json_encode([
+            'success' => [
+                'type' => $this->normalizeScenarioDestinationType($data->hotspotScenarioSuccessType),
+                'url' => trim($data->hotspotScenarioSuccessUrl),
+            ],
+            'failure' => [
+                'type' => $this->normalizeScenarioDestinationType($data->hotspotScenarioFailureType),
+                'url' => trim($data->hotspotScenarioFailureUrl),
+            ],
+        ]);
+
+        $relation->setDestination(false === $destination ? null : $destination);
+    }
+
+    private function normalizeScenarioDestinationType(string $value): string
+    {
+        $value = trim($value);
+        if ('' === $value || 'repeat' === $value || '-1' === $value || 'url' === $value || ctype_digit($value)) {
+            return $value;
+        }
+
+        return '';
+    }
+
+    private function plainText(string $value): string
+    {
+        return trim(html_entity_decode(strip_tags($value), ENT_QUOTES | ENT_HTML5));
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCleanHotspotItems(ExerciseQuestionEditor $data): array
+    {
+        $items = [];
+        foreach ($data->hotspotItems as $index => $item) {
+            if (!\is_array($item)) {
+                continue;
+            }
+
+            $hotspotType = $this->normalizeHotspotType((string) ($item['hotspotType'] ?? 'square'));
+            $answer = trim((string) ($item['answer'] ?? ''));
+            if ('delineation' === $hotspotType && '' === $answer) {
+                $answer = 'delineation';
+            }
+            if ('oar' === $hotspotType && '' === $answer) {
+                $answer = 'Area to avoid';
+            }
+
+            $coordinates = $this->normalizeHotspotCoordinates((string) ($item['coordinates'] ?? ''));
+            if ('' === $answer || '' === $coordinates) {
+                continue;
+            }
+
+            $items[] = [
+                'answer' => $answer,
+                'comment' => (string) ($item['comment'] ?? ''),
+                'score' => 'oar' === $hotspotType ? 0.0 : max(0.0, (float) ($item['score'] ?? 0.0)),
+                'position' => $index + 1,
+                'hotspotType' => $hotspotType,
+                'coordinates' => $coordinates,
+            ];
+        }
+
+        return $items;
+    }
+
+    private function validateHotspotPayload(ExerciseQuestionEditor $data): void
+    {
+        $items = $this->getCleanHotspotItems($data);
+        if (0 === \count($items)) {
+            throw new BadRequestHttpException('Please draw at least one hotspot.');
+        }
+
+        if (self::HOT_SPOT_COMBINATION === (int) $data->type) {
+            if (0 >= (float) $data->globalScore) {
+                throw new BadRequestHttpException('Required field.');
+            }
+
+            return;
+        }
+
+        if (self::HOT_SPOT_DELINEATION === (int) $data->type) {
+            $hasDelineation = false;
+            foreach ($items as $item) {
+                if ('delineation' === (string) ($item['hotspotType'] ?? '')) {
+                    $hasDelineation = true;
+                }
+
+                if ('oar' !== (string) ($item['hotspotType'] ?? '') && 0 >= (float) ($item['score'] ?? 0.0)) {
+                    throw new BadRequestHttpException('You must give a positive score for each hotspots');
+                }
+            }
+
+            if (!$hasDelineation) {
+                throw new BadRequestHttpException('Please draw at least one delineation.');
+            }
+
+            return;
+        }
+
+        foreach ($items as $item) {
+            if (0 >= (float) ($item['score'] ?? 0.0)) {
+                throw new BadRequestHttpException('You must give a positive score for each hotspots');
+            }
+        }
+    }
+
+    private function persistHotspotAnswers(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        $position = 1;
+        foreach ($this->getCleanHotspotItems($data) as $item) {
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) $item['answer'])
+                ->setCorrect(0)
+                ->setComment((string) $item['comment'])
+                ->setPonderation(self::HOT_SPOT_COMBINATION === (int) $data->type ? 0.0 : (float) $item['score'])
+                ->setPosition($position)
+                ->setHotspotCoordinates((string) $item['coordinates'])
+                ->setHotspotType((string) $item['hotspotType'])
+            ;
+            $this->entityManager->persist($answer);
+            ++$position;
+        }
+
+        if (self::HOT_SPOT_DELINEATION === (int) $data->type) {
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer('noerror')
+                ->setCorrect(0)
+                ->setComment('')
+                ->setPonderation(0.0)
+                ->setPosition($position)
+                ->setHotspotCoordinates(null)
+                ->setHotspotType('noerror')
+            ;
+            $this->entityManager->persist($answer);
+        }
+    }
+
+    private function normalizeHotspotType(string $type): string
+    {
+        return \in_array($type, ['square', 'circle', 'poly', 'delineation', 'oar'], true) ? $type : 'square';
+    }
+
+    private function normalizeHotspotCoordinates(string $coordinates): string
+    {
+        $coordinates = trim($coordinates);
+        if ('' === $coordinates || '0;0|0|0' === $coordinates) {
+            return '';
+        }
+
+        return $coordinates;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDefaultHotspotItems(int $type): array
+    {
+        if (self::HOT_SPOT_DELINEATION === $type) {
+            return [
+                [
+                    'id' => null,
+                    'answer' => 'delineation',
+                    'comment' => '',
+                    'score' => 10.0,
+                    'position' => 1,
+                    'hotspotType' => 'delineation',
+                    'coordinates' => '0;0|0|0',
+                ],
+            ];
+        }
+
+        return [
+            [
+                'id' => null,
+                'answer' => '',
+                'comment' => '',
+                'score' => self::HOT_SPOT_COMBINATION === $type ? 0.0 : 10.0,
+                'position' => 1,
+                'hotspotType' => 'square',
+                'coordinates' => '0;0|0|0',
+            ],
+        ];
+    }
+
+    private function usesHotspot(int $type): bool
+    {
+        return \in_array($type, [self::HOT_SPOT, self::HOT_SPOT_DELINEATION, self::HOT_SPOT_COMBINATION], true);
+    }
+
+    private function addAnnotationData(ExerciseQuestionEditor $response, CQuizQuestion $question, Course $course, ?Session $session): void
+    {
+        if (self::ANNOTATION !== (int) $question->getType()) {
+            return;
+        }
+
+        $resourceNode = $question->getResourceNode();
+        if (null === $resourceNode) {
+            return;
+        }
+
+        $resourceFile = $resourceNode->getResourceFiles()->first();
+        if (!$resourceFile instanceof ResourceFile) {
+            return;
+        }
+
+        $response->annotationImageName = (string) $resourceFile->getOriginalName();
+        $response->annotationImageUrl = $this->appendCourseContextToUrl(
+            $this->questionRepository->getHotSpotImageUrl($question),
+            $course,
+            $session
+        );
+    }
+
+    private function appendCourseContextToUrl(string $url, Course $course, ?Session $session): string
+    {
+        if ('' === $url) {
+            return '';
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $params = [
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? $request?->query->getInt('sid', 0) ?? 0),
+            'gid' => (int) ($request?->query->getInt('gid', 0) ?? 0),
+        ];
+
+        return $url.(str_contains($url, '?') ? '&' : '?').http_build_query($params);
+    }
+
+    private function addCalculatedData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        if (self::CALCULATED_ANSWER !== (int) $question->getType()) {
+            return;
+        }
+
+        $answers = $this->getExistingAnswers($question);
+        $firstAnswer = $answers[0] ?? null;
+        if (!$firstAnswer instanceof CQuizAnswer) {
+            $response->calculatedText = $this->getDefaultCalculatedText();
+            $response->calculatedFormula = '';
+            $response->calculatedRanges = [];
+            $response->calculatedVariations = 1;
+            $response->calculatedComment = '';
+            $response->answers = [];
+
+            return;
+        }
+
+        $parsed = $this->parseCalculatedAnswer((string) $firstAnswer->getAnswer());
+        $response->calculatedText = $parsed['text'];
+        $response->calculatedFormula = $parsed['formula'];
+        $response->calculatedRanges = $this->buildCalculatedRanges($parsed['text']);
+        $response->calculatedVariations = max(1, \count($answers));
+        $response->calculatedComment = (string) $firstAnswer->getComment();
+        $response->score = (float) $question->getPonderation();
+        $response->answers = [];
+    }
+
+    /**
+     * @return array{text: string, formula: string}
+     */
+    private function parseCalculatedAnswer(string $encodedAnswer): array
+    {
+        $parts = explode('@@', $encodedAnswer);
+        $formula = \count($parts) > 1 ? (string) array_pop($parts) : '';
+        $text = (string) array_shift($parts);
+        $text = preg_replace('/\[[^\]]*\]/', '[]', $text) ?? $text;
+
+        return [
+            'text' => $text,
+            'formula' => $formula,
+        ];
+    }
+
+    /**
+     * @return array<int, array{token: string, low: string, high: string, random: string, position: int}>
+     */
+    private function buildCalculatedRanges(string $text): array
+    {
+        $ranges = [];
+        foreach ($this->extractCalculatedTokens($text) as $index => $token) {
+            $ranges[] = [
+                'token' => $token,
+                'low' => '1',
+                'high' => '20',
+                'random' => $this->generateCalculatedValue('1', '20'),
+                'position' => $index + 1,
+            ];
+        }
+
+        return $ranges;
+    }
+
+    private function getDefaultCalculatedText(): string
+    {
+        return '<p>Calculate the Body Mass Index for a person with weight [95] Kg and height [1.81] m.</p><p>Body Mass Index: []</p>';
+    }
+
+    private function validateFillBlanksPayload(ExerciseQuestionEditor $data): void
+    {
+        $type = (int) $data->type;
+        $text = trim((string) $data->fillBlanksText);
+        if ('' === trim(strip_tags($text))) {
+            throw new BadRequestHttpException('The fill in blanks text is required.');
+        }
+
+        $blanks = $this->extractFillBlankAnswers($text, (int) $data->fillBlanksSeparator);
+        if (0 === \count($blanks)) {
+            throw new BadRequestHttpException('Please define at least one blank with the selected marker.');
+        }
+
+        if (self::FILL_IN_BLANKS_COMBINATION === $type) {
+            if (0 >= (float) $data->globalScore) {
+                throw new BadRequestHttpException('Required field.');
+            }
+
+            return;
+        }
+
+        if (0 >= $this->calculateFillBlanksScore($data)) {
+            throw new BadRequestHttpException('Required field.');
+        }
+    }
+
+    private function persistFillBlanksAnswer(CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        $answer = new CQuizAnswer();
+        $answer
+            ->setQuestion($question)
+            ->setAnswer($this->buildFillBlanksAnswerString($data))
+            ->setCorrect(0)
+            ->setComment((string) $data->fillBlanksComment)
+            ->setPonderation($this->calculateQuestionScore($data))
+            ->setPosition(1)
+        ;
+        $this->entityManager->persist($answer);
+    }
+
+    private function buildFillBlanksAnswerString(ExerciseQuestionEditor $data): string
+    {
+        $separator = $this->normalizeFillBlanksSeparator((int) $data->fillBlanksSeparator);
+        $text = $this->normalizeFillBlanksText((string) $data->fillBlanksText, $separator);
+        $blanks = $this->extractFillBlankAnswers($text, $separator);
+        $items = \is_array($data->fillBlankItems) ? array_values($data->fillBlankItems) : [];
+
+        $weights = [];
+        $sizes = [];
+        foreach ($blanks as $index => $_blank) {
+            $item = $items[$index] ?? [];
+            $weights[] = self::FILL_IN_BLANKS_COMBINATION === (int) $data->type
+                ? 0.0
+                : max(0.0, (float) ($item['score'] ?? 1.0));
+            $sizes[] = $this->normalizeFillBlanksInputSize((int) ($item['inputSize'] ?? 200));
+        }
+
+        return sprintf(
+            '%s::%s:%s:%d@%s',
+            $text,
+            implode(',', $weights),
+            implode(',', $sizes),
+            $separator,
+            $data->fillBlanksSwitchable ? '1' : ''
+        );
+    }
+
+    private function normalizeFillBlanksText(string $text, int $separator): string
+    {
+        [$start, $end] = $this->getFillBlankSeparators($separator);
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+
+        return preg_replace_callback(
+            $pattern,
+            static fn (array $matches): string => $start.trim((string) $matches[1]).$end,
+            $text
+        ) ?? $text;
+    }
+
+    private function calculateFillBlanksScore(ExerciseQuestionEditor $data): float
+    {
+        $score = 0.0;
+        foreach ($this->normalizeFillBlankItems($data) as $item) {
+            $score += max(0.0, (float) ($item['score'] ?? 0.0));
+        }
+
+        return $score;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function normalizeFillBlankItems(ExerciseQuestionEditor $data): array
+    {
+        $text = (string) $data->fillBlanksText;
+        $separator = $this->normalizeFillBlanksSeparator((int) $data->fillBlanksSeparator);
+        $blanks = $this->extractFillBlankAnswers($text, $separator);
+        $submittedItems = \is_array($data->fillBlankItems) ? array_values($data->fillBlankItems) : [];
+        $items = [];
+
+        foreach ($blanks as $index => $blank) {
+            $submitted = $submittedItems[$index] ?? [];
+            $items[] = [
+                'answer' => $blank,
+                'score' => max(0.0, (float) ($submitted['score'] ?? 1.0)),
+                'inputSize' => $this->normalizeFillBlanksInputSize((int) ($submitted['inputSize'] ?? 200)),
+                'position' => $index + 1,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private function extractFillBlankAnswers(string $text, int $separator): array
+    {
+        [$start, $end] = $this->getFillBlankSeparators($this->normalizeFillBlanksSeparator($separator));
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+        preg_match_all($pattern, $text, $matches);
+
+        return array_map(
+            static fn (string $value): string => trim($value),
+            $matches[1] ?? []
+        );
+    }
+
+    private function normalizeFillBlanksSeparator(int $separator): int
+    {
+        return \in_array($separator, [0, 1, 2, 3, 4, 5, 6], true) ? $separator : 0;
+    }
+
+    private function normalizeFillBlanksInputSize(int $inputSize): int
+    {
+        if (40 > $inputSize) {
+            return 40;
+        }
+
+        if (800 < $inputSize) {
+            return 800;
+        }
+
+        return $inputSize;
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    private function addFillBlanksData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        $type = (int) $question->getType();
+        if (!$this->usesFillBlanks($type)) {
+            return;
+        }
+
+        $answer = $this->getFirstAnswer($question);
+        $parsed = $this->parseFillBlanksAnswer($answer?->getAnswer() ?? '');
+
+        $response->fillBlanksText = $parsed['text'];
+        $response->fillBlankItems = $this->buildFillBlankItems(
+            $parsed['text'],
+            $parsed['weights'],
+            $parsed['sizes'],
+            $parsed['separator']
+        );
+        $response->fillBlanksSeparator = $parsed['separator'];
+        $response->fillBlanksSwitchable = $parsed['switchable'];
+        $response->fillBlanksCaseInsensitive = 'case:false' === (string) $question->getExtra();
+        $response->fillBlanksComment = (string) ($answer?->getComment() ?? '');
+        if (self::FILL_IN_BLANKS_COMBINATION === $type) {
+            $response->globalScore = (float) $question->getPonderation();
+            $response->score = 0.0;
+        } else {
+            $response->score = (float) $question->getPonderation();
+        }
+    }
+
+    private function getFirstAnswer(CQuizQuestion $question): ?CQuizAnswer
+    {
+        $answer = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $answer instanceof CQuizAnswer ? $answer : null;
+    }
+
+    /**
+     * @return array{text: string, weights: array<int, float>, sizes: array<int, int>, separator: int, switchable: bool}
+     */
+    private function parseFillBlanksAnswer(string $encodedAnswer): array
+    {
+        $parts = explode('::', $encodedAnswer, 2);
+        $text = (string) ($parts[0] ?? '');
+        $systemString = (string) ($parts[1] ?? '');
+        $switchableParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($switchableParts[0] ?? ''));
+
+        $weights = $this->parseFloatList((string) ($details[0] ?? ''));
+        $sizes = [];
+        $separator = 0;
+
+        if (\count($details) >= 3) {
+            $sizes = $this->parseIntegerList((string) ($details[1] ?? ''));
+            $separator = $this->normalizeFillBlanksSeparator((int) ($details[2] ?? 0));
+        } else {
+            foreach ($weights as $_weight) {
+                $sizes[] = 200;
+            }
+        }
+
+        return [
+            'text' => $text,
+            'weights' => $weights,
+            'sizes' => $sizes,
+            'separator' => $separator,
+            'switchable' => '1' === (string) ($switchableParts[1] ?? ''),
+        ];
+    }
+
+    /**
+     * @return array<int, array{answer: string, score: float, inputSize: int, position: int}>
+     */
+    private function buildFillBlankItems(string $text, array $weights, array $sizes, int $separator): array
+    {
+        $blanks = $this->extractFillBlankAnswers($text, $separator);
+        $items = [];
+        foreach ($blanks as $index => $blank) {
+            $items[] = [
+                'answer' => $blank,
+                'score' => (float) ($weights[$index] ?? 1.0),
+                'inputSize' => (int) ($sizes[$index] ?? 200),
+                'position' => $index + 1,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, float>
+     */
+    private function parseFloatList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(
+            static fn (string $item): float => (float) trim($item),
+            explode(',', $value)
+        );
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseIntegerList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(
+            static fn (string $item): int => max(40, (int) trim($item)),
+            explode(',', $value)
+        );
+    }
+
+    private function addDraggableData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        if (!$this->usesDraggableOrdering((int) $question->getType())) {
+            return;
+        }
+
+        $response->draggableItems = $this->buildDraggableItems($question);
+        $response->matchingOrientation = \in_array((string) $question->getExtra(), ['h', 'v'], true) ? (string) $question->getExtra() : 'h';
+        $response->answers = [];
+        $response->score = (float) $question->getPonderation();
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function buildDraggableItems(CQuizQuestion $question): array
+    {
+        $items = [];
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            $correct = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correct) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $answer->getIid(),
+                'localId' => 'draggable-'.(int) $answer->getPosition(),
+                'answer' => $answer->getAnswer(),
+                'targetPosition' => $correct,
+                'score' => (float) $answer->getPonderation(),
+                'position' => \count($items) + 1,
+            ];
+        }
+
+        if ([] === $items) {
+            return [
+                ['id' => null, 'localId' => 'draggable-1', 'answer' => '', 'targetPosition' => 1, 'score' => 10.0, 'position' => 1],
+                ['id' => null, 'localId' => 'draggable-2', 'answer' => '', 'targetPosition' => 2, 'score' => 10.0, 'position' => 2],
+            ];
+        }
+
+        return $items;
+    }
+
+    private function usesDraggableOrdering(int $type): bool
+    {
+        return self::DRAGGABLE === $type;
+    }
+
+    private function isStructuralQuestionType(int $type): bool
+    {
+        return \in_array($type, [self::MEDIA_QUESTION, self::READING_COMPREHENSION, self::PAGE_BREAK], true);
+    }
+
+    private function usesMatching(int $type): bool
+    {
+        return \in_array($type, [self::MATCHING, self::MATCHING_COMBINATION, self::MATCHING_DRAGGABLE, self::MATCHING_DRAGGABLE_COMBINATION], true);
+    }
+
+    private function usesFillBlanks(int $type): bool
+    {
+        return \in_array($type, [self::FILL_IN_BLANKS, self::FILL_IN_BLANKS_COMBINATION], true);
+    }
+
+
+    private function buildDropdownListText(CQuizQuestion $question): string
+    {
+        $type = (int) $question->getType();
+        if (!\in_array($type, [self::MULTIPLE_ANSWER_DROPDOWN, self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION], true)) {
+            return '';
+        }
+
+        $lines = [];
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            $lines[] = trim(strip_tags(html_entity_decode((string) $answer->getAnswer(), ENT_QUOTES, 'UTF-8')));
+        }
+
+        return implode(PHP_EOL, array_values(array_filter($lines, static fn (string $line): bool => '' !== $line)));
+    }
+
+    private function buildResponse(CQuiz $quiz, CQuizQuestion $question, Course $course, ?Session $session): ExerciseQuestionEditor
+    {
+        $response = new ExerciseQuestionEditor();
+        $response->exerciseId = (int) $quiz->getIid();
+        $response->questionId = (int) $question->getIid();
+        $response->type = (int) $question->getType();
+        $response->typeLabel = $this->getQuestionTypeLabel((int) $question->getType());
+        $response->title = $question->getQuestion();
+        $response->description = (string) $question->getDescription();
+        $response->feedback = (string) $question->getFeedback();
+        $response->dropdownListText = $this->buildDropdownListText($question);
+        $response->score = (float) $question->getPonderation();
+        $response->globalScore = $this->usesGlobalScore((int) $question->getType()) ? (float) $question->getPonderation() : 0.0;
+        [$response->correctScore, $response->wrongScore, $response->unknownScore] = $this->getTrueFalseScores($question);
+        $response->usesGlobalScore = $this->usesGlobalScore((int) $question->getType());
+        $response->hasFixedUnknownAnswer = self::UNIQUE_ANSWER_NO_OPTION === (int) $question->getType();
+        $response->mandatory = 1 === (int) $question->getMandatory();
+        $response->duration = $question->getDuration();
+        $response->difficulty = max(1, (int) $question->getLevel());
+        $response->categoryId = $this->getFirstCategoryId($question);
+        $response->parentMediaId = (int) ($question->getParentMediaId() ?? 0);
+        $response->answers = $this->getResponseAnswers($question);
+        $this->addAnnotationData($response, $question, $course, $session);
+        $this->addHotspotData($response, $quiz, $question, $course, $session);
+        $this->addCalculatedData($response, $question);
+        $this->addFillBlanksData($response, $question);
+        $this->addMatchingData($response, $question);
+        $this->addDraggableData($response, $question);
+        $response->noNegativeScore = self::GLOBAL_MULTIPLE_ANSWER === (int) $question->getType() && $this->hasNoNegativeScore($response->answers);
+        $summary = $this->getQuestionSummary($quiz);
+        $response->questionCount = (int) $summary['questionCount'];
+        $response->totalScore = (float) $summary['totalScore'];
+        $response->legacyUrls = [
+            'questions' => '/main/exercise/admin.php?'.http_build_query([
+                'exerciseId' => (int) $quiz->getIid(),
+                'cid' => (int) $course->getId(),
+                'sid' => (int) ($session?->getId() ?? 0),
+            ]),
+        ];
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+        $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
+
+        return $response;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
new file mode 100644
index 00000000000..2897b7c66ca
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
@@ -0,0 +1,1449 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionEditor;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProviderInterface<ExerciseQuestionEditor>
+ */
+final readonly class ExerciseQuestionEditorProvider implements ProviderInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_question_editor';
+    private const UNIQUE_ANSWER = 1;
+    private const MULTIPLE_ANSWER = 2;
+    private const FILL_IN_BLANKS = 3;
+    private const MATCHING = 4;
+    private const FREE_ANSWER = 5;
+    private const HOT_SPOT = 6;
+    private const HOT_SPOT_DELINEATION = 8;
+    private const MULTIPLE_ANSWER_COMBINATION = 9;
+    private const UNIQUE_ANSWER_NO_OPTION = 10;
+    private const MULTIPLE_ANSWER_TRUE_FALSE = 11;
+    private const MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE = 12;
+    private const ORAL_EXPRESSION = 13;
+    private const GLOBAL_MULTIPLE_ANSWER = 14;
+    private const MEDIA_QUESTION = 15;
+    private const CALCULATED_ANSWER = 16;
+    private const UNIQUE_ANSWER_IMAGE = 17;
+    private const ANNOTATION = 20;
+    private const READING_COMPREHENSION = 21;
+    private const MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY = 22;
+    private const UPLOAD_ANSWER = 23;
+    private const PAGE_BREAK = 31;
+    private const DRAGGABLE = 18;
+    private const MATCHING_DRAGGABLE = 19;
+    private const MATCHING_COMBINATION = 24;
+    private const MATCHING_DRAGGABLE_COMBINATION = 25;
+    private const HOT_SPOT_COMBINATION = 26;
+    private const FILL_IN_BLANKS_COMBINATION = 27;
+    private const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28;
+    private const MULTIPLE_ANSWER_DROPDOWN = 29;
+    private const UNKNOWN_ANSWER_POSITION = 666;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizQuestionRepository $questionRepository,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionEditor
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercise questions in this context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $questionId = isset($uriVariables['questionId']) ? (int) $uriVariables['questionId'] : 0;
+
+        if (0 < $questionId) {
+            return $this->buildExistingQuestionResponse($quiz, $questionId, $course, $session);
+        }
+
+        $type = $request->query->getInt('type', self::UNIQUE_ANSWER);
+        if (!$this->isVueSupportedQuestionType($type)) {
+            throw new BadRequestHttpException('This question type is still managed by the legacy exercise tool.');
+        }
+
+        return $this->buildNewQuestionResponse($quiz, $type, $course, $session);
+    }
+
+    private function buildNewQuestionResponse(CQuiz $quiz, int $type, Course $course, ?Session $session): ExerciseQuestionEditor
+    {
+        $response = new ExerciseQuestionEditor();
+        $response->exerciseId = (int) $quiz->getIid();
+        $response->questionId = null;
+        $response->type = $type;
+        $response->typeLabel = $this->getQuestionTypeLabel($type);
+        $response->score = $this->usesGlobalScore($type) ? 0.0 : 1.0;
+        $response->globalScore = $this->usesGlobalScore($type) ? 10.0 : 0.0;
+        if (self::CALCULATED_ANSWER === $type) {
+            $response->score = 10.0;
+            $response->globalScore = 0.0;
+            $response->calculatedText = $this->getDefaultCalculatedText();
+            $response->calculatedFormula = '';
+            $response->calculatedRanges = $this->buildCalculatedRanges($response->calculatedText, []);
+            $response->calculatedVariations = 1;
+            $response->calculatedComment = '';
+            $response->answers = [];
+        }
+        if ($this->usesFillBlanks($type)) {
+            $response->fillBlanksText = 'The capital of Peru is [Lima].';
+            $response->fillBlankItems = $this->buildFillBlankItems($response->fillBlanksText, [1.0], [200], 0);
+            $response->fillBlanksSeparator = 0;
+            $response->fillBlanksSwitchable = false;
+            $response->fillBlanksCaseInsensitive = false;
+            $response->score = self::FILL_IN_BLANKS_COMBINATION === $type ? 0.0 : 1.0;
+            $response->globalScore = self::FILL_IN_BLANKS_COMBINATION === $type ? 10.0 : 0.0;
+        }
+        if ($this->usesHotspot($type)) {
+            $response->score = self::HOT_SPOT_COMBINATION === $type ? 0.0 : 10.0;
+            $response->globalScore = self::HOT_SPOT_COMBINATION === $type ? 10.0 : 0.0;
+            $response->hotspotItems = $this->getDefaultHotspotItems($type);
+            if (self::HOT_SPOT_DELINEATION === $type) {
+                $this->addHotspotScenarioOptions($response, $quiz, null);
+            }
+            $response->answers = [];
+        }
+        if ($this->usesMatching($type)) {
+            $response->score = $this->usesGlobalScore($type) ? 0.0 : 20.0;
+            $response->globalScore = $this->usesGlobalScore($type) ? 10.0 : 0.0;
+            $response->matchingOptions = $this->getDefaultMatchingOptions();
+            $response->matchingPairs = $this->getDefaultMatchingPairs($type);
+            $response->answers = [];
+        }
+        if ($this->usesDraggableOrdering($type)) {
+            $response->score = 20.0;
+            $response->globalScore = 0.0;
+            $response->draggableItems = $this->getDefaultDraggableItems();
+            $response->matchingOrientation = 'h';
+            $response->answers = [];
+        }
+        if (\in_array($type, [self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER], true)) {
+            $response->score = 10.0;
+            $response->globalScore = 0.0;
+            $response->answers = [];
+        }
+        if ($this->isStructuralQuestionType($type)) {
+            $response->score = 0.0;
+            $response->globalScore = 0.0;
+            $response->mandatory = false;
+            $response->duration = null;
+            $response->parentMediaId = 0;
+            $response->answers = [];
+        }
+        $response->correctScore = 1.0;
+        $response->wrongScore = -0.5;
+        $response->unknownScore = 0.0;
+        $response->noNegativeScore = self::GLOBAL_MULTIPLE_ANSWER === $type;
+        $response->usesGlobalScore = $this->usesGlobalScore($type);
+        $response->hasFixedUnknownAnswer = self::UNIQUE_ANSWER_NO_OPTION === $type;
+        $response->difficulty = 1;
+        $response->categoryId = 0;
+        $response->parentMediaId = 0;
+        $response->answers = $this->getDefaultAnswers($type);
+        if ($this->usesMatching($type) || $this->usesDraggableOrdering($type) || $this->usesHotspot($type) || $this->isStructuralQuestionType($type)) {
+            $response->answers = [];
+        }
+        $this->addSharedEditorData($response, $quiz, null, $course, $session);
+
+        return $response;
+    }
+
+    private function buildExistingQuestionResponse(CQuiz $quiz, int $questionId, Course $course, ?Session $session): ExerciseQuestionEditor
+    {
+        $question = $this->getQuestionFromExercise($quiz, $questionId);
+        $type = (int) $question->getType();
+        if (!$this->isVueSupportedQuestionType($type)) {
+            throw new BadRequestHttpException('This question type is still managed by the legacy exercise tool.');
+        }
+
+        $response = new ExerciseQuestionEditor();
+        $response->exerciseId = (int) $quiz->getIid();
+        $response->questionId = $questionId;
+        $response->type = $type;
+        $response->typeLabel = $this->getQuestionTypeLabel($type);
+        $response->title = $question->getQuestion();
+        $response->description = (string) $question->getDescription();
+        $response->feedback = (string) $question->getFeedback();
+        $response->dropdownListText = $this->buildDropdownListText($question);
+        $response->score = (float) $question->getPonderation();
+        $response->globalScore = $this->usesGlobalScore($type) ? (float) $question->getPonderation() : 0.0;
+        [$response->correctScore, $response->wrongScore, $response->unknownScore] = $this->getTrueFalseScores($question);
+        $response->usesGlobalScore = $this->usesGlobalScore($type);
+        $response->hasFixedUnknownAnswer = self::UNIQUE_ANSWER_NO_OPTION === $type;
+        $response->mandatory = 1 === (int) $question->getMandatory();
+        $response->duration = $question->getDuration();
+        $response->difficulty = max(1, (int) $question->getLevel());
+        $response->categoryId = $this->getFirstCategoryId($question);
+        $response->parentMediaId = (int) ($question->getParentMediaId() ?? 0);
+        $response->answers = $this->getAnswers($question);
+        $this->addAnnotationData($response, $question, $course, $session);
+        $this->addHotspotData($response, $quiz, $question, $course, $session);
+        $this->addCalculatedData($response, $question);
+        $this->addFillBlanksData($response, $question);
+        $this->addMatchingData($response, $question);
+        $this->addDraggableData($response, $question);
+        $response->noNegativeScore = self::GLOBAL_MULTIPLE_ANSWER === $type && $this->hasNoNegativeScore($response->answers);
+        $this->addSharedEditorData($response, $quiz, $question, $course, $session);
+
+        return $response;
+    }
+
+    private function addSharedEditorData(
+        ExerciseQuestionEditor $response,
+        CQuiz $quiz,
+        ?CQuizQuestion $question,
+        Course $course,
+        ?Session $session,
+    ): void {
+        $summary = $this->getQuestionSummary($quiz);
+        $response->questionCount = (int) $summary['questionCount'];
+        $response->totalScore = (float) $summary['totalScore'];
+        $response->categoryOptions = $this->getCategoryOptions($course, $session);
+        $response->mediaOptions = $this->getMediaOptions($quiz, $question);
+        $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session);
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+        $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
+        $response->imageZoomEnabled = $this->isImageZoomEnabled();
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function getQuestionFromExercise(CQuiz $quiz, int $questionId): CQuizQuestion
+    {
+        $relation = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$relation instanceof CQuizRelQuestion) {
+            throw new NotFoundHttpException('The requested question was not found in this exercise.');
+        }
+
+        return $relation->getQuestion();
+    }
+
+
+    private function buildDropdownListText(CQuizQuestion $question): string
+    {
+        $type = (int) $question->getType();
+        if (!\in_array($type, [self::MULTIPLE_ANSWER_DROPDOWN, self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION], true)) {
+            return '';
+        }
+
+        $lines = [];
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            $lines[] = trim(strip_tags(html_entity_decode((string) $answer->getAnswer(), ENT_QUOTES, 'UTF-8')));
+        }
+
+        return implode(PHP_EOL, array_values(array_filter($lines, static fn (string $line): bool => '' !== $line)));
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDefaultAnswers(int $type): array
+    {
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::CALCULATED_ANSWER], true) || $this->isStructuralQuestionType($type) || $this->usesFillBlanks($type) || $this->usesMatching($type) || $this->usesDraggableOrdering($type) || \in_array($type, [self::MULTIPLE_ANSWER_DROPDOWN, self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION], true)) {
+            return [];
+        }
+
+        $answers = [];
+        $maxPosition = self::UNIQUE_ANSWER_NO_OPTION === $type ? 3 : 4;
+        for ($position = 1; $position <= $maxPosition; $position++) {
+            $answers[] = [
+                'id' => null,
+                'answer' => '',
+                'correct' => $this->usesSingleCorrectAnswer($type) ? 1 === $position : false,
+                'correctChoice' => $this->usesTrueFalseOptions($type) ? 1 : null,
+                'comment' => '',
+                'score' => $this->usesGlobalScore($type) || $this->usesTrueFalseOptions($type) ? 0.0 : (1 === $position ? 1.0 : 0.0),
+                'position' => $position,
+                'isUnknown' => false,
+            ];
+        }
+
+        if (self::UNIQUE_ANSWER_NO_OPTION === $type) {
+            $answers[] = [
+                'id' => null,
+                'answer' => 'Don\'t know',
+                'correct' => false,
+                'correctChoice' => null,
+                'comment' => '',
+                'score' => 0.0,
+                'position' => self::UNKNOWN_ANSWER_POSITION,
+                'isUnknown' => true,
+            ];
+        }
+
+        return $answers;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getAnswers(CQuizQuestion $question): array
+    {
+        $answers = $this->getExistingAnswers($question);
+
+        $type = (int) $question->getType();
+        if (self::CALCULATED_ANSWER === $type || $this->usesFillBlanks($type) || $this->usesMatching($type) || $this->usesDraggableOrdering($type)) {
+            return [];
+        }
+
+        $optionPositionsByIid = $this->getQuestionOptionPositionsByIid($question);
+
+        $items = [];
+        foreach ($answers as $answer) {
+            if (!$answer instanceof CQuizAnswer) {
+                continue;
+            }
+
+            $correctValue = (int) $answer->getCorrect();
+            $correctChoice = $this->usesTrueFalseOptions($type)
+                ? (int) ($optionPositionsByIid[$correctValue] ?? $correctValue)
+                : null;
+
+            $items[] = [
+                'id' => $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'correct' => $this->usesTrueFalseOptions($type) ? 1 === $correctChoice : 1 === $correctValue,
+                'correctChoice' => $this->usesTrueFalseOptions($type) ? $correctChoice : null,
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+                'isUnknown' => self::UNKNOWN_ANSWER_POSITION === (int) $answer->getPosition(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getExistingAnswers(CQuizQuestion $question): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    /**
+     * @return array{questionCount: int, totalScore: float}
+     */
+    private function getQuestionSummary(CQuiz $quiz): array
+    {
+        $questions = $this->entityManager->createQueryBuilder()
+            ->select('question.ponderation')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $totalScore = 0.0;
+        foreach ($questions as $question) {
+            $totalScore += (float) ($question['ponderation'] ?? 0.0);
+        }
+
+        return [
+            'questionCount' => \count($questions),
+            'totalScore' => $totalScore,
+        ];
+    }
+
+    /**
+     * @return array<int, array{label: string, value: int}>
+     */
+    private function getCategoryOptions(Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizQuestionCategory::class, 'category')
+            ->innerJoin('category.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.title', 'ASC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $items = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $category) {
+            if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+                continue;
+            }
+
+            $items[] = [
+                'label' => $category->getTitle(),
+                'value' => (int) $category->getIid(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array{label: string, value: int}>
+     */
+    private function getMediaOptions(CQuiz $quiz, ?CQuizQuestion $currentQuestion): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('question.type = :mediaType')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('mediaType', self::MEDIA_QUESTION, Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+        ;
+
+        if (null !== $currentQuestion && null !== $currentQuestion->getIid()) {
+            $queryBuilder
+                ->andWhere('question.iid != :questionId')
+                ->setParameter('questionId', (int) $currentQuestion->getIid(), Types::INTEGER)
+            ;
+        }
+
+        $items = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+                continue;
+            }
+
+            $items[] = [
+                'label' => strip_tags($question->getQuestion()),
+                'value' => (int) $question->getIid(),
+            ];
+        }
+
+        return $items;
+    }
+
+    private function getFirstCategoryId(CQuizQuestion $question): int
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory && null !== $category->getIid()) {
+                return (int) $category->getIid();
+            }
+        }
+
+        return 0;
+    }
+
+    private function isVueSupportedQuestionType(int $type): bool
+    {
+        return \in_array($type, [
+            self::UNIQUE_ANSWER,
+            self::MULTIPLE_ANSWER,
+            self::FILL_IN_BLANKS,
+            self::MATCHING,
+            self::FREE_ANSWER,
+            self::HOT_SPOT,
+            self::ORAL_EXPRESSION,
+            self::MULTIPLE_ANSWER_COMBINATION,
+            self::UNIQUE_ANSWER_NO_OPTION,
+            self::MULTIPLE_ANSWER_TRUE_FALSE,
+            self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE,
+            self::GLOBAL_MULTIPLE_ANSWER,
+            self::MEDIA_QUESTION,
+            self::CALCULATED_ANSWER,
+            self::UNIQUE_ANSWER_IMAGE,
+            self::ANNOTATION,
+            self::READING_COMPREHENSION,
+            self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY,
+            self::UPLOAD_ANSWER,
+            self::DRAGGABLE,
+            self::MATCHING_DRAGGABLE,
+            self::MATCHING_COMBINATION,
+            self::MATCHING_DRAGGABLE_COMBINATION,
+            self::HOT_SPOT_COMBINATION,
+            self::FILL_IN_BLANKS_COMBINATION,
+            self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION,
+            self::MULTIPLE_ANSWER_DROPDOWN,
+            self::PAGE_BREAK,
+        ], true);
+    }
+
+    private function getQuestionTypeLabel(int $type): string
+    {
+        return match ($type) {
+            self::UNIQUE_ANSWER => 'Unique answer',
+            self::MULTIPLE_ANSWER => 'Multiple answer',
+            self::FILL_IN_BLANKS => 'Fill in blanks',
+            self::MATCHING => 'Matching',
+            self::FREE_ANSWER => 'Open question',
+            self::HOT_SPOT => 'Hotspot',
+            self::HOT_SPOT_DELINEATION => 'Hotspot delineation',
+            self::ORAL_EXPRESSION => 'Oral expression',
+            self::MULTIPLE_ANSWER_COMBINATION => 'Exact Selection',
+            self::UNIQUE_ANSWER_NO_OPTION => 'Unique answer with unknown',
+            self::MULTIPLE_ANSWER_TRUE_FALSE => 'Multiple answer true/false',
+            self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => 'Multiple answer combination true/false',
+            self::GLOBAL_MULTIPLE_ANSWER => 'Global multiple answer',
+            self::MEDIA_QUESTION => 'Media question',
+            self::CALCULATED_ANSWER => 'Calculated answer',
+            self::UNIQUE_ANSWER_IMAGE => 'Unique answer with images',
+            self::ANNOTATION => 'Annotation',
+            self::READING_COMPREHENSION => 'Reading comprehension',
+            self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => 'Multiple answer true/false with degree of certainty',
+            self::UPLOAD_ANSWER => 'Upload answer',
+            self::DRAGGABLE => 'Draggable',
+            self::MATCHING_DRAGGABLE => 'Matching draggable',
+            self::MATCHING_COMBINATION => 'Matching combination',
+            self::MATCHING_DRAGGABLE_COMBINATION => 'Matching draggable combination',
+            self::HOT_SPOT_COMBINATION => 'Hotspot combination',
+            self::FILL_IN_BLANKS_COMBINATION => 'Fill in blanks combination',
+            self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => 'Multiple answer dropdown combination',
+            self::MULTIPLE_ANSWER_DROPDOWN => 'Multiple answer dropdown',
+            self::PAGE_BREAK => 'Page break',
+            default => 'Question',
+        };
+    }
+
+    private function usesSingleCorrectAnswer(int $type): bool
+    {
+        return \in_array($type, [self::UNIQUE_ANSWER, self::UNIQUE_ANSWER_NO_OPTION, self::UNIQUE_ANSWER_IMAGE], true);
+    }
+
+    private function usesGlobalScore(int $type): bool
+    {
+        return \in_array($type, [self::MULTIPLE_ANSWER_COMBINATION, self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE, self::GLOBAL_MULTIPLE_ANSWER, self::FILL_IN_BLANKS_COMBINATION, self::MATCHING_COMBINATION, self::MATCHING_DRAGGABLE_COMBINATION, self::HOT_SPOT_COMBINATION, self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION], true);
+    }
+
+    private function usesTrueFalseOptions(int $type): bool
+    {
+        return \in_array($type, [self::MULTIPLE_ANSWER_TRUE_FALSE, self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE, self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY], true);
+    }
+
+    /**
+     * @return array{0: float, 1: float, 2: float}
+     */
+    private function getTrueFalseScores(CQuizQuestion $question): array
+    {
+        $scores = explode(':', (string) $question->getExtra());
+
+        return [
+            (float) ($scores[0] ?? 1.0),
+            (float) ($scores[1] ?? -0.5),
+            (float) ($scores[2] ?? 0.0),
+        ];
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getQuestionOptionPositionsByIid(CQuizQuestion $question): array
+    {
+        $items = [];
+        foreach ($question->getOptions() as $option) {
+            if (!$option instanceof CQuizQuestionOption || null === $option->getIid()) {
+                continue;
+            }
+
+            $items[(int) $option->getIid()] = (int) $option->getPosition();
+        }
+
+        return $items;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $answers
+     */
+    private function hasNoNegativeScore(array $answers): bool
+    {
+        foreach ($answers as $answer) {
+            if (true === ($answer['correct'] ?? false)) {
+                continue;
+            }
+
+            if (0.0 === (float) ($answer['score'] ?? 0.0)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function isQuestionFeedbackEnabled(): bool
+    {
+        $value = $this->settingsManager->getSetting('exercise.allow_quiz_question_feedback', true);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
+    private function isImageZoomEnabled(): bool
+    {
+        $value = $this->settingsManager->getSetting('exercise.quiz_image_zoom', true);
+        if (\is_array($value)) {
+            return isset($value['options']) || true === ($value['value'] ?? false) || '1' === (string) ($value['value'] ?? '');
+        }
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
+
+    private function addHotspotData(ExerciseQuestionEditor $response, CQuiz $quiz, CQuizQuestion $question, Course $course, ?Session $session): void
+    {
+        if (!$this->usesHotspot((int) $question->getType())) {
+            return;
+        }
+
+        $resourceNode = $question->getResourceNode();
+        if (null !== $resourceNode) {
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            if ($resourceFile instanceof ResourceFile) {
+                $response->hotspotImageName = (string) $resourceFile->getOriginalName();
+                $response->hotspotImageUrl = $this->appendCourseContextToUrl(
+                    $this->questionRepository->getHotSpotImageUrl($question),
+                    $course,
+                    $session
+                );
+            }
+        }
+
+        $response->hotspotItems = $this->getHotspotItems($question);
+        if (self::HOT_SPOT_DELINEATION === (int) $question->getType()) {
+            $this->addHotspotScenarioOptions($response, $quiz, $question);
+        }
+        $response->answers = [];
+    }
+
+    private function addHotspotScenarioOptions(ExerciseQuestionEditor $response, CQuiz $quiz, ?CQuizQuestion $question): void
+    {
+        $response->hotspotScenarioOptions = [
+            ['label' => 'Select destination', 'value' => ''],
+            ['label' => 'Repeat question', 'value' => 'repeat'],
+            ['label' => 'End of test', 'value' => '-1'],
+            ['label' => 'Other (custom URL)', 'value' => 'url'],
+        ];
+
+        foreach ($this->getScenarioQuestionOptions($quiz) as $option) {
+            $response->hotspotScenarioOptions[] = $option;
+        }
+
+        if (null === $question) {
+            return;
+        }
+
+        $relation = $this->entityManager->getRepository(CQuizRelQuestion::class)->findOneBy([
+            'quiz' => $quiz,
+            'question' => $question,
+        ]);
+
+        if (!$relation instanceof CQuizRelQuestion || '' === (string) $relation->getDestination()) {
+            return;
+        }
+
+        $destination = json_decode((string) $relation->getDestination(), true);
+        if (!\is_array($destination)) {
+            return;
+        }
+
+        $success = \is_array($destination['success'] ?? null) ? $destination['success'] : [];
+        $failure = \is_array($destination['failure'] ?? null) ? $destination['failure'] : [];
+
+        $response->hotspotScenarioSuccessType = (string) ($success['type'] ?? '');
+        $response->hotspotScenarioSuccessUrl = (string) ($success['url'] ?? '');
+        $response->hotspotScenarioFailureType = (string) ($failure['type'] ?? '');
+        $response->hotspotScenarioFailureUrl = (string) ($failure['url'] ?? '');
+    }
+
+    /**
+     * @return array<int, array{label: string, value: string}>
+     */
+    private function getScenarioQuestionOptions(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relation', 'question')
+            ->from(CQuizRelQuestion::class, 'relation')
+            ->innerJoin('relation.question', 'question')
+            ->andWhere('IDENTITY(relation.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relation.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $options = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (null === $question->getIid()) {
+                continue;
+            }
+
+            $options[] = [
+                'label' => 'Q'.(int) $relation->getQuestionOrder().': '.$this->plainText($question->getQuestion()),
+                'value' => (string) $question->getIid(),
+            ];
+        }
+
+        return $options;
+    }
+
+    private function plainText(string $value): string
+    {
+        return trim(html_entity_decode(strip_tags($value), ENT_QUOTES | ENT_HTML5));
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getHotspotItems(CQuizQuestion $question): array
+    {
+        $answers = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($answers as $answer) {
+            if (!$answer instanceof CQuizAnswer) {
+                continue;
+            }
+
+            if ('noerror' === (string) $answer->getHotspotType()) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+                'hotspotType' => (string) ($answer->getHotspotType() ?: 'square'),
+                'coordinates' => (string) ($answer->getHotspotCoordinates() ?: '0;0|0|0'),
+            ];
+        }
+
+        return [] !== $items ? $items : $this->getDefaultHotspotItems((int) $question->getType());
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDefaultHotspotItems(int $type): array
+    {
+        if (self::HOT_SPOT_DELINEATION === $type) {
+            return [
+                [
+                    'id' => null,
+                    'answer' => 'delineation',
+                    'comment' => '',
+                    'score' => 10.0,
+                    'position' => 1,
+                    'hotspotType' => 'delineation',
+                    'coordinates' => '0;0|0|0',
+                ],
+            ];
+        }
+
+        return [
+            [
+                'id' => null,
+                'answer' => '',
+                'comment' => '',
+                'score' => self::HOT_SPOT_COMBINATION === $type ? 0.0 : 10.0,
+                'position' => 1,
+                'hotspotType' => 'square',
+                'coordinates' => '0;0|0|0',
+            ],
+        ];
+    }
+
+    private function usesHotspot(int $type): bool
+    {
+        return \in_array($type, [self::HOT_SPOT, self::HOT_SPOT_DELINEATION, self::HOT_SPOT_COMBINATION], true);
+    }
+
+    private function addAnnotationData(ExerciseQuestionEditor $response, CQuizQuestion $question, Course $course, ?Session $session): void
+    {
+        if (self::ANNOTATION !== (int) $question->getType()) {
+            return;
+        }
+
+        $resourceNode = $question->getResourceNode();
+        if (null === $resourceNode) {
+            return;
+        }
+
+        $resourceFile = $resourceNode->getResourceFiles()->first();
+        if (!$resourceFile instanceof ResourceFile) {
+            return;
+        }
+
+        $response->annotationImageName = (string) $resourceFile->getOriginalName();
+        $response->annotationImageUrl = $this->appendCourseContextToUrl(
+            $this->questionRepository->getHotSpotImageUrl($question),
+            $course,
+            $session
+        );
+    }
+
+    private function appendCourseContextToUrl(string $url, Course $course, ?Session $session): string
+    {
+        if ('' === $url) {
+            return '';
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $params = [
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? $request?->query->getInt('sid', 0) ?? 0),
+            'gid' => (int) ($request?->query->getInt('gid', 0) ?? 0),
+        ];
+
+        return $url.(str_contains($url, '?') ? '&' : '?').http_build_query($params);
+    }
+
+    private function addMatchingData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        $type = (int) $question->getType();
+        if (!$this->usesMatching($type)) {
+            return;
+        }
+
+        $data = $this->buildMatchingData($question);
+        $response->matchingOptions = $data['options'];
+        $response->matchingPairs = $data['pairs'];
+        $response->answers = [];
+        $response->score = (float) $question->getPonderation();
+    }
+
+    /**
+     * @return array{options: array<int, array<string, mixed>>, pairs: array<int, array<string, mixed>>}
+     */
+    private function buildMatchingData(CQuizQuestion $question): array
+    {
+        $answers = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $options = [];
+        $optionsByIid = [];
+        $pairs = [];
+
+        foreach ($answers as $answer) {
+            if (!$answer instanceof CQuizAnswer) {
+                continue;
+            }
+
+            $correct = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correct) {
+                $option = [
+                    'id' => (int) $answer->getIid(),
+                    'localId' => 'option-'.(int) $answer->getPosition(),
+                    'label' => $this->getMatchingOptionLabel(\count($options) + 1),
+                    'answer' => $answer->getAnswer(),
+                    'position' => (int) $answer->getPosition(),
+                ];
+                $options[] = $option;
+                $optionsByIid[(int) $answer->getIid()] = $option;
+
+                continue;
+            }
+
+            $pairs[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'optionId' => $correct,
+                'optionLocalId' => '',
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        foreach ($pairs as &$pair) {
+            $optionId = (int) ($pair['optionId'] ?? 0);
+            if (isset($optionsByIid[$optionId])) {
+                $pair['optionLocalId'] = (string) $optionsByIid[$optionId]['localId'];
+            }
+        }
+        unset($pair);
+
+        if (empty($options)) {
+            $options = $this->getDefaultMatchingOptions();
+        }
+
+        if (empty($pairs)) {
+            $pairs = $this->getDefaultMatchingPairs($type);
+        }
+
+        return ['options' => $options, 'pairs' => $pairs];
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDefaultMatchingOptions(): array
+    {
+        return [
+            ['id' => null, 'localId' => 'option-1', 'label' => 'A', 'answer' => '', 'position' => 1],
+            ['id' => null, 'localId' => 'option-2', 'label' => 'B', 'answer' => '', 'position' => 2],
+        ];
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDefaultMatchingPairs(int $type = self::MATCHING): array
+    {
+        $score = \in_array($type, [self::MATCHING_COMBINATION, self::MATCHING_DRAGGABLE_COMBINATION], true) ? 0.0 : 10.0;
+
+        return [
+            ['id' => null, 'answer' => '', 'optionId' => null, 'optionLocalId' => 'option-1', 'comment' => '', 'score' => $score, 'position' => 3],
+            ['id' => null, 'answer' => '', 'optionId' => null, 'optionLocalId' => 'option-2', 'comment' => '', 'score' => $score, 'position' => 4],
+        ];
+    }
+
+    private function getMatchingOptionLabel(int $position): string
+    {
+        if (1 <= $position && 26 >= $position) {
+            return chr(64 + $position);
+        }
+
+        return (string) $position;
+    }
+
+
+    private function addDraggableData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        if (!$this->usesDraggableOrdering((int) $question->getType())) {
+            return;
+        }
+
+        $response->draggableItems = $this->buildDraggableItems($question);
+        $response->matchingOrientation = \in_array((string) $question->getExtra(), ['h', 'v'], true) ? (string) $question->getExtra() : 'h';
+        $response->answers = [];
+        $response->score = (float) $question->getPonderation();
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function buildDraggableItems(CQuizQuestion $question): array
+    {
+        $items = [];
+        foreach ($this->getExistingAnswers($question) as $answer) {
+            $correct = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correct) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $answer->getIid(),
+                'localId' => 'draggable-'.(int) $answer->getPosition(),
+                'answer' => $answer->getAnswer(),
+                'targetPosition' => $correct,
+                'score' => (float) $answer->getPonderation(),
+                'position' => \count($items) + 1,
+            ];
+        }
+
+        return [] !== $items ? $items : $this->getDefaultDraggableItems();
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDefaultDraggableItems(): array
+    {
+        return [
+            ['id' => null, 'localId' => 'draggable-1', 'answer' => '', 'targetPosition' => 1, 'score' => 10.0, 'position' => 1],
+            ['id' => null, 'localId' => 'draggable-2', 'answer' => '', 'targetPosition' => 2, 'score' => 10.0, 'position' => 2],
+        ];
+    }
+
+    private function addCalculatedData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        if (self::CALCULATED_ANSWER !== (int) $question->getType()) {
+            return;
+        }
+
+        $answers = $this->getExistingAnswers($question);
+        $firstAnswer = $answers[0] ?? null;
+        if (!$firstAnswer instanceof CQuizAnswer) {
+            $response->calculatedText = $this->getDefaultCalculatedText();
+            $response->calculatedFormula = '';
+            $response->calculatedRanges = $this->buildCalculatedRanges($response->calculatedText, []);
+            $response->calculatedVariations = 1;
+            $response->calculatedComment = '';
+            $response->answers = [];
+
+            return;
+        }
+
+        $parsed = $this->parseCalculatedAnswer((string) $firstAnswer->getAnswer());
+        $response->calculatedText = $parsed['text'];
+        $response->calculatedFormula = $parsed['formula'];
+        $response->calculatedRanges = $this->buildCalculatedRanges($parsed['text'], []);
+        $response->calculatedVariations = max(1, \count($answers));
+        $response->calculatedComment = (string) $firstAnswer->getComment();
+        $response->score = (float) $question->getPonderation();
+        $response->answers = [];
+    }
+
+    /**
+     * @return array{text: string, formula: string}
+     */
+    private function parseCalculatedAnswer(string $encodedAnswer): array
+    {
+        $parts = explode('@@', $encodedAnswer);
+        $formula = \count($parts) > 1 ? (string) array_pop($parts) : '';
+        $text = (string) array_shift($parts);
+        $text = preg_replace('/\[[^\]]*\]/', '[]', $text) ?? $text;
+
+        return [
+            'text' => $text,
+            'formula' => $formula,
+        ];
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $submittedRanges
+     *
+     * @return array<int, array{token: string, low: string, high: string, random: string, position: int}>
+     */
+    private function buildCalculatedRanges(string $text, array $submittedRanges): array
+    {
+        $previousByToken = [];
+        foreach ($submittedRanges as $range) {
+            if (!\is_array($range)) {
+                continue;
+            }
+
+            $token = (string) ($range['token'] ?? '');
+            if ('' === $token) {
+                continue;
+            }
+
+            $previousByToken[$token] = $range;
+        }
+
+        $ranges = [];
+        foreach ($this->extractCalculatedTokens($text) as $index => $token) {
+            $previous = $previousByToken[$token] ?? [];
+            $low = (string) ($previous['low'] ?? '1');
+            $high = (string) ($previous['high'] ?? '20');
+
+            $ranges[] = [
+                'token' => $token,
+                'low' => $low,
+                'high' => $high,
+                'random' => $this->buildCalculatedRandomPreview($low, $high),
+                'position' => $index + 1,
+            ];
+        }
+
+        return $ranges;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private function extractCalculatedTokens(string $text): array
+    {
+        preg_match_all('/\[[^\]]+\]/', $text, $matches);
+        $tokens = [];
+        foreach ($matches[0] ?? [] as $token) {
+            $token = trim((string) $token);
+            if ('' !== $token && !\in_array($token, $tokens, true)) {
+                $tokens[] = $token;
+            }
+        }
+
+        return $tokens;
+    }
+
+    private function buildCalculatedRandomPreview(string $low, string $high): string
+    {
+        $minimum = (float) $low;
+        $maximum = (float) $high;
+        if ($maximum < $minimum) {
+            [$minimum, $maximum] = [$maximum, $minimum];
+        }
+
+        $hasDecimal = str_contains($low, '.') || str_contains($high, '.');
+        $value = random_int((int) round($minimum * 100), (int) round($maximum * 100)) / 100;
+
+        if (!$hasDecimal) {
+            return (string) random_int((int) $minimum, (int) $maximum);
+        }
+
+        return number_format($value, 2, '.', '');
+    }
+
+    private function getDefaultCalculatedText(): string
+    {
+        return '<p>Calculate the Body Mass Index for a person with weight [95] Kg and height [1.81] m.</p><p>Body Mass Index: []</p>';
+    }
+
+    private function addFillBlanksData(ExerciseQuestionEditor $response, CQuizQuestion $question): void
+    {
+        $type = (int) $question->getType();
+        if (!$this->usesFillBlanks($type)) {
+            return;
+        }
+
+        $answer = $this->getFirstAnswer($question);
+        $parsed = $this->parseFillBlanksAnswer($answer?->getAnswer() ?? '');
+
+        $response->fillBlanksText = $parsed['text'];
+        $response->fillBlankItems = $this->buildFillBlankItems(
+            $parsed['text'],
+            $parsed['weights'],
+            $parsed['sizes'],
+            $parsed['separator']
+        );
+        $response->fillBlanksSeparator = $parsed['separator'];
+        $response->fillBlanksSwitchable = $parsed['switchable'];
+        $response->fillBlanksCaseInsensitive = 'case:false' === (string) $question->getExtra();
+        $response->fillBlanksComment = (string) ($answer?->getComment() ?? '');
+        if (self::FILL_IN_BLANKS_COMBINATION === $type) {
+            $response->globalScore = (float) $question->getPonderation();
+            $response->score = 0.0;
+        } else {
+            $response->score = (float) $question->getPonderation();
+        }
+    }
+
+    private function getFirstAnswer(CQuizQuestion $question): ?CQuizAnswer
+    {
+        $answer = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $answer instanceof CQuizAnswer ? $answer : null;
+    }
+
+    /**
+     * @return array{text: string, weights: array<int, float>, sizes: array<int, int>, separator: int, switchable: bool}
+     */
+    private function parseFillBlanksAnswer(string $encodedAnswer): array
+    {
+        $parts = explode('::', $encodedAnswer, 2);
+        $text = (string) ($parts[0] ?? '');
+        $systemString = (string) ($parts[1] ?? '');
+        $switchableParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($switchableParts[0] ?? ''));
+
+        $weights = $this->parseFloatList((string) ($details[0] ?? ''));
+        $sizes = [];
+        $separator = 0;
+
+        if (\count($details) >= 3) {
+            $sizes = $this->parseIntegerList((string) ($details[1] ?? ''));
+            $separator = max(0, (int) ($details[2] ?? 0));
+        } else {
+            foreach ($weights as $_weight) {
+                $sizes[] = 200;
+            }
+        }
+
+        return [
+            'text' => $text,
+            'weights' => $weights,
+            'sizes' => $sizes,
+            'separator' => $separator,
+            'switchable' => '1' === (string) ($switchableParts[1] ?? ''),
+        ];
+    }
+
+    /**
+     * @return array<int, array{answer: string, score: float, inputSize: int, position: int}>
+     */
+    private function buildFillBlankItems(string $text, array $weights, array $sizes, int $separator): array
+    {
+        $blanks = $this->extractFillBlankAnswers($text, $separator);
+        $items = [];
+        foreach ($blanks as $index => $blank) {
+            $items[] = [
+                'answer' => $blank,
+                'score' => (float) ($weights[$index] ?? 1.0),
+                'inputSize' => (int) ($sizes[$index] ?? 200),
+                'position' => $index + 1,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private function extractFillBlankAnswers(string $text, int $separator): array
+    {
+        [$start, $end] = $this->getFillBlankSeparators($separator);
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+        preg_match_all($pattern, $text, $matches);
+
+        return array_map(
+            static fn (string $value): string => trim($value),
+            $matches[1] ?? []
+        );
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    /**
+     * @return array<int, float>
+     */
+    private function parseFloatList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(
+            static fn (string $item): float => (float) trim($item),
+            explode(',', $value)
+        );
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseIntegerList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(
+            static fn (string $item): int => max(40, (int) trim($item)),
+            explode(',', $value)
+        );
+    }
+
+    private function usesDraggableOrdering(int $type): bool
+    {
+        return self::DRAGGABLE === $type;
+    }
+
+    private function isStructuralQuestionType(int $type): bool
+    {
+        return \in_array($type, [self::MEDIA_QUESTION, self::READING_COMPREHENSION, self::PAGE_BREAK], true);
+    }
+
+    private function usesMatching(int $type): bool
+    {
+        return \in_array($type, [self::MATCHING, self::MATCHING_COMBINATION, self::MATCHING_DRAGGABLE, self::MATCHING_DRAGGABLE_COMBINATION], true);
+    }
+
+    private function usesFillBlanks(int $type): bool
+    {
+        return \in_array($type, [self::FILL_IN_BLANKS, self::FILL_IN_BLANKS_COMBINATION], true);
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session): array
+    {
+        $baseParams = [
+            'exerciseId' => (int) $quiz->getIid(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+        ];
+
+        return [
+            'questions' => '/main/exercise/admin.php?'.http_build_query($baseParams),
+            'questionPool' => '/main/exercise/question_pool.php?'.http_build_query($baseParams),
+        ];
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
new file mode 100644
index 00000000000..38651652c01
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
@@ -0,0 +1,838 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestion;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProviderInterface<ExerciseQuestion>
+ */
+final readonly class ExerciseQuestionProvider implements ProviderInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_question_action';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizQuestionRepository $questionRepository,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestion
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercise questions in this context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $questions = $this->getQuestions($quiz, $course, $session);
+
+        $response = new ExerciseQuestion();
+        $response->exerciseId = $exerciseId;
+        $response->title = $quiz->getTitle();
+        $response->questions = $questions;
+        $response->questionTypes = $this->getQuestionTypes($quiz);
+        $response->questionCount = \count($questions);
+        $response->totalScore = $this->getTotalScore($questions);
+        $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session);
+        $response->canManage = true;
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestions(CQuiz $quiz, Course $course, ?Session $session): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+                continue;
+            }
+
+            $type = (int) $question->getType();
+            $items[] = [
+                'id' => (int) $question->getIid(),
+                'title' => $question->getQuestion(),
+                'description' => (string) $question->getDescription(),
+                'type' => $type,
+                'typeLabel' => $this->getQuestionTypeLabel($type),
+                'typeIcon' => $this->getQuestionTypeIcon($type),
+                'score' => (float) $question->getPonderation(),
+                'position' => (int) $relation->getQuestionOrder(),
+                'mandatory' => 1 === (int) $question->getMandatory(),
+                'duration' => $question->getDuration(),
+                'difficulty' => max(1, (int) $question->getLevel()),
+                'categoryLabel' => $this->getFirstCategoryTitle($question),
+                'answers' => $this->getAnswers($question),
+                'fillBlanks' => $this->getFillBlanksPreview($question),
+                'matching' => $this->getMatchingPreview($question),
+                'draggable' => $this->getDraggablePreview($question),
+                'annotation' => $this->getAnnotationPreview($question, $course, $session),
+                'hotspot' => $this->getHotspotPreview($question, $course, $session),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getAnnotationPreview(CQuizQuestion $question, Course $course, ?Session $session): array
+    {
+        if (20 !== (int) $question->getType()) {
+            return [];
+        }
+
+        $resourceNode = $question->getResourceNode();
+        if (null === $resourceNode) {
+            return [];
+        }
+
+        $resourceFile = $resourceNode->getResourceFiles()->first();
+        if (!$resourceFile instanceof ResourceFile) {
+            return [];
+        }
+
+        return [
+            'imageName' => (string) $resourceFile->getOriginalName(),
+            'imageUrl' => $this->appendCourseContextToUrl(
+                $this->questionRepository->getHotSpotImageUrl($question),
+                $course,
+                $session
+            ),
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getHotspotPreview(CQuizQuestion $question, Course $course, ?Session $session): array
+    {
+        if (!$this->usesHotspot((int) $question->getType())) {
+            return [];
+        }
+
+        $imageName = '';
+        $imageUrl = '';
+        $resourceNode = $question->getResourceNode();
+        if (null !== $resourceNode) {
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            if ($resourceFile instanceof ResourceFile) {
+                $imageName = (string) $resourceFile->getOriginalName();
+                $imageUrl = $this->appendCourseContextToUrl(
+                    $this->questionRepository->getHotSpotImageUrl($question),
+                    $course,
+                    $session
+                );
+            }
+        }
+
+        $answers = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($answers as $answer) {
+            if (!$answer instanceof CQuizAnswer || 'noerror' === (string) $answer->getHotspotType()) {
+                continue;
+            }
+
+            $items[] = [
+                'answer' => $answer->getAnswer(),
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+                'hotspotType' => (string) ($answer->getHotspotType() ?: 'square'),
+                'coordinates' => (string) ($answer->getHotspotCoordinates() ?: ''),
+            ];
+        }
+
+        return [
+            'imageName' => $imageName,
+            'imageUrl' => $imageUrl,
+            'items' => $items,
+        ];
+    }
+
+    private function appendCourseContextToUrl(string $url, Course $course, ?Session $session): string
+    {
+        if ('' === $url) {
+            return '';
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $params = [
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? $request?->query->getInt('sid', 0) ?? 0),
+            'gid' => (int) ($request?->query->getInt('gid', 0) ?? 0),
+        ];
+
+        return $url.(str_contains($url, '?') ? '&' : '?').http_build_query($params);
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getAnswers(CQuizQuestion $question): array
+    {
+        $answers = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $type = (int) $question->getType();
+        if ($this->usesFillBlanks($type) || $this->usesMatching($type) || $this->usesHotspot($type) || 18 === $type) {
+            return [];
+        }
+
+        $optionPositionsByIid = $this->getQuestionOptionPositionsByIid($question);
+
+        $items = [];
+        foreach ($answers as $answer) {
+            if (!$answer instanceof CQuizAnswer) {
+                continue;
+            }
+
+            $correctValue = (int) $answer->getCorrect();
+            $correctChoice = $this->usesTrueFalseOptions($type)
+                ? (int) ($optionPositionsByIid[$correctValue] ?? $correctValue)
+                : null;
+
+            $items[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'correct' => $this->usesTrueFalseOptions($type) ? 1 === $correctChoice : 1 === $correctValue,
+                'correctChoice' => $this->usesTrueFalseOptions($type) ? $correctChoice : null,
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getQuestionOptionPositionsByIid(CQuizQuestion $question): array
+    {
+        $items = [];
+        foreach ($question->getOptions() as $option) {
+            if (!$option instanceof CQuizQuestionOption || null === $option->getIid()) {
+                continue;
+            }
+
+            $items[(int) $option->getIid()] = (int) $option->getPosition();
+        }
+
+        return $items;
+    }
+
+    private function usesTrueFalseOptions(int $type): bool
+    {
+        return \in_array($type, [11, 12, 22], true);
+    }
+
+    private function getFirstCategoryTitle(CQuizQuestion $question): string
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                return $category->getTitle();
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     */
+    private function getTotalScore(array $questions): float
+    {
+        $total = 0.0;
+        foreach ($questions as $question) {
+            $total += (float) ($question['score'] ?? 0.0);
+        }
+
+        return $total;
+    }
+
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getDraggablePreview(CQuizQuestion $question): ?array
+    {
+        if (18 !== (int) $question->getType()) {
+            return null;
+        }
+
+        $answers = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($answers as $answer) {
+            if (!$answer instanceof CQuizAnswer) {
+                continue;
+            }
+
+            $targetPosition = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $targetPosition) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'targetPosition' => $targetPosition,
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        return [
+            'orientation' => \in_array((string) $question->getExtra(), ['h', 'v'], true) ? (string) $question->getExtra() : 'h',
+            'items' => $items,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getMatchingPreview(CQuizQuestion $question): ?array
+    {
+        $type = (int) $question->getType();
+        if (!$this->usesMatching($type)) {
+            return null;
+        }
+
+        $answers = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $options = [];
+        $optionsByIid = [];
+        $pairs = [];
+        foreach ($answers as $answer) {
+            if (!$answer instanceof CQuizAnswer) {
+                continue;
+            }
+
+            $correct = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correct) {
+                $option = [
+                    'id' => (int) $answer->getIid(),
+                    'label' => $this->getMatchingOptionLabel(\count($options) + 1),
+                    'answer' => $answer->getAnswer(),
+                    'position' => (int) $answer->getPosition(),
+                ];
+                $options[] = $option;
+                $optionsByIid[(int) $answer->getIid()] = $option;
+
+                continue;
+            }
+
+            $pairs[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'optionId' => $correct,
+                'optionLabel' => isset($optionsByIid[$correct]) ? (string) $optionsByIid[$correct]['label'] : '',
+                'optionAnswer' => isset($optionsByIid[$correct]) ? (string) $optionsByIid[$correct]['answer'] : '',
+                'comment' => (string) $answer->getComment(),
+                'score' => (float) $answer->getPonderation(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        return [
+            'options' => $options,
+            'pairs' => $pairs,
+        ];
+    }
+
+    private function getMatchingOptionLabel(int $position): string
+    {
+        if (1 <= $position && 26 >= $position) {
+            return chr(64 + $position);
+        }
+
+        return (string) $position;
+    }
+
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getFillBlanksPreview(CQuizQuestion $question): ?array
+    {
+        $type = (int) $question->getType();
+        if (!$this->usesFillBlanks($type)) {
+            return null;
+        }
+
+        $answer = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$answer instanceof CQuizAnswer) {
+            return null;
+        }
+
+        $parsed = $this->parseFillBlanksAnswer($answer->getAnswer());
+
+        return [
+            'text' => $parsed['text'],
+            'items' => $this->buildFillBlankItems($parsed['text'], $parsed['weights'], $parsed['sizes'], $parsed['separator']),
+            'separator' => $parsed['separator'],
+            'switchable' => $parsed['switchable'],
+            'caseInsensitive' => 'case:false' === (string) $question->getExtra(),
+            'comment' => (string) $answer->getComment(),
+        ];
+    }
+
+    /**
+     * @return array{text: string, weights: array<int, float>, sizes: array<int, int>, separator: int, switchable: bool}
+     */
+    private function parseFillBlanksAnswer(string $encodedAnswer): array
+    {
+        $parts = explode('::', $encodedAnswer, 2);
+        $text = (string) ($parts[0] ?? '');
+        $systemString = (string) ($parts[1] ?? '');
+        $switchableParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($switchableParts[0] ?? ''));
+
+        $weights = $this->parseFloatList((string) ($details[0] ?? ''));
+        $sizes = [];
+        $separator = 0;
+
+        if (\count($details) >= 3) {
+            $sizes = $this->parseIntegerList((string) ($details[1] ?? ''));
+            $separator = max(0, (int) ($details[2] ?? 0));
+        } else {
+            foreach ($weights as $_weight) {
+                $sizes[] = 200;
+            }
+        }
+
+        return [
+            'text' => $text,
+            'weights' => $weights,
+            'sizes' => $sizes,
+            'separator' => $separator,
+            'switchable' => '1' === (string) ($switchableParts[1] ?? ''),
+        ];
+    }
+
+    /**
+     * @return array<int, array{answer: string, score: float, inputSize: int, position: int}>
+     */
+    private function buildFillBlankItems(string $text, array $weights, array $sizes, int $separator): array
+    {
+        $items = [];
+        foreach ($this->extractFillBlankAnswers($text, $separator) as $index => $blank) {
+            $items[] = [
+                'answer' => $blank,
+                'score' => (float) ($weights[$index] ?? 1.0),
+                'inputSize' => (int) ($sizes[$index] ?? 200),
+                'position' => $index + 1,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private function extractFillBlankAnswers(string $text, int $separator): array
+    {
+        [$start, $end] = $this->getFillBlankSeparators($separator);
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+        preg_match_all($pattern, $text, $matches);
+
+        return array_map(
+            static fn (string $value): string => trim($value),
+            $matches[1] ?? []
+        );
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    /**
+     * @return array<int, float>
+     */
+    private function parseFloatList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(
+            static fn (string $item): float => (float) trim($item),
+            explode(',', $value)
+        );
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseIntegerList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(
+            static fn (string $item): int => max(40, (int) trim($item)),
+            explode(',', $value)
+        );
+    }
+
+    private function usesHotspot(int $type): bool
+    {
+        return \in_array($type, [6, 8, 26], true);
+    }
+
+    private function usesMatching(int $type): bool
+    {
+        return \in_array($type, [4, 19, 24, 25], true);
+    }
+
+    private function usesFillBlanks(int $type): bool
+    {
+        return \in_array($type, [3, 27], true);
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestionTypes(CQuiz $quiz): array
+    {
+        $feedbackType = $quiz->getFeedbackType();
+        $types = [];
+
+        foreach ($this->getLegacyQuestionTypeDefinitions() as $definition) {
+            $type = (int) $definition['type'];
+            $isVueEditor = $this->isVueQuestionEditorType($type);
+
+            if (!$this->isQuestionTypeAllowedByFeedback($type, (int) $feedbackType)) {
+                continue;
+            }
+
+            $types[] = [
+                'type' => $type,
+                'label' => $definition['label'],
+                'icon' => $definition['icon'],
+                'enabled' => true,
+                'requiresImmediateFeedback' => false,
+                'migratedToVue' => $isVueEditor,
+                'editor' => $isVueEditor ? 'vue' : 'legacy',
+            ];
+        }
+
+        return $types;
+    }
+
+    /**
+     * @return array<int, array{type: int, label: string, icon: string}>
+     */
+    private function getLegacyQuestionTypeDefinitions(): array
+    {
+        return [
+            ['type' => 1, 'label' => 'Unique answer', 'icon' => 'mcua.png'],
+            ['type' => 2, 'label' => 'Multiple answer', 'icon' => 'mcma.png'],
+            ['type' => 3, 'label' => 'Fill in blanks', 'icon' => 'fill_in_blanks.png'],
+            ['type' => 4, 'label' => 'Matching', 'icon' => 'matching.png'],
+            ['type' => 5, 'label' => 'Open question', 'icon' => 'open_answer.png'],
+            ['type' => 6, 'label' => 'Hotspot', 'icon' => 'hotspot.png'],
+            ['type' => 9, 'label' => 'Exact Selection', 'icon' => 'mcmac.png'],
+            ['type' => 10, 'label' => 'Unique answer with unknown', 'icon' => 'mcuao.png'],
+            ['type' => 11, 'label' => 'Multiple answer true/false', 'icon' => 'mcmao.png'],
+            ['type' => 12, 'label' => 'Multiple answer combination true/false', 'icon' => 'mcmaco.png'],
+            ['type' => 13, 'label' => 'Oral expression', 'icon' => 'audio_question.png'],
+            ['type' => 14, 'label' => 'Global multiple answer', 'icon' => 'mcmagl.png'],
+            ['type' => 15, 'label' => 'Media question', 'icon' => 'media.png'],
+            ['type' => 16, 'label' => 'Calculated answer', 'icon' => 'calculated_answer.png'],
+            ['type' => 17, 'label' => 'Unique answer with images', 'icon' => 'uaimg.png'],
+            ['type' => 18, 'label' => 'Sequence ordering', 'icon' => 'ordering.png'],
+            ['type' => 19, 'label' => 'Matching draggable', 'icon' => 'matchingdrag.png'],
+            ['type' => 20, 'label' => 'Annotation', 'icon' => 'annotation.png'],
+            ['type' => 21, 'label' => 'Reading comprehension', 'icon' => 'reading_comprehension.png'],
+            ['type' => 22, 'label' => 'Multiple answer true/false with degree of certainty', 'icon' => 'mccert.png'],
+            ['type' => 23, 'label' => 'Upload answer', 'icon' => 'file_upload_question.png'],
+            ['type' => 24, 'label' => 'Matching combination', 'icon' => 'matching_co.png'],
+            ['type' => 25, 'label' => 'Matching draggable combination', 'icon' => 'matchingdrag_co.png'],
+            ['type' => 26, 'label' => 'Hotspot combination', 'icon' => 'hotspot_co.png'],
+            ['type' => 27, 'label' => 'Fill in blanks combination', 'icon' => 'fill_in_blanks_co.png'],
+            ['type' => 28, 'label' => 'Multiple answer dropdown combination', 'icon' => 'mcma_dropdown_co.png'],
+            ['type' => 29, 'label' => 'Multiple answer dropdown', 'icon' => 'mcma_dropdown.png'],
+            ['type' => 31, 'label' => 'Page break', 'icon' => 'page_end.png'],
+        ];
+    }
+
+
+    private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType): bool
+    {
+        if (1 === $feedbackType) {
+            return !\in_array($type, [5, 13, 20, 22, 23, 31], true);
+        }
+
+        if (3 === $feedbackType) {
+            return \in_array($type, [1, 2, 16, 18], true);
+        }
+
+        return true;
+    }
+
+    private function isVueQuestionEditorType(int $type): bool
+    {
+        return \in_array($type, [1, 2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31], true);
+    }
+
+    private function getQuestionTypeLabel(int $type): string
+    {
+        foreach ($this->getLegacyQuestionTypeDefinitions() as $definition) {
+            if ($type === $definition['type']) {
+                return $definition['label'];
+            }
+        }
+
+        return 'Question';
+    }
+
+    private function getQuestionTypeIcon(int $type): string
+    {
+        foreach ($this->getLegacyQuestionTypeDefinitions() as $definition) {
+            if ($type === $definition['type']) {
+                return $definition['icon'];
+            }
+        }
+
+        return 'quiz.png';
+    }
+
+
+    /**
+     * @param array<string, int> $baseParams
+     *
+     * @return array<string, int>
+     */
+    private function getQuestionPoolParams(CQuiz $quiz, array $baseParams): array
+    {
+        $feedbackType = (int) $quiz->getFeedbackType();
+        if (\in_array($feedbackType, [1, 3], true)) {
+            $baseParams['type'] = 1;
+        }
+
+        return $baseParams;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session): array
+    {
+        $baseParams = [
+            'exerciseId' => (int) $quiz->getIid(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+        ];
+
+        return [
+            'list' => '/main/exercise/exercise.php?'.http_build_query($baseParams),
+            'configure' => '/main/exercise/exercise_admin.php?'.http_build_query($baseParams + ['modifyExercise' => 'yes']),
+            'preview' => '/main/exercise/overview.php?'.http_build_query($baseParams),
+            'results' => '/main/exercise/exercise_report.php?'.http_build_query($baseParams),
+            'questionPool' => '/main/exercise/question_pool.php?'.http_build_query($this->getQuestionPoolParams($quiz, $baseParams)),
+        ];
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
new file mode 100644
index 00000000000..d3fff8e4348
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -0,0 +1,690 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAnswer;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTime;
+use DateTimeImmutable;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Saves draft answers for simple Vue runtime question types.
+ *
+ * This processor intentionally writes legacy-compatible track_e_attempt rows only.
+ * Final scoring, status changes and results remain delegated to the legacy runtime.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeAnswer, ExerciseRuntimeAnswer>
+ */
+final readonly class ExerciseRuntimeAnswerProcessor implements ProcessorInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const UNIQUE_TYPES = [1, 10, 17];
+    private const MULTIPLE_TYPES = [2, 9, 14];
+    private const TRUE_FALSE_TYPES = [11, 12];
+    private const FILL_BLANK_TYPES = [3, 27];
+    private const MATCHING_TYPES = [4, 19, 24, 25];
+    private const DROPDOWN_TYPES = [28, 29];
+    private const FREE_ANSWER_TYPES = [5];
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeAnswer
+    {
+        if (!$data instanceof ExerciseRuntimeAnswer) {
+            throw new BadRequestHttpException('Invalid exercise runtime answer payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canSaveDraftAnswers()) {
+            throw new AccessDeniedHttpException('You are not allowed to save answers for this exercise.');
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('A valid authenticated user is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : (int) ($data->attemptId ?? 0);
+        $questionId = (int) ($data->questionId ?? 0);
+
+        if (0 >= $exerciseId || 0 >= $attemptId || 0 >= $questionId) {
+            throw new BadRequestHttpException('A valid exercise, attempt and question are required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempt = $this->getIncompleteAttempt($attemptId, $quiz, $course, $session, $user);
+        $question = $this->getQuestionFromExercise($questionId, $quiz);
+
+        if (!$question instanceof CQuizQuestion) {
+            throw new NotFoundHttpException('The requested question was not found in this exercise.');
+        }
+
+        if (!$this->questionBelongsToAttempt($questionId, $attempt)) {
+            throw new AccessDeniedHttpException('The requested question does not belong to this attempt.');
+        }
+
+        $rows = $this->buildDraftRows($question, $data->answer, max(0, (int) $data->secondsSpent));
+        $this->deletePreviousDraftRows($attempt, $questionId);
+
+        foreach ($rows as $row) {
+            $attemptRow = (new TrackEAttempt())
+                ->setTrackEExercise($attempt)
+                ->setUser($user)
+                ->setQuestionId($questionId)
+                ->setAnswer($row['answer'])
+                ->setTeacherComment('')
+                ->setMarks(0.0)
+                ->setPosition($row['position'])
+                ->setTms(new DateTime())
+                ->setSecondsSpent($row['secondsSpent'])
+            ;
+            $this->entityManager->persist($attemptRow);
+        }
+
+        $this->entityManager->flush();
+
+        $response = new ExerciseRuntimeAnswer();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->questionId = $questionId;
+        $response->success = true;
+        $response->message = [] === $rows ? 'Draft answer cleared' : 'Draft answer saved';
+        $response->savedAnswer = $this->getSavedAnswerRows($attemptId, $questionId);
+        $response->answeredQuestionIds = $this->getAnsweredQuestionIds($attemptId);
+        $response->answeredCount = \count($response->answeredQuestionIds);
+        $response->canFinish = false;
+
+        return $response;
+    }
+
+    private function canSaveDraftAnswers(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        $now = new DateTimeImmutable();
+        if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+            throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+        }
+
+        if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+            throw new AccessDeniedHttpException('The requested exercise is closed.');
+        }
+
+        return $quiz;
+    }
+
+    private function getIncompleteAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session, User $user): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->andWhere('attempt.status = :status')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_INCOMPLETE)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested incomplete attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    private function getQuestionFromExercise(int $questionId, CQuiz $quiz): ?CQuizQuestion
+    {
+        $relQuestion = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$relQuestion instanceof CQuizRelQuestion) {
+            return null;
+        }
+
+        return $relQuestion->getQuestion();
+    }
+
+    private function questionBelongsToAttempt(int $questionId, TrackEExercise $attempt): bool
+    {
+        $attemptQuestionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if ([] === $attemptQuestionIds) {
+            return true;
+        }
+
+        return \in_array($questionId, $attemptQuestionIds, true);
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+
+    /**
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildDraftRows(CQuizQuestion $question, mixed $answer, int $secondsSpent): array
+    {
+        $type = (int) $question->getType();
+        $payload = $this->normalizePayload($answer);
+
+        if (\in_array($type, self::UNIQUE_TYPES, true)) {
+            return $this->buildUniqueRows($payload, $secondsSpent);
+        }
+
+        if (\in_array($type, self::MULTIPLE_TYPES, true)) {
+            return $this->buildMultipleRows($payload, $secondsSpent);
+        }
+
+        if (\in_array($type, self::TRUE_FALSE_TYPES, true)) {
+            return $this->buildTrueFalseRows($payload, $secondsSpent);
+        }
+
+        if (\in_array($type, self::FILL_BLANK_TYPES, true)) {
+            return $this->buildFillBlankRows($question, $payload, $secondsSpent);
+        }
+
+        if (\in_array($type, self::MATCHING_TYPES, true)) {
+            return $this->buildMatchingRows($payload, $secondsSpent);
+        }
+
+        if (\in_array($type, self::DROPDOWN_TYPES, true)) {
+            return $this->buildDropdownRows($payload, $secondsSpent);
+        }
+
+        if (\in_array($type, self::FREE_ANSWER_TYPES, true)) {
+            return $this->buildFreeAnswerRows($payload, $secondsSpent);
+        }
+
+        throw new BadRequestHttpException('This question type is not supported by the draft answer processor yet.');
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizePayload(mixed $answer): array
+    {
+        if (\is_array($answer)) {
+            return $answer;
+        }
+
+        if (null === $answer) {
+            return [];
+        }
+
+        return ['value' => $answer];
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildUniqueRows(array $payload, int $secondsSpent): array
+    {
+        $choiceId = $this->toPositiveInt($payload['choice'] ?? $payload['value'] ?? null);
+
+        return 0 < $choiceId ? [['answer' => (string) $choiceId, 'position' => 0, 'secondsSpent' => $secondsSpent]] : [];
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildMultipleRows(array $payload, int $secondsSpent): array
+    {
+        $choices = $this->toPositiveIntList($payload['choices'] ?? $payload['value'] ?? []);
+        $rows = [];
+        foreach ($choices as $position => $choiceId) {
+            $rows[] = ['answer' => (string) $choiceId, 'position' => $position, 'secondsSpent' => $secondsSpent];
+        }
+
+        return $rows;
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildTrueFalseRows(array $payload, int $secondsSpent): array
+    {
+        $values = $payload['trueFalse'] ?? $payload['value'] ?? [];
+        if (!\is_array($values)) {
+            return [];
+        }
+
+        $rows = [];
+        $position = 0;
+        foreach ($values as $answerId => $optionValue) {
+            $safeAnswerId = $this->toPositiveInt($answerId);
+            $safeOptionValue = $this->toPositiveInt($optionValue);
+            if (0 >= $safeAnswerId || 0 >= $safeOptionValue) {
+                continue;
+            }
+
+            $rows[] = [
+                'answer' => $safeAnswerId.':'.$safeOptionValue,
+                'position' => $position,
+                'secondsSpent' => $secondsSpent,
+            ];
+            ++$position;
+        }
+
+        return $rows;
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildFillBlankRows(CQuizQuestion $question, array $payload, int $secondsSpent): array
+    {
+        $answer = $this->getFirstAnswer($question);
+        if (!$answer instanceof CQuizAnswer) {
+            return [];
+        }
+
+        $blankValues = $payload['blanks'] ?? $payload['value'] ?? [];
+        if (!\is_array($blankValues)) {
+            return [];
+        }
+
+        $encodedAnswer = $this->buildStudentFillBlankAnswer($answer->getAnswer(), $blankValues);
+        if ('' === $encodedAnswer) {
+            return [];
+        }
+
+        return [['answer' => $encodedAnswer, 'position' => 0, 'secondsSpent' => $secondsSpent]];
+    }
+
+    /**
+     * @param array<string|int, mixed> $blankValues
+     */
+    private function buildStudentFillBlankAnswer(string $teacherAnswer, array $blankValues): string
+    {
+        $parts = explode('::', $teacherAnswer, 2);
+        $text = (string) ($parts[0] ?? '');
+        $systemString = (string) ($parts[1] ?? '');
+        $separator = $this->getFillBlankSeparator($systemString);
+        [$start, $end] = $this->getFillBlankSeparators($separator);
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+        $blankIndex = 0;
+
+        $studentText = preg_replace_callback(
+            $pattern,
+            function (array $matches) use (&$blankIndex, $blankValues, $start, $end): string {
+                ++$blankIndex;
+                $correctAnswer = (string) ($matches[1] ?? '');
+                $studentAnswer = $this->escapeFillBlankValue($blankValues[$blankIndex] ?? '');
+
+                return $start.$correctAnswer.$end.$start.$studentAnswer.$end.$start.'0'.$end;
+            },
+            $text,
+        );
+
+        if (!\is_string($studentText)) {
+            return '';
+        }
+
+        return $studentText.'::'.$systemString;
+    }
+
+    private function getFillBlankSeparator(string $systemString): int
+    {
+        $systemParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($systemParts[0] ?? ''));
+
+        return \count($details) >= 3 ? max(0, (int) ($details[2] ?? 0)) : 0;
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    private function escapeFillBlankValue(mixed $value): string
+    {
+        return htmlspecialchars((string) $value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildMatchingRows(array $payload, int $secondsSpent): array
+    {
+        $values = $payload['matching'] ?? $payload['value'] ?? [];
+        if (!\is_array($values)) {
+            return [];
+        }
+
+        $rows = [];
+        foreach ($values as $promptId => $optionId) {
+            $safePromptId = $this->toPositiveInt($promptId);
+            $safeOptionId = $this->toPositiveInt($optionId);
+            if (0 >= $safePromptId || 0 >= $safeOptionId) {
+                continue;
+            }
+
+            $rows[] = [
+                'answer' => (string) $safeOptionId,
+                'position' => $safePromptId,
+                'secondsSpent' => $secondsSpent,
+            ];
+        }
+
+        return $rows;
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildDropdownRows(array $payload, int $secondsSpent): array
+    {
+        if (isset($payload['choices'])) {
+            return $this->buildMultipleRows(['choices' => $payload['choices']], $secondsSpent);
+        }
+
+        $choiceId = $this->toPositiveInt($payload['dropdown'] ?? $payload['value'] ?? null);
+
+        return 0 < $choiceId ? [['answer' => (string) $choiceId, 'position' => 0, 'secondsSpent' => $secondsSpent]] : [];
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildFreeAnswerRows(array $payload, int $secondsSpent): array
+    {
+        $text = (string) ($payload['text'] ?? $payload['value'] ?? '');
+
+        return '' !== $text ? [['answer' => $text, 'position' => 0, 'secondsSpent' => $secondsSpent]] : [];
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function toPositiveIntList(mixed $value): array
+    {
+        if (!\is_array($value)) {
+            $value = [$value];
+        }
+
+        $result = [];
+        foreach ($value as $item) {
+            $integer = $this->toPositiveInt($item);
+            if (0 < $integer && !\in_array($integer, $result, true)) {
+                $result[] = $integer;
+            }
+        }
+
+        return $result;
+    }
+
+    private function toPositiveInt(mixed $value): int
+    {
+        if (null === $value || '' === $value) {
+            return 0;
+        }
+
+        return max(0, (int) $value);
+    }
+
+    private function getFirstAnswer(CQuizQuestion $question): ?CQuizAnswer
+    {
+        $answer = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $answer instanceof CQuizAnswer ? $answer : null;
+    }
+
+    private function deletePreviousDraftRows(TrackEExercise $attempt, int $questionId): void
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', (int) $attempt->getExeId(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        foreach ($rows as $row) {
+            if ($row instanceof TrackEAttempt) {
+                $this->entityManager->remove($row);
+            }
+        }
+    }
+
+    /**
+     * @return array<int, array{answer: string, position: int|null}>
+     */
+    private function getSavedAnswerRows(int $attemptId, int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved.answer AS answer')
+            ->addSelect('saved.position AS position')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $result = [];
+        foreach ($rows as $row) {
+            if (!\is_array($row)) {
+                continue;
+            }
+
+            $result[] = [
+                'answer' => (string) ($row['answer'] ?? ''),
+                'position' => null !== ($row['position'] ?? null) ? (int) $row['position'] : null,
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getAnsweredQuestionIds(int $attemptId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('DISTINCT saved.questionId AS questionId')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->orderBy('saved.questionId', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $result = [];
+        foreach ($rows as $row) {
+            if (\is_array($row)) {
+                $result[] = (int) ($row['questionId'] ?? 0);
+            }
+        }
+
+        return array_values(array_filter($result));
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
new file mode 100644
index 00000000000..5172ee5709f
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
@@ -0,0 +1,185 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAttemptDelete;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Deletes a learner attempt from the migrated exercise report.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeAttemptDelete, ExerciseRuntimeAttemptDelete>
+ */
+final readonly class ExerciseRuntimeAttemptDeleteProcessor implements ProcessorInterface
+{
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeAttemptDelete
+    {
+        if (!$data instanceof ExerciseRuntimeAttemptDelete) {
+            throw new BadRequestHttpException('Invalid delete request.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to delete this exercise attempt.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : (int) ($data->attemptId ?? 0);
+        if (0 >= $exerciseId || 0 >= $attemptId) {
+            throw new BadRequestHttpException('A valid exercise and attempt are required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempt = $this->getAttempt($attemptId, $quiz, $course, $session);
+
+        $this->entityManager->remove($attempt);
+        $this->entityManager->flush();
+
+        $response = new ExerciseRuntimeAttemptDelete();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->success = true;
+        $response->message = 'Attempt deleted';
+
+        return $response;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        return $quiz;
+    }
+
+    private function getAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested attempt was not found.');
+        }
+
+        return $attempt;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
new file mode 100644
index 00000000000..18f6663c92f
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -0,0 +1,547 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAttempt;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Starts or resumes a Vue runtime attempt without submitting answers yet.
+ *
+ * The goal of this batch is to create the same legacy-compatible attempt shell
+ * used by exercise_submit.php: one incomplete row in track_e_exercises with
+ * stable question order stored in data_tracking. Scoring and answer persistence
+ * remain for the next processors.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeAttempt, ExerciseRuntimeAttempt>
+ */
+final readonly class ExerciseRuntimeAttemptProcessor implements ProcessorInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const QUESTION_SELECTION_RANDOM = 2;
+    private const PAGE_BREAK = 31;
+    private const MEDIA_QUESTION = 15;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeAttempt
+    {
+        if (!$data instanceof ExerciseRuntimeAttempt) {
+            throw new BadRequestHttpException('Invalid exercise runtime attempt payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $canManage = $this->canManageExercises();
+
+        if (!$canManage && !$this->canViewExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to start this exercise.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManage);
+
+        if ($canManage) {
+            return $this->createTeacherPreviewResponse($quiz, $course, $session, $request);
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('A valid authenticated user is required.');
+        }
+
+        if ($this->requiresLegacyQuestionSelection($quiz)) {
+            return $this->createLegacyRequiredResponse(
+                $quiz,
+                $course,
+                $session,
+                $request,
+                'This exercise uses category-based question selection. Continue in legacy exercise until the Vue selector reaches parity.'
+            );
+        }
+
+        $incompleteAttempt = $this->findIncompleteAttempt($quiz, $course, $session, $user, $request);
+        if ($incompleteAttempt instanceof TrackEExercise) {
+            return $this->normalizeAttemptResponse($quiz, $course, $session, $request, $incompleteAttempt, 'Attempt resumed');
+        }
+
+        if (!$this->canCreateNewAttempt($quiz, $course, $session, $user, $request)) {
+            return $this->createLegacyRequiredResponse(
+                $quiz,
+                $course,
+                $session,
+                $request,
+                'The maximum number of attempts has been reached.'
+            );
+        }
+
+        $questionIds = $this->buildQuestionList($quiz);
+        $expiredAt = $this->buildExpiredAt($quiz);
+        $attempt = (new TrackEExercise())
+            ->setSession($session)
+            ->setCourse($course)
+            ->setMaxScore($this->getTotalWeight($questionIds))
+            ->setDataTracking(implode(',', $questionIds))
+            ->setUser($user)
+            ->setUserIp((string) ($request->getClientIp() ?? ''))
+            ->setOrigLpId($request->query->getInt('learnpath_id'))
+            ->setOrigLpItemId($request->query->getInt('learnpath_item_id'))
+            ->setOrigLpItemViewId($request->query->getInt('learnpath_item_view_id'))
+            ->setExpiredTimeControl($expiredAt)
+            ->setQuiz($quiz)
+        ;
+
+        $this->entityManager->persist($attempt);
+        $this->entityManager->flush();
+
+        return $this->normalizeAttemptResponse($quiz, $course, $session, $request, $attempt, 'Attempt started');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canViewExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        if (!$canManage) {
+            $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+            $now = new DateTimeImmutable();
+
+            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+                throw new AccessDeniedHttpException('The requested exercise is not visible.');
+            }
+
+            if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+                throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+            }
+
+            if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+                throw new AccessDeniedHttpException('The requested exercise is closed.');
+            }
+        }
+
+        return $quiz;
+    }
+
+    private function requiresLegacyQuestionSelection(CQuiz $quiz): bool
+    {
+        return 0 < (int) $quiz->getRandomByCategory()
+            || (int) ($quiz->getQuestionSelectionType() ?? 0) > self::QUESTION_SELECTION_RANDOM;
+    }
+
+    private function findIncompleteAttempt(CQuiz $quiz, Course $course, ?Session $session, User $user, Request $request): ?TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->andWhere('attempt.status = :status')
+            ->andWhere('attempt.origLpId = :lpId')
+            ->andWhere('attempt.origLpItemId = :lpItemId')
+            ->andWhere('attempt.origLpItemViewId = :lpItemViewId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_INCOMPLETE)
+            ->setParameter('lpId', $request->query->getInt('learnpath_id'), Types::INTEGER)
+            ->setParameter('lpItemId', $request->query->getInt('learnpath_item_id'), Types::INTEGER)
+            ->setParameter('lpItemViewId', $request->query->getInt('learnpath_item_view_id'), Types::INTEGER)
+            ->orderBy('attempt.exeId', 'DESC')
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+
+        return $attempt instanceof TrackEExercise ? $attempt : null;
+    }
+
+    private function canCreateNewAttempt(CQuiz $quiz, Course $course, ?Session $session, User $user, Request $request): bool
+    {
+        $maxAttempt = (int) $quiz->getMaxAttempt();
+        if (0 >= $maxAttempt) {
+            return true;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('COUNT(attempt.exeId)')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->andWhere('attempt.origLpId = :lpId')
+            ->andWhere('attempt.origLpItemId = :lpItemId')
+            ->andWhere('attempt.origLpItemViewId = :lpItemViewId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setParameter('lpId', $request->query->getInt('learnpath_id'), Types::INTEGER)
+            ->setParameter('lpItemId', $request->query->getInt('learnpath_item_id'), Types::INTEGER)
+            ->setParameter('lpItemViewId', $request->query->getInt('learnpath_item_view_id'), Types::INTEGER)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        return (int) $queryBuilder->getQuery()->getSingleScalarResult() < $maxAttempt;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function buildQuestionList(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questionIds = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+                continue;
+            }
+
+            if (\in_array((int) $question->getType(), [self::PAGE_BREAK, self::MEDIA_QUESTION], true)) {
+                continue;
+            }
+
+            $questionIds[] = (int) $question->getIid();
+        }
+
+        $mustShuffle = self::QUESTION_SELECTION_RANDOM === (int) ($quiz->getQuestionSelectionType() ?? 0);
+        if ($mustShuffle || 0 < (int) $quiz->getRandom()) {
+            shuffle($questionIds);
+        }
+
+        $randomCount = (int) $quiz->getRandom();
+        if (0 < $randomCount && $randomCount < \count($questionIds)) {
+            $questionIds = \array_slice($questionIds, 0, $randomCount);
+        }
+
+        return $questionIds;
+    }
+
+    /**
+     * @param array<int, int> $questionIds
+     */
+    private function getTotalWeight(array $questionIds): float
+    {
+        if ([] === $questionIds) {
+            return 0.0;
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('SUM(question.ponderation) AS totalScore')
+            ->from(CQuizQuestion::class, 'question')
+            ->andWhere('question.iid IN (:questionIds)')
+            ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        return (float) ($rows[0]['totalScore'] ?? 0.0);
+    }
+
+    private function buildExpiredAt(CQuiz $quiz): ?DateTimeImmutable
+    {
+        $expiredMinutes = (int) $quiz->getExpiredTime();
+        if (0 >= $expiredMinutes) {
+            return null;
+        }
+
+        return (new DateTimeImmutable())->modify(sprintf('+%d minutes', $expiredMinutes));
+    }
+
+    private function createTeacherPreviewResponse(CQuiz $quiz, Course $course, ?Session $session, Request $request): ExerciseRuntimeAttempt
+    {
+        $questionIds = $this->buildQuestionList($quiz);
+        $response = $this->createBaseResponse($quiz, $course, $session, $request, $questionIds);
+        $response->success = true;
+        $response->preview = true;
+        $response->message = 'Teacher preview does not create a tracked attempt.';
+        $response->status = 'preview';
+
+        return $response;
+    }
+
+    private function createLegacyRequiredResponse(CQuiz $quiz, Course $course, ?Session $session, Request $request, string $message): ExerciseRuntimeAttempt
+    {
+        $response = $this->createBaseResponse($quiz, $course, $session, $request, $this->buildQuestionList($quiz));
+        $response->success = false;
+        $response->usesLegacyRuntime = true;
+        $response->message = $message;
+        $response->status = 'legacy_required';
+
+        return $response;
+    }
+
+    private function normalizeAttemptResponse(CQuiz $quiz, Course $course, ?Session $session, Request $request, TrackEExercise $attempt, string $message): ExerciseRuntimeAttempt
+    {
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if ([] === $questionIds) {
+            $questionIds = $this->buildQuestionList($quiz);
+        }
+
+        $response = $this->createBaseResponse($quiz, $course, $session, $request, $questionIds);
+        $response->success = true;
+        $response->attemptId = (int) $attempt->getExeId();
+        $response->status = method_exists($attempt, 'getStatus') ? (string) $attempt->getStatus() : self::STATUS_INCOMPLETE;
+        $response->message = $message;
+        $response->savedAnswers = $this->getSavedAnswers((int) $attempt->getExeId());
+
+        if (method_exists($attempt, 'getStartDate')) {
+            $startDate = $attempt->getStartDate();
+            $response->startedAt = $startDate instanceof DateTimeInterface ? $startDate->format(DateTimeInterface::ATOM) : null;
+        }
+
+        if (method_exists($attempt, 'getExpiredTimeControl')) {
+            $expiredAt = $attempt->getExpiredTimeControl();
+            if ($expiredAt instanceof DateTimeInterface) {
+                $response->expiredAt = $expiredAt->format(DateTimeInterface::ATOM);
+                $response->remainingSeconds = max(0, $expiredAt->getTimestamp() - time());
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param array<int, int> $questionIds
+     */
+    private function createBaseResponse(CQuiz $quiz, Course $course, ?Session $session, Request $request, array $questionIds): ExerciseRuntimeAttempt
+    {
+        $response = new ExerciseRuntimeAttempt();
+        $response->exerciseId = (int) $quiz->getIid();
+        $response->questionIds = array_values($questionIds);
+        $response->totalQuestions = \count($questionIds);
+        $response->currentQuestionIndex = 0;
+        $response->currentQuestionId = $questionIds[0] ?? null;
+        $response->canNavigatePrevious = false;
+        $response->canNavigateNext = \count($questionIds) > 1;
+        $response->canFinish = \count($questionIds) > 0;
+        $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session, $request);
+
+        return $response;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+
+    /**
+     * @return array<int|string, array<int, array{answer: string, position: int|null}>>
+     */
+    private function getSavedAnswers(int $attemptId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved.questionId AS questionId')
+            ->addSelect('saved.answer AS answer')
+            ->addSelect('saved.position AS position')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->orderBy('saved.questionId', 'ASC')
+            ->addOrderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $savedAnswers = [];
+        foreach ($rows as $row) {
+            if (!\is_array($row)) {
+                continue;
+            }
+
+            $questionId = (int) ($row['questionId'] ?? 0);
+            if (0 >= $questionId) {
+                continue;
+            }
+
+            $savedAnswers[$questionId][] = [
+                'answer' => (string) ($row['answer'] ?? ''),
+                'position' => null !== ($row['position'] ?? null) ? (int) $row['position'] : null,
+            ];
+        }
+
+        return $savedAnswers;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session, Request $request): array
+    {
+        $baseParams = [
+            'exerciseId' => (int) $quiz->getIid(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+            'gid' => $request->query->getInt('gid'),
+        ];
+
+        foreach (['origin', 'learnpath_id', 'learnpath_item_id', 'learnpath_item_view_id'] as $key) {
+            $value = $request->query->get($key);
+            if (null !== $value && '' !== (string) $value) {
+                $baseParams[$key] = (string) $value;
+            }
+        }
+
+        return [
+            'overview' => '/main/exercise/overview.php?'.http_build_query($baseParams),
+            'show' => '/main/exercise/exercise_show.php?'.http_build_query($baseParams),
+            'submit' => '/main/exercise/exercise_submit.php?'.http_build_query($baseParams),
+        ];
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
new file mode 100644
index 00000000000..1a994988271
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
@@ -0,0 +1,365 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeCorrection;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Corrects manual Vue runtime answers using the same tracking tables as the legacy correction flow.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeCorrection, ExerciseRuntimeCorrection>
+ */
+final readonly class ExerciseRuntimeCorrectionProcessor implements ProcessorInterface
+{
+    private const STATUS_COMPLETED = 'completed';
+    private const FREE_ANSWER = 5;
+    private const UPLOAD_ANSWER = 23;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeCorrection
+    {
+        if (!$data instanceof ExerciseRuntimeCorrection) {
+            throw new BadRequestHttpException('Invalid exercise runtime correction payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canCorrectAttempts()) {
+            throw new AccessDeniedHttpException('You are not allowed to correct this exercise attempt.');
+        }
+
+        if (!$this->security->getUser() instanceof User) {
+            throw new AccessDeniedHttpException('A valid authenticated user is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : (int) ($data->attemptId ?? 0);
+        $questionId = (int) ($data->questionId ?? 0);
+
+        if (0 >= $exerciseId || 0 >= $attemptId || 0 >= $questionId) {
+            throw new BadRequestHttpException('A valid exercise, attempt and question are required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempt = $this->getCompletedAttempt($attemptId, $quiz, $course, $session);
+        $question = $this->getQuestionFromExercise($questionId, $quiz);
+        if (!$question instanceof CQuizQuestion) {
+            throw new NotFoundHttpException('The requested question was not found in this exercise.');
+        }
+
+        if (!$this->isManualCorrectionQuestion($question)) {
+            throw new BadRequestHttpException('This question type is not supported by the Vue manual correction flow yet.');
+        }
+
+        $maxScore = (float) $question->getPonderation();
+        $marks = (float) $data->marks;
+        if (0.0 > $marks || $marks > $maxScore) {
+            throw new BadRequestHttpException('The correction score must be between zero and the question maximum score.');
+        }
+
+        $rows = $this->getAttemptRows($attemptId, $questionId);
+        if ([] === $rows) {
+            $rows[] = $this->createEmptyAttemptRow($attempt, $questionId);
+        }
+
+        foreach ($rows as $row) {
+            $row
+                ->setMarks($marks)
+                ->setTeacherComment((string) $data->teacherComment)
+                ->setTms(new DateTime())
+            ;
+        }
+
+        $this->removeQuestionToCheck($attempt, $questionId);
+        $this->recalculateAttemptScore($attempt, $quiz);
+        $this->entityManager->flush();
+
+        $response = new ExerciseRuntimeCorrection();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->questionId = $questionId;
+        $response->marks = $marks;
+        $response->teacherComment = (string) $data->teacherComment;
+        $response->success = true;
+        $response->message = 'Correction saved';
+        $response->score = (float) $attempt->getScore();
+        $response->maxScore = (float) $attempt->getMaxScore();
+        $response->questionsToCheck = $this->parseQuestionIds((string) $attempt->getQuestionsToCheck());
+
+        return $response;
+    }
+
+    private function isManualCorrectionQuestion(CQuizQuestion $question): bool
+    {
+        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::UPLOAD_ANSWER], true);
+    }
+
+    private function canCorrectAttempts(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        return $quiz;
+    }
+
+    private function getCompletedAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('attempt.status = :status')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_COMPLETED)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested completed attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    private function getQuestionFromExercise(int $questionId, CQuiz $quiz): ?CQuizQuestion
+    {
+        $relQuestion = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$relQuestion instanceof CQuizRelQuestion) {
+            return null;
+        }
+
+        return $relQuestion->getQuestion();
+    }
+
+    /**
+     * @return array<int, TrackEAttempt>
+     */
+    private function getAttemptRows(int $attemptId, int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        return array_values(array_filter($rows, static fn (mixed $row): bool => $row instanceof TrackEAttempt));
+    }
+
+    private function createEmptyAttemptRow(TrackEExercise $attempt, int $questionId): TrackEAttempt
+    {
+        $row = (new TrackEAttempt())
+            ->setTrackEExercise($attempt)
+            ->setUser($attempt->getUser())
+            ->setQuestionId($questionId)
+            ->setAnswer('')
+            ->setTeacherComment('')
+            ->setMarks(0.0)
+            ->setPosition(0)
+            ->setTms(new DateTime())
+            ->setSecondsSpent(0)
+        ;
+
+        $this->entityManager->persist($row);
+
+        return $row;
+    }
+
+    private function removeQuestionToCheck(TrackEExercise $attempt, int $questionId): void
+    {
+        $pendingQuestions = array_values(array_filter(
+            $this->parseQuestionIds((string) $attempt->getQuestionsToCheck()),
+            static fn (int $pendingQuestionId): bool => $pendingQuestionId !== $questionId,
+        ));
+
+        $attempt->setQuestionsToCheck(implode(',', $pendingQuestions));
+    }
+
+    private function recalculateAttemptScore(TrackEExercise $attempt, CQuiz $quiz): void
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->setParameter('attemptId', (int) $attempt->getExeId(), Types::INTEGER)
+            ->orderBy('saved.questionId', 'ASC')
+            ->addOrderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $seenQuestions = [];
+        $score = 0.0;
+        foreach ($rows as $row) {
+            if (!$row instanceof TrackEAttempt) {
+                continue;
+            }
+
+            $questionId = (int) $row->getQuestionId();
+            if (isset($seenQuestions[$questionId])) {
+                continue;
+            }
+
+            $marks = (float) $row->getMarks();
+            if (0 === (int) $quiz->getPropagateNeg() && 0 > $marks) {
+                $seenQuestions[$questionId] = true;
+                continue;
+            }
+
+            $score += $marks;
+            $seenQuestions[$questionId] = true;
+        }
+
+        $attempt->setScore($score);
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
new file mode 100644
index 00000000000..a532bced703
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -0,0 +1,1077 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeFinish;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTime;
+use DateTimeInterface;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Finishes Vue runtime attempts using native Symfony/Doctrine scoring rules mirrored from the verified legacy rules.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeFinish, ExerciseRuntimeFinish>
+ */
+final readonly class ExerciseRuntimeFinishProcessor implements ProcessorInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const STATUS_COMPLETED = 'completed';
+    private const UNIQUE_ANSWER = 1;
+    private const MULTIPLE_ANSWER = 2;
+    private const FILL_IN_BLANKS = 3;
+    private const MATCHING = 4;
+    private const FREE_ANSWER = 5;
+    private const UPLOAD_ANSWER = 23;
+    private const MULTIPLE_ANSWER_COMBINATION = 9;
+    private const UNIQUE_ANSWER_NO_OPTION = 10;
+    private const MULTIPLE_ANSWER_TRUE_FALSE = 11;
+    private const MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE = 12;
+    private const GLOBAL_MULTIPLE_ANSWER = 14;
+    private const UNIQUE_ANSWER_IMAGE = 17;
+    private const MATCHING_DRAGGABLE = 19;
+    private const FILL_IN_BLANKS_COMBINATION = 27;
+    private const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28;
+    private const MULTIPLE_ANSWER_DROPDOWN = 29;
+    private const MATCHING_COMBINATION = 24;
+    private const MATCHING_DRAGGABLE_COMBINATION = 25;
+
+    /**
+     * @var array<int, string>
+     */
+    private const SUPPORTED_TYPE_NAMES = [
+        self::UNIQUE_ANSWER => 'Unique answer',
+        self::UNIQUE_ANSWER_NO_OPTION => 'Unique answer no option',
+        self::UNIQUE_ANSWER_IMAGE => 'Unique answer with images',
+        self::MULTIPLE_ANSWER => 'Multiple answer',
+        self::GLOBAL_MULTIPLE_ANSWER => 'Global multiple answer',
+        self::MULTIPLE_ANSWER_COMBINATION => 'Multiple answer combination',
+        self::MULTIPLE_ANSWER_TRUE_FALSE => 'Multiple answer true/false',
+        self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => 'Multiple answer combination true/false',
+        self::FILL_IN_BLANKS => 'Fill in blanks',
+        self::FILL_IN_BLANKS_COMBINATION => 'Fill in blanks combination',
+        self::MATCHING => 'Matching',
+        self::MATCHING_DRAGGABLE => 'Matching draggable',
+        self::MATCHING_COMBINATION => 'Matching combination',
+        self::MATCHING_DRAGGABLE_COMBINATION => 'Matching draggable combination',
+        self::MULTIPLE_ANSWER_DROPDOWN => 'Multiple answer dropdown',
+        self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => 'Multiple answer dropdown combination',
+        self::FREE_ANSWER => 'Free answer',
+        self::UPLOAD_ANSWER => 'Upload answer',
+    ];
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeFinish
+    {
+        if (!$data instanceof ExerciseRuntimeFinish) {
+            throw new BadRequestHttpException('Invalid exercise runtime finish payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canFinishAttempt()) {
+            throw new AccessDeniedHttpException('You are not allowed to finish this exercise attempt.');
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('A valid authenticated user is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : (int) ($data->attemptId ?? 0);
+
+        if (0 >= $exerciseId || 0 >= $attemptId) {
+            throw new BadRequestHttpException('A valid exercise and attempt are required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempt = $this->getIncompleteAttempt($attemptId, $quiz, $course, $session, $user);
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if ([] === $questionIds) {
+            throw new BadRequestHttpException('The attempt does not contain a persisted question list.');
+        }
+
+        $questions = $this->getQuestions($quiz, $questionIds);
+        $unsupportedTypes = $this->getUnsupportedQuestionTypes($questions);
+        if ([] !== $unsupportedTypes) {
+            throw new BadRequestHttpException('This attempt contains question types that are not supported by the Vue finish scorer yet: '.implode(', ', $unsupportedTypes).'.');
+        }
+
+        $totalScore = 0.0;
+        $totalWeight = 0.0;
+        $questionsToCheck = [];
+
+        foreach ($questionIds as $questionId) {
+            $question = $questions[$questionId] ?? null;
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $rows = $this->getAttemptRows($attemptId, $questionId);
+            $answers = $this->getQuestionAnswers($questionId);
+            $options = $this->getQuestionOptions($questionId);
+            $score = $this->scoreQuestion($quiz, $question, $answers, $options, $rows);
+            $weight = $this->getQuestionWeight($question, $answers);
+
+            if (0 === (int) $quiz->getPropagateNeg() && 0 > $score) {
+                $score = 0.0;
+            }
+
+            $this->updateQuestionAttemptRows($question, $rows, $score);
+
+            if ($this->requiresManualCorrection($question)) {
+                $questionsToCheck[] = $questionId;
+            }
+
+            $totalScore += $score;
+            $totalWeight += $weight;
+        }
+
+        if (0.0 >= $totalWeight) {
+            $totalWeight = (float) $attempt->getMaxScore();
+        }
+
+        $finishedAt = $this->getFinishedAt($attempt);
+        $duration = max(0, $finishedAt->getTimestamp() - $attempt->getStartDate()->getTimestamp());
+
+        $attempt
+            ->setScore($totalScore)
+            ->setMaxScore($totalWeight)
+            ->setStatus(self::STATUS_COMPLETED)
+            ->setExeDate($finishedAt)
+            ->setExeDuration($duration)
+            ->setQuestionsToCheck(implode(',', $questionsToCheck))
+        ;
+
+        $this->entityManager->flush();
+
+        $response = new ExerciseRuntimeFinish();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->success = true;
+        $response->message = 'Attempt finished';
+        $response->status = self::STATUS_COMPLETED;
+        $response->score = $totalScore;
+        $response->maxScore = $totalWeight;
+        $response->completedAt = $finishedAt->format(DateTimeInterface::ATOM);
+        $response->resultUrl = '';
+
+        return $response;
+    }
+
+    private function canFinishAttempt(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        $now = new DateTime();
+        if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+            throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+        }
+
+        if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+            throw new AccessDeniedHttpException('The requested exercise is closed.');
+        }
+
+        return $quiz;
+    }
+
+    private function getIncompleteAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session, User $user): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->andWhere('attempt.status = :status')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_INCOMPLETE)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested incomplete attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+
+    /**
+     * @param array<int, int> $questionIds
+     *
+     * @return array<int, CQuizQuestion>
+     */
+    private function getQuestions(CQuiz $quiz, array $questionIds): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) IN (:questionIds)')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questions = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (null === $question->getIid()) {
+                continue;
+            }
+
+            $questions[(int) $question->getIid()] = $question;
+        }
+
+        return $questions;
+    }
+
+    /**
+     * @param array<int, CQuizQuestion> $questions
+     *
+     * @return array<int, string>
+     */
+    private function getUnsupportedQuestionTypes(array $questions): array
+    {
+        $unsupportedTypes = [];
+        foreach ($questions as $question) {
+            $type = (int) $question->getType();
+            if (!$this->isSupportedQuestionType($type)) {
+                $unsupportedTypes[$type] = self::SUPPORTED_TYPE_NAMES[$type] ?? (string) $type;
+            }
+        }
+
+        return $unsupportedTypes;
+    }
+
+    private function isSupportedQuestionType(int $type): bool
+    {
+        return isset(self::SUPPORTED_TYPE_NAMES[$type]);
+    }
+
+    /**
+     * @return array<int, TrackEAttempt>
+     */
+    private function getAttemptRows(int $attemptId, int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $result = [];
+        foreach ($rows as $row) {
+            if ($row instanceof TrackEAttempt) {
+                $result[] = $row;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getQuestionAnswers(int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->addOrderBy('answer.iid', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $answers = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CQuizAnswer || null === $row->getIid()) {
+                continue;
+            }
+
+            $answers[(int) $row->getIid()] = $row;
+        }
+
+        return $answers;
+    }
+
+    /**
+     * @return array<int, CQuizQuestionOption>
+     */
+    private function getQuestionOptions(int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('questionOption')
+            ->from(CQuizQuestionOption::class, 'questionOption')
+            ->andWhere('IDENTITY(questionOption.question) = :questionId')
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $options = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CQuizQuestionOption || null === $row->getIid()) {
+                continue;
+            }
+
+            $options[(int) $row->getIid()] = $row;
+        }
+
+        return $options;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, TrackEAttempt>       $rows
+     */
+    private function scoreQuestion(CQuiz $quiz, CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        return match ((int) $question->getType()) {
+            self::UNIQUE_ANSWER,
+            self::UNIQUE_ANSWER_NO_OPTION,
+            self::UNIQUE_ANSWER_IMAGE => $this->scoreUniqueAnswer($answers, $rows),
+            self::MULTIPLE_ANSWER,
+            self::GLOBAL_MULTIPLE_ANSWER,
+            self::MULTIPLE_ANSWER_DROPDOWN => $this->scoreMultipleAnswer($answers, $rows),
+            self::MULTIPLE_ANSWER_COMBINATION,
+            self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => $this->scoreMultipleCombination($question, $answers, $rows),
+            self::MULTIPLE_ANSWER_TRUE_FALSE => $this->scoreTrueFalseAnswer($question, $answers, $options, $rows),
+            self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => $this->scoreTrueFalseCombination($question, $answers, $options, $rows),
+            self::FILL_IN_BLANKS,
+            self::FILL_IN_BLANKS_COMBINATION => $this->scoreFillBlanks($quiz, $question, $answers, $rows),
+            self::MATCHING,
+            self::MATCHING_DRAGGABLE => $this->scoreMatchingAnswer($answers, $rows),
+            self::MATCHING_COMBINATION,
+            self::MATCHING_DRAGGABLE_COMBINATION => $this->scoreMatchingCombination($question, $answers, $rows),
+            self::FREE_ANSWER,
+            self::UPLOAD_ANSWER => $this->scoreManualAnswer($rows),
+            default => 0.0,
+        };
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreUniqueAnswer(array $answers, array $rows): float
+    {
+        $selectedAnswerId = $this->getFirstSavedAnswerId($rows);
+        if (0 >= $selectedAnswerId || !isset($answers[$selectedAnswerId])) {
+            return 0.0;
+        }
+
+        return $answers[$selectedAnswerId]->getPonderation();
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMultipleAnswer(array $answers, array $rows): float
+    {
+        $score = 0.0;
+        foreach ($this->getSavedAnswerIds($rows) as $answerId) {
+            if (!isset($answers[$answerId])) {
+                continue;
+            }
+
+            $score += $answers[$answerId]->getPonderation();
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMultipleCombination(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $selectedAnswerIds = array_flip($this->getSavedAnswerIds($rows));
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $isCorrect = 1 === (int) $answer->getCorrect();
+            $isSelected = isset($selectedAnswerIds[$answerId]);
+            if ($isCorrect !== $isSelected) {
+                return 0.0;
+            }
+        }
+
+        $firstAnswer = reset($answers);
+        if ($firstAnswer instanceof CQuizAnswer && 0.0 !== $firstAnswer->getPonderation()) {
+            return $firstAnswer->getPonderation();
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, TrackEAttempt>       $rows
+     */
+    private function scoreTrueFalseAnswer(CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        [$trueScore, $falseScore, $doubtScore] = $this->getTrueFalseScores((string) $question->getExtra());
+        $choices = $this->getSavedTrueFalseChoices($rows);
+        $score = 0.0;
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $studentChoice = $choices[$answerId] ?? 0;
+            if (0 >= $studentChoice) {
+                $score += $doubtScore;
+                continue;
+            }
+
+            if ($this->isTrueFalseChoiceCorrect($studentChoice, (int) $answer->getCorrect(), $options)) {
+                $score += $trueScore;
+                continue;
+            }
+
+            $optionTitle = $this->getTrueFalseOptionTitle($studentChoice, $options);
+            $score += \in_array($optionTitle, ["Don't know", 'DoubtScore'], true) ? $doubtScore : $falseScore;
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, TrackEAttempt>       $rows
+     */
+    private function scoreTrueFalseCombination(CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        $choices = $this->getSavedTrueFalseChoices($rows);
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            if (!$this->isTrueFalseChoiceCorrect($choices[$answerId] ?? 0, (int) $answer->getCorrect(), $options)) {
+                return 0.0;
+            }
+        }
+
+        $firstAnswer = reset($answers);
+        if ($firstAnswer instanceof CQuizAnswer && 0.0 !== $firstAnswer->getPonderation()) {
+            return $firstAnswer->getPonderation();
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @return array{0: float, 1: float, 2: float}
+     */
+    private function getTrueFalseScores(string $extra): array
+    {
+        if ('' === trim($extra)) {
+            return [1.0, -0.5, 0.0];
+        }
+
+        $parts = explode(':', $extra);
+
+        return [
+            isset($parts[0]) ? (float) trim($parts[0]) : 1.0,
+            isset($parts[1]) ? (float) trim($parts[1]) : -0.5,
+            isset($parts[2]) ? (float) trim($parts[2]) : 0.0,
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedTrueFalseChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $parts = explode(':', (string) $row->getAnswer());
+            $answerId = isset($parts[0]) ? (int) $parts[0] : 0;
+            $optionId = isset($parts[1]) ? (int) $parts[1] : 0;
+            if (0 < $answerId && 0 < $optionId) {
+                $choices[$answerId] = $optionId;
+            }
+        }
+
+        return $choices;
+    }
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function isTrueFalseChoiceCorrect(int $studentChoice, int $correctChoice, array $options): bool
+    {
+        if (0 >= $studentChoice || 0 >= $correctChoice) {
+            return false;
+        }
+
+        if ($studentChoice === $correctChoice) {
+            return true;
+        }
+
+        $studentPosition = $this->getTrueFalseOptionPosition($studentChoice, $options);
+        $correctPosition = $this->getTrueFalseOptionPosition($correctChoice, $options);
+
+        return 0 < $studentPosition && $studentPosition === $correctPosition;
+    }
+
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function getTrueFalseOptionPosition(int $choice, array $options): int
+    {
+        $option = $options[$choice] ?? null;
+        if ($option instanceof CQuizQuestionOption) {
+            return (int) $option->getPosition();
+        }
+
+        foreach ($options as $candidate) {
+            if (!$candidate instanceof CQuizQuestionOption) {
+                continue;
+            }
+
+            if ((int) $candidate->getPosition() === $choice) {
+                return (int) $candidate->getPosition();
+            }
+        }
+
+        return $choice;
+    }
+
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function getTrueFalseOptionTitle(int $choice, array $options): string
+    {
+        $option = $options[$choice] ?? null;
+        if ($option instanceof CQuizQuestionOption) {
+            return (string) $option->getTitle();
+        }
+
+        foreach ($options as $candidate) {
+            if (!$candidate instanceof CQuizQuestionOption) {
+                continue;
+            }
+
+            if ((int) $candidate->getPosition() === $choice) {
+                return (string) $candidate->getTitle();
+            }
+        }
+
+        return '';
+    }
+
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreFillBlanks(CQuiz $quiz, CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return 0.0;
+        }
+
+        $answer = reset($answers);
+        if (!$answer instanceof CQuizAnswer) {
+            return 0.0;
+        }
+
+        $teacherInfo = $this->parseFillBlankAnswer($answer->getAnswer(), false);
+        $studentInfo = $this->parseFillBlankAnswer($row->getAnswer(), true);
+        $caseInsensitive = 'case:false' === (string) $question->getExtra();
+        $studentScores = [];
+        $score = 0.0;
+        $blankCount = \count($teacherInfo['words']);
+
+        for ($index = 0; $index < $blankCount; ++$index) {
+            $correctAnswer = (string) ($teacherInfo['words'][$index] ?? '');
+            $studentAnswer = (string) ($studentInfo['student_answer'][$index] ?? '');
+            $isCorrect = $this->isFillBlankStudentAnswerGood($studentAnswer, $correctAnswer, $caseInsensitive);
+            $studentScores[$index] = $isCorrect ? '1' : '0';
+            if ($isCorrect) {
+                $score += (float) ($teacherInfo['weighting'][$index] ?? 0.0);
+            }
+        }
+
+        if (self::FILL_IN_BLANKS_COMBINATION === (int) $question->getType()) {
+            $score = $blankCount > 0 && !\in_array('0', $studentScores, true) ? (float) $question->getPonderation() : 0.0;
+        }
+
+        $row->setAnswer($this->rebuildFillBlankStudentAnswer($teacherInfo, $studentInfo['student_answer'], $studentScores));
+
+        return $score;
+    }
+
+    /**
+     * @return array{
+     *     text: string,
+     *     system_string: string,
+     *     words_count: int,
+     *     words: array<int, string>,
+     *     words_with_bracket: array<int, string>,
+     *     weighting: array<int, string>,
+     *     common_words: array<int, string>,
+     *     student_answer: array<int, string>,
+     *     student_score: array<int, string>,
+     *     blank_separator_start: string,
+     *     blank_separator_end: string
+     * }
+     */
+    private function parseFillBlankAnswer(string $answer, bool $isStudentAnswer): array
+    {
+        $parts = [];
+        if (1 === preg_match('/(.*)::(.*)$/s', $answer, $matches)) {
+            $parts = [(string) ($matches[1] ?? ''), (string) ($matches[2] ?? '')];
+        } else {
+            $parts = ['', ''];
+        }
+
+        $systemString = $parts[1];
+        $systemParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($systemParts[0] ?? ''));
+        $weighting = '' !== (string) ($details[0] ?? '') ? explode(',', (string) $details[0]) : [];
+        $separatorNumber = \count($details) >= 3 ? (int) ($details[2] ?? 0) : 0;
+        [$start, $end] = $this->getFillBlankSeparators($separatorNumber);
+        $startPattern = preg_quote($start, '/');
+        $endPattern = preg_quote($end, '/');
+        $wordMatches = [];
+        preg_match_all('/'.$startPattern.'[^'.$endPattern.']*'.$endPattern.'/', $parts[0], $wordMatches);
+        $wordsWithBracket = \is_array($wordMatches[0] ?? null) ? $wordMatches[0] : [];
+        $words = [];
+        foreach ($wordsWithBracket as $word) {
+            $words[] = trim((string) $word, $start.$end);
+        }
+
+        $commonWordsString = preg_replace('/'.$startPattern.'[^'.$endPattern.']*'.$endPattern.'/', '::', $parts[0]);
+        if (!\is_string($commonWordsString)) {
+            $commonWordsString = '';
+        }
+
+        $studentAnswer = [];
+        $studentScore = [];
+        if ($isStudentAnswer) {
+            $baseWords = [];
+            $baseWordsWithBracket = [];
+            $count = \count($words);
+            for ($index = 0; $index < $count; ++$index) {
+                $baseWordsWithBracket[] = $wordsWithBracket[$index] ?? '';
+                $baseWords[] = $words[$index] ?? '';
+                ++$index;
+                $studentAnswer[] = $words[$index] ?? '';
+                ++$index;
+                $studentScore[] = $words[$index] ?? '0';
+            }
+            $words = $baseWords;
+            $wordsWithBracket = $baseWordsWithBracket;
+            $commonWordsString = preg_replace('/::::::/', '::', $commonWordsString) ?: '';
+        }
+
+        return [
+            'text' => $parts[0],
+            'system_string' => $systemString,
+            'words_count' => \count($words),
+            'words' => $words,
+            'words_with_bracket' => $wordsWithBracket,
+            'weighting' => $weighting,
+            'common_words' => explode('::', $commonWordsString),
+            'student_answer' => $studentAnswer,
+            'student_score' => $studentScore,
+            'blank_separator_start' => $start,
+            'blank_separator_end' => $end,
+        ];
+    }
+
+    /**
+     * @param array{
+     *     common_words: array<int, string>,
+     *     words_with_bracket: array<int, string>,
+     *     system_string: string,
+     *     blank_separator_start: string,
+     *     blank_separator_end: string
+     * } $teacherInfo
+     * @param array<int, string> $studentAnswers
+     * @param array<int, string> $studentScores
+     */
+    private function rebuildFillBlankStudentAnswer(array $teacherInfo, array $studentAnswers, array $studentScores): string
+    {
+        $start = (string) $teacherInfo['blank_separator_start'];
+        $end = (string) $teacherInfo['blank_separator_end'];
+        $commonWords = $teacherInfo['common_words'];
+        $result = '';
+        $count = \count($teacherInfo['words_with_bracket']);
+
+        for ($index = 0; $index < $count; ++$index) {
+            $result .= (string) ($commonWords[$index] ?? '');
+            $result .= (string) ($teacherInfo['words_with_bracket'][$index] ?? '');
+            $result .= $start.(string) ($studentAnswers[$index] ?? '').$end;
+            $result .= $start.(string) ($studentScores[$index] ?? '0').$end;
+        }
+
+        $result .= (string) ($commonWords[$count] ?? '');
+        $result .= '::'.(string) $teacherInfo['system_string'];
+
+        return $result;
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    private function isFillBlankStudentAnswerGood(string $studentAnswer, string $correctAnswer, bool $caseInsensitive): bool
+    {
+        $normalizedStudentAnswer = $caseInsensitive ? mb_strtolower($studentAnswer) : $studentAnswer;
+
+        if (false !== strpos($correctAnswer, '|') && false === strpos($correctAnswer, '||')) {
+            $menuAnswers = array_map([$this, 'trimFillBlankOption'], explode('|', $correctAnswer));
+            $firstAnswer = (string) ($menuAnswers[0] ?? '');
+            $normalizedFirstAnswer = $caseInsensitive ? mb_strtolower($firstAnswer) : $firstAnswer;
+
+            return $normalizedStudentAnswer === $normalizedFirstAnswer || $normalizedStudentAnswer === sha1($normalizedFirstAnswer);
+        }
+
+        if (false !== strpos($correctAnswer, '||')) {
+            $answers = array_map([$this, 'trimFillBlankOption'], preg_split('/\|\|/', $correctAnswer) ?: []);
+            foreach ($answers as $answer) {
+                $candidate = $caseInsensitive ? mb_strtolower($answer) : $answer;
+                if ($normalizedStudentAnswer === $candidate) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        $normalizedCorrectAnswer = $caseInsensitive ? mb_strtolower($this->trimFillBlankOption($correctAnswer)) : $this->trimFillBlankOption($correctAnswer);
+
+        return $normalizedStudentAnswer === $normalizedCorrectAnswer;
+    }
+
+    private function trimFillBlankOption(string $value): string
+    {
+        return trim(html_entity_decode($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMatchingAnswer(array $answers, array $rows): float
+    {
+        $choices = $this->getSavedMatchingChoices($rows);
+        $score = 0.0;
+        foreach ($answers as $answer) {
+            if (0 === (int) $answer->getCorrect()) {
+                continue;
+            }
+
+            $answerId = (int) $answer->getIid();
+            if (($choices[$answerId] ?? 0) === (int) $answer->getCorrect()) {
+                $score += $answer->getPonderation();
+            }
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMatchingCombination(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $choices = $this->getSavedMatchingChoices($rows);
+        $optionCount = 0;
+        $correctCount = 0;
+
+        foreach ($answers as $answer) {
+            if (0 === (int) $answer->getCorrect()) {
+                continue;
+            }
+
+            ++$optionCount;
+            $answerId = (int) $answer->getIid();
+            if (($choices[$answerId] ?? 0) === (int) $answer->getCorrect()) {
+                ++$correctCount;
+            }
+        }
+
+        return 0 < $optionCount && $correctCount === $optionCount ? (float) $question->getPonderation() : 0.0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedMatchingChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $position = $row->getPosition();
+            if (null === $position || 0 >= $position) {
+                continue;
+            }
+
+            $choices[(int) $position] = (int) $row->getAnswer();
+        }
+
+        return $choices;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreManualAnswer(array $rows): float
+    {
+        $row = $rows[0] ?? null;
+
+        return $row instanceof TrackEAttempt ? (float) $row->getMarks() : 0.0;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     */
+    private function getQuestionWeight(CQuizQuestion $question, array $answers): float
+    {
+        $type = (int) $question->getType();
+        if (\in_array($type, [self::MULTIPLE_ANSWER_COMBINATION, self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE], true)) {
+            $firstAnswer = reset($answers);
+            if ($firstAnswer instanceof CQuizAnswer && 0.0 !== $firstAnswer->getPonderation()) {
+                return $firstAnswer->getPonderation();
+            }
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function getFirstSavedAnswerId(array $rows): int
+    {
+        $row = $rows[0] ?? null;
+
+        return $row instanceof TrackEAttempt ? (int) $row->getAnswer() : 0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function requiresManualCorrection(CQuizQuestion $question): bool
+    {
+        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::UPLOAD_ANSWER], true);
+    }
+
+    private function getSavedAnswerIds(array $rows): array
+    {
+        $answerIds = [];
+        foreach ($rows as $row) {
+            $answerId = (int) $row->getAnswer();
+            if (0 < $answerId && !\in_array($answerId, $answerIds, true)) {
+                $answerIds[] = $answerId;
+            }
+        }
+
+        return $answerIds;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function updateQuestionAttemptRows(CQuizQuestion $question, array $rows, float $score): void
+    {
+        foreach ($rows as $row) {
+            $row->setMarks($score);
+            $row->setTms(new DateTime());
+        }
+
+        if ([] === $rows && !$this->requiresManualCorrection($question)) {
+            return;
+        }
+    }
+
+    private function getFinishedAt(TrackEExercise $attempt): DateTime
+    {
+        $finishedAt = new DateTime();
+        $expiredAt = $attempt->getExpiredTimeControl();
+        if ($expiredAt instanceof DateTime && $expiredAt < $finishedAt) {
+            return $expiredAt;
+        }
+
+        return $finishedAt;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
new file mode 100644
index 00000000000..b9baa891248
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -0,0 +1,990 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntime;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Runtime data provider for the Vue exercise player foundation.
+ *
+ * This provider intentionally exposes only the data required to render the attempt UI.
+ * Correct answers, scores per answer and feedback comments remain hidden for learners.
+ * Submission, scoring and tracking are still handled by the legacy runtime in this batch.
+ *
+ * @implements ProviderInterface<ExerciseRuntime>
+ */
+final readonly class ExerciseRuntimeProvider implements ProviderInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const UNIQUE_TYPES = [1, 10, 17];
+    private const MULTIPLE_TYPES = [2, 9, 14];
+    private const TRUE_FALSE_TYPES = [11, 12];
+    private const FILL_BLANK_TYPES = [3, 27];
+    private const MATCHING_TYPES = [4, 19, 24, 25];
+    private const DROPDOWN_TYPES = [28, 29];
+    private const FREE_ANSWER_TYPES = [5];
+    private const UPLOAD_ANSWER_TYPES = [23];
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private CQuizQuestionRepository $questionRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntime
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $canManage = $this->canManageExercises();
+
+        if (!$canManage && !$this->canViewExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to open this exercise.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManage);
+        $attempt = $this->getRuntimeAttempt($request, $quiz, $course, $session, $canManage);
+        $attemptQuestionIds = $attempt instanceof TrackEExercise ? $this->parseQuestionIds((string) $attempt->getDataTracking()) : null;
+        $questions = $this->getRuntimeQuestions($quiz, $course, $session, $canManage, $attemptQuestionIds);
+
+        $response = new ExerciseRuntime();
+        $response->exerciseId = $exerciseId;
+        $response->title = $quiz->getTitle();
+        $response->description = (string) $quiz->getDescription();
+        $response->settings = $this->getRuntimeSettings($quiz);
+        $response->questions = $questions;
+        $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session);
+        $response->questionCount = \count($questions);
+        $response->totalScore = $this->getTotalScore($questions);
+        $canSubmit = !$canManage
+            && $attempt instanceof TrackEExercise
+            && self::STATUS_INCOMPLETE === (string) $attempt->getStatus()
+            && $this->canFinishWithVue($questions);
+
+        $response->canManage = $canManage;
+        $response->attempt = $attempt instanceof TrackEExercise ? $this->normalizeAttempt($attempt, $questions) : null;
+        $response->canStartAttempt = !$canManage;
+        $response->canSubmit = $canSubmit;
+        $response->usesLegacySubmit = !$canSubmit;
+
+        return $response;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     */
+    private function canFinishWithVue(array $questions): bool
+    {
+        if ([] === $questions) {
+            return false;
+        }
+
+        foreach ($questions as $question) {
+            $type = (int) ($question['type'] ?? 0);
+            if (!$this->isFinishSupportedQuestionType($type)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function isFinishSupportedQuestionType(int $type): bool
+    {
+        return \in_array($type, self::UNIQUE_TYPES, true)
+            || \in_array($type, self::MULTIPLE_TYPES, true)
+            || \in_array($type, self::TRUE_FALSE_TYPES, true)
+            || \in_array($type, self::FILL_BLANK_TYPES, true)
+            || \in_array($type, self::MATCHING_TYPES, true)
+            || \in_array($type, self::DROPDOWN_TYPES, true)
+            || \in_array($type, self::FREE_ANSWER_TYPES, true)
+            || \in_array($type, self::UPLOAD_ANSWER_TYPES, true);
+    }
+
+    private function getRuntimeAttempt(Request $request, CQuiz $quiz, Course $course, ?Session $session, bool $canManage): ?TrackEExercise
+    {
+        $attemptId = $request->query->getInt('attemptId');
+        if (0 >= $attemptId) {
+            return null;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        if (!$canManage) {
+            $user = $this->security->getUser();
+            if (!$user instanceof User) {
+                throw new AccessDeniedHttpException('A valid authenticated user is required.');
+            }
+
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.user) = :userId')
+                ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ;
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+
+        return $attempt instanceof TrackEExercise ? $attempt : null;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeAttempt(TrackEExercise $attempt, array $questions): array
+    {
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        $expiredAt = null;
+        $remainingSeconds = null;
+        if (method_exists($attempt, 'getExpiredTimeControl')) {
+            $expiredTimeControl = $attempt->getExpiredTimeControl();
+            if ($expiredTimeControl instanceof DateTimeInterface) {
+                $expiredAt = $expiredTimeControl->format(DateTimeInterface::ATOM);
+                $remainingSeconds = max(0, $expiredTimeControl->getTimestamp() - time());
+            }
+        }
+
+        return [
+            'attemptId' => (int) $attempt->getExeId(),
+            'status' => method_exists($attempt, 'getStatus') ? (string) $attempt->getStatus() : 'incomplete',
+            'questionIds' => $questionIds,
+            'currentQuestionIndex' => 0,
+            'currentQuestionId' => (int) ($questionIds[0] ?? ($questions[0]['id'] ?? 0)),
+            'totalQuestions' => \count($questions),
+            'expiredAt' => $expiredAt,
+            'remainingSeconds' => $remainingSeconds,
+            'savedAnswers' => $this->getSavedAnswers((int) $attempt->getExeId()),
+        ];
+    }
+
+    /**
+     * @return array<int|string, array<int, array{answer: string, position: int|null}>>
+     */
+    private function getSavedAnswers(int $attemptId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved.questionId AS questionId')
+            ->addSelect('saved.answer AS answer')
+            ->addSelect('saved.position AS position')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->orderBy('saved.questionId', 'ASC')
+            ->addOrderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $savedAnswers = [];
+        foreach ($rows as $row) {
+            if (!\is_array($row)) {
+                continue;
+            }
+
+            $questionId = (int) ($row['questionId'] ?? 0);
+            if (0 >= $questionId) {
+                continue;
+            }
+
+            $savedAnswers[$questionId][] = [
+                'answer' => (string) ($row['answer'] ?? ''),
+                'position' => null !== ($row['position'] ?? null) ? (int) $row['position'] : null,
+            ];
+        }
+
+        return $savedAnswers;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canViewExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        if (!$canManage) {
+            $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+            $now = new DateTimeImmutable();
+
+            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+                throw new AccessDeniedHttpException('The requested exercise is not visible.');
+            }
+
+            if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+                throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+            }
+
+            if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+                throw new AccessDeniedHttpException('The requested exercise is closed.');
+            }
+        }
+
+        return $quiz;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getRuntimeSettings(CQuiz $quiz): array
+    {
+        return [
+            'type' => (int) $quiz->getType(),
+            'oneQuestionPerPage' => CQuiz::ONE_PER_PAGE === (int) $quiz->getType(),
+            'randomQuestions' => (int) $quiz->getRandom(),
+            'randomAnswers' => true === $quiz->getRandomAnswers(),
+            'resultsDisabled' => (int) $quiz->getResultsDisabled(),
+            'maxAttempt' => (int) $quiz->getMaxAttempt(),
+            'feedbackType' => (int) $quiz->getFeedbackType(),
+            'expiredTime' => (int) $quiz->getExpiredTime(),
+            'duration' => $quiz->getDuration(),
+            'propagateNegative' => (int) $quiz->getPropagateNeg(),
+            'saveCorrectAnswers' => (int) ($quiz->getSaveCorrectAnswers() ?? 0),
+            'reviewAnswers' => (int) $quiz->getReviewAnswers(),
+            'randomByCategory' => (int) $quiz->getRandomByCategory(),
+            'displayCategoryName' => (int) $quiz->getDisplayCategoryName(),
+            'passPercentage' => $quiz->getPassPercentage(),
+            'preventBackwards' => 1 === (int) $quiz->getPreventBackwards(),
+            'hideQuestionNumber' => 1 === (int) $quiz->getHideQuestionNumber(),
+            'hideQuestionTitle' => true === $quiz->isHideQuestionTitle(),
+            'showPreviousButton' => true === $quiz->isShowPreviousButton(),
+            'hideAttemptsTable' => true === $quiz->isHideAttemptsTable(),
+            'questionSelectionType' => (int) ($quiz->getQuestionSelectionType() ?? 0),
+            'pageResultConfiguration' => $quiz->getPageResultConfiguration(),
+            'autoLaunch' => true === $quiz->isAutoLaunch(),
+            'notifications' => $quiz->getNotifications(),
+            'accessCondition' => (string) $quiz->getAccessCondition(),
+            'sound' => (string) ($quiz->getSound() ?? ''),
+            'quizCategoryId' => null !== $quiz->getQuizCategory()?->getId() ? (int) $quiz->getQuizCategory()->getId() : null,
+            'displayChartDegreeCertainty' => (int) $quiz->getDisplayChartDegreeCertainty(),
+            'sendEmailChartDegreeCertainty' => (int) $quiz->getSendEmailChartDegreeCertainty(),
+            'notDisplayBalancePercentageCategorieQuestion' => (int) $quiz->getNotDisplayBalancePercentageCategorieQuestion(),
+            'displayChartDegreeCertaintyCategory' => (int) $quiz->getDisplayChartDegreeCertaintyCategory(),
+            'gatherQuestionsCategories' => (int) $quiz->getGatherQuestionsCategories(),
+            'startTime' => $this->formatDate($quiz->getStartTime()),
+            'endTime' => $this->formatDate($quiz->getEndTime()),
+            'textWhenFinished' => (string) $quiz->getTextWhenFinished(),
+            'textWhenFinishedFailure' => (string) $quiz->getTextWhenFinishedFailure(),
+        ];
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    /**
+     * @param array<int, int>|null $questionIds
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function getRuntimeQuestions(CQuiz $quiz, Course $course, ?Session $session, bool $canManage, ?array $questionIds = null): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+        ;
+
+        if (null !== $questionIds && [] !== $questionIds) {
+            $queryBuilder
+                ->andWhere('IDENTITY(relQuestion.question) IN (:questionIds)')
+                ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
+            ;
+        }
+
+        $relations = $queryBuilder->getQuery()->getResult();
+
+        $items = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+                continue;
+            }
+
+            $items[(int) $question->getIid()] = $this->normalizeQuestion($question, $relation, $course, $session, $canManage);
+        }
+
+        if (null !== $questionIds && [] !== $questionIds) {
+            $orderedItems = [];
+            foreach ($questionIds as $position => $questionId) {
+                if (!isset($items[$questionId])) {
+                    continue;
+                }
+
+                $item = $items[$questionId];
+                $item['position'] = $position + 1;
+                $orderedItems[] = $item;
+            }
+
+            return $orderedItems;
+        }
+
+        return array_values($items);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $relation, Course $course, ?Session $session, bool $canManage): array
+    {
+        $type = (int) $question->getType();
+
+        return [
+            'id' => (int) $question->getIid(),
+            'title' => $question->getQuestion(),
+            'description' => (string) $question->getDescription(),
+            'type' => $type,
+            'typeLabel' => $this->getQuestionTypeLabel($type),
+            'score' => (float) $question->getPonderation(),
+            'position' => (int) $relation->getQuestionOrder(),
+            'mandatory' => 1 === (int) $question->getMandatory(),
+            'duration' => $question->getDuration(),
+            'difficulty' => max(1, (int) $question->getLevel()),
+            'canRevealTeacherData' => $canManage,
+            'choices' => $this->getChoiceItems($question),
+            'trueFalseOptions' => $this->getQuestionOptions($question),
+            'fillBlanks' => $this->getFillBlanksRuntime($question),
+            'matching' => $this->getMatchingRuntime($question),
+            'draggable' => $this->getDraggableRuntime($question),
+            'dropdown' => $this->getDropdownRuntime($question),
+            'calculated' => $this->getCalculatedRuntime($question),
+            'annotation' => $this->getImageRuntime($question, $course, $session, [20]),
+            'hotspot' => $this->getImageRuntime($question, $course, $session, [6, 8, 26]),
+            'reading' => $this->getReadingRuntime($question),
+        ];
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getChoiceItems(CQuizQuestion $question): array
+    {
+        $type = (int) $question->getType();
+        if (!\in_array($type, [1, 2, 9, 10, 11, 12, 14, 17, 22], true)) {
+            return [];
+        }
+
+        $items = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $items[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestionOptions(CQuizQuestion $question): array
+    {
+        $options = [];
+        foreach ($question->getOptions() as $option) {
+            if (!$option instanceof CQuizQuestionOption || null === $option->getIid()) {
+                continue;
+            }
+
+            $options[] = [
+                'id' => (int) $option->getIid(),
+                'title' => (string) $option->getTitle(),
+                'position' => (int) $option->getPosition(),
+            ];
+        }
+
+        usort($options, static fn (array $a, array $b): int => ((int) $a['position']) <=> ((int) $b['position']));
+
+        return $options;
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getFillBlanksRuntime(CQuizQuestion $question): ?array
+    {
+        if (!\in_array((int) $question->getType(), [3, 27], true)) {
+            return null;
+        }
+
+        $answer = $this->getFirstAnswer($question);
+        if (!$answer instanceof CQuizAnswer) {
+            return null;
+        }
+
+        $parsed = $this->parseFillBlanksAnswer($answer->getAnswer());
+
+        return [
+            'segments' => $this->buildFillBlankSegments($parsed['text'], $parsed['sizes'], $parsed['separator']),
+            'separator' => $parsed['separator'],
+            'switchable' => $parsed['switchable'],
+            'caseInsensitive' => 'case:false' === (string) $question->getExtra(),
+        ];
+    }
+
+    /**
+     * @return array{text: string, weights: array<int, float>, sizes: array<int, int>, separator: int, switchable: bool}
+     */
+    private function parseFillBlanksAnswer(string $encodedAnswer): array
+    {
+        $parts = explode('::', $encodedAnswer, 2);
+        $text = (string) ($parts[0] ?? '');
+        $systemString = (string) ($parts[1] ?? '');
+        $switchableParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($switchableParts[0] ?? ''));
+        $weights = $this->parseFloatList((string) ($details[0] ?? ''));
+        $sizes = [];
+        $separator = 0;
+
+        if (\count($details) >= 3) {
+            $sizes = $this->parseIntegerList((string) ($details[1] ?? ''));
+            $separator = max(0, (int) ($details[2] ?? 0));
+        }
+
+        if ([] === $sizes) {
+            foreach ($this->extractFillBlankAnswers($text, $separator) as $_blank) {
+                $sizes[] = 200;
+            }
+        }
+
+        return [
+            'text' => $text,
+            'weights' => $weights,
+            'sizes' => $sizes,
+            'separator' => $separator,
+            'switchable' => '1' === (string) ($switchableParts[1] ?? ''),
+        ];
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function buildFillBlankSegments(string $text, array $sizes, int $separator): array
+    {
+        [$start, $end] = $this->getFillBlankSeparators($separator);
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+        $segments = [];
+        $offset = 0;
+        $blankIndex = 0;
+
+        if (preg_match_all($pattern, $text, $matches, PREG_OFFSET_CAPTURE)) {
+            foreach ($matches[0] as $match) {
+                $fullMatch = (string) $match[0];
+                $position = (int) $match[1];
+                $plainText = substr($text, $offset, $position - $offset);
+
+                if ('' !== $plainText) {
+                    $segments[] = ['type' => 'text', 'text' => $plainText];
+                }
+
+                $segments[] = [
+                    'type' => 'blank',
+                    'position' => $blankIndex + 1,
+                    'inputSize' => (int) ($sizes[$blankIndex] ?? 200),
+                ];
+
+                $offset = $position + \strlen($fullMatch);
+                ++$blankIndex;
+            }
+        }
+
+        $remainingText = substr($text, $offset);
+        if (false !== $remainingText && '' !== $remainingText) {
+            $segments[] = ['type' => 'text', 'text' => $remainingText];
+        }
+
+        return $segments;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private function extractFillBlankAnswers(string $text, int $separator): array
+    {
+        [$start, $end] = $this->getFillBlankSeparators($separator);
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+        preg_match_all($pattern, $text, $matches);
+
+        return array_map(static fn (string $value): string => trim($value), $matches[1] ?? []);
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getMatchingRuntime(CQuizQuestion $question): ?array
+    {
+        if (!\in_array((int) $question->getType(), [4, 19, 24, 25], true)) {
+            return null;
+        }
+
+        $options = [];
+        $prompts = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $correct = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correct) {
+                $options[] = [
+                    'id' => (int) $answer->getIid(),
+                    'label' => $this->getMatchingOptionLabel(\count($options) + 1),
+                    'answer' => $answer->getAnswer(),
+                    'position' => (int) $answer->getPosition(),
+                ];
+
+                continue;
+            }
+
+            $prompts[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        return [
+            'options' => $options,
+            'prompts' => $prompts,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getDraggableRuntime(CQuizQuestion $question): ?array
+    {
+        if (18 !== (int) $question->getType()) {
+            return null;
+        }
+
+        $items = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $items[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        return [
+            'orientation' => \in_array((string) $question->getExtra(), ['h', 'v'], true) ? (string) $question->getExtra() : 'h',
+            'items' => $items,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getDropdownRuntime(CQuizQuestion $question): ?array
+    {
+        if (!\in_array((int) $question->getType(), [28, 29], true)) {
+            return null;
+        }
+
+        $options = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $options[] = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        return ['options' => $options];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getCalculatedRuntime(CQuizQuestion $question): ?array
+    {
+        if (16 !== (int) $question->getType()) {
+            return null;
+        }
+
+        $text = '';
+        $answer = $this->getFirstAnswer($question);
+        if ($answer instanceof CQuizAnswer) {
+            $text = $this->stripCalculatedMetadata($answer->getAnswer());
+        }
+
+        return ['text' => $text];
+    }
+
+    /**
+     * @param array<int, int> $allowedTypes
+     *
+     * @return array<string, mixed>|null
+     */
+    private function getImageRuntime(CQuizQuestion $question, Course $course, ?Session $session, array $allowedTypes): ?array
+    {
+        if (!\in_array((int) $question->getType(), $allowedTypes, true)) {
+            return null;
+        }
+
+        $imageName = '';
+        $imageUrl = '';
+        $resourceNode = $question->getResourceNode();
+        if (null !== $resourceNode) {
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            if ($resourceFile instanceof ResourceFile) {
+                $imageName = (string) $resourceFile->getOriginalName();
+                $imageUrl = $this->appendCourseContextToUrl($this->questionRepository->getHotSpotImageUrl($question), $course, $session);
+            }
+        }
+
+        return [
+            'imageName' => $imageName,
+            'imageUrl' => $imageUrl,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getReadingRuntime(CQuizQuestion $question): ?array
+    {
+        if (21 !== (int) $question->getType()) {
+            return null;
+        }
+
+        return [
+            'speed' => match (max(1, (int) $question->getLevel())) {
+                1 => 50,
+                2 => 100,
+                3 => 175,
+                4 => 300,
+                default => 600,
+            },
+            'text' => (string) $question->getDescription(),
+        ];
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getOrderedAnswers(CQuizQuestion $question): array
+    {
+        $answers = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        return array_values(array_filter($answers, static fn (mixed $answer): bool => $answer instanceof CQuizAnswer));
+    }
+
+    private function getFirstAnswer(CQuizQuestion $question): ?CQuizAnswer
+    {
+        $answers = $this->getOrderedAnswers($question);
+
+        return $answers[0] ?? null;
+    }
+
+    private function appendCourseContextToUrl(string $url, Course $course, ?Session $session): string
+    {
+        if ('' === $url) {
+            return '';
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $params = [
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? $request?->query->getInt('sid', 0) ?? 0),
+            'gid' => (int) ($request?->query->getInt('gid', 0) ?? 0),
+        ];
+
+        return $url.(str_contains($url, '?') ? '&' : '?').http_build_query($params);
+    }
+
+    private function stripCalculatedMetadata(string $answer): string
+    {
+        $parts = explode('@@', $answer, 2);
+
+        return (string) ($parts[0] ?? $answer);
+    }
+
+    /**
+     * @return array<int, float>
+     */
+    private function parseFloatList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(static fn (string $item): float => (float) trim($item), explode(',', $value));
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseIntegerList(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_map(static fn (string $item): int => max(40, (int) trim($item)), explode(',', $value));
+    }
+
+    private function getMatchingOptionLabel(int $position): string
+    {
+        if (1 <= $position && 26 >= $position) {
+            return chr(64 + $position);
+        }
+
+        return (string) $position;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     */
+    private function getTotalScore(array $questions): float
+    {
+        $total = 0.0;
+        foreach ($questions as $question) {
+            $total += (float) ($question['score'] ?? 0.0);
+        }
+
+        return $total;
+    }
+
+    private function formatDate(?DateTimeInterface $date): ?string
+    {
+        if (null === $date) {
+            return null;
+        }
+
+        return $date->format(DateTimeInterface::ATOM);
+    }
+
+    private function getQuestionTypeLabel(int $type): string
+    {
+        return match ($type) {
+            1 => 'Unique answer',
+            2 => 'Multiple answer',
+            3 => 'Fill in blanks',
+            4 => 'Matching',
+            5 => 'Open question',
+            6 => 'Hotspot',
+            9 => 'Exact Selection',
+            10 => 'Unique answer with unknown',
+            11 => 'Multiple answer true/false',
+            12 => 'Multiple answer combination true/false',
+            13 => 'Oral expression',
+            14 => 'Global multiple answer',
+            15 => 'Media question',
+            16 => 'Calculated answer',
+            17 => 'Unique answer with images',
+            18 => 'Sequence ordering',
+            19 => 'Matching draggable',
+            20 => 'Annotation',
+            21 => 'Reading comprehension',
+            22 => 'Multiple answer true/false with degree of certainty',
+            23 => 'Upload answer',
+            24 => 'Matching combination',
+            25 => 'Matching draggable combination',
+            26 => 'Hotspot combination',
+            27 => 'Fill in blanks combination',
+            28 => 'Multiple answer dropdown combination',
+            29 => 'Multiple answer dropdown',
+            31 => 'Page break',
+            default => 'Question',
+        };
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session): array
+    {
+        $baseParams = [
+            'exerciseId' => (int) $quiz->getIid(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+        ];
+
+        return [
+            'overview' => '/main/exercise/overview.php?'.http_build_query($baseParams),
+            'show' => '/main/exercise/exercise_show.php?'.http_build_query($baseParams),
+            'submit' => '/main/exercise/exercise_submit.php?'.http_build_query($baseParams),
+            'results' => '/main/exercise/exercise_report.php?'.http_build_query($baseParams),
+            'list' => '/main/exercise/exercise.php?'.http_build_query($baseParams),
+        ];
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
new file mode 100644
index 00000000000..00f3c332ab9
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
@@ -0,0 +1,382 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeReport;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeInterface;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Read-only provider for the migrated exercise learner attempts report.
+ *
+ * @implements ProviderInterface<ExerciseRuntimeReport>
+ */
+final readonly class ExerciseRuntimeReportProvider implements ProviderInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const STATUS_PENDING_CORRECTION = 'pending_correction';
+    private const STATUS_COMPLETED = 'completed';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeReport
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to view this exercise report.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempts = $this->getAttempts($request, $quiz, $course, $session);
+
+        $response = new ExerciseRuntimeReport();
+        $response->exerciseId = $exerciseId;
+        $response->title = $quiz->getTitle();
+        $response->description = (string) $quiz->getDescription();
+        $response->attempts = $attempts;
+        $response->filters = [
+            'firstName' => trim((string) $request->query->get('firstName', '')),
+            'lastName' => trim((string) $request->query->get('lastName', '')),
+            'status' => trim((string) $request->query->get('status', '')),
+        ];
+        $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session, $request);
+        $response->totalItems = \count($attempts);
+        $response->canManage = true;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt', 'user')
+            ->from(TrackEExercise::class, 'attempt')
+            ->innerJoin('attempt.user', 'user')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('attempt.exeDate', 'DESC')
+            ->addOrderBy('attempt.exeId', 'DESC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $firstName = trim((string) $request->query->get('firstName', ''));
+        if ('' !== $firstName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.firstname) LIKE :firstName')
+                ->setParameter('firstName', '%'.mb_strtolower($firstName).'%', Types::STRING)
+            ;
+        }
+
+        $lastName = trim((string) $request->query->get('lastName', ''));
+        if ('' !== $lastName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.lastname) LIKE :lastName')
+                ->setParameter('lastName', '%'.mb_strtolower($lastName).'%', Types::STRING)
+            ;
+        }
+
+        $status = trim((string) $request->query->get('status', ''));
+        if (self::STATUS_PENDING_CORRECTION === $status) {
+            $queryBuilder->andWhere("attempt.questionsToCheck <> ''");
+        } elseif (self::STATUS_INCOMPLETE === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->setParameter('status', self::STATUS_INCOMPLETE, Types::STRING)
+            ;
+        } elseif (self::STATUS_COMPLETED === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->andWhere("attempt.questionsToCheck = ''")
+                ->setParameter('status', self::STATUS_COMPLETED, Types::STRING)
+            ;
+        }
+
+        $attempts = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
+            if (!$attempt instanceof TrackEExercise) {
+                continue;
+            }
+
+            $attempts[] = $this->normalizeAttempt($attempt, $quiz, $request);
+        }
+
+        return $attempts;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request $request): array
+    {
+        $user = $attempt->getUser();
+        $questionsToCheck = $this->parseQuestionIds($attempt->getQuestionsToCheck());
+        $pendingCorrection = [] !== $questionsToCheck;
+        $status = $this->getAttemptStatus($attempt, $pendingCorrection);
+        $statusLabel = match ($status) {
+            self::STATUS_PENDING_CORRECTION => 'Pending correction',
+            self::STATUS_INCOMPLETE => 'Ongoing',
+            default => 'Completed',
+        };
+        $score = $attempt->getScore();
+        $maxScore = $attempt->getMaxScore();
+        $percentage = 0.0 < $maxScore ? round(($score * 100) / $maxScore, 2) : 0.0;
+        $baseParams = $this->getBaseParams((int) $quiz->getIid(), $request);
+        $attemptId = (int) $attempt->getExeId();
+        $userId = (int) $user->getId();
+
+        return [
+            'id' => $attemptId,
+            'attemptId' => $attemptId,
+            'exerciseId' => (int) $quiz->getIid(),
+            'userId' => $userId,
+            'username' => $user->getUsername(),
+            'firstName' => (string) $user->getFirstname(),
+            'lastName' => (string) $user->getLastname(),
+            'fullName' => $user->getFullName(),
+            'groupName' => '-',
+            'duration' => $attempt->getExeDuration(),
+            'startedAt' => $this->formatDate($attempt->getStartDate()),
+            'completedAt' => $this->formatDate($attempt->getExeDate()),
+            'score' => $score,
+            'maxScore' => $maxScore,
+            'percentage' => $percentage,
+            'ip' => $attempt->getUserIp(),
+            'status' => $status,
+            'statusLabel' => $statusLabel,
+            'pendingCorrection' => $pendingCorrection,
+            'questionsToCheck' => $questionsToCheck,
+            'learningPath' => $this->formatLearningPath($attempt),
+            'canReview' => self::STATUS_INCOMPLETE !== $status,
+            'canDelete' => true,
+            'legacyUrls' => [
+                'result' => api_get_path(WEB_CODE_PATH).'exercise/exercise_result.php?'.http_build_query(['exe_id' => $attemptId] + $baseParams),
+                'pdf' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'export_pdf', 'attemptId' => $attemptId, 'userId' => $userId] + $baseParams),
+                'sendEmail' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'send_email', 'attemptId' => $attemptId] + $baseParams),
+                'recalculate' => api_get_path(WEB_CODE_PATH).'exercise/recalculate.php?'.http_build_query(['id' => $attemptId, 'exercise' => (int) $quiz->getIid(), 'user' => $userId] + $this->getContextParams($request)),
+            ],
+        ];
+    }
+
+    private function getAttemptStatus(TrackEExercise $attempt, bool $pendingCorrection): string
+    {
+        if ($pendingCorrection) {
+            return self::STATUS_PENDING_CORRECTION;
+        }
+
+        if (self::STATUS_INCOMPLETE === (string) $attempt->getStatus()) {
+            return self::STATUS_INCOMPLETE;
+        }
+
+        return self::STATUS_COMPLETED;
+    }
+
+    private function formatLearningPath(TrackEExercise $attempt): string
+    {
+        if (0 < $attempt->getOrigLpId()) {
+            return '#'.$attempt->getOrigLpId();
+        }
+
+        return '-';
+    }
+
+    private function formatDate(DateTimeInterface $date): string
+    {
+        return $date->format(DateTimeInterface::ATOM);
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        $ids = [];
+        foreach (preg_split('/[,;]+/', $value) ?: [] as $rawId) {
+            $id = (int) trim($rawId);
+            if (0 < $id) {
+                $ids[] = $id;
+            }
+        }
+
+        return array_values(array_unique($ids));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session, Request $request): array
+    {
+        $baseParams = $this->getBaseParams((int) $quiz->getIid(), $request);
+        $contextParams = $this->getContextParams($request);
+
+        return [
+            'legacyReport' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query($baseParams),
+            'backToQuestions' => api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.http_build_query($contextParams),
+            'liveStats' => api_get_path(WEB_CODE_PATH).'exercise/live_stats.php?'.http_build_query($baseParams),
+            'questionReport' => api_get_path(WEB_CODE_PATH).'exercise/stats.php?'.http_build_query($baseParams),
+            'questionStats' => api_get_path(WEB_CODE_PATH).'exercise/question_stats.php?'.http_build_query(['id' => (int) $quiz->getIid()] + $contextParams),
+            'export' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['export_report' => 1] + $baseParams),
+            'recalculateAll' => api_get_path(WEB_CODE_PATH).'exercise/recalculate_all.php?'.http_build_query(['exercise' => (int) $quiz->getIid()] + $contextParams),
+            'exportAllPdf' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'export_all_results'] + $baseParams),
+            'sendAllEmails' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'send_all_emails'] + $baseParams),
+        ];
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getBaseParams(int $exerciseId, Request $request): array
+    {
+        return ['exerciseId' => $exerciseId] + $this->getContextParams($request);
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getContextParams(Request $request): array
+    {
+        $params = [
+            'cid' => $request->query->getInt('cid'),
+            'gid' => $request->query->getInt('gid'),
+        ];
+
+        $sessionId = $request->query->getInt('sid');
+        if (0 < $sessionId) {
+            $params['sid'] = $sessionId;
+        }
+
+        return $params;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
new file mode 100644
index 00000000000..10ddd83c621
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -0,0 +1,1267 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeResult;
+use Chamilo\CoreBundle\Entity\AttemptFile;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeInterface;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Read-only provider for migrated exercise runtime result/review data.
+ *
+ * @implements ProviderInterface<ExerciseRuntimeResult>
+ */
+final readonly class ExerciseRuntimeResultProvider implements ProviderInterface
+{
+    private const STATUS_COMPLETED = 'completed';
+    private const VISIBILITY_PUBLISHED = 2;
+    private const FEEDBACK_TYPE_EXAM = 2;
+    private const RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS = 0;
+    private const RESULT_NO_SCORE_AND_EXPECTED_ANSWERS = 1;
+    private const RESULT_SHOW_SCORE_ONLY = 2;
+    private const RESULT_SHOW_FINAL_SCORE_ONLY_WITH_CATEGORIES = 3;
+    private const RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT = 4;
+    private const RESULT_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK = 5;
+    private const RESULT_RANKING = 6;
+    private const RESULT_SHOW_ONLY_IN_CORRECT_ANSWER = 7;
+    private const RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING = 8;
+    private const RESULT_RADAR = 9;
+    private const RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK = 10;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private ResourceNodeRepository $resourceNodeRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeResult
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : 0;
+        if (0 >= $exerciseId || 0 >= $attemptId) {
+            throw new BadRequestHttpException('A valid exercise and attempt are required.');
+        }
+
+        $canManage = $this->canManageExercises();
+        if (!$canManage && !$this->canViewExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to view this exercise result.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManage);
+        $attempt = $this->getAttempt($attemptId, $quiz, $course, $session, $canManage);
+        if (self::STATUS_COMPLETED !== (string) $attempt->getStatus()) {
+            throw new BadRequestHttpException('The requested attempt has not been completed yet.');
+        }
+
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if ([] === $questionIds) {
+            $questionIds = $this->getExerciseQuestionIds($quiz);
+        }
+
+        $rowsByQuestion = $this->getAttemptRowsByQuestion((int) $attempt->getExeId());
+        $pendingQuestionIds = $this->parseQuestionIds((string) $attempt->getQuestionsToCheck());
+        $isLastAllowedAttempt = $this->isLastAllowedAttempt($quiz, $attempt, $course, $session);
+        $visibility = $this->getResultVisibility($quiz, $isLastAllowedAttempt);
+        $questions = $this->getQuestions($quiz, $questionIds, $rowsByQuestion, $visibility, $pendingQuestionIds, $canManage);
+        if (true === ($visibility['hideCorrectAnsweredQuestions'] ?? false) && true === ($visibility['showQuestionScore'] ?? false)) {
+            $questions = array_values(array_filter(
+                $questions,
+                static fn (array $question): bool => true !== ($question['isCorrect'] ?? false)
+            ));
+        }
+
+        $response = new ExerciseRuntimeResult();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->title = $quiz->getTitle();
+        $response->description = (string) $quiz->getDescription();
+        $response->attempt = $this->normalizeAttempt($attempt, $quiz, $visibility);
+        $response->visibility = $visibility;
+        $response->questions = $questions;
+        $response->legacyUrls = $this->getLegacyUrls($quiz, $attempt, $course, $session, $request);
+        $response->canManage = $canManage;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canViewExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        if (!$canManage) {
+            $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+                throw new AccessDeniedHttpException('The requested exercise is not visible.');
+            }
+        }
+
+        return $quiz;
+    }
+
+    private function getAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session, bool $canManage): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        if (!$canManage) {
+            $user = $this->security->getUser();
+            if (!$user instanceof User) {
+                throw new AccessDeniedHttpException('A valid authenticated user is required.');
+            }
+
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.user) = :userId')
+                ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ;
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getExerciseQuestionIds(CQuiz $quiz): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('IDENTITY(relQuestion.question) AS questionId')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $questionIds = [];
+        foreach ($rows as $row) {
+            if (!\is_array($row)) {
+                continue;
+            }
+
+            $questionId = (int) ($row['questionId'] ?? 0);
+            if (0 < $questionId) {
+                $questionIds[] = $questionId;
+            }
+        }
+
+        return $questionIds;
+    }
+
+    /**
+     * @return array<int, array<int, TrackEAttempt>>
+     */
+    private function getAttemptRowsByQuestion(int $attemptId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('attemptRow')
+            ->from(TrackEAttempt::class, 'attemptRow')
+            ->andWhere('IDENTITY(attemptRow.trackExercise) = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->orderBy('attemptRow.questionId', 'ASC')
+            ->addOrderBy('attemptRow.position', 'ASC')
+            ->addOrderBy('attemptRow.id', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $groupedRows = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof TrackEAttempt) {
+                continue;
+            }
+
+            $questionId = (int) $row->getQuestionId();
+            if (0 >= $questionId) {
+                continue;
+            }
+
+            $groupedRows[$questionId][] = $row;
+        }
+
+        return $groupedRows;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getResultVisibility(CQuiz $quiz, bool $isLastAllowedAttempt): array
+    {
+        $resultsDisabled = (int) $quiz->getResultsDisabled();
+        $pageResultConfiguration = $this->normalizePageResultConfiguration($quiz->getPageResultConfiguration());
+        $showScore = self::RESULT_NO_SCORE_AND_EXPECTED_ANSWERS !== $resultsDisabled;
+        $showCorrections = \in_array($resultsDisabled, [
+            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS,
+            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            self::RESULT_SHOW_ONLY_IN_CORRECT_ANSWER,
+        ], true);
+
+        if (\in_array($resultsDisabled, [
+            self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT,
+            self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK,
+        ], true)) {
+            $showCorrections = $isLastAllowedAttempt;
+        }
+
+        if (true === $pageResultConfiguration['hideExpectedAnswers']) {
+            $showCorrections = false;
+        }
+
+        $showOnlyIncorrect = self::RESULT_SHOW_ONLY_IN_CORRECT_ANSWER === $resultsDisabled;
+        $showFeedback = $showCorrections
+            && self::FEEDBACK_TYPE_EXAM !== (int) $quiz->getFeedbackType()
+            && self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK !== $resultsDisabled;
+
+        return [
+            'resultsDisabled' => $resultsDisabled,
+            'feedbackType' => (int) $quiz->getFeedbackType(),
+            'reviewAnswers' => 1 === (int) $quiz->getReviewAnswers(),
+            'saveCorrectAnswers' => (int) ($quiz->getSaveCorrectAnswers() ?? 0),
+            'showScore' => $showScore,
+            'showTotalScore' => $showScore && false === $pageResultConfiguration['hideTotalScore'],
+            'showQuestionScore' => $showScore && false === $pageResultConfiguration['hideQuestionScore'],
+            'showCorrections' => $showCorrections,
+            'showOnlyIncorrect' => $showOnlyIncorrect,
+            'showFeedback' => $showFeedback,
+            'hideCorrectAnsweredQuestions' => $pageResultConfiguration['hideCorrectAnsweredQuestions'],
+            'showCategoryTable' => false === $pageResultConfiguration['hideCategoryTable'],
+            'isLastAllowedAttempt' => $isLastAllowedAttempt,
+            'pageResultConfiguration' => $pageResultConfiguration,
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $configuration
+     *
+     * @return array<string, bool>
+     */
+    private function normalizePageResultConfiguration(array $configuration): array
+    {
+        return [
+            'hideExpectedAnswers' => $this->isEnabledPageResultFlag($configuration, 'hideExpectedAnswers', 'hide_expected_answer'),
+            'hideTotalScore' => $this->isEnabledPageResultFlag($configuration, 'hideTotalScore', 'hide_total_score'),
+            'hideQuestionScore' => $this->isEnabledPageResultFlag($configuration, 'hideQuestionScore', 'hide_question_score'),
+            'hideCategoryTable' => $this->isEnabledPageResultFlag($configuration, 'hideCategoryTable', 'hide_category_table'),
+            'hideCorrectAnsweredQuestions' => $this->isEnabledPageResultFlag($configuration, 'hideCorrectAnsweredQuestions', 'hide_correct_answered_questions'),
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $configuration
+     */
+    private function isEnabledPageResultFlag(array $configuration, string $camelKey, string $legacyKey): bool
+    {
+        $value = $configuration[$camelKey] ?? $configuration[$legacyKey] ?? false;
+
+        return true === $value || 1 === $value || '1' === (string) $value || 'on' === strtolower((string) $value);
+    }
+
+    private function isLastAllowedAttempt(CQuiz $quiz, TrackEExercise $attempt, Course $course, ?Session $session): bool
+    {
+        $maxAttempt = (int) $quiz->getMaxAttempt();
+        if (0 >= $maxAttempt) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('COUNT(completedAttempt.exeId)')
+            ->from(TrackEExercise::class, 'completedAttempt')
+            ->andWhere('IDENTITY(completedAttempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(completedAttempt.course) = :courseId')
+            ->andWhere('IDENTITY(completedAttempt.user) = :userId')
+            ->andWhere('completedAttempt.status = :status')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $attempt->getUser()->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_COMPLETED)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(completedAttempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('completedAttempt.session IS NULL');
+        }
+
+        return (int) $queryBuilder->getQuery()->getSingleScalarResult() >= $maxAttempt;
+    }
+
+    /**
+     * @param array<string, mixed> $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, array $visibility): array
+    {
+        $score = (float) $attempt->getScore();
+        $maxScore = (float) $attempt->getMaxScore();
+        $percentage = 0.0 < $maxScore ? round(($score / $maxScore) * 100, 2) : 0.0;
+        $passPercentage = (int) ($quiz->getPassPercentage() ?? 0);
+        $hasPassPercentage = 0 < $passPercentage;
+        $passed = $hasPassPercentage ? $percentage >= (float) $passPercentage : null;
+
+        return [
+            'attemptId' => (int) $attempt->getExeId(),
+            'status' => (string) $attempt->getStatus(),
+            'score' => true === ($visibility['showTotalScore'] ?? false) ? $score : null,
+            'maxScore' => true === ($visibility['showTotalScore'] ?? false) ? $maxScore : null,
+            'percentage' => true === ($visibility['showTotalScore'] ?? false) ? $percentage : null,
+            'passPercentage' => $hasPassPercentage ? $passPercentage : null,
+            'passed' => true === ($visibility['showTotalScore'] ?? false) ? $passed : null,
+            'startedAt' => $attempt->getStartDate()->format(DateTimeInterface::ATOM),
+            'completedAt' => $attempt->getExeDate()->format(DateTimeInterface::ATOM),
+            'duration' => (int) $attempt->getExeDuration(),
+            'questionsToCheck' => $this->parseQuestionIds((string) $attempt->getQuestionsToCheck()),
+            'textWhenFinished' => $this->getFinishedText($quiz, $passed),
+        ];
+    }
+
+    private function getFinishedText(CQuiz $quiz, ?bool $passed): string
+    {
+        if (false === $passed && '' !== (string) $quiz->getTextWhenFinishedFailure()) {
+            return (string) $quiz->getTextWhenFinishedFailure();
+        }
+
+        return (string) $quiz->getTextWhenFinished();
+    }
+
+    /**
+     * @param array<int, int>                      $questionIds
+     * @param array<int, array<int, TrackEAttempt>> $rowsByQuestion
+     * @param array<string, mixed>                 $visibility
+     * @param array<int, int>                      $pendingQuestionIds
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestions(CQuiz $quiz, array $questionIds, array $rowsByQuestion, array $visibility, array $pendingQuestionIds, bool $canManage): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) IN (:questionIds)')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questions = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (null === $question->getIid()) {
+                continue;
+            }
+
+            $questionId = (int) $question->getIid();
+            $questions[$questionId] = $this->normalizeQuestion(
+                $question,
+                $rowsByQuestion[$questionId] ?? [],
+                $visibility,
+                \in_array($questionId, $pendingQuestionIds, true),
+                $canManage,
+            );
+        }
+
+        $orderedQuestions = [];
+        foreach ($questionIds as $position => $questionId) {
+            if (!isset($questions[$questionId])) {
+                continue;
+            }
+
+            $question = $questions[$questionId];
+            $question['position'] = $position + 1;
+            $orderedQuestions[] = $question;
+        }
+
+        return $orderedQuestions;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeQuestion(CQuizQuestion $question, array $rows, array $visibility, bool $pendingCorrection, bool $canManage): array
+    {
+        $questionScore = $this->getQuestionScore($rows);
+        $maxScore = $this->getQuestionMaxScore($question);
+        $requiresManualCorrection = $this->requiresManualCorrection($question);
+        $isCorrect = 0 < $maxScore ? $questionScore >= $maxScore : 0 < $questionScore;
+        if ($requiresManualCorrection && $pendingCorrection) {
+            $isCorrect = null;
+        }
+        $showQuestionCorrection = $this->shouldShowQuestionCorrection($rows, $visibility, true === $isCorrect);
+
+        return [
+            'id' => (int) $question->getIid(),
+            'title' => $question->getQuestion(),
+            'description' => (string) $question->getDescription(),
+            'type' => (int) $question->getType(),
+            'typeLabel' => $this->getQuestionTypeLabel((int) $question->getType()),
+            'position' => 0,
+            'score' => true === ($visibility['showQuestionScore'] ?? false) ? $questionScore : null,
+            'maxScore' => true === ($visibility['showQuestionScore'] ?? false) ? $maxScore : null,
+            'isCorrect' => true === ($visibility['showQuestionScore'] ?? false) ? $isCorrect : null,
+            'requiresManualCorrection' => $requiresManualCorrection,
+            'pendingCorrection' => $pendingCorrection,
+            'canCorrect' => $canManage && $requiresManualCorrection,
+            'feedback' => $this->getQuestionFeedback($question, $visibility, $showQuestionCorrection),
+            'answer' => $this->normalizeQuestionAnswer($question, $rows, $visibility, $showQuestionCorrection),
+        ];
+    }
+
+
+    private function getQuestionMaxScore(CQuizQuestion $question): float
+    {
+        if (\in_array((int) $question->getType(), [9, 12], true)) {
+            $answer = $this->getFirstAnswer($question);
+            if ($answer instanceof CQuizAnswer && 0.0 !== $answer->getPonderation()) {
+                return (float) $answer->getPonderation();
+            }
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function getQuestionScore(array $rows): float
+    {
+        $row = $rows[0] ?? null;
+
+        return $row instanceof TrackEAttempt ? (float) $row->getMarks() : 0.0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     */
+    private function shouldShowQuestionCorrection(array $rows, array $visibility, bool $isCorrect): bool
+    {
+        if (true !== ($visibility['showCorrections'] ?? false)) {
+            return false;
+        }
+
+        if (true === ($visibility['showOnlyIncorrect'] ?? false) && $isCorrect) {
+            return false;
+        }
+
+        return [] !== $rows;
+    }
+
+    /**
+     * @param array<string, mixed> $visibility
+     */
+    private function getQuestionFeedback(CQuizQuestion $question, array $visibility, bool $showQuestionCorrection): ?string
+    {
+        if (!$showQuestionCorrection || true !== ($visibility['showFeedback'] ?? false)) {
+            return null;
+        }
+
+        return '' !== (string) $question->getFeedback() ? (string) $question->getFeedback() : null;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeQuestionAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
+    {
+        $type = (int) $question->getType();
+        if (\in_array($type, [1, 2, 9, 10, 11, 12, 14, 17], true)) {
+            return $this->normalizeChoiceAnswer($question, $rows, $visibility, $showQuestionCorrection);
+        }
+
+        if (\in_array($type, [3, 27], true)) {
+            return $this->normalizeFillBlankAnswer($question, $rows, $showQuestionCorrection);
+        }
+
+        if (\in_array($type, [4, 19, 24, 25], true)) {
+            return $this->normalizeMatchingAnswer($question, $rows, $visibility, $showQuestionCorrection);
+        }
+
+        if (\in_array($type, [28, 29], true)) {
+            return $this->normalizeDropdownAnswer($question, $rows, $visibility, $showQuestionCorrection);
+        }
+
+        if (5 === $type) {
+            return $this->normalizeFreeAnswer($rows, $visibility);
+        }
+
+        if (23 === $type) {
+            return $this->normalizeUploadAnswer($rows, $visibility);
+        }
+
+        return [
+            'kind' => 'unsupported',
+            'studentAnswer' => $this->normalizeRawRows($rows),
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeChoiceAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
+    {
+        $selectedIds = array_flip($this->getSavedAnswerIds($rows));
+        $trueFalseChoices = $this->getSavedTrueFalseChoices($rows);
+        $isTrueFalse = \in_array((int) $question->getType(), [11, 12], true);
+        $options = $this->getQuestionOptions($question);
+        $choices = [];
+
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $answerId = (int) $answer->getIid();
+            $choice = [
+                'id' => $answerId,
+                'answer' => $answer->getAnswer(),
+                'selected' => isset($selectedIds[$answerId]),
+            ];
+
+            if ($isTrueFalse) {
+                $selectedOption = $trueFalseChoices[$answerId] ?? 0;
+                $choice['selectedOptionId'] = $selectedOption ?: null;
+                $choice['selectedOptionLabel'] = $this->getOptionTitle($options, $selectedOption);
+            }
+
+            if ($showQuestionCorrection) {
+                if ($isTrueFalse) {
+                    $choice['correctOptionId'] = (int) $answer->getCorrect();
+                    $choice['correctOptionLabel'] = $this->getOptionTitle($options, (int) $answer->getCorrect());
+                } else {
+                    $choice['correct'] = 1 === (int) $answer->getCorrect();
+                }
+
+                if (true === ($visibility['showFeedback'] ?? false) && '' !== (string) $answer->getComment()) {
+                    $choice['comment'] = (string) $answer->getComment();
+                }
+            }
+
+            $choices[] = $choice;
+        }
+
+        return [
+            'kind' => $isTrueFalse ? 'true_false' : 'choice',
+            'choices' => $choices,
+            'options' => array_values($options),
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeFillBlankAnswer(CQuizQuestion $question, array $rows, bool $showQuestionCorrection): array
+    {
+        $row = $rows[0] ?? null;
+        $answer = $this->getFirstAnswer($question);
+        $teacherInfo = $answer instanceof CQuizAnswer ? $this->parseFillBlankAnswer($answer->getAnswer(), false) : null;
+        $studentInfo = $row instanceof TrackEAttempt ? $this->parseFillBlankAnswer($row->getAnswer(), true) : null;
+        $blankCount = null !== $teacherInfo ? \count($teacherInfo['words']) : \count($studentInfo['student_answer'] ?? []);
+        $blanks = [];
+
+        for ($index = 0; $index < $blankCount; ++$index) {
+            $blank = [
+                'position' => $index + 1,
+                'studentAnswer' => (string) ($studentInfo['student_answer'][$index] ?? ''),
+                'studentScore' => (string) ($studentInfo['student_score'][$index] ?? ''),
+            ];
+
+            if ($showQuestionCorrection && null !== $teacherInfo) {
+                $blank['correctAnswer'] = (string) ($teacherInfo['words'][$index] ?? '');
+            }
+
+            $blanks[] = $blank;
+        }
+
+        return [
+            'kind' => 'fill_blanks',
+            'text' => (string) ($teacherInfo['text'] ?? ''),
+            'blanks' => $blanks,
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeMatchingAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
+    {
+        $selected = $this->getSavedMatchingChoices($rows);
+        $options = [];
+        $prompts = [];
+        $answers = $this->getOrderedAnswers($question);
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            if (0 < (int) ($answer->getCorrect() ?? 0)) {
+                continue;
+            }
+
+            $options[$answerId] = [
+                'id' => $answerId,
+                'answer' => $answer->getAnswer(),
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $correct = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correct) {
+                continue;
+            }
+
+            $prompt = [
+                'id' => $answerId,
+                'answer' => $answer->getAnswer(),
+                'selectedOptionId' => $selected[$answerId] ?? null,
+                'selectedOptionAnswer' => isset($selected[$answerId]) ? (string) ($options[$selected[$answerId]]['answer'] ?? '') : '',
+            ];
+
+            if ($showQuestionCorrection) {
+                $prompt['correctOptionId'] = $correct;
+                $prompt['correctOptionAnswer'] = (string) ($options[$correct]['answer'] ?? '');
+                if (true === ($visibility['showFeedback'] ?? false) && '' !== (string) $answer->getComment()) {
+                    $prompt['comment'] = (string) $answer->getComment();
+                }
+            }
+
+            $prompts[] = $prompt;
+        }
+
+        return [
+            'kind' => 'matching',
+            'prompts' => $prompts,
+            'options' => array_values($options),
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeDropdownAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
+    {
+        $selectedId = $this->getFirstSavedAnswerId($rows);
+        $options = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $answerId = (int) $answer->getIid();
+            $option = [
+                'id' => $answerId,
+                'answer' => $answer->getAnswer(),
+                'selected' => $answerId === $selectedId,
+            ];
+
+            if ($showQuestionCorrection) {
+                $option['correct'] = 1 === (int) $answer->getCorrect();
+                if (true === ($visibility['showFeedback'] ?? false) && '' !== (string) $answer->getComment()) {
+                    $option['comment'] = (string) $answer->getComment();
+                }
+            }
+
+            $options[] = $option;
+        }
+
+        return [
+            'kind' => 'dropdown',
+            'selectedId' => $selectedId ?: null,
+            'options' => $options,
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeFreeAnswer(array $rows, array $visibility): array
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return [
+                'kind' => 'free_answer',
+                'studentAnswer' => '',
+                'teacherComment' => null,
+                'marks' => 0.0,
+            ];
+        }
+
+        return [
+            'kind' => 'free_answer',
+            'studentAnswer' => $row->getAnswer(),
+            'teacherComment' => true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
+            'marks' => (float) $row->getMarks(),
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeUploadAnswer(array $rows, array $visibility): array
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return [
+                'kind' => 'upload_answer',
+                'files' => [],
+                'teacherComment' => null,
+                'marks' => 0.0,
+            ];
+        }
+
+        return [
+            'kind' => 'upload_answer',
+            'files' => $this->normalizeAttemptFiles($row),
+            'teacherComment' => true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
+            'marks' => (float) $row->getMarks(),
+        ];
+    }
+
+    /**
+     * @return array<int, array{id: int, name: string, size: int, mimeType: string, url: string}>
+     */
+    private function normalizeAttemptFiles(TrackEAttempt $row): array
+    {
+        $files = [];
+        foreach ($row->getAttemptFiles() as $attemptFile) {
+            if (!$attemptFile instanceof AttemptFile) {
+                continue;
+            }
+
+            $resourceNode = $attemptFile->getResourceNode();
+            if (!$resourceNode instanceof ResourceNode) {
+                continue;
+            }
+
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            $url = $this->getAttemptFileDownloadUrl($row, $resourceNode);
+
+            $files[] = [
+                'id' => (int) $resourceNode->getId(),
+                'name' => (string) ($resourceFile instanceof ResourceFile ? $resourceFile->getOriginalName() : $resourceNode->getTitle()),
+                'size' => (int) ($resourceFile instanceof ResourceFile ? $resourceFile->getSize() : 0),
+                'mimeType' => (string) ($resourceFile instanceof ResourceFile ? $resourceFile->getMimeType() : ''),
+                'url' => $url,
+            ];
+        }
+
+        return $files;
+    }
+
+
+    private function getAttemptFileDownloadUrl(TrackEAttempt $attemptRow, ResourceNode $resourceNode): string
+    {
+        $attempt = $attemptRow->getTrackEExercise();
+        $quiz = $attempt->getQuiz();
+        if (null === $quiz || null === $quiz->getIid() || null === $resourceNode->getId()) {
+            return '';
+        }
+
+        $query = [
+            'cid' => (int) $attempt->getCourse()->getId(),
+        ];
+
+        $session = $attempt->getSession();
+        if (null !== $session) {
+            $query['sid'] = (int) $session->getId();
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null !== $request) {
+            foreach (['gid', 'origin', 'learnpath_id', 'learnpath_item_id', 'learnpath_item_view_id'] as $queryKey) {
+                $value = $request->query->get($queryKey);
+                if (null !== $value && '' !== (string) $value) {
+                    $query[$queryKey] = (string) $value;
+                }
+            }
+        }
+
+        return sprintf(
+            '/api/exercise/runtime/%d/attempt/%d/file/%d/download?%s',
+            (int) $quiz->getIid(),
+            (int) $attempt->getExeId(),
+            (int) $resourceNode->getId(),
+            http_build_query($query)
+        );
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getOrderedAnswers(CQuizQuestion $question): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->addOrderBy('answer.iid', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        return array_values(array_filter($rows, static fn (mixed $answer): bool => $answer instanceof CQuizAnswer));
+    }
+
+    private function getFirstAnswer(CQuizQuestion $question): ?CQuizAnswer
+    {
+        $answers = $this->getOrderedAnswers($question);
+
+        return $answers[0] ?? null;
+    }
+
+    /**
+     * @return array<int, array{id: int, title: string, position: int}>
+     */
+    private function getQuestionOptions(CQuizQuestion $question): array
+    {
+        $options = [];
+        foreach ($question->getOptions() as $option) {
+            if (!$option instanceof CQuizQuestionOption || null === $option->getIid()) {
+                continue;
+            }
+
+            $options[(int) $option->getIid()] = [
+                'id' => (int) $option->getIid(),
+                'title' => (string) $option->getTitle(),
+                'position' => (int) $option->getPosition(),
+            ];
+        }
+
+        uasort($options, static fn (array $a, array $b): int => ((int) $a['position']) <=> ((int) $b['position']));
+
+        return $options;
+    }
+
+    /**
+     * @param array<int, array{id: int, title: string, position: int}> $options
+     */
+    private function getOptionTitle(array $options, int $optionId): string
+    {
+        if (isset($options[$optionId])) {
+            return (string) ($options[$optionId]['title'] ?? '');
+        }
+
+        foreach ($options as $option) {
+            if ((int) ($option['position'] ?? 0) === $optionId) {
+                return (string) ($option['title'] ?? '');
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedAnswerIds(array $rows): array
+    {
+        $answerIds = [];
+        foreach ($rows as $row) {
+            $answerId = (int) $row->getAnswer();
+            if (0 < $answerId && !\in_array($answerId, $answerIds, true)) {
+                $answerIds[] = $answerId;
+            }
+        }
+
+        return $answerIds;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function getFirstSavedAnswerId(array $rows): int
+    {
+        $row = $rows[0] ?? null;
+
+        return $row instanceof TrackEAttempt ? (int) $row->getAnswer() : 0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedTrueFalseChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $parts = explode(':', (string) $row->getAnswer());
+            $answerId = isset($parts[0]) ? (int) $parts[0] : 0;
+            $optionId = isset($parts[1]) ? (int) $parts[1] : 0;
+            if (0 < $answerId && 0 < $optionId) {
+                $choices[$answerId] = $optionId;
+            }
+        }
+
+        return $choices;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedMatchingChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $position = $row->getPosition();
+            if (null === $position || 0 >= $position) {
+                continue;
+            }
+
+            $choices[(int) $position] = (int) $row->getAnswer();
+        }
+
+        return $choices;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, array{answer: string, position: int|null, marks: float}>
+     */
+    private function normalizeRawRows(array $rows): array
+    {
+        $result = [];
+        foreach ($rows as $row) {
+            $result[] = [
+                'answer' => $row->getAnswer(),
+                'position' => $row->getPosition(),
+                'marks' => (float) $row->getMarks(),
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return array{
+     *     text: string,
+     *     system_string: string,
+     *     words: array<int, string>,
+     *     words_with_bracket: array<int, string>,
+     *     common_words: array<int, string>,
+     *     student_answer: array<int, string>,
+     *     student_score: array<int, string>,
+     *     blank_separator_start: string,
+     *     blank_separator_end: string
+     * }
+     */
+    private function parseFillBlankAnswer(string $answer, bool $isStudentAnswer): array
+    {
+        $parts = [];
+        if (1 === preg_match('/(.*)::(.*)$/s', $answer, $matches)) {
+            $parts = [(string) ($matches[1] ?? ''), (string) ($matches[2] ?? '')];
+        } else {
+            $parts = [$answer, ''];
+        }
+
+        $systemString = $parts[1];
+        $systemParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($systemParts[0] ?? ''));
+        $separatorNumber = \count($details) >= 3 ? (int) ($details[2] ?? 0) : 0;
+        [$start, $end] = $this->getFillBlankSeparators($separatorNumber);
+        $startPattern = preg_quote($start, '/');
+        $endPattern = preg_quote($end, '/');
+        $wordMatches = [];
+        preg_match_all('/'.$startPattern.'[^'.$endPattern.']*'.$endPattern.'/', $parts[0], $wordMatches);
+        $wordsWithBracket = \is_array($wordMatches[0] ?? null) ? $wordMatches[0] : [];
+        $words = [];
+        foreach ($wordsWithBracket as $word) {
+            $words[] = trim((string) $word, $start.$end);
+        }
+
+        $commonWordsString = preg_replace('/'.$startPattern.'[^'.$endPattern.']*'.$endPattern.'/', '::', $parts[0]);
+        if (!\is_string($commonWordsString)) {
+            $commonWordsString = '';
+        }
+
+        $studentAnswer = [];
+        $studentScore = [];
+        if ($isStudentAnswer) {
+            $baseWords = [];
+            $baseWordsWithBracket = [];
+            $count = \count($words);
+            for ($index = 0; $index < $count; ++$index) {
+                $baseWordsWithBracket[] = $wordsWithBracket[$index] ?? '';
+                $baseWords[] = $words[$index] ?? '';
+                ++$index;
+                $studentAnswer[] = $words[$index] ?? '';
+                ++$index;
+                $studentScore[] = $words[$index] ?? '0';
+            }
+            $words = $baseWords;
+            $wordsWithBracket = $baseWordsWithBracket;
+            $commonWordsString = preg_replace('/::::::/', '::', $commonWordsString) ?: '';
+        }
+
+        return [
+            'text' => $parts[0],
+            'system_string' => $systemString,
+            'words' => $words,
+            'words_with_bracket' => $wordsWithBracket,
+            'common_words' => explode('::', $commonWordsString),
+            'student_answer' => $studentAnswer,
+            'student_score' => $studentScore,
+            'blank_separator_start' => $start,
+            'blank_separator_end' => $end,
+        ];
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    private function requiresManualCorrection(CQuizQuestion $question): bool
+    {
+        return \in_array((int) $question->getType(), [5, 23], true);
+    }
+
+    private function getQuestionTypeLabel(int $type): string
+    {
+        return match ($type) {
+            1 => 'Unique answer',
+            2 => 'Multiple answer',
+            3 => 'Fill in blanks',
+            4 => 'Matching',
+            5 => 'Open question',
+            9 => 'Exact Selection',
+            10 => 'Unique answer with unknown',
+            11 => 'Multiple answer true/false',
+            12 => 'Multiple answer combination true/false',
+            14 => 'Global multiple answer',
+            17 => 'Unique answer with images',
+            19 => 'Matching draggable',
+            23 => 'Upload answer',
+            24 => 'Matching combination',
+            25 => 'Matching draggable combination',
+            27 => 'Fill in blanks combination',
+            28 => 'Multiple answer dropdown combination',
+            29 => 'Multiple answer dropdown',
+            default => 'Question',
+        };
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getLegacyUrls(CQuiz $quiz, TrackEExercise $attempt, Course $course, ?Session $session, Request $request): array
+    {
+        $baseParams = [
+            'exerciseId' => (int) $quiz->getIid(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+        ];
+        $resultParams = [
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? $request->query->getInt('sid')),
+            'gid' => $request->query->getInt('gid'),
+            'exe_id' => (int) $attempt->getExeId(),
+            'learnpath_id' => (int) $attempt->getOrigLpId(),
+            'learnpath_item_id' => (int) $attempt->getOrigLpItemId(),
+            'learnpath_item_view_id' => (int) $attempt->getOrigLpItemViewId(),
+            'origin' => (string) $request->query->get('origin', ''),
+        ];
+
+        return [
+            'overview' => '/main/exercise/overview.php?'.http_build_query($baseParams),
+            'legacyResult' => api_get_path(WEB_CODE_PATH).'exercise/exercise_result.php?'.http_build_query($resultParams),
+            'results' => '/main/exercise/exercise_report.php?'.http_build_query($baseParams),
+            'list' => '/main/exercise/exercise.php?'.http_build_query($baseParams),
+        ];
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
new file mode 100644
index 00000000000..f7861da7763
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -0,0 +1,548 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeUploadAnswer;
+use Chamilo\CoreBundle\Entity\AttemptFile;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CoreBundle\Entity\ResourceType;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTime;
+use DateTimeImmutable;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Uploads a learner file answer and attaches it to a track_e_attempt row as AttemptFile, matching legacy upload answer tracking.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeUploadAnswer, ExerciseRuntimeUploadAnswer>
+ */
+final readonly class ExerciseRuntimeUploadAnswerProcessor implements ProcessorInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const UPLOAD_ANSWER = 23;
+    private const ATTEMPT_FILE_RESOURCE_TYPE = 'attempt_file';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private ResourceNodeRepository $resourceNodeRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeUploadAnswer
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canUploadAnswer()) {
+            throw new AccessDeniedHttpException('You are not allowed to upload answers for this exercise.');
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('A valid authenticated user is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : $request->request->getInt('exerciseId');
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : $request->request->getInt('attemptId');
+        $questionId = $request->request->getInt('questionId');
+        $secondsSpent = max(0, $request->request->getInt('secondsSpent'));
+
+        if (0 >= $exerciseId || 0 >= $attemptId || 0 >= $questionId) {
+            throw new BadRequestHttpException('A valid exercise, attempt and question are required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempt = $this->getIncompleteAttempt($attemptId, $quiz, $course, $session, $user);
+        $question = $this->getQuestionFromExercise($questionId, $quiz);
+        if (!$question instanceof CQuizQuestion) {
+            throw new NotFoundHttpException('The requested question was not found in this exercise.');
+        }
+
+        if (self::UPLOAD_ANSWER !== (int) $question->getType()) {
+            throw new BadRequestHttpException('This endpoint only supports upload answer questions.');
+        }
+
+        if (!$this->questionBelongsToAttempt($questionId, $attempt)) {
+            throw new AccessDeniedHttpException('The requested question does not belong to this attempt.');
+        }
+
+        $uploadedFiles = $this->getUploadedFiles($request);
+        $postedNodeIds = $this->getPostedResourceNodeIds($request);
+        if ([] === $uploadedFiles && [] === $postedNodeIds) {
+            throw new BadRequestHttpException('A file is required for this upload answer.');
+        }
+
+        $resourceNodes = [];
+        foreach ($uploadedFiles as $uploadedFile) {
+            $resourceNodes[] = $this->createAttemptFileResourceNode($uploadedFile, $user);
+        }
+        foreach ($postedNodeIds as $postedNodeId) {
+            $node = $this->entityManager->getRepository(ResourceNode::class)->find($postedNodeId);
+            if ($node instanceof ResourceNode) {
+                $resourceNodes[] = $node;
+            }
+        }
+
+        if ([] === $resourceNodes) {
+            throw new BadRequestHttpException('No valid uploaded file could be attached to this answer.');
+        }
+
+        $this->deletePreviousDraftRows($attempt, $questionId);
+
+        $attemptRow = (new TrackEAttempt())
+            ->setTrackEExercise($attempt)
+            ->setUser($user)
+            ->setQuestionId($questionId)
+            ->setAnswer('')
+            ->setTeacherComment('')
+            ->setMarks(0.0)
+            ->setPosition(0)
+            ->setTms(new DateTime())
+            ->setSecondsSpent($secondsSpent)
+        ;
+        $this->entityManager->persist($attemptRow);
+
+        foreach ($resourceNodes as $resourceNode) {
+            $attemptFile = new AttemptFile();
+            $attemptFile->setResourceNode($resourceNode);
+            $attemptRow->addAttemptFile($attemptFile);
+            $this->entityManager->persist($attemptFile);
+        }
+
+        $this->entityManager->flush();
+
+        $response = new ExerciseRuntimeUploadAnswer();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->questionId = $questionId;
+        $response->success = true;
+        $response->message = 'Draft answer saved';
+        $response->files = $this->normalizeAttemptFiles($attemptRow);
+        $response->savedAnswer = $this->getSavedAnswerRows($attemptId, $questionId);
+        $response->answeredQuestionIds = $this->getAnsweredQuestionIds($attemptId);
+        $response->answeredCount = \count($response->answeredQuestionIds);
+        $response->canFinish = false;
+
+        return $response;
+    }
+
+    private function canUploadAnswer(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        $now = new DateTimeImmutable();
+        if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+            throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+        }
+
+        if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+            throw new AccessDeniedHttpException('The requested exercise is closed.');
+        }
+
+        return $quiz;
+    }
+
+    private function getIncompleteAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session, User $user): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->andWhere('attempt.status = :status')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_INCOMPLETE)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested incomplete attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    private function getQuestionFromExercise(int $questionId, CQuiz $quiz): ?CQuizQuestion
+    {
+        $relQuestion = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$relQuestion instanceof CQuizRelQuestion) {
+            return null;
+        }
+
+        return $relQuestion->getQuestion();
+    }
+
+    private function questionBelongsToAttempt(int $questionId, TrackEExercise $attempt): bool
+    {
+        $attemptQuestionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if ([] === $attemptQuestionIds) {
+            return true;
+        }
+
+        return \in_array($questionId, $attemptQuestionIds, true);
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+
+    /**
+     * @return array<int, UploadedFile>
+     */
+    private function getUploadedFiles(Request $request): array
+    {
+        $file = $request->files->get('file');
+        if ($file instanceof UploadedFile) {
+            return [$file];
+        }
+
+        $files = $request->files->all('files');
+        if (!\is_array($files)) {
+            return [];
+        }
+
+        return array_values(array_filter($files, static fn (mixed $item): bool => $item instanceof UploadedFile));
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getPostedResourceNodeIds(Request $request): array
+    {
+        $value = $request->request->all('resourceNodeIds');
+        if ([] === $value) {
+            $singleValue = $request->request->get('resourceNodeId');
+            $value = null === $singleValue ? [] : [$singleValue];
+        }
+
+        $nodeIds = [];
+        foreach ($value as $item) {
+            $nodeId = (int) $item;
+            if (0 < $nodeId && !\in_array($nodeId, $nodeIds, true)) {
+                $nodeIds[] = $nodeId;
+            }
+        }
+
+        return $nodeIds;
+    }
+
+    private function createAttemptFileResourceNode(UploadedFile $uploadedFile, User $user): ResourceNode
+    {
+        $resourceType = $this->entityManager->getRepository(ResourceType::class)->findOneBy(['title' => self::ATTEMPT_FILE_RESOURCE_TYPE]);
+        if (!$resourceType instanceof ResourceType) {
+            throw new BadRequestHttpException('Missing ResourceType "attempt_file".');
+        }
+
+        $originalName = $this->sanitizeFileName($uploadedFile->getClientOriginalName());
+        $node = new ResourceNode();
+        $node->setTitle($originalName);
+        $node->setResourceType($resourceType);
+        $node->setCreator($user);
+        $this->entityManager->persist($node);
+
+        $resourceFile = new ResourceFile();
+        $resourceFile->setResourceNode($node);
+        $resourceFile->setFile($uploadedFile);
+        $this->entityManager->persist($resourceFile);
+
+        return $node;
+    }
+
+    private function sanitizeFileName(string $fileName): string
+    {
+        $safeName = preg_replace('/[^A-Za-z0-9._-]+/', '_', $fileName);
+        if (!\is_string($safeName)) {
+            return 'answer_file';
+        }
+
+        $safeName = trim($safeName, '._-');
+
+        return '' !== $safeName ? $safeName : 'answer_file';
+    }
+
+    private function deletePreviousDraftRows(TrackEExercise $attempt, int $questionId): void
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', (int) $attempt->getExeId(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        foreach ($rows as $row) {
+            if ($row instanceof TrackEAttempt) {
+                $this->entityManager->remove($row);
+            }
+        }
+    }
+
+    /**
+     * @return array<int, array{id: int, name: string, size: int, mimeType: string, url: string}>
+     */
+    private function normalizeAttemptFiles(TrackEAttempt $attemptRow): array
+    {
+        $files = [];
+        foreach ($attemptRow->getAttemptFiles() as $attemptFile) {
+            $resourceNode = $attemptFile->getResourceNode();
+            if (!$resourceNode instanceof ResourceNode) {
+                continue;
+            }
+
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            $url = $this->getAttemptFileDownloadUrl($attemptRow, $resourceNode);
+
+            $files[] = [
+                'id' => (int) $resourceNode->getId(),
+                'name' => (string) ($resourceFile instanceof ResourceFile ? $resourceFile->getOriginalName() : $resourceNode->getTitle()),
+                'size' => (int) ($resourceFile instanceof ResourceFile ? $resourceFile->getSize() : 0),
+                'mimeType' => (string) ($resourceFile instanceof ResourceFile ? $resourceFile->getMimeType() : ''),
+                'url' => $url,
+            ];
+        }
+
+        return $files;
+    }
+
+
+    private function getAttemptFileDownloadUrl(TrackEAttempt $attemptRow, ResourceNode $resourceNode): string
+    {
+        $attempt = $attemptRow->getTrackEExercise();
+        $quiz = $attempt->getQuiz();
+        if (null === $quiz || null === $quiz->getIid() || null === $resourceNode->getId()) {
+            return '';
+        }
+
+        $query = [
+            'cid' => (int) $attempt->getCourse()->getId(),
+        ];
+
+        $session = $attempt->getSession();
+        if (null !== $session) {
+            $query['sid'] = (int) $session->getId();
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null !== $request) {
+            foreach (['gid', 'origin', 'learnpath_id', 'learnpath_item_id', 'learnpath_item_view_id'] as $queryKey) {
+                $value = $request->query->get($queryKey);
+                if (null !== $value && '' !== (string) $value) {
+                    $query[$queryKey] = (string) $value;
+                }
+            }
+        }
+
+        return sprintf(
+            '/api/exercise/runtime/%d/attempt/%d/file/%d/download?%s',
+            (int) $quiz->getIid(),
+            (int) $attempt->getExeId(),
+            (int) $resourceNode->getId(),
+            http_build_query($query)
+        );
+    }
+
+    /**
+     * @return array<int, array{answer: string, position: int|null}>
+     */
+    private function getSavedAnswerRows(int $attemptId, int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved.answer AS answer')
+            ->addSelect('saved.position AS position')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $result = [];
+        foreach ($rows as $row) {
+            if (!\is_array($row)) {
+                continue;
+            }
+
+            $result[] = [
+                'answer' => (string) ($row['answer'] ?? ''),
+                'position' => null !== ($row['position'] ?? null) ? (int) $row['position'] : null,
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getAnsweredQuestionIds(int $attemptId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('DISTINCT saved.questionId AS questionId')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->orderBy('saved.questionId', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $result = [];
+        foreach ($rows as $row) {
+            if (\is_array($row)) {
+                $result[] = (int) ($row['questionId'] ?? 0);
+            }
+        }
+
+        return array_values(array_filter($result));
+    }
+}
diff --git a/src/CoreBundle/Tool/Exercise.php b/src/CoreBundle/Tool/Exercise.php
index 21d75d0739a..a98f75ce22f 100644
--- a/src/CoreBundle/Tool/Exercise.php
+++ b/src/CoreBundle/Tool/Exercise.php
@@ -32,7 +32,7 @@ public function getIcon(): string
 
     public function getLink(): string
     {
-        return '/main/exercise/exercise.php';
+        return '/resources/exercise/:nodeId/';
     }
 
     public function getCategory(): string
diff --git a/src/CourseBundle/Entity/CQuizQuestion.php b/src/CourseBundle/Entity/CQuizQuestion.php
index 1a94bea0b9a..a4052c9626e 100644
--- a/src/CourseBundle/Entity/CQuizQuestion.php
+++ b/src/CourseBundle/Entity/CQuizQuestion.php
@@ -332,6 +332,13 @@ public function getMandatory(): int
         return $this->mandatory;
     }
 
+    public function setMandatory(int $mandatory): self
+    {
+        $this->mandatory = $mandatory;
+
+        return $this;
+    }
+
     /**
      * @return CQuizQuestionOption[]|Collection
      */

From 2abe2c05d990486d416b890bb7d9709f884de80e Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Fri, 12 Jun 2026 10:26:03 -0500
Subject: [PATCH 02/21] Exercise: Extend exercise Vue runtime question support

---
 .../vue/views/exercise/ExercisePlayerView.vue | 1372 ++++++++++++++++-
 .../vue/views/exercise/ExerciseResultView.vue |  404 ++++-
 .../Exercise/ExerciseRuntimeUploadAnswer.php  |    3 +-
 ...erciseRuntimeAttemptFileDownloadAction.php |    2 +-
 .../ExerciseRuntimeAnswerProcessor.php        |  218 ++-
 .../ExerciseRuntimeAttemptProcessor.php       |   13 +-
 .../ExerciseRuntimeCorrectionProcessor.php    |    4 +-
 .../ExerciseRuntimeFinishProcessor.php        |  335 +++-
 .../Exercise/ExerciseRuntimeProvider.php      |  501 +++++-
 .../ExerciseRuntimeResultProvider.php         |  421 ++++-
 .../ExerciseRuntimeUploadAnswerProcessor.php  |   27 +-
 11 files changed, 3146 insertions(+), 154 deletions(-)

diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index 65ec05ce5f8..91b4984ffb2 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -126,7 +126,7 @@
               {{ t("Teacher preview does not create a tracked attempt.") }}
             </div>
             <div v-else-if="activeAttempt">
-              {{ t("Attempt") }} #{{ activeAttempt.attemptId }} · {{ t("Question") }} {{ currentQuestionIndex + 1 }} / {{ visibleQuestionTotal }}
+              {{ t("Attempt") }} #{{ activeAttempt.attemptId }} · {{ progressLabel }}
               <span v-if="activeAttempt.remainingSeconds !== null && activeAttempt.remainingSeconds !== undefined">
                 · {{ t("Time left") }}: {{ formatSeconds(activeAttempt.remainingSeconds) }}
               </span>
@@ -174,6 +174,46 @@
       </div>
 
       <form v-if="canManage || activeAttempt" class="space-y-4" @submit.prevent="submitDisabled">
+        <div
+          v-if="currentRuntimePage?.pageBreak || currentRuntimePage?.media"
+          class="space-y-4 rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
+        >
+          <div
+            v-if="currentRuntimePage?.pageBreak"
+            class="rounded-lg border border-gray-20 bg-gray-10 p-4"
+          >
+            <div
+              v-if="currentRuntimePage.pageBreak.title"
+              class="exercise-runtime-html text-lg font-semibold text-gray-90"
+              v-html="currentRuntimePage.pageBreak.title"
+            />
+            <div
+              v-if="currentRuntimePage.pageBreak.description"
+              class="exercise-runtime-html mt-2 text-sm text-gray-700"
+              v-html="currentRuntimePage.pageBreak.description"
+            />
+          </div>
+
+          <div
+            v-if="currentRuntimePage?.media"
+            class="rounded-lg border border-dashed border-gray-40 bg-gray-10 p-4"
+          >
+            <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+              {{ t("Media question") }}
+            </div>
+            <h2
+              v-if="currentRuntimePage.media.title"
+              class="exercise-runtime-html text-lg font-semibold text-gray-90"
+              v-html="currentRuntimePage.media.title"
+            />
+            <div
+              v-if="currentRuntimePage.media.description || currentRuntimePage.media.content?.description"
+              class="exercise-runtime-html mt-2 text-sm text-gray-700"
+              v-html="currentRuntimePage.media.description || currentRuntimePage.media.content?.description"
+            />
+          </div>
+        </div>
+
         <article
           v-for="(question, index) in visibleQuestions"
           :key="question.id"
@@ -210,6 +250,11 @@
 
           <div v-if="answers[question.id]" class="space-y-4">
             <div v-if="isRadioChoice(question)" class="space-y-3">
+              <div
+                v-if="isReadingQuestion(question) && question.reading?.text"
+                class="exercise-runtime-html rounded-lg border border-gray-20 bg-gray-10 p-4 text-gray-800"
+                v-html="question.reading.text"
+              />
               <label
                 v-for="choice in question.choices"
                 :key="choice.id"
@@ -245,27 +290,94 @@
 
             <div v-else-if="isTrueFalseQuestion(question)" class="space-y-3">
               <div
-                v-for="choice in question.choices"
-                :key="choice.id"
-                class="rounded-lg border border-gray-20 p-3"
+                v-if="isDegreeCertaintyQuestion(question)"
+                class="overflow-x-auto rounded-lg border border-gray-20"
               >
-                <div class="exercise-runtime-html mb-3 font-medium text-gray-90" v-html="choice.answer" />
-                <div class="flex flex-wrap gap-3">
-                  <label
-                    v-for="option in trueFalseOptions(question)"
-                    :key="`${choice.id}-${option.value}`"
-                    class="inline-flex items-center gap-2 text-sm text-gray-700"
-                  >
-                    <input
-                      v-model="answers[question.id].trueFalse[choice.id]"
-                      :name="`question_${question.id}_${choice.id}`"
-                      type="radio"
-                      :value="option.value"
-                    />
-                    <span>{{ option.label }}</span>
-                  </label>
-                </div>
+                <table class="min-w-full divide-y divide-gray-20 text-sm">
+                  <thead class="bg-gray-10 text-left text-xs font-semibold uppercase tracking-wide text-gray-600">
+                    <tr>
+                      <th class="w-full px-4 py-3">
+                        {{ t("Statement") }}
+                      </th>
+                      <th
+                        v-for="option in trueFalseChoiceOptions(question)"
+                        :key="`degree-certainty-answer-header-${option.value}`"
+                        class="whitespace-nowrap px-3 py-3 text-center"
+                      >
+                        {{ option.label }}
+                      </th>
+                      <th
+                        v-for="option in degreeCertaintyOptions(question)"
+                        :key="`degree-certainty-header-${option.value}`"
+                        class="whitespace-nowrap px-3 py-3 text-center"
+                      >
+                        {{ option.label }}
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody class="divide-y divide-gray-20 bg-white">
+                    <tr
+                      v-for="choice in question.choices"
+                      :key="choice.id"
+                    >
+                      <td class="min-w-[18rem] px-4 py-3 align-top">
+                        <div class="exercise-runtime-html font-medium text-gray-90" v-html="choice.answer" />
+                      </td>
+                      <td
+                        v-for="option in trueFalseChoiceOptions(question)"
+                        :key="`${choice.id}-${option.value}`"
+                        class="px-3 py-3 text-center align-middle"
+                      >
+                        <input
+                          v-model="answers[question.id].trueFalse[choice.id]"
+                          :aria-label="`${displayText(choice.answer)} - ${option.label}`"
+                          :name="`question_${question.id}_${choice.id}`"
+                          type="radio"
+                          :value="option.value"
+                        />
+                      </td>
+                      <td
+                        v-for="option in degreeCertaintyOptions(question)"
+                        :key="`${choice.id}-degree-${option.value}`"
+                        class="px-3 py-3 text-center align-middle"
+                      >
+                        <input
+                          v-model="answers[question.id].degreeCertainty[choice.id]"
+                          :aria-label="`${displayText(choice.answer)} - ${option.label}`"
+                          :name="`question_${question.id}_${choice.id}_degree`"
+                          type="radio"
+                          :value="option.value"
+                        />
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
               </div>
+
+              <template v-else>
+                <div
+                  v-for="choice in question.choices"
+                  :key="choice.id"
+                  class="rounded-lg border border-gray-20 p-3"
+                >
+                  <div class="exercise-runtime-html mb-3 font-medium text-gray-90" v-html="choice.answer" />
+                  <div class="flex flex-wrap gap-3">
+                    <label
+                      v-for="option in trueFalseChoiceOptions(question)"
+                      :key="`${choice.id}-${option.value}`"
+                      class="inline-flex items-center gap-2 text-sm text-gray-700"
+                    >
+                      <input
+                        v-model="answers[question.id].trueFalse[choice.id]"
+                        :name="`question_${question.id}_${choice.id}`"
+                        type="radio"
+                        :value="option.value"
+                      />
+                      <span>{{ option.label }}</span>
+                    </label>
+                  </div>
+                </div>
+              </template>
             </div>
 
             <div v-else-if="isFillBlanksQuestion(question)" class="rounded-lg border border-gray-20 p-4 text-gray-800">
@@ -289,6 +401,85 @@
               </template>
             </div>
 
+            <div v-else-if="isMatchingDraggableQuestion(question)" class="space-y-4">
+              <div class="grid gap-4 lg:grid-cols-[minmax(0,1fr)_minmax(18rem,22rem)]">
+                <div class="space-y-3">
+                  <div class="text-sm font-semibold text-gray-80">
+                    {{ t("Drop each option on the matching answer") }}
+                  </div>
+
+                  <div
+                    v-for="prompt in question.matching.prompts"
+                    :key="prompt.id"
+                    class="grid gap-3 rounded-lg border border-gray-20 bg-white p-3 md:grid-cols-[minmax(0,1fr)_minmax(14rem,18rem)] md:items-stretch"
+                    @dragover.prevent
+                    @drop.prevent="onMatchingDrop(question, prompt.id)"
+                  >
+                    <div class="exercise-runtime-html min-w-0 text-gray-900" v-html="prompt.answer" />
+
+                    <button
+                      type="button"
+                      class="min-h-[3.25rem] rounded-lg border border-dashed px-3 py-2 text-left text-sm transition"
+                      :class="selectedMatchingOptionId(question, prompt.id)
+                        ? 'border-primary bg-primary/5 text-gray-900'
+                        : 'border-gray-30 bg-gray-15 text-gray-500 hover:border-primary hover:bg-primary/5'"
+                      @click="assignSelectedMatchingOption(question, prompt.id)"
+                    >
+                      <template v-if="selectedMatchingOption(question, prompt.id)">
+                        <span class="mb-1 block text-xs font-semibold uppercase text-primary">
+                          {{ matchingOptionDisplayLabel(selectedMatchingOption(question, prompt.id)) }}
+                        </span>
+                        <span
+                          class="exercise-runtime-html block"
+                          v-html="selectedMatchingOption(question, prompt.id).answer"
+                        />
+                        <span
+                          class="mt-2 inline-flex text-xs text-danger"
+                          @click.stop="clearMatchingOption(question, prompt.id)"
+                        >
+                          {{ t("Clear match") }}
+                        </span>
+                      </template>
+                      <template v-else>
+                        {{ selectedMatchingOptionForQuestion(question)
+                          ? t("Click to place the selected option here")
+                          : t("Select an option, then click here") }}
+                      </template>
+                    </button>
+                  </div>
+                </div>
+
+                <aside class="space-y-3 rounded-lg border border-gray-20 bg-gray-15 p-3">
+                  <div class="text-sm font-semibold text-gray-80">
+                    {{ t("Options") }}
+                  </div>
+
+                  <button
+                    v-for="option in question.matching.options"
+                    :key="option.id"
+                    type="button"
+                    draggable="true"
+                    class="w-full rounded-lg border px-3 py-2 text-left text-sm transition"
+                    :class="matchingOptionButtonClass(question, option.id)"
+                    @click="selectMatchingOption(question, option.id)"
+                    @dragstart="onMatchingDragStart(option.id)"
+                  >
+                    <span class="mb-1 block text-xs font-semibold uppercase">
+                      {{ matchingOptionDisplayLabel(option) }}
+                    </span>
+                    <span class="exercise-runtime-html block" v-html="option.answer" />
+                    <span v-if="isMatchingOptionAssigned(question, option.id)" class="mt-1 block text-xs text-gray-500">
+                      {{ t("Already matched") }}
+                    </span>
+                  </button>
+
+                  <p class="text-xs text-gray-500">
+                    {{ t("You can drag an option to an answer, or select an option and then click a target box.") }}
+                  </p>
+                </aside>
+              </div>
+            </div>
+
             <div v-else-if="isMatchingQuestion(question)" class="space-y-3">
               <div
                 v-for="prompt in question.matching.prompts"
@@ -346,9 +537,9 @@
 
             <div v-else-if="isCalculatedQuestion(question)" class="space-y-3">
               <div
-                v-if="question.calculated.text"
+                v-if="currentCalculatedVariation(question).text"
                 class="exercise-runtime-html rounded-lg border border-gray-20 p-3 text-sm text-gray-800"
-                v-html="question.calculated.text"
+                v-html="currentCalculatedVariation(question).text"
               />
               <input
                 v-model="answers[question.id].calculated"
@@ -393,41 +584,270 @@
               </div>
             </div>
 
-            <div v-else-if="isOralQuestion(question)" class="space-y-2">
-              <div class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800">
-                {{ t("Audio recording and upload will be connected in the submit processor batch.") }}
+            <div v-else-if="isOralQuestion(question)" class="space-y-3">
+              <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                <div class="mb-2 text-sm font-semibold text-gray-800">
+                  {{ t("Record oral answer") }}
+                </div>
+                <AudioRecorder
+                  :multiple="false"
+                  @recorded-audio="onOralRecorded(question, $event)"
+                />
               </div>
-              <input
-                class="block w-full text-sm text-gray-700"
-                :name="`question_${question.id}_audio`"
-                type="file"
-                accept="audio/*"
+
+              <div class="space-y-2 rounded-lg border border-gray-20 bg-white p-3">
+                <div class="text-sm font-semibold text-gray-800">
+                  {{ t("Or upload an audio file") }}
+                </div>
+                <input
+                  class="block w-full text-sm text-gray-700"
+                  :name="`question_${question.id}_audio`"
+                  type="file"
+                  accept=".wav,.ogg,audio/wav,audio/ogg"
+                  @change="onOralFileChange(question, $event)"
+                />
+              </div>
+
+              <audio
+                v-if="answers[question.id]?.oralPreviewUrl"
+                class="max-w-full"
+                controls
+                :src="answers[question.id].oralPreviewUrl"
               />
+
+              <div
+                v-if="answers[question.id]?.oralFileName"
+                class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+              >
+                {{ t("Selected audio") }}: {{ answers[question.id].oralFileName }}
+              </div>
+              <div
+                v-if="answers[question.id]?.uploadedFiles?.length"
+                class="space-y-2 rounded-lg border border-success/30 bg-success/10 p-3 text-sm text-success"
+              >
+                <div class="font-semibold">{{ t("Uploaded audio") }}</div>
+                <div
+                  v-for="file in answers[question.id].uploadedFiles"
+                  :key="file.id || file.name"
+                >
+                  {{ file.name || t("Uploaded audio") }}
+                </div>
+              </div>
             </div>
 
             <div v-else-if="isAnnotationQuestion(question)" class="space-y-3">
-              <img
-                v-if="question.annotation.imageUrl"
-                class="max-h-[32rem] max-w-full rounded-lg border border-gray-20 object-contain"
-                :alt="question.annotation.imageName || t('Question image')"
-                :src="question.annotation.imageUrl"
-              />
-              <textarea
-                v-model="answers[question.id].text"
-                class="min-h-28 w-full rounded border border-gray-30 px-3 py-2 text-sm"
-                :name="`question_${question.id}_annotation`"
-              />
+              <div class="grid gap-4 lg:grid-cols-[minmax(0,1fr)_20rem]">
+                <div
+                  v-if="question.annotation.imageUrl"
+                  class="inline-block max-w-full rounded-lg border border-gray-20 bg-gray-10 p-2"
+                >
+                  <div class="relative inline-block max-w-full">
+                    <img
+                      class="max-h-[32rem] max-w-full cursor-crosshair object-contain"
+                      :alt="question.annotation.imageName || t('Question image')"
+                      :src="question.annotation.imageUrl"
+                      @click="onAnnotationImageClick(question, $event)"
+                      @load="onAnnotationImageLoad(question, $event)"
+                    />
+                    <svg
+                      v-if="annotationImageReady(question)"
+                      class="pointer-events-none absolute inset-0 h-full w-full"
+                      :viewBox="annotationViewBox(question)"
+                      preserveAspectRatio="none"
+                    >
+                      <polyline
+                        v-for="(path, pathIndex) in annotationPaths(question)"
+                        :key="`${question.id}-annotation-path-${pathIndex}`"
+                        fill="none"
+                        :points="annotationPolylinePoints(path)"
+                        stroke="currentColor"
+                        stroke-width="3"
+                        class="text-primary"
+                      />
+                    </svg>
+                    <span
+                      v-for="(textAnnotation, textIndex) in annotationTexts(question)"
+                      :key="`${question.id}-annotation-text-${textIndex}`"
+                      class="pointer-events-none absolute -translate-x-1/2 -translate-y-1/2 rounded bg-white/90 px-2 py-1 text-xs font-semibold text-primary shadow"
+                      :style="annotationPointStyle(question, textAnnotation)"
+                    >
+                      {{ textAnnotation.text }}
+                    </span>
+                  </div>
+                </div>
+                <div
+                  v-else
+                  class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning"
+                >
+                  {{ t("No annotation image available") }}
+                </div>
+
+                <aside class="space-y-3 rounded-lg border border-gray-20 bg-white p-3">
+                  <div class="text-sm font-semibold text-gray-90">
+                    {{ t("Annotation tools") }}
+                  </div>
+                  <div class="grid grid-cols-2 gap-2">
+                    <button
+                      class="rounded border px-3 py-2 text-sm font-semibold"
+                      :class="answers[question.id]?.annotationMode === 'path' ? 'border-primary bg-primary/10 text-primary' : 'border-gray-30 text-gray-700'"
+                      type="button"
+                      @click="setAnnotationMode(question, 'path')"
+                    >
+                      {{ t("Add annotation path") }}
+                    </button>
+                    <button
+                      class="rounded border px-3 py-2 text-sm font-semibold"
+                      :class="answers[question.id]?.annotationMode === 'text' ? 'border-primary bg-primary/10 text-primary' : 'border-gray-30 text-gray-700'"
+                      type="button"
+                      @click="setAnnotationMode(question, 'text')"
+                    >
+                      {{ t("Add annotation text") }}
+                    </button>
+                  </div>
+
+                  <div
+                    v-if="answers[question.id]?.annotationMode === 'text'"
+                    class="space-y-2"
+                  >
+                    <label class="text-xs font-semibold uppercase tracking-wide text-gray-500">
+                      {{ t("Text to place") }}
+                    </label>
+                    <input
+                      v-model="answers[question.id].annotationTextDraft"
+                      class="w-full rounded border border-gray-30 px-3 py-2 text-sm"
+                      :name="`question_${question.id}_annotation_text`"
+                      type="text"
+                    />
+                    <p class="text-xs text-gray-500">
+                      {{ t("Click the image to place the text annotation.") }}
+                    </p>
+                  </div>
+                  <p
+                    v-else
+                    class="text-xs text-gray-500"
+                  >
+                    {{ t("Click the image to add path points. Use Start new path to separate paths.") }}
+                  </p>
+
+                  <div class="flex flex-wrap gap-2">
+                    <button
+                      class="rounded border border-gray-30 px-3 py-2 text-xs font-semibold text-gray-700 hover:bg-gray-10"
+                      type="button"
+                      @click="startNewAnnotationPath(question)"
+                    >
+                      {{ t("Start new path") }}
+                    </button>
+                    <button
+                      class="rounded border border-gray-30 px-3 py-2 text-xs font-semibold text-gray-700 hover:bg-gray-10"
+                      type="button"
+                      @click="undoAnnotation(question)"
+                    >
+                      {{ t("Undo") }}
+                    </button>
+                    <button
+                      class="rounded border border-danger/30 px-3 py-2 text-xs font-semibold text-danger hover:bg-danger/10"
+                      type="button"
+                      @click="clearAnnotation(question)"
+                    >
+                      {{ t("Clear") }}
+                    </button>
+                  </div>
+
+                  <div class="space-y-2 text-xs text-gray-700">
+                    <div class="font-semibold text-gray-90">
+                      {{ t("Current annotations") }}
+                    </div>
+                    <div>{{ t("Paths") }}: {{ annotationPaths(question).length }}</div>
+                    <div>{{ t("Texts") }}: {{ annotationTexts(question).length }}</div>
+                  </div>
+                </aside>
+              </div>
             </div>
 
             <div v-else-if="isHotspotQuestion(question)" class="space-y-3">
-              <img
-                v-if="question.hotspot.imageUrl"
-                class="max-h-[32rem] max-w-full rounded-lg border border-gray-20 object-contain"
-                :alt="question.hotspot.imageName || t('Question image')"
-                :src="question.hotspot.imageUrl"
+              <div class="grid gap-4 lg:grid-cols-[minmax(0,1fr)_20rem]">
+                <div
+                  v-if="question.hotspot.imageUrl"
+                  class="inline-block max-w-full rounded-lg border border-gray-20 bg-gray-10 p-2"
+                >
+                  <div class="relative inline-block max-w-full">
+                    <img
+                      class="max-h-[32rem] max-w-full cursor-crosshair object-contain"
+                      :alt="question.hotspot.imageName || t('Question image')"
+                      :src="question.hotspot.imageUrl"
+                      @click="onHotspotImageClick(question, $event)"
+                      @load="onHotspotImageLoad(question, $event)"
+                    />
+                    <button
+                      v-for="point in hotspotPlacedPoints(question)"
+                      :key="`${question.id}-hotspot-point-${point.answerId || point.label}`"
+                      class="absolute flex h-7 w-7 -translate-x-1/2 -translate-y-1/2 items-center justify-center rounded-full border-2 border-white bg-primary text-xs font-bold text-white shadow"
+                      :style="hotspotPointStyle(question, point)"
+                      type="button"
+                      :title="t('Remove point')"
+                      @click.stop="removeHotspotPoint(question, point.answerId)"
+                    >
+                      {{ hotspotPointLabel(question, point) }}
+                    </button>
+                  </div>
+                </div>
+                <div
+                  v-else
+                  class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning"
+                >
+                  {{ t("No hotspot image available") }}
+                </div>
+
+                <aside class="space-y-3 rounded-lg border border-gray-20 bg-white p-3">
+                  <div class="text-sm font-semibold text-gray-90">
+                    {{ t("Answers") }}
+                  </div>
+                  <div class="space-y-2">
+                    <button
+                      v-for="(zone, zoneIndex) in hotspotZones(question)"
+                      :key="zone.id"
+                      class="w-full rounded-lg border px-3 py-2 text-left text-sm transition hover:bg-gray-10"
+                      :class="Number(answers[question.id].selectedHotspotAnswerId) === Number(zone.id) ? 'border-primary bg-primary/5 text-primary' : 'border-gray-20 text-gray-700'"
+                      type="button"
+                      @click="selectHotspotZone(question, zone.id)"
+                    >
+                      <div class="flex items-start gap-2">
+                        <span class="mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-primary text-xs font-bold text-white">
+                          {{ zone.position || zoneIndex + 1 }}
+                        </span>
+                        <span class="min-w-0 flex-1">
+                          <span class="exercise-runtime-html block font-medium" v-html="zone.answer" />
+                          <span
+                            v-if="hotspotPointByAnswer(question, zone.id)"
+                            class="mt-1 block text-xs text-success"
+                          >
+                            {{ t("Placed") }}
+                          </span>
+                        </span>
+                      </div>
+                    </button>
+                  </div>
+                  <div class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4">
+                    {{ t("Select an answer, then click on the image to mark it.") }}
+                    <span v-if="hotspotPlacedPoints(question).length">
+                      {{ t("Click a marker to remove it.") }}
+                    </span>
+                  </div>
+                </aside>
+              </div>
+            </div>
+
+            <div v-else-if="isMediaQuestion(question)" class="space-y-3">
+              <div
+                v-if="question.content?.description || question.description"
+                class="exercise-runtime-html rounded-lg border border-gray-20 bg-gray-10 p-4 text-gray-800"
+                v-html="question.content?.description || question.description"
               />
-              <div class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800">
-                {{ t("Hotspot click capture and scoring will be migrated in the submit processor batch.") }}
+              <div
+                v-else
+                class="rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm text-gray-700"
+              >
+                {{ t("Media question") }}
               </div>
             </div>
 
@@ -441,11 +861,18 @@
               />
             </div>
 
-            <div
-              v-else-if="isPageBreak(question)"
-              class="rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm text-gray-700"
-            >
-              {{ t("Page break") }}
+            <div v-else-if="isPageBreak(question)" class="space-y-3">
+              <div
+                v-if="question.content?.description || question.description"
+                class="exercise-runtime-html rounded-lg border border-gray-20 bg-gray-10 p-4 text-gray-800"
+                v-html="question.content?.description || question.description"
+              />
+              <div
+                v-else
+                class="rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm text-gray-700"
+              >
+                {{ t("Page break") }}
+              </div>
             </div>
 
             <div
@@ -460,7 +887,7 @@
         <div class="flex flex-wrap justify-between gap-2 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
           <BaseButton
             :disabled="!canMovePrevious || isSavingAnswer"
-            :label="t('Previous question')"
+            :label="previousNavigationLabel"
             icon="back"
             type="secondary"
             @click="goToPreviousQuestion"
@@ -475,14 +902,14 @@
               @click="saveVisibleAnswers"
             />
             <BaseButton
-              v-if="settings.oneQuestionPerPage"
-              :disabled="!canMoveNext || isSavingAnswer"
-              :label="t('Next question')"
+              v-if="canMoveNext"
+              :disabled="isSavingAnswer"
+              :label="nextNavigationLabel"
               type="primary"
               @click="goToNextQuestion"
             />
             <BaseButton
-              v-if="!canManage && activeAttempt"
+              v-if="!canManage && activeAttempt && canFinishCurrentPage"
               :disabled="!canSubmit || isSavingAnswer || isFinishingAttempt"
               :label="isFinishingAttempt ? t('Finishing') : t('Finish in Vue')"
               icon="check"
@@ -508,6 +935,7 @@ import { computed, onMounted, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
 import { useRoute, useRouter } from "vue-router"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import AudioRecorder from "../../components/AudioRecorder.vue"
 import exerciseService from "../../services/exerciseService"
 
 const { t } = useI18n()
@@ -540,20 +968,64 @@ const isFinishingAttempt = ref(false)
 const finishError = ref("")
 const finishMessage = ref("")
 const savedQuestionIds = ref(new Set())
+const draggedMatchingOptionId = ref(null)
+const selectedMatchingOptions = ref({})
+
+const questionMap = computed(() => new Map(questions.value.map((question) => [Number(question.id), question])))
+
+const runtimePages = computed(() => {
+  const pages = settings.value?.runtimePages
+
+  return Array.isArray(pages) ? pages : []
+})
+
+const usesPagedNavigation = computed(() => {
+  if (runtimePages.value.length > 0 && (settings.value.effectiveOneQuestionPerPage || settings.value.usesStructuralPages)) {
+    return true
+  }
+
+  return true === settings.value.oneQuestionPerPage
+})
+
+const currentRuntimePage = computed(() => {
+  if (runtimePages.value.length === 0) {
+    return null
+  }
+
+  return runtimePages.value[Math.min(Math.max(0, currentQuestionIndex.value), runtimePages.value.length - 1)] || null
+})
 
 const visibleQuestions = computed(() => {
+  if (currentRuntimePage.value && usesPagedNavigation.value) {
+    return (currentRuntimePage.value.questionIds || [])
+      .map((questionId) => questionMap.value.get(Number(questionId)))
+      .filter(Boolean)
+  }
+
   if (!settings.value.oneQuestionPerPage) {
-    return questions.value
+    return questions.value.filter((question) => !isStructuralQuestion(question))
   }
 
-  const question = questions.value[currentQuestionIndex.value]
+  const question = questions.value.filter((item) => !isStructuralQuestion(item))[currentQuestionIndex.value]
 
   return question ? [question] : []
 })
 
-const visibleQuestionTotal = computed(() => questions.value.length)
-const canMovePrevious = computed(() => settings.value.oneQuestionPerPage && currentQuestionIndex.value > 0)
-const canMoveNext = computed(() => settings.value.oneQuestionPerPage && currentQuestionIndex.value < questions.value.length - 1)
+const visibleQuestionTotal = computed(() => answerableQuestions.value.length)
+const navigationTotal = computed(() => usesPagedNavigation.value ? Math.max(1, runtimePages.value.length || visibleQuestionTotal.value) : visibleQuestionTotal.value)
+const canMovePrevious = computed(() => usesPagedNavigation.value && currentQuestionIndex.value > 0)
+const canMoveNext = computed(() => usesPagedNavigation.value && currentQuestionIndex.value < navigationTotal.value - 1)
+const canFinishCurrentPage = computed(() => !usesPagedNavigation.value || !canMoveNext.value)
+const answerableQuestions = computed(() => questions.value.filter((question) => !isStructuralQuestion(question)))
+const progressLabel = computed(() => {
+  if (usesPagedNavigation.value && currentRuntimePage.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1)) {
+    return `${t("Page")} ${currentQuestionIndex.value + 1} / ${navigationTotal.value}`
+  }
+
+  return `${t("Question")} ${currentQuestionIndex.value + 1} / ${navigationTotal.value}`
+})
+const previousNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Previous page") : t("Previous question"))
+const nextNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Next page") : t("Next question"))
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -667,22 +1139,42 @@ function reorderQuestionsFromAttempt(questionIds = []) {
     return
   }
 
-  const questionMap = new Map(questions.value.map((question) => [Number(question.id), question]))
-  const orderedQuestions = []
+  const selectedIds = new Set(questionIds.map(Number))
+  const orderedAttemptIds = questionIds.map(Number)
+  const originalQuestionMap = new Map(questions.value.map((question) => [Number(question.id), question]))
 
-  for (const questionId of questionIds.map(Number)) {
-    const question = questionMap.get(questionId)
+  if (settings.value?.usesStructuralPages || settings.value?.forceGroupedByMedia) {
+    questionCount.value = answerableQuestions.value.length
+    return
+  }
+
+  const orderedQuestions = []
+  for (const questionId of orderedAttemptIds) {
+    const question = originalQuestionMap.get(questionId)
     if (question) {
       orderedQuestions.push(question)
     }
   }
 
+  for (const question of questions.value) {
+    if (isStructuralQuestion(question) && !selectedIds.has(Number(question.id))) {
+      orderedQuestions.push(question)
+    }
+  }
+
   if (orderedQuestions.length > 0) {
-    questions.value = orderedQuestions.map((question, index) => ({
-      ...question,
-      position: index + 1,
-    }))
-    questionCount.value = questions.value.length
+    let position = 1
+    questions.value = orderedQuestions.map((question) => {
+      if (isStructuralQuestion(question)) {
+        return question
+      }
+
+      return {
+        ...question,
+        position: position++,
+      }
+    })
+    questionCount.value = answerableQuestions.value.length
   }
 }
 
@@ -799,7 +1291,7 @@ async function saveQuestionDraftAnswer(question) {
     return
   }
 
-  const response = isUploadQuestion(question)
+  const response = isUploadQuestion(question) || isOralQuestion(question)
     ? await saveUploadQuestionAnswer(question, exerciseId, attemptId)
     : await exerciseService.saveExerciseRuntimeAnswer(
       {
@@ -838,14 +1330,14 @@ async function saveQuestionDraftAnswer(question) {
 
 async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
   const questionAnswer = answers.value[question.id] || {}
-  if (!questionAnswer.uploadFile) {
+  if (!questionAnswer.uploadFile && !questionAnswer.oralFile) {
     return null
   }
 
   const formData = new FormData()
   formData.append("questionId", String(Number(question.id)))
   formData.append("secondsSpent", "0")
-  formData.append("file", questionAnswer.uploadFile)
+  formData.append("file", questionAnswer.uploadFile || questionAnswer.oralFile)
 
   const response = await exerciseService.uploadExerciseRuntimeAnswer(
     formData,
@@ -857,12 +1349,160 @@ async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
   if (response?.success) {
     questionAnswer.uploadFile = null
     questionAnswer.uploadFileName = ""
+    questionAnswer.oralFile = null
+    questionAnswer.oralFileName = ""
+    questionAnswer.oralPreviewUrl = ""
     questionAnswer.uploadedFiles = Array.isArray(response.files) ? response.files : []
   }
 
   return response
 }
 
+
+function getMatchingAnswerState(question) {
+  if (!answers.value[question.id]) {
+    answers.value[question.id] = { matching: {} }
+  }
+
+  if (!answers.value[question.id].matching || typeof answers.value[question.id].matching !== "object") {
+    answers.value[question.id].matching = {}
+  }
+
+  return answers.value[question.id].matching
+}
+
+function matchingOptionById(question, optionId) {
+  const safeOptionId = Number(optionId || 0)
+
+  return (question.matching?.options || []).find((option) => Number(option.id) === safeOptionId) || null
+}
+
+function selectedMatchingOptionId(question, promptId) {
+  return Number(getMatchingAnswerState(question)[promptId] || 0)
+}
+
+function selectedMatchingOption(question, promptId) {
+  return matchingOptionById(question, selectedMatchingOptionId(question, promptId))
+}
+
+function selectedMatchingOptionForQuestion(question) {
+  return matchingOptionById(question, selectedMatchingOptions.value[question.id])
+}
+
+function matchingOptionDisplayLabel(option) {
+  if (!option) {
+    return ""
+  }
+
+  return option.label ? `${option.label}.` : `#${option.position || option.id}`
+}
+
+function isMatchingOptionAssigned(question, optionId) {
+  const safeOptionId = Number(optionId || 0)
+  if (safeOptionId <= 0) {
+    return false
+  }
+
+  return Object.values(getMatchingAnswerState(question)).some((value) => Number(value) === safeOptionId)
+}
+
+function matchingOptionButtonClass(question, optionId) {
+  const safeOptionId = Number(optionId || 0)
+  const isSelected = Number(selectedMatchingOptions.value[question.id] || 0) === safeOptionId
+  const isAssigned = isMatchingOptionAssigned(question, safeOptionId)
+
+  if (isSelected) {
+    return "border-primary bg-primary/10 text-primary"
+  }
+
+  if (isAssigned) {
+    return "border-gray-25 bg-white text-gray-500 opacity-70 hover:border-primary"
+  }
+
+  return "border-gray-30 bg-white text-gray-900 hover:border-primary hover:bg-primary/5"
+}
+
+function selectMatchingOption(question, optionId) {
+  const safeOptionId = Number(optionId || 0)
+  if (safeOptionId <= 0) {
+    return
+  }
+
+  selectedMatchingOptions.value = {
+    ...selectedMatchingOptions.value,
+    [question.id]: safeOptionId,
+  }
+}
+
+function assignSelectedMatchingOption(question, promptId) {
+  const selectedOptionId = Number(selectedMatchingOptions.value[question.id] || 0)
+  if (selectedOptionId <= 0) {
+    return
+  }
+
+  assignMatchingOption(question, promptId, selectedOptionId)
+}
+
+function assignMatchingOption(question, promptId, optionId) {
+  const safePromptId = Number(promptId || 0)
+  const safeOptionId = Number(optionId || 0)
+  if (safePromptId <= 0 || safeOptionId <= 0) {
+    return
+  }
+
+  const matching = getMatchingAnswerState(question)
+  for (const existingPromptId of Object.keys(matching)) {
+    if (Number(existingPromptId) !== safePromptId && Number(matching[existingPromptId]) === safeOptionId) {
+      delete matching[existingPromptId]
+    }
+  }
+
+  matching[safePromptId] = safeOptionId
+  selectedMatchingOptions.value = {
+    ...selectedMatchingOptions.value,
+    [question.id]: nextUnassignedMatchingOptionId(question) || safeOptionId,
+  }
+}
+
+function clearMatchingOption(question, promptId) {
+  const safePromptId = Number(promptId || 0)
+  if (safePromptId <= 0) {
+    return
+  }
+
+  const matching = getMatchingAnswerState(question)
+  const removedOptionId = Number(matching[safePromptId] || 0)
+  delete matching[safePromptId]
+
+  if (removedOptionId > 0) {
+    selectedMatchingOptions.value = {
+      ...selectedMatchingOptions.value,
+      [question.id]: removedOptionId,
+    }
+  }
+}
+
+function nextUnassignedMatchingOptionId(question) {
+  const assignedOptionIds = new Set(Object.values(getMatchingAnswerState(question)).map((value) => Number(value || 0)))
+  const option = (question.matching?.options || []).find((candidate) => !assignedOptionIds.has(Number(candidate.id)))
+
+  return Number(option?.id || 0)
+}
+
+function onMatchingDragStart(optionId) {
+  draggedMatchingOptionId.value = Number(optionId || 0)
+}
+
+function onMatchingDrop(question, promptId) {
+  const optionId = Number(draggedMatchingOptionId.value || 0)
+  draggedMatchingOptionId.value = null
+  if (optionId <= 0) {
+    return
+  }
+
+  assignMatchingOption(question, promptId, optionId)
+}
+
 function buildAnswerPayload(question) {
   const questionAnswer = answers.value[question.id] || {}
 
@@ -875,7 +1515,10 @@ function buildAnswerPayload(question) {
   }
 
   if (isTrueFalseQuestion(question)) {
-    return { trueFalse: questionAnswer.trueFalse || {} }
+    return {
+      trueFalse: questionAnswer.trueFalse || {},
+      degreeCertainty: questionAnswer.degreeCertainty || {},
+    }
   }
 
   if (isFillBlanksQuestion(question)) {
@@ -890,6 +1533,24 @@ function buildAnswerPayload(question) {
     return { dropdown: questionAnswer.dropdown }
   }
 
+  if (isCalculatedQuestion(question)) {
+    return {
+      calculated: questionAnswer.calculated || "",
+      answerId: questionAnswer.calculatedAnswerId || currentCalculatedVariation(question).id || question.calculated?.answerId || null,
+    }
+  }
+
+  if (isAnnotationQuestion(question)) {
+    return {
+      paths: annotationPaths(question),
+      texts: annotationTexts(question),
+    }
+  }
+
+  if (isHotspotQuestion(question)) {
+    return { points: hotspotPlacedPoints(question) }
+  }
+
   if (isDraftFreeAnswerQuestion(question)) {
     return { text: questionAnswer.text || "" }
   }
@@ -904,12 +1565,16 @@ function isDraftSaveSupported(question) {
     || isFillBlanksQuestion(question)
     || isMatchingQuestion(question)
     || isDropdownQuestion(question)
+    || isCalculatedQuestion(question)
+    || isHotspotQuestion(question)
+    || isAnnotationQuestion(question)
     || isDraftFreeAnswerQuestion(question)
     || isUploadQuestion(question)
+    || isOralQuestion(question)
 }
 
 function isDraftTrueFalseQuestion(question) {
-  return [11, 12].includes(Number(question.type))
+  return [11, 12, 22].includes(Number(question.type))
 }
 
 function isDraftFreeAnswerQuestion(question) {
@@ -952,13 +1617,18 @@ function applySavedAnswer(question, rows) {
 
   if (isTrueFalseQuestion(question)) {
     questionAnswer.trueFalse = {}
+    questionAnswer.degreeCertainty = {}
     for (const row of rows) {
       const parts = String(row.answer || "").split(":")
       const answerId = Number(parts[0] || 0)
       const optionValue = Number(parts[1] || 0)
+      const degreeValue = Number(parts[2] || 0)
       if (answerId > 0 && optionValue > 0) {
         questionAnswer.trueFalse[answerId] = optionValue
       }
+      if (answerId > 0 && degreeValue > 0) {
+        questionAnswer.degreeCertainty[answerId] = degreeValue
+      }
     }
     return
   }
@@ -985,6 +1655,27 @@ function applySavedAnswer(question, rows) {
     return
   }
 
+  if (isCalculatedQuestion(question)) {
+    const [answerId, value] = parseSavedCalculatedAnswer(rows[0]?.answer || "")
+    questionAnswer.calculatedAnswerId = answerId || question.calculated?.answerId || currentCalculatedVariation(question).id || null
+    questionAnswer.calculated = value
+    return
+  }
+
+  if (isAnnotationQuestion(question)) {
+    const annotation = parseSavedAnnotationAnswer(rows[0]?.answer || "")
+    questionAnswer.annotationPaths = annotation.paths
+    questionAnswer.annotationTexts = annotation.texts
+    questionAnswer.annotationMode = "path"
+    return
+  }
+
+  if (isHotspotQuestion(question)) {
+    questionAnswer.hotspotPoints = parseSavedHotspotPoints(rows[0]?.answer || "")
+    questionAnswer.selectedHotspotAnswerId = firstMissingHotspotZoneId(question) || hotspotZones(question)[0]?.id || null
+    return
+  }
+
   if (isOpenQuestion(question)) {
     questionAnswer.text = rows[0]?.answer || ""
     return
@@ -992,6 +1683,11 @@ function applySavedAnswer(question, rows) {
 
   if (isUploadQuestion(question)) {
     questionAnswer.uploadedFiles = rows.length > 0 ? [{ name: t("Uploaded file") }] : []
+    return
+  }
+
+  if (isOralQuestion(question)) {
+    questionAnswer.uploadedFiles = rows.length > 0 ? [{ name: t("Uploaded audio") }] : []
   }
 }
 
@@ -1037,24 +1733,43 @@ function formatSeconds(seconds) {
 
 function initializeAnswerState() {
   const nextAnswers = {}
+  const nextSelectedMatchingOptions = {}
 
   for (const question of questions.value) {
     nextAnswers[question.id] = {
       choice: null,
       choices: [],
       trueFalse: {},
+      degreeCertainty: {},
       blanks: {},
       matching: {},
       dropdown: "",
       calculated: "",
+      calculatedAnswerId: currentCalculatedVariation(question).id || question.calculated?.answerId || null,
       text: "",
       uploadFile: null,
       uploadFileName: "",
       uploadedFiles: [],
+      oralFile: null,
+      oralFileName: "",
+      oralPreviewUrl: "",
+      annotationMode: "path",
+      annotationPaths: [[]],
+      annotationTexts: [],
+      annotationTextDraft: "",
+      annotationImageSize: null,
+      hotspotPoints: [],
+      hotspotImageSize: null,
+      selectedHotspotAnswerId: hotspotZones(question)[0]?.id || null,
+    }
+
+    if (isMatchingDraggableQuestion(question)) {
+      nextSelectedMatchingOptions[question.id] = question.matching?.options?.[0]?.id || null
     }
   }
 
   answers.value = nextAnswers
+  selectedMatchingOptions.value = nextSelectedMatchingOptions
 }
 
 
@@ -1069,16 +1784,443 @@ function onUploadAnswerFileChange(question, event) {
   questionAnswer.uploadFileName = file?.name || ""
 }
 
+function onOralRecorded(question, audioBlob) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer || !audioBlob) {
+    return
+  }
+
+  const fileName = `oral-expression-${question.id}.wav`
+  questionAnswer.oralFile = new File([audioBlob], fileName, { type: "audio/wav" })
+  questionAnswer.oralFileName = fileName
+  questionAnswer.uploadFile = null
+  questionAnswer.uploadFileName = ""
+  questionAnswer.oralPreviewUrl = window.URL.createObjectURL(audioBlob)
+}
+
+function onOralFileChange(question, event) {
+  const file = event?.target?.files?.[0] || null
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  questionAnswer.oralFile = file
+  questionAnswer.oralFileName = file?.name || ""
+  questionAnswer.uploadFile = null
+  questionAnswer.uploadFileName = ""
+  questionAnswer.oralPreviewUrl = file ? window.URL.createObjectURL(file) : ""
+}
+
+function setAnnotationMode(question, mode) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  questionAnswer.annotationMode = mode
+  if (mode === "path") {
+    ensureCurrentAnnotationPath(question)
+  }
+}
+
+function onAnnotationImageLoad(question, event) {
+  const questionAnswer = answers.value[question.id]
+  const image = event?.target
+  if (!questionAnswer || !image) {
+    return
+  }
+
+  questionAnswer.annotationImageSize = {
+    width: Number(image.naturalWidth || image.width || 0),
+    height: Number(image.naturalHeight || image.height || 0),
+  }
+}
+
+function onAnnotationImageClick(question, event) {
+  const questionAnswer = answers.value[question.id]
+  const image = event?.target
+  if (!questionAnswer || !image) {
+    return
+  }
+
+  const point = getImageNaturalPoint(image, event)
+  if (!point) {
+    return
+  }
+
+  questionAnswer.annotationImageSize = point.size
+  if (questionAnswer.annotationMode === "text") {
+    const text = String(questionAnswer.annotationTextDraft || "").trim()
+    if (!text) {
+      return
+    }
+
+    questionAnswer.annotationTexts.push({ text, x: point.x, y: point.y })
+    questionAnswer.annotationTextDraft = ""
+    return
+  }
+
+  const currentPath = ensureCurrentAnnotationPath(question)
+  currentPath.push({ x: point.x, y: point.y })
+}
+
+function getImageNaturalPoint(image, event) {
+  const rect = image.getBoundingClientRect()
+  const naturalWidth = Number(image.naturalWidth || rect.width || 0)
+  const naturalHeight = Number(image.naturalHeight || rect.height || 0)
+  if (!rect.width || !rect.height || !naturalWidth || !naturalHeight) {
+    return null
+  }
+
+  return {
+    x: Math.max(0, Math.round(((event.clientX - rect.left) / rect.width) * naturalWidth)),
+    y: Math.max(0, Math.round(((event.clientY - rect.top) / rect.height) * naturalHeight)),
+    size: { width: naturalWidth, height: naturalHeight },
+  }
+}
+
+function ensureCurrentAnnotationPath(question) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer.annotationPaths || !Array.isArray(questionAnswer.annotationPaths)) {
+    questionAnswer.annotationPaths = [[]]
+  }
+
+  if (questionAnswer.annotationPaths.length === 0) {
+    questionAnswer.annotationPaths.push([])
+  }
+
+  return questionAnswer.annotationPaths[questionAnswer.annotationPaths.length - 1]
+}
+
+function startNewAnnotationPath(question) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  const currentPath = ensureCurrentAnnotationPath(question)
+  if (currentPath.length === 0) {
+    return
+  }
+
+  questionAnswer.annotationPaths.push([])
+}
+
+function undoAnnotation(question) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  if (questionAnswer.annotationMode === "text" && questionAnswer.annotationTexts.length > 0) {
+    questionAnswer.annotationTexts.pop()
+    return
+  }
+
+  const currentPath = ensureCurrentAnnotationPath(question)
+  if (currentPath.length > 0) {
+    currentPath.pop()
+    return
+  }
+
+  if (questionAnswer.annotationPaths.length > 1) {
+    questionAnswer.annotationPaths.pop()
+  }
+}
+
+function clearAnnotation(question) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  questionAnswer.annotationPaths = [[]]
+  questionAnswer.annotationTexts = []
+  questionAnswer.annotationTextDraft = ""
+}
+
+function annotationPaths(question) {
+  const questionAnswer = answers.value[question.id] || {}
+  const paths = Array.isArray(questionAnswer.annotationPaths) ? questionAnswer.annotationPaths : []
+
+  return paths
+    .map((path) => Array.isArray(path) ? path.filter((point) => Number.isFinite(Number(point.x)) && Number.isFinite(Number(point.y))) : [])
+    .filter((path) => path.length > 0)
+    .map((points) => ({ points }))
+}
+
+function annotationTexts(question) {
+  const questionAnswer = answers.value[question.id] || {}
+  const texts = Array.isArray(questionAnswer.annotationTexts) ? questionAnswer.annotationTexts : []
+
+  return texts.filter((item) => String(item.text || "").trim() && Number.isFinite(Number(item.x)) && Number.isFinite(Number(item.y)))
+}
+
+function annotationImageReady(question) {
+  const size = answers.value[question.id]?.annotationImageSize || {}
+
+  return Number(size.width || 0) > 0 && Number(size.height || 0) > 0
+}
+
+function annotationViewBox(question) {
+  const size = answers.value[question.id]?.annotationImageSize || {}
+
+  return `0 0 ${Number(size.width || 1)} ${Number(size.height || 1)}`
+}
+
+function annotationPolylinePoints(path) {
+  const points = Array.isArray(path?.points) ? path.points : []
+
+  return points.map((point) => `${Number(point.x || 0)},${Number(point.y || 0)}`).join(" ")
+}
+
+function annotationPointStyle(question, point) {
+  const size = answers.value[question.id]?.annotationImageSize || {}
+  const width = Number(size.width || 0)
+  const height = Number(size.height || 0)
+  if (width > 0 && height > 0) {
+    return {
+      left: `${(Number(point.x || 0) / width) * 100}%`,
+      top: `${(Number(point.y || 0) / height) * 100}%`,
+    }
+  }
+
+  return {
+    left: "0%",
+    top: "0%",
+  }
+}
+
+function parseSavedAnnotationAnswer(value) {
+  const result = { paths: [], texts: [] }
+  for (const item of String(value || "").split("|")) {
+    const parts = item.split(")(")
+    const type = parts.shift()
+    if (type === "P") {
+      const points = parts.map(decodeAnnotationPoint).filter(Boolean)
+      if (points.length > 0) {
+        result.paths.push(points)
+      }
+      continue
+    }
+
+    if (type === "T" && parts.length >= 2) {
+      const text = String(parts.shift() || "").trim()
+      const point = decodeAnnotationPoint(parts[0])
+      if (text && point) {
+        result.texts.push({ text, ...point })
+      }
+    }
+  }
+
+  if (result.paths.length === 0) {
+    result.paths = [[]]
+  }
+
+  return result
+}
+
+function decodeAnnotationPoint(value) {
+  const parts = String(value || "").split(";")
+  const x = Number(parts[0] || NaN)
+  const y = Number(parts[1] || NaN)
+  if (!Number.isFinite(x) || !Number.isFinite(y)) {
+    return null
+  }
+
+  return { x, y }
+}
+
+function onHotspotImageLoad(question, event) {
+  const questionAnswer = answers.value[question.id]
+  const image = event?.target
+  if (!questionAnswer || !image) {
+    return
+  }
+
+  questionAnswer.hotspotImageSize = {
+    width: Number(image.naturalWidth || image.width || 0),
+    height: Number(image.naturalHeight || image.height || 0),
+  }
+}
+
+function onHotspotImageClick(question, event) {
+  const questionAnswer = answers.value[question.id]
+  const image = event?.target
+  const selectedAnswerId = Number(questionAnswer?.selectedHotspotAnswerId || 0)
+  if (!questionAnswer || !image || selectedAnswerId <= 0) {
+    return
+  }
+
+  const rect = image.getBoundingClientRect()
+  const naturalWidth = Number(image.naturalWidth || rect.width || 0)
+  const naturalHeight = Number(image.naturalHeight || rect.height || 0)
+  if (!rect.width || !rect.height || !naturalWidth || !naturalHeight) {
+    return
+  }
+
+  const x = Math.round(((event.clientX - rect.left) / rect.width) * naturalWidth)
+  const y = Math.round(((event.clientY - rect.top) / rect.height) * naturalHeight)
+  questionAnswer.hotspotImageSize = { width: naturalWidth, height: naturalHeight }
+
+  const nextPoint = {
+    answerId: selectedAnswerId,
+    x: Math.max(0, x),
+    y: Math.max(0, y),
+  }
+  const existingIndex = questionAnswer.hotspotPoints.findIndex((point) => Number(point.answerId || 0) === selectedAnswerId)
+  if (existingIndex >= 0) {
+    questionAnswer.hotspotPoints.splice(existingIndex, 1, nextPoint)
+  } else {
+    questionAnswer.hotspotPoints.push(nextPoint)
+  }
+
+  questionAnswer.selectedHotspotAnswerId = firstMissingHotspotZoneId(question) || selectedAnswerId
+}
+
+function selectHotspotZone(question, answerId) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  questionAnswer.selectedHotspotAnswerId = Number(answerId || 0) || null
+}
+
+function removeHotspotPoint(question, answerId) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  const numericAnswerId = Number(answerId || 0)
+  if (numericAnswerId > 0) {
+    questionAnswer.hotspotPoints = questionAnswer.hotspotPoints.filter((point) => Number(point.answerId || 0) !== numericAnswerId)
+    questionAnswer.selectedHotspotAnswerId = numericAnswerId
+    return
+  }
+
+  questionAnswer.hotspotPoints.pop()
+}
+
+function hotspotZones(question) {
+  const zones = Array.isArray(question?.hotspot?.zones) ? question.hotspot.zones : []
+
+  return zones.length ? zones : (Array.isArray(question?.hotspot?.items) ? question.hotspot.items : [])
+}
+
+function hotspotPointByAnswer(question, answerId) {
+  const questionAnswer = answers.value[question.id] || {}
+  const numericAnswerId = Number(answerId || 0)
+
+  return (questionAnswer.hotspotPoints || []).find((point) => Number(point.answerId || 0) === numericAnswerId) || null
+}
+
+function hotspotPlacedPoints(question) {
+  const questionAnswer = answers.value[question.id] || {}
+  const zones = hotspotZones(question)
+  const rawPoints = questionAnswer.hotspotPoints || []
+  const orderedPoints = []
+
+  for (const [zoneIndex, zone] of zones.entries()) {
+    const answerId = Number(zone.id || 0)
+    const point = rawPoints.find((item) => Number(item.answerId || 0) === answerId)
+    if (!point) {
+      continue
+    }
+
+    orderedPoints.push({
+      ...point,
+      answerId,
+      label: zone.position || zoneIndex + 1,
+    })
+  }
+
+  for (const [pointIndex, point] of rawPoints.entries()) {
+    const answerId = Number(point.answerId || 0)
+    if (answerId > 0 && zones.some((zone) => Number(zone.id || 0) === answerId)) {
+      continue
+    }
+
+    orderedPoints.push({
+      ...point,
+      answerId,
+      label: point.label || orderedPoints.length + pointIndex + 1,
+    })
+  }
+
+  return orderedPoints
+}
+
+function hotspotPointLabel(question, point) {
+  return point.label || hotspotZones(question).findIndex((zone) => Number(zone.id || 0) === Number(point.answerId || 0)) + 1 || ''
+}
+
+function firstMissingHotspotZoneId(question) {
+  const questionAnswer = answers.value[question.id] || {}
+  const placedAnswerIds = new Set((questionAnswer.hotspotPoints || []).map((point) => Number(point.answerId || 0)).filter((value) => value > 0))
+  const missingZone = hotspotZones(question).find((zone) => !placedAnswerIds.has(Number(zone.id || 0)))
+
+  return missingZone?.id || null
+}
+
+function hotspotPointStyle(question, point) {
+  const questionAnswer = answers.value[question.id] || {}
+  const size = questionAnswer.hotspotImageSize || {}
+  const width = Number(size.width || 0)
+  const height = Number(size.height || 0)
+
+  if (width > 0 && height > 0) {
+    return {
+      left: `${(Number(point.x || 0) / width) * 100}%`,
+      top: `${(Number(point.y || 0) / height) * 100}%`,
+    }
+  }
+
+  return {
+    left: `${Number(point.x || 0)}px`,
+    top: `${Number(point.y || 0)}px`,
+  }
+}
+
+function parseSavedHotspotPoints(value) {
+  return String(value || "")
+    .split("|")
+    .map((coordinate, index) => {
+      const trimmedCoordinate = String(coordinate || "").trim()
+      if (!trimmedCoordinate) {
+        return null
+      }
+
+      const [answerPrefix, pointValue] = trimmedCoordinate.includes(":")
+        ? trimmedCoordinate.split(":", 2)
+        : ["", trimmedCoordinate]
+      const [x, y] = String(pointValue || "").split(";").map((part) => Number(part))
+      if (!Number.isFinite(x) || !Number.isFinite(y)) {
+        return null
+      }
+
+      return {
+        answerId: Number(answerPrefix || 0) || 0,
+        x,
+        y,
+        label: index + 1,
+      }
+    })
+    .filter(Boolean)
+}
+
 function questionNumberLabel(question, index) {
   if (settings.value.hideQuestionNumber) {
     return t("Question")
   }
 
-  return t("Question {0}", [question.position || index + 1])
+  return `${t("Question")} ${question.position || index + 1}`
 }
 
 function isRadioChoice(question) {
-  return [1, 10, 17].includes(Number(question.type))
+  return [1, 10, 17, 21].includes(Number(question.type))
 }
 
 function isCheckboxChoice(question) {
@@ -1089,6 +2231,10 @@ function isTrueFalseQuestion(question) {
   return [11, 12, 22].includes(Number(question.type))
 }
 
+function isDegreeCertaintyQuestion(question) {
+  return Number(question.type) === 22
+}
+
 function isFillBlanksQuestion(question) {
   return [3, 27].includes(Number(question.type)) && question.fillBlanks && Array.isArray(question.fillBlanks.segments)
 }
@@ -1097,6 +2243,10 @@ function isMatchingQuestion(question) {
   return [4, 19, 24, 25].includes(Number(question.type)) && question.matching
 }
 
+function isMatchingDraggableQuestion(question) {
+  return [19, 25].includes(Number(question.type)) && question.matching
+}
+
 function isDraggableQuestion(question) {
   return Number(question.type) === 18 && question.draggable
 }
@@ -1105,12 +2255,37 @@ function isDropdownQuestion(question) {
   return [28, 29].includes(Number(question.type)) && question.dropdown
 }
 
+function currentCalculatedVariation(question) {
+  const variations = Array.isArray(question?.calculated?.variations) ? question.calculated.variations : []
+  const questionAnswer = answers.value?.[question?.id] || {}
+  const selectedAnswerId = Number(questionAnswer.calculatedAnswerId || question?.calculated?.answerId || 0)
+
+  if (selectedAnswerId > 0) {
+    const selectedVariation = variations.find((variation) => Number(variation.id) === selectedAnswerId)
+    if (selectedVariation) {
+      return selectedVariation
+    }
+  }
+
+  return variations[0] || { id: question?.calculated?.answerId || null, text: question?.calculated?.text || "" }
+}
+
+function parseSavedCalculatedAnswer(value) {
+  const parts = String(value || "").split(":")
+  if (parts.length >= 2) {
+    const answerId = Number(parts.shift() || 0)
+    return [answerId, parts.join(":")]
+  }
+
+  return [0, String(value || "")]
+}
+
 function isCalculatedQuestion(question) {
   return Number(question.type) === 16
 }
 
 function isOpenQuestion(question) {
-  return [5, 15].includes(Number(question.type))
+  return Number(question.type) === 5
 }
 
 function isUploadQuestion(question) {
@@ -1121,12 +2296,20 @@ function isOralQuestion(question) {
   return Number(question.type) === 13
 }
 
+function isStructuralQuestion(question) {
+  return [15, 31].includes(Number(question?.type))
+}
+
+function isMediaQuestion(question) {
+  return Number(question.type) === 15
+}
+
 function isAnnotationQuestion(question) {
   return Number(question.type) === 20 && question.annotation
 }
 
 function isHotspotQuestion(question) {
-  return [6, 8, 26].includes(Number(question.type)) && question.hotspot
+  return [6, 26].includes(Number(question.type)) && question.hotspot
 }
 
 function isReadingQuestion(question) {
@@ -1140,18 +2323,37 @@ function isPageBreak(question) {
 function trueFalseOptions(question) {
   if (Array.isArray(question.trueFalseOptions) && question.trueFalseOptions.length > 0) {
     return question.trueFalseOptions.map((option) => ({
-      value: Number(option.position || option.id),
+      value: Number(option.id || option.position),
+      position: Number(option.position || 0),
       label: displayText(option.title),
     }))
   }
 
   return [
-    { value: 1, label: t("True") },
-    { value: 2, label: t("False") },
-    { value: 3, label: t("Don't know") },
+    { value: 1, position: 1, label: t("True") },
+    { value: 2, position: 2, label: t("False") },
+    { value: 3, position: 3, label: t("Don't know") },
   ]
 }
 
+function trueFalseChoiceOptions(question) {
+  const options = trueFalseOptions(question)
+
+  if (isDegreeCertaintyQuestion(question)) {
+    return options.filter((option) => [1, 2].includes(Number(option.position || option.value)))
+  }
+
+  return options
+}
+
+function degreeCertaintyOptions(question) {
+  return trueFalseOptions(question).filter((option) => {
+    const position = Number(option.position || option.value)
+
+    return position >= 3 && position < 9
+  })
+}
+
 function submitDisabled() {
   return false
 }
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index c2653638fcf..4e0cd28da2e 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -184,11 +184,30 @@
 
       <div class="space-y-4">
         <article
-          v-for="question in questions"
+          v-for="(question, index) in questions"
           :key="question.id"
           class="overflow-hidden rounded-xl border bg-white shadow-sm"
           :class="questionCardClass(question)"
         >
+          <div
+            v-if="shouldShowParentMedia(question, index)"
+            class="border-b border-dashed border-gray-40 bg-gray-10 p-4"
+          >
+            <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+              {{ t("Media question") }}
+            </div>
+            <h2
+              v-if="question.parent?.title"
+              class="exercise-result-html text-lg font-semibold text-gray-90"
+              v-html="question.parent.title"
+            />
+            <div
+              v-if="question.parent?.description || question.parent?.content?.description"
+              class="exercise-result-html mt-2 text-sm text-gray-700"
+              v-html="question.parent.description || question.parent.content?.description"
+            />
+          </div>
+
           <div class="border-b border-gray-20 bg-gray-10 p-4">
             <div class="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
               <div class="flex gap-3">
@@ -216,7 +235,7 @@
 
               <div class="flex flex-wrap items-center gap-2 md:justify-end">
                 <span
-                  v-if="visibility.showQuestionScore"
+                  v-if="visibility.showQuestionScore && question.score !== null && question.maxScore !== null"
                   class="rounded-full border px-3 py-1 text-xs font-semibold"
                   :class="questionScoreClass(question)"
                 >
@@ -296,6 +315,12 @@
                   <span class="rounded-full bg-info/10 px-2 py-1 text-info">
                     {{ t("Your answer") }}: {{ choice.selectedOptionLabel || t("No answer") }}
                   </span>
+                  <span
+                    v-if="choice.selectedDegreeLabel"
+                    class="rounded-full bg-support-1 px-2 py-1 text-support-4"
+                  >
+                    {{ t("Degree of certainty that my answer will be considered correct") }}: {{ choice.selectedDegreeLabel }}
+                  </span>
                   <span
                     v-if="choice.correctOptionLabel"
                     class="rounded-full bg-success/10 px-2 py-1 text-success"
@@ -374,6 +399,302 @@
               </div>
             </template>
 
+
+            <template v-else-if="question.answer.kind === 'calculated'">
+              <div class="space-y-3 rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm">
+                <div
+                  v-if="question.answer.text"
+                  class="exercise-result-html rounded bg-white p-3 text-gray-800"
+                  v-html="question.answer.text"
+                />
+                <div class="grid gap-2 md:grid-cols-2">
+                  <div class="rounded bg-info/10 p-2 text-info">
+                    <span class="font-semibold">{{ t("Your answer") }}:</span>
+                    {{ question.answer.studentAnswer || t("No answer") }}
+                  </div>
+                  <div
+                    v-if="question.answer.expectedAnswer"
+                    class="rounded bg-success/10 p-2 text-success"
+                  >
+                    <span class="font-semibold">{{ t("Correct answer") }}:</span>
+                    {{ question.answer.expectedAnswer }}
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'hotspot'">
+              <div class="space-y-3">
+                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                  <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Learner clicks") }}
+                  </div>
+                  <div
+                    v-if="question.answer.imageUrl"
+                    class="inline-block max-w-full rounded-lg border border-gray-20 bg-white p-2"
+                  >
+                    <div class="relative inline-block max-w-full">
+                      <img
+                        class="max-h-[32rem] max-w-full object-contain"
+                        :alt="question.answer.imageName || t('Question image')"
+                        :src="question.answer.imageUrl"
+                        @load="onResultHotspotImageLoad(question, $event)"
+                      />
+                      <span
+                        v-for="point in question.answer.studentPoints"
+                        :key="`${question.id}-result-hotspot-${point.label}`"
+                        class="absolute flex h-7 w-7 -translate-x-1/2 -translate-y-1/2 items-center justify-center rounded-full border-2 border-white bg-primary text-xs font-bold text-white shadow"
+                        :style="resultHotspotPointStyle(question, point)"
+                      >
+                        {{ point.label }}
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    v-else
+                    class="text-sm text-gray-600"
+                  >
+                    {{ t("No hotspot image available") }}
+                  </div>
+                  <div
+                    v-if="!question.answer.studentPoints?.length"
+                    class="mt-2 text-sm text-gray-600"
+                  >
+                    {{ t("No answer") }}
+                  </div>
+                </div>
+
+                <div
+                  v-if="question.answer.zones?.length"
+                  class="rounded-lg border border-success/30 bg-success/10 p-3 text-sm text-success"
+                >
+                  <div class="mb-2 text-xs font-semibold uppercase tracking-wide">
+                    {{ t("Expected zones") }}
+                  </div>
+                  <ul class="list-disc space-y-1 pl-5">
+                    <li
+                      v-for="zone in question.answer.zones"
+                      :key="zone.id"
+                    >
+                      <span class="font-semibold">{{ displayText(zone.answer, t("Zone")) }}</span>
+                      <span> · {{ zone.hotspotType }}</span>
+                      <span v-if="zone.score !== null && zone.score !== undefined"> · {{ t("Score") }}: {{ formatNumber(zone.score) }}</span>
+                    </li>
+                  </ul>
+                </div>
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'annotation'">
+              <div class="space-y-3">
+                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                  <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Learner annotation") }}
+                  </div>
+                  <div
+                    v-if="question.answer.imageUrl"
+                    class="inline-block max-w-full rounded-lg border border-gray-20 bg-white p-2"
+                  >
+                    <div class="relative inline-block max-w-full">
+                      <img
+                        class="max-h-[32rem] max-w-full object-contain"
+                        :alt="question.answer.imageName || t('Question image')"
+                        :src="question.answer.imageUrl"
+                        @load="onResultHotspotImageLoad(question, $event)"
+                      />
+                      <svg
+                        v-if="resultAnnotationImageReady(question)"
+                        class="pointer-events-none absolute inset-0 h-full w-full"
+                        :viewBox="resultAnnotationViewBox(question)"
+                        preserveAspectRatio="none"
+                      >
+                        <polyline
+                          v-for="(path, pathIndex) in question.answer.paths || []"
+                          :key="`${question.id}-result-annotation-path-${pathIndex}`"
+                          fill="none"
+                          :points="resultAnnotationPolylinePoints(path)"
+                          stroke="currentColor"
+                          stroke-width="3"
+                          class="text-primary"
+                        />
+                      </svg>
+                      <span
+                        v-for="(textAnnotation, textIndex) in question.answer.texts || []"
+                        :key="`${question.id}-result-annotation-text-${textIndex}`"
+                        class="absolute -translate-x-1/2 -translate-y-1/2 rounded bg-white/90 px-2 py-1 text-xs font-semibold text-primary shadow"
+                        :style="resultHotspotPointStyle(question, textAnnotation)"
+                      >
+                        {{ textAnnotation.text }}
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    v-else
+                    class="text-sm text-gray-600"
+                  >
+                    {{ t("No annotation image available") }}
+                  </div>
+                  <div
+                    v-if="!(question.answer.paths?.length || question.answer.texts?.length)"
+                    class="mt-2 text-sm text-gray-600"
+                  >
+                    {{ t("No answer") }}
+                  </div>
+                </div>
+
+                <div
+                  v-if="question.pendingCorrection"
+                  class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning"
+                >
+                  {{ t("This answer is pending teacher correction.") }}
+                </div>
+
+                <div
+                  v-if="question.answer.teacherComment"
+                  class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+                >
+                  <div class="mb-1 text-xs font-semibold uppercase tracking-wide">
+                    {{ t("Teacher comment") }}
+                  </div>
+                  {{ question.answer.teacherComment }}
+                </div>
+
+                <div
+                  v-if="question.canCorrect && correctionForms[question.id]"
+                  class="rounded-lg border border-gray-20 bg-white p-4"
+                >
+                  <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
+                    <BaseIcon icon="edit" size="small" />
+                    {{ t("Teacher correction") }}
+                  </div>
+                  <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
+                    <BaseInputNumber
+                      v-model="correctionForms[question.id].marks"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionScoreInputId(question)"
+                      :label="t('Correction score')"
+                      :max="Number(question.maxScore || 0)"
+                      :min="0"
+                      :step="0.5"
+                      name="correction_score"
+                    />
+                    <BaseTextArea
+                      v-model="correctionForms[question.id].teacherComment"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionCommentInputId(question)"
+                      :label="t('Teacher comment')"
+                      name="teacher_comment"
+                      rows="3"
+                    />
+                    <BaseButton
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :is-loading="correctionSavingQuestionId === question.id"
+                      :label="t('Save correction')"
+                      icon="content-save"
+                      type="success"
+                      @click="saveManualCorrection(question)"
+                    />
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else-if="question.answer.kind === 'oral_expression'">
+              <div class="space-y-3">
+                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                  <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
+                    {{ t("Learner audio") }}
+                  </div>
+                  <div
+                    v-if="question.answer.files?.length"
+                    class="space-y-3"
+                  >
+                    <div
+                      v-for="file in question.answer.files"
+                      :key="file.id || file.name"
+                      class="space-y-2"
+                    >
+                      <audio
+                        class="max-w-full"
+                        controls
+                        :src="file.inlineUrl || file.url"
+                      />
+                      <a
+                        class="inline-flex items-center gap-2 rounded border border-primary/30 bg-white px-3 py-2 text-sm font-semibold text-primary hover:bg-support-1"
+                        :href="file.url"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        <BaseIcon icon="download" size="small" />
+                        {{ file.name || t("Download audio") }}
+                      </a>
+                    </div>
+                  </div>
+                  <div
+                    v-else
+                    class="text-sm text-gray-600"
+                  >
+                    {{ t("No uploaded audio") }}
+                  </div>
+                </div>
+
+                <div
+                  v-if="question.pendingCorrection"
+                  class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning"
+                >
+                  {{ t("This answer is pending teacher correction.") }}
+                </div>
+
+                <div
+                  v-if="question.answer.teacherComment"
+                  class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+                >
+                  <div class="mb-1 text-xs font-semibold uppercase tracking-wide">
+                    {{ t("Teacher comment") }}
+                  </div>
+                  {{ question.answer.teacherComment }}
+                </div>
+
+                <div
+                  v-if="question.canCorrect && correctionForms[question.id]"
+                  class="rounded-lg border border-gray-20 bg-white p-4"
+                >
+                  <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
+                    <BaseIcon icon="edit" size="small" />
+                    {{ t("Teacher correction") }}
+                  </div>
+                  <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
+                    <BaseInputNumber
+                      v-model="correctionForms[question.id].marks"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionScoreInputId(question)"
+                      :label="t('Correction score')"
+                      :max="Number(question.maxScore || 0)"
+                      :min="0"
+                      :step="0.5"
+                      name="correction_score"
+                    />
+                    <BaseTextArea
+                      v-model="correctionForms[question.id].teacherComment"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionCommentInputId(question)"
+                      :label="t('Teacher comment')"
+                      name="teacher_comment"
+                      rows="3"
+                    />
+                    <BaseButton
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :is-loading="correctionSavingQuestionId === question.id"
+                      :label="t('Save correction')"
+                      icon="content-save"
+                      type="success"
+                      @click="saveManualCorrection(question)"
+                    />
+                  </div>
+                </div>
+              </div>
+            </template>
+
             <template v-else-if="question.answer.kind === 'upload_answer'">
               <div class="space-y-3">
                 <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
@@ -461,6 +782,20 @@
               </div>
             </template>
 
+            <template v-else-if="question.answer.kind === 'content'">
+              <div
+                v-if="question.answer.description"
+                class="exercise-result-html rounded-lg border border-gray-20 bg-gray-10 p-4 text-gray-800"
+                v-html="question.answer.description"
+              />
+              <div
+                v-else
+                class="rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm text-gray-700"
+              >
+                {{ t("Content item") }}
+              </div>
+            </template>
+
             <template v-else-if="question.answer.kind === 'free_answer'">
               <div class="space-y-3">
                 <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
@@ -572,6 +907,7 @@ const correctionForms = ref({})
 const correctionSavingQuestionId = ref(null)
 const correctionError = ref("")
 const correctionMessage = ref("")
+const resultHotspotImageSizes = ref({})
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -638,6 +974,68 @@ async function loadResult() {
   }
 }
 
+function onResultHotspotImageLoad(question, event) {
+  const image = event?.target
+  if (!image || !question?.id) {
+    return
+  }
+
+  resultHotspotImageSizes.value = {
+    ...resultHotspotImageSizes.value,
+    [question.id]: {
+      width: Number(image.naturalWidth || image.width || 0),
+      height: Number(image.naturalHeight || image.height || 0),
+    },
+  }
+}
+
+function resultHotspotPointStyle(question, point) {
+  const size = resultHotspotImageSizes.value[question.id] || {}
+  const width = Number(size.width || 0)
+  const height = Number(size.height || 0)
+
+  if (width > 0 && height > 0) {
+    return {
+      left: `${(Number(point.x || 0) / width) * 100}%`,
+      top: `${(Number(point.y || 0) / height) * 100}%`,
+    }
+  }
+
+  return {
+    left: `${Number(point.x || 0)}px`,
+    top: `${Number(point.y || 0)}px`,
+  }
+}
+
+function resultAnnotationImageReady(question) {
+  const size = resultHotspotImageSizes.value[question.id] || {}
+
+  return Number(size.width || 0) > 0 && Number(size.height || 0) > 0
+}
+
+function resultAnnotationViewBox(question) {
+  const size = resultHotspotImageSizes.value[question.id] || {}
+
+  return `0 0 ${Number(size.width || 1)} ${Number(size.height || 1)}`
+}
+
+function resultAnnotationPolylinePoints(path) {
+  const points = Array.isArray(path?.points) ? path.points : []
+
+  return points.map((point) => `${Number(point.x || 0)},${Number(point.y || 0)}`).join(" ")
+}
+
+function shouldShowParentMedia(question, index) {
+  const parentId = Number(question?.parent?.id || question?.parentId || 0)
+  if (parentId <= 0) {
+    return false
+  }
+
+  const previousQuestion = questions.value[index - 1] || null
+
+  return Number(previousQuestion?.parent?.id || previousQuestion?.parentId || 0) !== parentId
+}
+
 function questionLabel(position) {
   const safePosition = Number(position || 0)
 
@@ -645,7 +1043,7 @@ function questionLabel(position) {
 }
 
 function isManualCorrectionQuestion(question) {
-  return ["free_answer", "upload_answer"].includes(question?.answer?.kind)
+  return ["free_answer", "oral_expression", "upload_answer"].includes(question?.answer?.kind)
 }
 
 function hasPartialManualScore(question) {
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
index a68350923fb..042e2a856c0 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
@@ -26,7 +26,7 @@
                 'attemptId' => '\\d+',
             ],
             openapi: new Operation(
-                summary: 'Upload a file as a Vue exercise runtime answer',
+                summary: 'Upload a file or oral recording as a Vue exercise runtime answer',
                 parameters: [
                     new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
                     new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
@@ -45,6 +45,7 @@
                                     'file' => [
                                         'type' => 'string',
                                         'format' => 'binary',
+                                        'description' => 'Upload answer file or oral expression audio file',
                                     ],
                                 ],
                             ],
diff --git a/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php b/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php
index feebf2838b7..dd29229fdf2 100644
--- a/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php
+++ b/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptFileDownloadAction.php
@@ -93,7 +93,7 @@ public function __invoke(int $exerciseId, int $attemptId, int $resourceNodeId, R
         $response->headers->set(
             'Content-Disposition',
             $response->headers->makeDisposition(
-                ResponseHeaderBag::DISPOSITION_ATTACHMENT,
+                true === $request->query->getBoolean('inline') ? ResponseHeaderBag::DISPOSITION_INLINE : ResponseHeaderBag::DISPOSITION_ATTACHMENT,
                 $fileName,
                 $this->getAsciiFileName($fileName)
             )
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index d3fff8e4348..83ab0d645c1 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -42,13 +42,17 @@
 {
     private const VISIBILITY_PUBLISHED = 2;
     private const STATUS_INCOMPLETE = 'incomplete';
-    private const UNIQUE_TYPES = [1, 10, 17];
+    private const UNIQUE_TYPES = [1, 10, 17, 21];
     private const MULTIPLE_TYPES = [2, 9, 14];
     private const TRUE_FALSE_TYPES = [11, 12];
+    private const TRUE_FALSE_DEGREE_CERTAINTY_TYPES = [22];
     private const FILL_BLANK_TYPES = [3, 27];
     private const MATCHING_TYPES = [4, 19, 24, 25];
     private const DROPDOWN_TYPES = [28, 29];
+    private const CALCULATED_TYPES = [16];
     private const FREE_ANSWER_TYPES = [5];
+    private const ANNOTATION_TYPES = [20];
+    private const HOTSPOT_TYPES = [6, 26];
 
     public function __construct(
         private RequestStack $requestStack,
@@ -326,6 +330,10 @@ private function buildDraftRows(CQuizQuestion $question, mixed $answer, int $sec
             return $this->buildTrueFalseRows($payload, $secondsSpent);
         }
 
+        if (\in_array($type, self::TRUE_FALSE_DEGREE_CERTAINTY_TYPES, true)) {
+            return $this->buildTrueFalseDegreeCertaintyRows($payload, $secondsSpent);
+        }
+
         if (\in_array($type, self::FILL_BLANK_TYPES, true)) {
             return $this->buildFillBlankRows($question, $payload, $secondsSpent);
         }
@@ -338,10 +346,22 @@ private function buildDraftRows(CQuizQuestion $question, mixed $answer, int $sec
             return $this->buildDropdownRows($payload, $secondsSpent);
         }
 
+        if (\in_array($type, self::CALCULATED_TYPES, true)) {
+            return $this->buildCalculatedRows($question, $payload, $secondsSpent);
+        }
+
         if (\in_array($type, self::FREE_ANSWER_TYPES, true)) {
             return $this->buildFreeAnswerRows($payload, $secondsSpent);
         }
 
+        if (\in_array($type, self::ANNOTATION_TYPES, true)) {
+            return $this->buildAnnotationRows($payload, $secondsSpent);
+        }
+
+        if (\in_array($type, self::HOTSPOT_TYPES, true)) {
+            return $this->buildHotspotRows($payload, $secondsSpent);
+        }
+
         throw new BadRequestHttpException('This question type is not supported by the draft answer processor yet.');
     }
 
@@ -421,6 +441,43 @@ private function buildTrueFalseRows(array $payload, int $secondsSpent): array
         return $rows;
     }
 
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildTrueFalseDegreeCertaintyRows(array $payload, int $secondsSpent): array
+    {
+        $values = $payload['trueFalse'] ?? [];
+        $certaintyValues = $payload['degreeCertainty'] ?? [];
+        if (!\is_array($values)) {
+            return [];
+        }
+        if (!\is_array($certaintyValues)) {
+            $certaintyValues = [];
+        }
+
+        $rows = [];
+        $position = 0;
+        foreach ($values as $answerId => $optionValue) {
+            $safeAnswerId = $this->toPositiveInt($answerId);
+            $safeOptionValue = $this->toPositiveInt($optionValue);
+            if (0 >= $safeAnswerId || 0 >= $safeOptionValue) {
+                continue;
+            }
+
+            $safeCertaintyValue = $this->toPositiveInt($certaintyValues[$answerId] ?? 0);
+            $rows[] = [
+                'answer' => $safeAnswerId.':'.$safeOptionValue.':'.$safeCertaintyValue,
+                'position' => $position,
+                'secondsSpent' => $secondsSpent,
+            ];
+            ++$position;
+        }
+
+        return $rows;
+    }
+
     /**
      * @param array<string, mixed> $payload
      *
@@ -553,6 +610,35 @@ private function buildDropdownRows(array $payload, int $secondsSpent): array
         return 0 < $choiceId ? [['answer' => (string) $choiceId, 'position' => 0, 'secondsSpent' => $secondsSpent]] : [];
     }
 
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildCalculatedRows(CQuizQuestion $question, array $payload, int $secondsSpent): array
+    {
+        $studentAnswer = trim((string) ($payload['calculated'] ?? $payload['value'] ?? ''));
+        if ('' === $studentAnswer) {
+            return [];
+        }
+
+        $answerId = $this->toPositiveInt($payload['answerId'] ?? 0);
+        if (0 >= $answerId) {
+            $firstAnswer = $this->getFirstAnswer($question);
+            $answerId = $firstAnswer instanceof CQuizAnswer ? (int) $firstAnswer->getIid() : 0;
+        }
+
+        if (0 >= $answerId) {
+            return [];
+        }
+
+        return [[
+            'answer' => $answerId.':'.$studentAnswer,
+            'position' => 0,
+            'secondsSpent' => $secondsSpent,
+        ]];
+    }
+
     /**
      * @param array<string, mixed> $payload
      *
@@ -565,6 +651,136 @@ private function buildFreeAnswerRows(array $payload, int $secondsSpent): array
         return '' !== $text ? [['answer' => $text, 'position' => 0, 'secondsSpent' => $secondsSpent]] : [];
     }
 
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildAnnotationRows(array $payload, int $secondsSpent): array
+    {
+        $encodedItems = [];
+
+        $paths = $payload['paths'] ?? $payload['annotation']['paths'] ?? [];
+        if (\is_array($paths)) {
+            foreach ($paths as $path) {
+                if (!\is_array($path)) {
+                    continue;
+                }
+
+                $rawPoints = $path['points'] ?? $path;
+                if (!\is_array($rawPoints)) {
+                    continue;
+                }
+
+                $points = [];
+                foreach ($rawPoints as $point) {
+                    if (!\is_array($point)) {
+                        continue;
+                    }
+
+                    $x = $this->toCoordinate($point['x'] ?? null);
+                    $y = $this->toCoordinate($point['y'] ?? null);
+                    if (null === $x || null === $y) {
+                        continue;
+                    }
+
+                    $points[] = $x.';'.$y;
+                }
+
+                if (2 <= \count($points)) {
+                    $encodedItems[] = 'P)('.implode(')(', $points);
+                }
+            }
+        }
+
+        $texts = $payload['texts'] ?? $payload['annotation']['texts'] ?? [];
+        if (\is_array($texts)) {
+            foreach ($texts as $textAnnotation) {
+                if (!\is_array($textAnnotation)) {
+                    continue;
+                }
+
+                $text = $this->sanitizeAnnotationText($textAnnotation['text'] ?? '');
+                $x = $this->toCoordinate($textAnnotation['x'] ?? null);
+                $y = $this->toCoordinate($textAnnotation['y'] ?? null);
+                if ('' === $text || null === $x || null === $y) {
+                    continue;
+                }
+
+                $encodedItems[] = 'T)('.$text.')('.$x.';'.$y;
+            }
+        }
+
+        if ([] === $encodedItems) {
+            return [];
+        }
+
+        return [[
+            'answer' => implode('|', $encodedItems),
+            'position' => 0,
+            'secondsSpent' => $secondsSpent,
+        ]];
+    }
+
+    private function sanitizeAnnotationText(mixed $value): string
+    {
+        $text = trim(strip_tags((string) $value));
+        if ('' === $text) {
+            return '';
+        }
+
+        return str_replace(['|', ')(', "\r", "\n"], [' ', ' ', ' ', ' '], $text);
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildHotspotRows(array $payload, int $secondsSpent): array
+    {
+        $points = $payload['points'] ?? $payload['hotspot']['points'] ?? $payload['answers'] ?? $payload['value'] ?? [];
+        if (!\is_array($points)) {
+            return [];
+        }
+
+        $coordinates = [];
+        foreach ($points as $point) {
+            if (!\is_array($point)) {
+                continue;
+            }
+
+            $x = $this->toCoordinate($point['x'] ?? null);
+            $y = $this->toCoordinate($point['y'] ?? null);
+            if (null === $x || null === $y) {
+                continue;
+            }
+
+            $answerId = $this->toPositiveInt($point['answerId'] ?? $point['answer_id'] ?? $point['id'] ?? 0);
+            $coordinate = $x.';'.$y;
+            $coordinates[] = 0 < $answerId ? $answerId.':'.$coordinate : $coordinate;
+        }
+
+        if ([] === $coordinates) {
+            return [];
+        }
+
+        return [[
+            'answer' => implode('|', $coordinates),
+            'position' => 0,
+            'secondsSpent' => $secondsSpent,
+        ]];
+    }
+
+    private function toCoordinate(mixed $value): ?int
+    {
+        if (null === $value || '' === $value || !is_numeric($value)) {
+            return null;
+        }
+
+        return max(0, (int) round((float) $value));
+    }
+
     /**
      * @return array<int, int>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index 18f6663c92f..f0d3e674e95 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -335,6 +335,8 @@ private function buildQuestionList(CQuiz $quiz): array
             ->getResult()
         ;
 
+        $mustShuffle = self::QUESTION_SELECTION_RANDOM === (int) ($quiz->getQuestionSelectionType() ?? 0);
+        $randomCount = (int) $quiz->getRandom();
         $questionIds = [];
         foreach ($relations as $relation) {
             if (!$relation instanceof CQuizRelQuestion) {
@@ -346,19 +348,22 @@ private function buildQuestionList(CQuiz $quiz): array
                 continue;
             }
 
-            if (\in_array((int) $question->getType(), [self::PAGE_BREAK, self::MEDIA_QUESTION], true)) {
+            $type = (int) $question->getType();
+            if (self::MEDIA_QUESTION === $type) {
+                continue;
+            }
+
+            if (self::PAGE_BREAK === $type && ($mustShuffle || 0 < $randomCount)) {
                 continue;
             }
 
             $questionIds[] = (int) $question->getIid();
         }
 
-        $mustShuffle = self::QUESTION_SELECTION_RANDOM === (int) ($quiz->getQuestionSelectionType() ?? 0);
-        if ($mustShuffle || 0 < (int) $quiz->getRandom()) {
+        if ($mustShuffle || 0 < $randomCount) {
             shuffle($questionIds);
         }
 
-        $randomCount = (int) $quiz->getRandom();
         if (0 < $randomCount && $randomCount < \count($questionIds)) {
             $questionIds = \array_slice($questionIds, 0, $randomCount);
         }
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
index 1a994988271..575fe3f0d48 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
@@ -37,7 +37,9 @@
 {
     private const STATUS_COMPLETED = 'completed';
     private const FREE_ANSWER = 5;
+    private const ORAL_EXPRESSION = 13;
     private const UPLOAD_ANSWER = 23;
+    private const ANNOTATION = 20;
 
     public function __construct(
         private RequestStack $requestStack,
@@ -130,7 +132,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
 
     private function isManualCorrectionQuestion(CQuizQuestion $question): bool
     {
-        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::UPLOAD_ANSWER], true);
+        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::UPLOAD_ANSWER, self::ANNOTATION], true);
     }
 
     private function canCorrectAttempts(): bool
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
index a532bced703..e939c6c86ec 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -47,11 +47,19 @@
     private const FILL_IN_BLANKS = 3;
     private const MATCHING = 4;
     private const FREE_ANSWER = 5;
+    private const HOT_SPOT = 6;
+    private const CALCULATED_ANSWER = 16;
+    private const MEDIA_QUESTION = 15;
+    private const READING_COMPREHENSION = 21;
+    private const PAGE_BREAK = 31;
+    private const ORAL_EXPRESSION = 13;
     private const UPLOAD_ANSWER = 23;
+    private const ANNOTATION = 20;
     private const MULTIPLE_ANSWER_COMBINATION = 9;
     private const UNIQUE_ANSWER_NO_OPTION = 10;
     private const MULTIPLE_ANSWER_TRUE_FALSE = 11;
     private const MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE = 12;
+    private const MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY = 22;
     private const GLOBAL_MULTIPLE_ANSWER = 14;
     private const UNIQUE_ANSWER_IMAGE = 17;
     private const MATCHING_DRAGGABLE = 19;
@@ -60,6 +68,7 @@
     private const MULTIPLE_ANSWER_DROPDOWN = 29;
     private const MATCHING_COMBINATION = 24;
     private const MATCHING_DRAGGABLE_COMBINATION = 25;
+    private const HOT_SPOT_COMBINATION = 26;
 
     /**
      * @var array<int, string>
@@ -73,16 +82,25 @@
         self::MULTIPLE_ANSWER_COMBINATION => 'Multiple answer combination',
         self::MULTIPLE_ANSWER_TRUE_FALSE => 'Multiple answer true/false',
         self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => 'Multiple answer combination true/false',
+        self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => 'Multiple answer true/false with degree of certainty',
         self::FILL_IN_BLANKS => 'Fill in blanks',
         self::FILL_IN_BLANKS_COMBINATION => 'Fill in blanks combination',
         self::MATCHING => 'Matching',
         self::MATCHING_DRAGGABLE => 'Matching draggable',
         self::MATCHING_COMBINATION => 'Matching combination',
         self::MATCHING_DRAGGABLE_COMBINATION => 'Matching draggable combination',
+        self::HOT_SPOT_COMBINATION => 'Hotspot combination',
         self::MULTIPLE_ANSWER_DROPDOWN => 'Multiple answer dropdown',
         self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => 'Multiple answer dropdown combination',
         self::FREE_ANSWER => 'Free answer',
+        self::HOT_SPOT => 'Hotspot',
+        self::CALCULATED_ANSWER => 'Calculated answer',
+        self::ORAL_EXPRESSION => 'Oral expression',
         self::UPLOAD_ANSWER => 'Upload answer',
+        self::ANNOTATION => 'Annotation',
+        self::MEDIA_QUESTION => 'Media question',
+        self::READING_COMPREHENSION => 'Reading comprehension',
+        self::PAGE_BREAK => 'Page break',
     ];
 
     public function __construct(
@@ -487,13 +505,15 @@ private function scoreQuestion(CQuiz $quiz, CQuizQuestion $question, array $answ
         return match ((int) $question->getType()) {
             self::UNIQUE_ANSWER,
             self::UNIQUE_ANSWER_NO_OPTION,
-            self::UNIQUE_ANSWER_IMAGE => $this->scoreUniqueAnswer($answers, $rows),
+            self::UNIQUE_ANSWER_IMAGE,
+            self::READING_COMPREHENSION => $this->scoreUniqueAnswer($answers, $rows),
             self::MULTIPLE_ANSWER,
             self::GLOBAL_MULTIPLE_ANSWER,
             self::MULTIPLE_ANSWER_DROPDOWN => $this->scoreMultipleAnswer($answers, $rows),
             self::MULTIPLE_ANSWER_COMBINATION,
             self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => $this->scoreMultipleCombination($question, $answers, $rows),
             self::MULTIPLE_ANSWER_TRUE_FALSE => $this->scoreTrueFalseAnswer($question, $answers, $options, $rows),
+            self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => $this->scoreTrueFalseDegreeCertaintyAnswer($question, $answers, $options, $rows),
             self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => $this->scoreTrueFalseCombination($question, $answers, $options, $rows),
             self::FILL_IN_BLANKS,
             self::FILL_IN_BLANKS_COMBINATION => $this->scoreFillBlanks($quiz, $question, $answers, $rows),
@@ -501,8 +521,13 @@ private function scoreQuestion(CQuiz $quiz, CQuizQuestion $question, array $answ
             self::MATCHING_DRAGGABLE => $this->scoreMatchingAnswer($answers, $rows),
             self::MATCHING_COMBINATION,
             self::MATCHING_DRAGGABLE_COMBINATION => $this->scoreMatchingCombination($question, $answers, $rows),
+            self::CALCULATED_ANSWER => $this->scoreCalculatedAnswer($question, $answers, $rows),
+            self::HOT_SPOT => $this->scoreHotspotAnswer($answers, $rows, false, (float) $question->getPonderation()),
+            self::HOT_SPOT_COMBINATION => $this->scoreHotspotAnswer($answers, $rows, true, (float) $question->getPonderation()),
             self::FREE_ANSWER,
-            self::UPLOAD_ANSWER => $this->scoreManualAnswer($rows),
+            self::ORAL_EXPRESSION,
+            self::UPLOAD_ANSWER,
+            self::ANNOTATION => $this->scoreManualAnswer($rows),
             default => 0.0,
         };
     }
@@ -599,6 +624,63 @@ private function scoreTrueFalseAnswer(CQuizQuestion $question, array $answers, a
      * @param array<int, CQuizQuestionOption> $options
      * @param array<int, TrackEAttempt>       $rows
      */
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, TrackEAttempt>       $rows
+     */
+    private function scoreTrueFalseDegreeCertaintyAnswer(CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        [$trueScore, $falseScore, $doubtScore] = $this->getTrueFalseScores((string) $question->getExtra());
+        $choices = $this->getSavedTrueFalseDegreeCertaintyChoices($rows);
+        $score = 0.0;
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $studentChoice = (int) ($choices[$answerId]['choice'] ?? 0);
+            if (0 >= $studentChoice) {
+                continue;
+            }
+
+            $studentDegreeChoice = (int) ($choices[$answerId]['degree'] ?? 0);
+            $studentDegreeChoicePosition = $this->getTrueFalseOptionPosition($studentDegreeChoice, $options);
+            $hasCertainty = 3 <= $studentDegreeChoicePosition && 9 > $studentDegreeChoicePosition;
+
+            if ($this->isTrueFalseChoiceCorrect($studentChoice, (int) $answer->getCorrect(), $options)) {
+                $score += $hasCertainty ? $trueScore : $doubtScore;
+                continue;
+            }
+
+            $score += $hasCertainty ? $falseScore : $doubtScore;
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, array{choice: int, degree: int}>
+     */
+    private function getSavedTrueFalseDegreeCertaintyChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $parts = explode(':', (string) $row->getAnswer());
+            $answerId = isset($parts[0]) ? (int) $parts[0] : 0;
+            $optionId = isset($parts[1]) ? (int) $parts[1] : 0;
+            $degreeId = isset($parts[2]) ? (int) $parts[2] : 0;
+            if (0 < $answerId && 0 < $optionId) {
+                $choices[$answerId] = [
+                    'choice' => $optionId,
+                    'degree' => $degreeId,
+                ];
+            }
+        }
+
+        return $choices;
+    }
+
     private function scoreTrueFalseCombination(CQuizQuestion $question, array $answers, array $options, array $rows): float
     {
         $choices = $this->getSavedTrueFalseChoices($rows);
@@ -990,6 +1072,245 @@ private function getSavedMatchingChoices(array $rows): array
         return $choices;
     }
 
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreHotspotAnswer(array $answers, array $rows, bool $combination, float $questionWeight): float
+    {
+        $points = $this->getSavedHotspotPoints($rows);
+        if ([] === $points) {
+            return 0.0;
+        }
+
+        $matchedAnswerIds = [];
+        $score = 0.0;
+        $scoringZoneCount = 0;
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $hotspotType = (string) ($answer->getHotspotType() ?: 'square');
+            if (!\in_array($hotspotType, ['square', 'circle', 'poly'], true)) {
+                continue;
+            }
+
+            if (0.0 < (float) $answer->getPonderation()) {
+                ++$scoringZoneCount;
+            }
+
+            foreach ($points as $point) {
+                $pointAnswerId = (int) ($point['answerId'] ?? 0);
+                if (0 < $pointAnswerId && $pointAnswerId !== $answerId) {
+                    continue;
+                }
+
+                if ($this->isPointInHotspot($point, $hotspotType, (string) $answer->getHotspotCoordinates())) {
+                    $matchedAnswerIds[$answerId] = true;
+                    if (!$combination) {
+                        $score += (float) $answer->getPonderation();
+                    }
+                    break;
+                }
+            }
+        }
+
+        if (!$combination) {
+            return $score;
+        }
+
+        return 0 < $scoringZoneCount && \count($matchedAnswerIds) >= $scoringZoneCount ? $questionWeight : 0.0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, array{x: float, y: float, answerId?: int}>
+     */
+    private function getSavedHotspotPoints(array $rows): array
+    {
+        $points = [];
+        foreach ($rows as $row) {
+            foreach (explode('|', (string) $row->getAnswer()) as $coordinate) {
+                $point = $this->decodeHotspotPoint($coordinate);
+                if (null !== $point) {
+                    $points[] = $point;
+                }
+            }
+        }
+
+        return $points;
+    }
+
+    /**
+     * @return array{x: float, y: float, answerId?: int}|null
+     */
+    private function decodeHotspotPoint(string $coordinate): ?array
+    {
+        $answerId = 0;
+        $coordinateValue = trim($coordinate);
+        if (str_contains($coordinateValue, ':')) {
+            [$answerIdValue, $coordinateValue] = explode(':', $coordinateValue, 2);
+            $answerId = (int) $answerIdValue;
+        }
+
+        $parts = array_map('trim', explode(';', $coordinateValue));
+        if (2 > \count($parts) || !is_numeric($parts[0]) || !is_numeric($parts[1])) {
+            return null;
+        }
+
+        $point = ['x' => (float) $parts[0], 'y' => (float) $parts[1]];
+        if (0 < $answerId) {
+            $point['answerId'] = $answerId;
+        }
+
+        return $point;
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInHotspot(array $point, string $hotspotType, string $coordinates): bool
+    {
+        return match ($hotspotType) {
+            'square' => $this->isPointInSquare($point, $coordinates),
+            'circle' => $this->isPointInEllipse($point, $coordinates),
+            'poly' => $this->isPointInPolygon($point, $coordinates),
+            default => false,
+        };
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInSquare(array $point, string $coordinates): bool
+    {
+        [$origin, $width, $height] = $this->parseBoxCoordinates($coordinates);
+        if (null === $origin) {
+            return false;
+        }
+
+        return $point['x'] >= $origin['x']
+            && $point['x'] <= $origin['x'] + $width
+            && $point['y'] >= $origin['y']
+            && $point['y'] <= $origin['y'] + $height;
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInEllipse(array $point, string $coordinates): bool
+    {
+        [$origin, $width, $height] = $this->parseBoxCoordinates($coordinates);
+        if (null === $origin || 0.0 >= $width || 0.0 >= $height) {
+            return false;
+        }
+
+        $radiusX = $width / 2;
+        $radiusY = $height / 2;
+        $centerX = $origin['x'] + $radiusX;
+        $centerY = $origin['y'] + $radiusY;
+
+        return ((($point['x'] - $centerX) ** 2) / ($radiusX ** 2))
+            + ((($point['y'] - $centerY) ** 2) / ($radiusY ** 2)) <= 1.0;
+    }
+
+    /**
+     * @return array{0: array{x: float, y: float}|null, 1: float, 2: float}
+     */
+    private function parseBoxCoordinates(string $coordinates): array
+    {
+        $parts = explode('|', $coordinates);
+        $origin = $this->decodeHotspotPoint((string) ($parts[0] ?? ''));
+        $width = isset($parts[1]) && is_numeric($parts[1]) ? (float) $parts[1] : 0.0;
+        $height = isset($parts[2]) && is_numeric($parts[2]) ? (float) $parts[2] : 0.0;
+
+        return [$origin, $width, $height];
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInPolygon(array $point, string $coordinates): bool
+    {
+        $vertices = [];
+        foreach (explode('|', $coordinates) as $coordinate) {
+            $decoded = $this->decodeHotspotPoint($coordinate);
+            if (null !== $decoded) {
+                $vertices[] = $decoded;
+            }
+        }
+
+        $count = \count($vertices);
+        if (3 > $count) {
+            return false;
+        }
+
+        $inside = false;
+        for ($i = 0, $j = $count - 1; $i < $count; $j = $i++) {
+            $xi = $vertices[$i]['x'];
+            $yi = $vertices[$i]['y'];
+            $xj = $vertices[$j]['x'];
+            $yj = $vertices[$j]['y'];
+
+            $intersects = (($yi > $point['y']) !== ($yj > $point['y']))
+                && ($point['x'] < ($xj - $xi) * ($point['y'] - $yi) / (($yj - $yi) ?: 0.000001) + $xi);
+            if ($intersects) {
+                $inside = !$inside;
+            }
+        }
+
+        return $inside;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreCalculatedAnswer(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return 0.0;
+        }
+
+        [$answerId, $studentAnswer] = $this->parseCalculatedStudentAnswer((string) $row->getAnswer());
+        $teacherAnswer = 0 < $answerId && isset($answers[$answerId]) ? $answers[$answerId] : reset($answers);
+        if (!$teacherAnswer instanceof CQuizAnswer) {
+            return 0.0;
+        }
+
+        $expectedAnswer = $this->extractCalculatedExpectedAnswer((string) $teacherAnswer->getAnswer());
+        if ('' === $expectedAnswer || '' === $studentAnswer) {
+            return 0.0;
+        }
+
+        return trim($studentAnswer) === trim($expectedAnswer) ? (float) $question->getPonderation() : 0.0;
+    }
+
+    /**
+     * @return array{0: int, 1: string}
+     */
+    private function parseCalculatedStudentAnswer(string $value): array
+    {
+        $parts = explode(':', $value, 2);
+        if (2 === \count($parts)) {
+            return [(int) $parts[0], trim((string) $parts[1])];
+        }
+
+        return [0, trim($value)];
+    }
+
+    private function extractCalculatedExpectedAnswer(string $answer): string
+    {
+        $parts = explode('@@', $answer, 2);
+        $text = (string) ($parts[0] ?? $answer);
+        if (1 === preg_match('/\[([^\[\]]*)\]\s*$/', $text, $matches)) {
+            return trim((string) ($matches[1] ?? ''));
+        }
+
+        return '';
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      */
@@ -1006,6 +1327,14 @@ private function scoreManualAnswer(array $rows): float
     private function getQuestionWeight(CQuizQuestion $question, array $answers): float
     {
         $type = (int) $question->getType();
+        if (\in_array($type, [self::MEDIA_QUESTION, self::PAGE_BREAK], true)) {
+            return 0.0;
+        }
+
+        if (self::CALCULATED_ANSWER === $type) {
+            return (float) $question->getPonderation();
+        }
+
         if (\in_array($type, [self::MULTIPLE_ANSWER_COMBINATION, self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE], true)) {
             $firstAnswer = reset($answers);
             if ($firstAnswer instanceof CQuizAnswer && 0.0 !== $firstAnswer->getPonderation()) {
@@ -1033,7 +1362,7 @@ private function getFirstSavedAnswerId(array $rows): int
      */
     private function requiresManualCorrection(CQuizQuestion $question): bool
     {
-        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::UPLOAD_ANSWER], true);
+        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::UPLOAD_ANSWER, self::ANNOTATION], true);
     }
 
     private function getSavedAnswerIds(array $rows): array
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index b9baa891248..d4f38b67854 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -47,14 +47,22 @@
 {
     private const VISIBILITY_PUBLISHED = 2;
     private const STATUS_INCOMPLETE = 'incomplete';
-    private const UNIQUE_TYPES = [1, 10, 17];
+    private const UNIQUE_TYPES = [1, 10, 17, 21];
     private const MULTIPLE_TYPES = [2, 9, 14];
-    private const TRUE_FALSE_TYPES = [11, 12];
+    private const TRUE_FALSE_TYPES = [11, 12, 22];
     private const FILL_BLANK_TYPES = [3, 27];
     private const MATCHING_TYPES = [4, 19, 24, 25];
     private const DROPDOWN_TYPES = [28, 29];
+    private const CALCULATED_TYPES = [16];
     private const FREE_ANSWER_TYPES = [5];
+    private const ORAL_EXPRESSION_TYPES = [13];
     private const UPLOAD_ANSWER_TYPES = [23];
+    private const ANNOTATION_TYPES = [20];
+    private const HOTSPOT_TYPES = [6, 26];
+    private const MEDIA_QUESTION = 15;
+    private const PAGE_BREAK = 31;
+    private const QUESTION_SELECTION_RANDOM = 2;
+    private const STRUCTURAL_CONTENT_TYPES = [self::MEDIA_QUESTION, self::PAGE_BREAK];
 
     public function __construct(
         private RequestStack $requestStack,
@@ -92,15 +100,21 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $attempt = $this->getRuntimeAttempt($request, $quiz, $course, $session, $canManage);
         $attemptQuestionIds = $attempt instanceof TrackEExercise ? $this->parseQuestionIds((string) $attempt->getDataTracking()) : null;
         $questions = $this->getRuntimeQuestions($quiz, $course, $session, $canManage, $attemptQuestionIds);
+        $runtimePages = $this->buildRuntimePages($quiz, $questions);
+        $settings = $this->getRuntimeSettings($quiz);
+        $settings['runtimePages'] = $runtimePages['pages'];
+        $settings['usesStructuralPages'] = $runtimePages['usesStructuralPages'];
+        $settings['forceGroupedByMedia'] = $runtimePages['forceGroupedByMedia'];
+        $settings['effectiveOneQuestionPerPage'] = $runtimePages['effectiveOneQuestionPerPage'];
 
         $response = new ExerciseRuntime();
         $response->exerciseId = $exerciseId;
         $response->title = $quiz->getTitle();
         $response->description = (string) $quiz->getDescription();
-        $response->settings = $this->getRuntimeSettings($quiz);
+        $response->settings = $settings;
         $response->questions = $questions;
         $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session);
-        $response->questionCount = \count($questions);
+        $response->questionCount = $this->countAnswerableQuestions($questions);
         $response->totalScore = $this->getTotalScore($questions);
         $canSubmit = !$canManage
             && $attempt instanceof TrackEExercise
@@ -143,8 +157,13 @@ private function isFinishSupportedQuestionType(int $type): bool
             || \in_array($type, self::FILL_BLANK_TYPES, true)
             || \in_array($type, self::MATCHING_TYPES, true)
             || \in_array($type, self::DROPDOWN_TYPES, true)
+            || \in_array($type, self::CALCULATED_TYPES, true)
             || \in_array($type, self::FREE_ANSWER_TYPES, true)
-            || \in_array($type, self::UPLOAD_ANSWER_TYPES, true);
+            || \in_array($type, self::ORAL_EXPRESSION_TYPES, true)
+            || \in_array($type, self::UPLOAD_ANSWER_TYPES, true)
+            || \in_array($type, self::ANNOTATION_TYPES, true)
+            || \in_array($type, self::HOTSPOT_TYPES, true)
+            || \in_array($type, self::STRUCTURAL_CONTENT_TYPES, true);
     }
 
     private function getRuntimeAttempt(Request $request, CQuiz $quiz, Course $course, ?Session $session, bool $canManage): ?TrackEExercise
@@ -427,26 +446,15 @@ private function getRuntimeSettings(CQuiz $quiz): array
      */
     private function getRuntimeQuestions(CQuiz $quiz, Course $course, ?Session $session, bool $canManage, ?array $questionIds = null): array
     {
-        $queryBuilder = $this->entityManager->createQueryBuilder()
-            ->select('relQuestion')
-            ->addSelect('question')
-            ->from(CQuizRelQuestion::class, 'relQuestion')
-            ->innerJoin('relQuestion.question', 'question')
-            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
-            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
-            ->orderBy('relQuestion.questionOrder', 'ASC')
-        ;
+        $relations = $this->getOrderedQuestionRelations($quiz);
+        $selectedQuestionIds = null !== $questionIds && [] !== $questionIds
+            ? array_values(array_unique(array_map('intval', $questionIds)))
+            : null;
+        $selectedQuestionIdMap = null !== $selectedQuestionIds ? array_flip($selectedQuestionIds) : [];
+        $mediaParents = [];
+        $normalizedById = [];
+        $includePageBreaks = !$this->usesRandomQuestionOrder($quiz);
 
-        if (null !== $questionIds && [] !== $questionIds) {
-            $queryBuilder
-                ->andWhere('IDENTITY(relQuestion.question) IN (:questionIds)')
-                ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
-            ;
-        }
-
-        $relations = $queryBuilder->getQuery()->getResult();
-
-        $items = [];
         foreach ($relations as $relation) {
             if (!$relation instanceof CQuizRelQuestion) {
                 continue;
@@ -457,17 +465,54 @@ private function getRuntimeQuestions(CQuiz $quiz, Course $course, ?Session $sess
                 continue;
             }
 
-            $items[(int) $question->getIid()] = $this->normalizeQuestion($question, $relation, $course, $session, $canManage);
+            $questionId = (int) $question->getIid();
+            $questionType = (int) $question->getType();
+
+            if (self::MEDIA_QUESTION === $questionType) {
+                $mediaParents[$questionId] = $this->normalizeMediaParentQuestion($question);
+                continue;
+            }
+
+            $isSelectedAttemptQuestion = null === $selectedQuestionIds || isset($selectedQuestionIdMap[$questionId]);
+            $isPageBreak = self::PAGE_BREAK === $questionType;
+
+            if (!$isSelectedAttemptQuestion && !($isPageBreak && $includePageBreaks)) {
+                continue;
+            }
+
+            if ($isPageBreak && !$includePageBreaks) {
+                continue;
+            }
+
+            $item = $this->normalizeQuestion($question, $relation, $course, $session, $canManage);
+            $normalizedById[$questionId] = $item;
         }
 
-        if (null !== $questionIds && [] !== $questionIds) {
+        foreach ($normalizedById as $questionId => &$item) {
+            $parentId = (int) ($item['parentId'] ?? 0);
+            if (0 < $parentId) {
+                if (!isset($mediaParents[$parentId])) {
+                    $mediaQuestion = $this->entityManager->getRepository(CQuizQuestion::class)->find($parentId);
+                    if ($mediaQuestion instanceof CQuizQuestion && self::MEDIA_QUESTION === (int) $mediaQuestion->getType()) {
+                        $mediaParents[$parentId] = $this->normalizeMediaParentQuestion($mediaQuestion);
+                    }
+                }
+
+                if (isset($mediaParents[$parentId])) {
+                    $item['parent'] = $mediaParents[$parentId];
+                }
+            }
+        }
+        unset($item);
+
+        if (null !== $selectedQuestionIds && $this->usesRandomQuestionOrder($quiz)) {
             $orderedItems = [];
-            foreach ($questionIds as $position => $questionId) {
-                if (!isset($items[$questionId])) {
+            foreach ($selectedQuestionIds as $position => $questionId) {
+                if (!isset($normalizedById[$questionId])) {
                     continue;
                 }
 
-                $item = $items[$questionId];
+                $item = $normalizedById[$questionId];
                 $item['position'] = $position + 1;
                 $orderedItems[] = $item;
             }
@@ -475,7 +520,38 @@ private function getRuntimeQuestions(CQuiz $quiz, Course $course, ?Session $sess
             return $orderedItems;
         }
 
-        return array_values($items);
+        $orderedItems = [];
+        $position = 1;
+        foreach ($normalizedById as $questionId => $item) {
+            if (self::PAGE_BREAK !== (int) ($item['type'] ?? 0)) {
+                $item['position'] = $position;
+                $position++;
+            }
+
+            $orderedItems[] = $item;
+        }
+
+        return $orderedItems;
+    }
+
+    /**
+     * @return array<int, CQuizRelQuestion>
+     */
+    private function getOrderedQuestionRelations(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        return array_values(array_filter($relations, static fn (mixed $relation): bool => $relation instanceof CQuizRelQuestion));
     }
 
     /**
@@ -493,6 +569,8 @@ private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $re
             'typeLabel' => $this->getQuestionTypeLabel($type),
             'score' => (float) $question->getPonderation(),
             'position' => (int) $relation->getQuestionOrder(),
+            'parentId' => (int) ($question->getParentMediaId() ?? 0),
+            'parent' => null,
             'mandatory' => 1 === (int) $question->getMandatory(),
             'duration' => $question->getDuration(),
             'difficulty' => max(1, (int) $question->getLevel()),
@@ -505,18 +583,266 @@ private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $re
             'dropdown' => $this->getDropdownRuntime($question),
             'calculated' => $this->getCalculatedRuntime($question),
             'annotation' => $this->getImageRuntime($question, $course, $session, [20]),
-            'hotspot' => $this->getImageRuntime($question, $course, $session, [6, 8, 26]),
+            'hotspot' => $this->getHotspotRuntime($question, $course, $session, $canManage),
             'reading' => $this->getReadingRuntime($question),
+            'content' => $this->getContentRuntime($question),
+            'isContent' => \in_array($type, self::STRUCTURAL_CONTENT_TYPES, true),
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeMediaParentQuestion(CQuizQuestion $question): array
+    {
+        return [
+            'id' => (int) $question->getIid(),
+            'title' => $question->getQuestion(),
+            'description' => (string) $question->getDescription(),
+            'type' => self::MEDIA_QUESTION,
+            'typeLabel' => $this->getQuestionTypeLabel(self::MEDIA_QUESTION),
+            'content' => [
+                'title' => $question->getQuestion(),
+                'description' => (string) $question->getDescription(),
+            ],
         ];
     }
 
+    private function usesRandomQuestionOrder(CQuiz $quiz): bool
+    {
+        return 0 < (int) $quiz->getRandom()
+            || self::QUESTION_SELECTION_RANDOM === (int) ($quiz->getQuestionSelectionType() ?? 0);
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     *
+     * @return array{pages: array<int, array<string, mixed>>, usesStructuralPages: bool, forceGroupedByMedia: bool, effectiveOneQuestionPerPage: bool}
+     */
+    private function buildRuntimePages(CQuiz $quiz, array $questions): array
+    {
+        $questions = $this->trimPageBreakEdges($questions);
+        $oneQuestionPerPage = CQuiz::ONE_PER_PAGE === (int) $quiz->getType();
+        $hasMediaWithChildren = $this->hasMediaQuestionChildren($questions);
+        $forceGroupedByMedia = $oneQuestionPerPage && $hasMediaWithChildren;
+        $pages = [];
+
+        if ($hasMediaWithChildren) {
+            $groupIndexByParent = [];
+            foreach ($questions as $question) {
+                $type = (int) ($question['type'] ?? 0);
+                if (self::PAGE_BREAK === $type || self::MEDIA_QUESTION === $type) {
+                    continue;
+                }
+
+                $parentId = (int) ($question['parentId'] ?? 0);
+                if (0 < $parentId) {
+                    if (!isset($groupIndexByParent[$parentId])) {
+                        $groupIndexByParent[$parentId] = \count($pages);
+                        $pages[] = [
+                            'type' => 'media_group',
+                            'media' => $question['parent'] ?? null,
+                            'questionIds' => [],
+                        ];
+                    }
+
+                    $pages[$groupIndexByParent[$parentId]]['questionIds'][] = (int) $question['id'];
+                    continue;
+                }
+
+                $pages[] = [
+                    'type' => 'questions',
+                    'media' => null,
+                    'questionIds' => [(int) $question['id']],
+                ];
+            }
+
+            return [
+                'pages' => $this->reindexPages($pages),
+                'usesStructuralPages' => true,
+                'forceGroupedByMedia' => $forceGroupedByMedia,
+                'effectiveOneQuestionPerPage' => true,
+            ];
+        }
+
+        if (!$oneQuestionPerPage) {
+            $currentPage = [
+                'type' => 'questions',
+                'media' => null,
+                'pageBreak' => null,
+                'questionIds' => [],
+            ];
+
+            foreach ($questions as $question) {
+                $type = (int) ($question['type'] ?? 0);
+                if (self::MEDIA_QUESTION === $type) {
+                    continue;
+                }
+
+                if (self::PAGE_BREAK === $type) {
+                    if ([] !== $currentPage['questionIds'] || null !== $currentPage['pageBreak']) {
+                        $pages[] = $currentPage;
+                    }
+
+                    $currentPage = [
+                        'type' => 'questions',
+                        'media' => null,
+                        'pageBreak' => $this->normalizePageBreakForPage($question),
+                        'questionIds' => [],
+                    ];
+                    continue;
+                }
+
+                $currentPage['questionIds'][] = (int) $question['id'];
+            }
+
+            if ([] !== $currentPage['questionIds'] || null !== $currentPage['pageBreak']) {
+                $pages[] = $currentPage;
+            }
+
+            if ([] === $pages) {
+                $pages[] = [
+                    'type' => 'questions',
+                    'media' => null,
+                    'pageBreak' => null,
+                    'questionIds' => [],
+                ];
+            }
+
+            $usesStructuralPages = 1 < \count($pages) || $this->containsPageBreak($questions);
+
+            return [
+                'pages' => $this->reindexPages($pages),
+                'usesStructuralPages' => $usesStructuralPages,
+                'forceGroupedByMedia' => false,
+                'effectiveOneQuestionPerPage' => $usesStructuralPages,
+            ];
+        }
+
+        foreach ($questions as $question) {
+            $type = (int) ($question['type'] ?? 0);
+            if (\in_array($type, [self::MEDIA_QUESTION, self::PAGE_BREAK], true)) {
+                continue;
+            }
+
+            $pages[] = [
+                'type' => 'questions',
+                'media' => null,
+                'pageBreak' => null,
+                'questionIds' => [(int) $question['id']],
+            ];
+        }
+
+        return [
+            'pages' => $this->reindexPages($pages),
+            'usesStructuralPages' => false,
+            'forceGroupedByMedia' => false,
+            'effectiveOneQuestionPerPage' => true,
+        ];
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function trimPageBreakEdges(array $questions): array
+    {
+        while ([] !== $questions && self::PAGE_BREAK === (int) ($questions[array_key_first($questions)]['type'] ?? 0)) {
+            array_shift($questions);
+        }
+
+        while ([] !== $questions && self::PAGE_BREAK === (int) ($questions[array_key_last($questions)]['type'] ?? 0)) {
+            array_pop($questions);
+        }
+
+        return array_values($questions);
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     */
+    private function hasMediaQuestionChildren(array $questions): bool
+    {
+        foreach ($questions as $question) {
+            if (0 < (int) ($question['parentId'] ?? 0)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     */
+    private function containsPageBreak(array $questions): bool
+    {
+        foreach ($questions as $question) {
+            if (self::PAGE_BREAK === (int) ($question['type'] ?? 0)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param array<string, mixed> $question
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizePageBreakForPage(array $question): array
+    {
+        return [
+            'id' => (int) ($question['id'] ?? 0),
+            'title' => (string) ($question['title'] ?? ''),
+            'description' => (string) ($question['description'] ?? ''),
+            'content' => $question['content'] ?? null,
+        ];
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $pages
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function reindexPages(array $pages): array
+    {
+        $result = [];
+        foreach (array_values($pages) as $index => $page) {
+            $page['index'] = $index;
+            $page['number'] = $index + 1;
+            $result[] = $page;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     */
+    private function countAnswerableQuestions(array $questions): int
+    {
+        $total = 0;
+        foreach ($questions as $question) {
+            if (\in_array((int) ($question['type'] ?? 0), self::STRUCTURAL_CONTENT_TYPES, true)) {
+                continue;
+            }
+
+            $total++;
+        }
+
+        return $total;
+    }
+
     /**
      * @return array<int, array<string, mixed>>
      */
     private function getChoiceItems(CQuizQuestion $question): array
     {
         $type = (int) $question->getType();
-        if (!\in_array($type, [1, 2, 9, 10, 11, 12, 14, 17, 22], true)) {
+        if (!\in_array($type, [1, 2, 9, 10, 11, 12, 14, 17, 21, 22], true)) {
             return [];
         }
 
@@ -768,17 +1094,77 @@ private function getDropdownRuntime(CQuizQuestion $question): ?array
      */
     private function getCalculatedRuntime(CQuizQuestion $question): ?array
     {
-        if (16 !== (int) $question->getType()) {
+        if (!\in_array((int) $question->getType(), self::CALCULATED_TYPES, true)) {
             return null;
         }
 
-        $text = '';
-        $answer = $this->getFirstAnswer($question);
-        if ($answer instanceof CQuizAnswer) {
-            $text = $this->stripCalculatedMetadata($answer->getAnswer());
+        $variations = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $parsedAnswer = $this->parseCalculatedAnswer((string) $answer->getAnswer());
+            $variations[] = [
+                'id' => (int) $answer->getIid(),
+                'text' => $parsedAnswer['text'],
+                'position' => (int) $answer->getPosition(),
+            ];
+        }
+
+        $firstVariation = $variations[0] ?? null;
+
+        return [
+            'answerId' => null !== $firstVariation ? (int) $firstVariation['id'] : null,
+            'text' => (string) ($firstVariation['text'] ?? ''),
+            'variations' => $variations,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getHotspotRuntime(CQuizQuestion $question, Course $course, ?Session $session, bool $canManage): ?array
+    {
+        if (!\in_array((int) $question->getType(), self::HOTSPOT_TYPES, true)) {
+            return null;
+        }
+
+        $image = $this->getImageRuntime($question, $course, $session, self::HOTSPOT_TYPES) ?? [
+            'imageName' => '',
+            'imageUrl' => '',
+        ];
+        $zones = [];
+        $maxClicks = 0;
+
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $hotspotType = (string) ($answer->getHotspotType() ?: 'square');
+            if (!\in_array($hotspotType, ['square', 'circle', 'poly'], true)) {
+                continue;
+            }
+
+            if (0.0 < (float) $answer->getPonderation()) {
+                ++$maxClicks;
+            }
+
+            $zone = [
+                'id' => (int) $answer->getIid(),
+                'answer' => $answer->getAnswer(),
+                'position' => (int) $answer->getPosition(),
+                'hotspotType' => $hotspotType,
+            ];
+
+            if ($canManage) {
+                $zone['score'] = (float) $answer->getPonderation();
+                $zone['coordinates'] = (string) ($answer->getHotspotCoordinates() ?: '');
+            }
+
+            $zones[] = $zone;
         }
 
-        return ['text' => $text];
+        return [
+            'imageName' => (string) ($image['imageName'] ?? ''),
+            'imageUrl' => (string) ($image['imageUrl'] ?? ''),
+            'maxClicks' => max(1, $maxClicks),
+            'combination' => 26 === (int) $question->getType(),
+            'zones' => $zones,
+        ];
     }
 
     /**
@@ -830,6 +1216,21 @@ private function getReadingRuntime(CQuizQuestion $question): ?array
         ];
     }
 
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getContentRuntime(CQuizQuestion $question): ?array
+    {
+        if (!\in_array((int) $question->getType(), self::STRUCTURAL_CONTENT_TYPES, true)) {
+            return null;
+        }
+
+        return [
+            'title' => $question->getQuestion(),
+            'description' => (string) $question->getDescription(),
+        ];
+    }
+
     /**
      * @return array<int, CQuizAnswer>
      */
@@ -871,11 +1272,27 @@ private function appendCourseContextToUrl(string $url, Course $course, ?Session
         return $url.(str_contains($url, '?') ? '&' : '?').http_build_query($params);
     }
 
-    private function stripCalculatedMetadata(string $answer): string
+    /**
+     * @return array{text: string, expectedAnswer: string, formula: string}
+     */
+    private function parseCalculatedAnswer(string $answer): array
     {
         $parts = explode('@@', $answer, 2);
+        $textWithExpectedAnswer = (string) ($parts[0] ?? $answer);
+        $formula = (string) ($parts[1] ?? '');
+        $expectedAnswer = '';
+        $text = $textWithExpectedAnswer;
+
+        if (1 === preg_match('/\[([^\[\]]*)\]\s*$/', $textWithExpectedAnswer, $matches)) {
+            $expectedAnswer = trim((string) ($matches[1] ?? ''));
+            $text = (string) preg_replace('/\s*\[[^\[\]]*\]\s*$/', '', $textWithExpectedAnswer);
+        }
 
-        return (string) ($parts[0] ?? $answer);
+        return [
+            'text' => $text,
+            'expectedAnswer' => $expectedAnswer,
+            'formula' => $formula,
+        ];
     }
 
     /**
@@ -918,6 +1335,10 @@ private function getTotalScore(array $questions): float
     {
         $total = 0.0;
         foreach ($questions as $question) {
+            if (\in_array((int) ($question['type'] ?? 0), self::STRUCTURAL_CONTENT_TYPES, true)) {
+                continue;
+            }
+
             $total += (float) ($question['score'] ?? 0.0);
         }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index 10ddd83c621..fe87f5922a3 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -43,6 +43,7 @@
 final readonly class ExerciseRuntimeResultProvider implements ProviderInterface
 {
     private const STATUS_COMPLETED = 'completed';
+    private const ANNOTATION = 20;
     private const VISIBILITY_PUBLISHED = 2;
     private const FEEDBACK_TYPE_EXAM = 2;
     private const RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS = 0;
@@ -548,8 +549,9 @@ private function normalizeQuestion(CQuizQuestion $question, array $rows, array $
         $questionScore = $this->getQuestionScore($rows);
         $maxScore = $this->getQuestionMaxScore($question);
         $requiresManualCorrection = $this->requiresManualCorrection($question);
+        $isStructuralContent = $this->isStructuralContentQuestion($question);
         $isCorrect = 0 < $maxScore ? $questionScore >= $maxScore : 0 < $questionScore;
-        if ($requiresManualCorrection && $pendingCorrection) {
+        if ($isStructuralContent || ($requiresManualCorrection && $pendingCorrection)) {
             $isCorrect = null;
         }
         $showQuestionCorrection = $this->shouldShowQuestionCorrection($rows, $visibility, true === $isCorrect);
@@ -561,9 +563,11 @@ private function normalizeQuestion(CQuizQuestion $question, array $rows, array $
             'type' => (int) $question->getType(),
             'typeLabel' => $this->getQuestionTypeLabel((int) $question->getType()),
             'position' => 0,
-            'score' => true === ($visibility['showQuestionScore'] ?? false) ? $questionScore : null,
-            'maxScore' => true === ($visibility['showQuestionScore'] ?? false) ? $maxScore : null,
-            'isCorrect' => true === ($visibility['showQuestionScore'] ?? false) ? $isCorrect : null,
+            'parentId' => (int) ($question->getParentMediaId() ?? 0),
+            'parent' => $this->normalizeParentMediaQuestion($question),
+            'score' => !$isStructuralContent && true === ($visibility['showQuestionScore'] ?? false) ? $questionScore : null,
+            'maxScore' => !$isStructuralContent && true === ($visibility['showQuestionScore'] ?? false) ? $maxScore : null,
+            'isCorrect' => !$isStructuralContent && true === ($visibility['showQuestionScore'] ?? false) ? $isCorrect : null,
             'requiresManualCorrection' => $requiresManualCorrection,
             'pendingCorrection' => $pendingCorrection,
             'canCorrect' => $canManage && $requiresManualCorrection,
@@ -573,8 +577,41 @@ private function normalizeQuestion(CQuizQuestion $question, array $rows, array $
     }
 
 
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function normalizeParentMediaQuestion(CQuizQuestion $question): ?array
+    {
+        $parentId = (int) ($question->getParentMediaId() ?? 0);
+        if (0 >= $parentId) {
+            return null;
+        }
+
+        $parent = $this->entityManager->getRepository(CQuizQuestion::class)->find($parentId);
+        if (!$parent instanceof CQuizQuestion || 15 !== (int) $parent->getType()) {
+            return null;
+        }
+
+        return [
+            'id' => (int) $parent->getIid(),
+            'title' => $parent->getQuestion(),
+            'description' => (string) $parent->getDescription(),
+            'type' => 15,
+            'typeLabel' => $this->getQuestionTypeLabel(15),
+            'content' => [
+                'title' => $parent->getQuestion(),
+                'description' => (string) $parent->getDescription(),
+            ],
+        ];
+    }
+
+
     private function getQuestionMaxScore(CQuizQuestion $question): float
     {
+        if ($this->isStructuralContentQuestion($question)) {
+            return 0.0;
+        }
+
         if (\in_array((int) $question->getType(), [9, 12], true)) {
             $answer = $this->getFirstAnswer($question);
             if ($answer instanceof CQuizAnswer && 0.0 !== $answer->getPonderation()) {
@@ -633,7 +670,7 @@ private function getQuestionFeedback(CQuizQuestion $question, array $visibility,
     private function normalizeQuestionAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
     {
         $type = (int) $question->getType();
-        if (\in_array($type, [1, 2, 9, 10, 11, 12, 14, 17], true)) {
+        if (\in_array($type, [1, 2, 9, 10, 11, 12, 14, 17, 21, 22], true)) {
             return $this->normalizeChoiceAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
@@ -649,20 +686,52 @@ private function normalizeQuestionAnswer(CQuizQuestion $question, array $rows, a
             return $this->normalizeDropdownAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
+        if (16 === $type) {
+            return $this->normalizeCalculatedAnswer($question, $rows, $showQuestionCorrection);
+        }
+
+        if (\in_array($type, [6, 26], true)) {
+            return $this->normalizeHotspotAnswer($question, $rows, $showQuestionCorrection);
+        }
+
         if (5 === $type) {
             return $this->normalizeFreeAnswer($rows, $visibility);
         }
 
+        if (13 === $type) {
+            return $this->normalizeOralExpressionAnswer($rows, $visibility);
+        }
+
         if (23 === $type) {
             return $this->normalizeUploadAnswer($rows, $visibility);
         }
 
+        if (self::ANNOTATION === $type) {
+            return $this->normalizeAnnotationAnswer($question, $rows, $visibility);
+        }
+
+        if (\in_array($type, [15, 31], true)) {
+            return $this->normalizeContentAnswer($question);
+        }
+
         return [
             'kind' => 'unsupported',
             'studentAnswer' => $this->normalizeRawRows($rows),
         ];
     }
 
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeContentAnswer(CQuizQuestion $question): array
+    {
+        return [
+            'kind' => 'content',
+            'title' => $question->getQuestion(),
+            'description' => (string) $question->getDescription(),
+        ];
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      * @param array<string, mixed>      $visibility
@@ -673,7 +742,9 @@ private function normalizeChoiceAnswer(CQuizQuestion $question, array $rows, arr
     {
         $selectedIds = array_flip($this->getSavedAnswerIds($rows));
         $trueFalseChoices = $this->getSavedTrueFalseChoices($rows);
-        $isTrueFalse = \in_array((int) $question->getType(), [11, 12], true);
+        $isTrueFalse = \in_array((int) $question->getType(), [11, 12, 22], true);
+        $isDegreeCertainty = 22 === (int) $question->getType();
+        $degreeCertaintyChoices = $isDegreeCertainty ? $this->getSavedTrueFalseDegreeCertaintyChoices($rows) : [];
         $options = $this->getQuestionOptions($question);
         $choices = [];
 
@@ -686,7 +757,15 @@ private function normalizeChoiceAnswer(CQuizQuestion $question, array $rows, arr
             ];
 
             if ($isTrueFalse) {
-                $selectedOption = $trueFalseChoices[$answerId] ?? 0;
+                if ($isDegreeCertainty) {
+                    $selectedOption = (int) ($degreeCertaintyChoices[$answerId]['choice'] ?? 0);
+                    $selectedDegree = (int) ($degreeCertaintyChoices[$answerId]['degree'] ?? 0);
+                    $choice['selectedDegreeId'] = $selectedDegree ?: null;
+                    $choice['selectedDegreeLabel'] = $this->getOptionTitle($options, $selectedDegree);
+                } else {
+                    $selectedOption = $trueFalseChoices[$answerId] ?? 0;
+                }
+
                 $choice['selectedOptionId'] = $selectedOption ?: null;
                 $choice['selectedOptionLabel'] = $this->getOptionTitle($options, $selectedOption);
             }
@@ -711,9 +790,34 @@ private function normalizeChoiceAnswer(CQuizQuestion $question, array $rows, arr
             'kind' => $isTrueFalse ? 'true_false' : 'choice',
             'choices' => $choices,
             'options' => array_values($options),
+            'hasDegreeCertainty' => $isDegreeCertainty,
         ];
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, array{choice: int, degree: int}>
+     */
+    private function getSavedTrueFalseDegreeCertaintyChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $parts = explode(':', (string) $row->getAnswer());
+            $answerId = isset($parts[0]) ? (int) $parts[0] : 0;
+            $optionId = isset($parts[1]) ? (int) $parts[1] : 0;
+            $degreeId = isset($parts[2]) ? (int) $parts[2] : 0;
+            if (0 < $answerId && 0 < $optionId) {
+                $choices[$answerId] = [
+                    'choice' => $optionId,
+                    'degree' => $degreeId,
+                ];
+            }
+        }
+
+        return $choices;
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      *
@@ -842,6 +946,173 @@ private function normalizeDropdownAnswer(CQuizQuestion $question, array $rows, a
         ];
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeCalculatedAnswer(CQuizQuestion $question, array $rows, bool $showQuestionCorrection): array
+    {
+        $row = $rows[0] ?? null;
+        $studentAnswer = '';
+        $answerId = 0;
+        if ($row instanceof TrackEAttempt) {
+            [$answerId, $studentAnswer] = $this->parseCalculatedStudentAnswer((string) $row->getAnswer());
+        }
+
+        $teacherAnswer = 0 < $answerId ? $this->getAnswerById($question, $answerId) : $this->getFirstAnswer($question);
+        $parsedTeacherAnswer = $teacherAnswer instanceof CQuizAnswer
+            ? $this->parseCalculatedTeacherAnswer((string) $teacherAnswer->getAnswer())
+            : ['text' => '', 'expectedAnswer' => ''];
+
+        return [
+            'kind' => 'calculated',
+            'text' => (string) ($parsedTeacherAnswer['text'] ?? ''),
+            'studentAnswer' => $studentAnswer,
+            'expectedAnswer' => $showQuestionCorrection ? (string) ($parsedTeacherAnswer['expectedAnswer'] ?? '') : null,
+        ];
+    }
+
+    /**
+     * @return array{0: int, 1: string}
+     */
+    private function parseCalculatedStudentAnswer(string $value): array
+    {
+        $parts = explode(':', $value, 2);
+        if (2 === \count($parts)) {
+            return [(int) $parts[0], trim((string) $parts[1])];
+        }
+
+        return [0, trim($value)];
+    }
+
+    /**
+     * @return array{text: string, expectedAnswer: string}
+     */
+    private function parseCalculatedTeacherAnswer(string $answer): array
+    {
+        $parts = explode('@@', $answer, 2);
+        $textWithExpectedAnswer = (string) ($parts[0] ?? $answer);
+        $expectedAnswer = '';
+        $text = $textWithExpectedAnswer;
+
+        if (1 === preg_match('/\[([^\[\]]*)\]\s*$/', $textWithExpectedAnswer, $matches)) {
+            $expectedAnswer = trim((string) ($matches[1] ?? ''));
+            $text = (string) preg_replace('/\s*\[[^\[\]]*\]\s*$/', '', $textWithExpectedAnswer);
+        }
+
+        return [
+            'text' => $text,
+            'expectedAnswer' => $expectedAnswer,
+        ];
+    }
+
+    private function getAnswerById(CQuizQuestion $question, int $answerId): ?CQuizAnswer
+    {
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            if ((int) $answer->getIid() === $answerId) {
+                return $answer;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeHotspotAnswer(CQuizQuestion $question, array $rows, bool $showQuestionCorrection): array
+    {
+        $row = $rows[0] ?? null;
+        $studentPoints = $row instanceof TrackEAttempt ? $this->parseHotspotCoordinates((string) $row->getAnswer()) : [];
+        $zones = [];
+
+        if ($showQuestionCorrection) {
+            foreach ($this->getOrderedAnswers($question) as $answer) {
+                $hotspotType = (string) ($answer->getHotspotType() ?: 'square');
+                if (!\in_array($hotspotType, ['square', 'circle', 'poly'], true)) {
+                    continue;
+                }
+
+                $zones[] = [
+                    'id' => (int) $answer->getIid(),
+                    'answer' => $answer->getAnswer(),
+                    'comment' => (string) $answer->getComment(),
+                    'score' => (float) $answer->getPonderation(),
+                    'position' => (int) $answer->getPosition(),
+                    'hotspotType' => $hotspotType,
+                    'coordinates' => (string) ($answer->getHotspotCoordinates() ?: ''),
+                ];
+            }
+        }
+
+        return [
+            'kind' => 'hotspot',
+            'imageUrl' => $this->getHotspotImageUrl($question),
+            'imageName' => $this->getHotspotImageName($question),
+            'studentPoints' => $studentPoints,
+            'zones' => $zones,
+            'combination' => 26 === (int) $question->getType(),
+        ];
+    }
+
+    /**
+     * @return array<int, array{x: float, y: float, label: int, answerId?: int}>
+     */
+    private function parseHotspotCoordinates(string $value): array
+    {
+        $points = [];
+        foreach (explode('|', $value) as $index => $coordinate) {
+            $answerId = 0;
+            $coordinateValue = trim($coordinate);
+            if (str_contains($coordinateValue, ':')) {
+                [$answerIdValue, $coordinateValue] = explode(':', $coordinateValue, 2);
+                $answerId = (int) $answerIdValue;
+            }
+
+            $parts = array_map('trim', explode(';', $coordinateValue));
+            if (2 > \count($parts) || !is_numeric($parts[0]) || !is_numeric($parts[1])) {
+                continue;
+            }
+
+            $point = [
+                'x' => (float) $parts[0],
+                'y' => (float) $parts[1],
+                'label' => $index + 1,
+            ];
+            if (0 < $answerId) {
+                $point['answerId'] = $answerId;
+            }
+
+            $points[] = $point;
+        }
+
+        return $points;
+    }
+
+    private function getHotspotImageUrl(CQuizQuestion $question): string
+    {
+        try {
+            return $this->resourceNodeRepository->getResourceFileUrl($question->getResourceNode());
+        } catch (\Throwable) {
+            return '';
+        }
+    }
+
+    private function getHotspotImageName(CQuizQuestion $question): string
+    {
+        $resourceNode = $question->getResourceNode();
+        if (!$resourceNode instanceof ResourceNode) {
+            return '';
+        }
+
+        $resourceFile = $resourceNode->getResourceFiles()->first();
+
+        return $resourceFile instanceof ResourceFile ? (string) $resourceFile->getOriginalName() : (string) $resourceNode->getTitle();
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      * @param array<string, mixed>      $visibility
@@ -868,6 +1139,92 @@ private function normalizeFreeAnswer(array $rows, array $visibility): array
         ];
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeAnnotationAnswer(CQuizQuestion $question, array $rows, array $visibility): array
+    {
+        $row = $rows[0] ?? null;
+
+        return [
+            'kind' => 'annotation',
+            'imageUrl' => $this->getHotspotImageUrl($question),
+            'imageName' => $this->getHotspotImageName($question),
+            'paths' => $row instanceof TrackEAttempt ? $this->parseAnnotationAnswer((string) $row->getAnswer())['paths'] : [],
+            'texts' => $row instanceof TrackEAttempt ? $this->parseAnnotationAnswer((string) $row->getAnswer())['texts'] : [],
+            'teacherComment' => $row instanceof TrackEAttempt && true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
+            'marks' => $row instanceof TrackEAttempt ? (float) $row->getMarks() : 0.0,
+        ];
+    }
+
+    /**
+     * @return array{paths: array<int, array{points: array<int, array{x: float, y: float}>}>, texts: array<int, array{text: string, x: float, y: float}>}
+     */
+    private function parseAnnotationAnswer(string $value): array
+    {
+        $result = [
+            'paths' => [],
+            'texts' => [],
+        ];
+
+        foreach (explode('|', $value) as $item) {
+            $item = trim($item);
+            if ('' === $item) {
+                continue;
+            }
+
+            $parts = explode(')(', $item);
+            $type = array_shift($parts);
+            if ('P' === $type) {
+                $points = [];
+                foreach ($parts as $point) {
+                    $decoded = $this->decodeAnnotationPoint($point);
+                    if (null !== $decoded) {
+                        $points[] = $decoded;
+                    }
+                }
+
+                if (2 <= \count($points)) {
+                    $result['paths'][] = ['points' => $points];
+                }
+                continue;
+            }
+
+            if ('T' === $type && 2 <= \count($parts)) {
+                $text = trim((string) array_shift($parts));
+                $decoded = $this->decodeAnnotationPoint((string) ($parts[0] ?? ''));
+                if ('' !== $text && null !== $decoded) {
+                    $result['texts'][] = [
+                        'text' => $text,
+                        'x' => $decoded['x'],
+                        'y' => $decoded['y'],
+                    ];
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return array{x: float, y: float}|null
+     */
+    private function decodeAnnotationPoint(string $value): ?array
+    {
+        $parts = array_map('trim', explode(';', $value));
+        if (2 > \count($parts) || !is_numeric($parts[0]) || !is_numeric($parts[1])) {
+            return null;
+        }
+
+        return [
+            'x' => (float) $parts[0],
+            'y' => (float) $parts[1],
+        ];
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      * @param array<string, mixed>      $visibility
@@ -894,10 +1251,36 @@ private function normalizeUploadAnswer(array $rows, array $visibility): array
         ];
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeOralExpressionAnswer(array $rows, array $visibility): array
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return [
+                'kind' => 'oral_expression',
+                'files' => [],
+                'teacherComment' => null,
+                'marks' => 0.0,
+            ];
+        }
+
+        return [
+            'kind' => 'oral_expression',
+            'files' => $this->normalizeAttemptFiles($row, true),
+            'teacherComment' => true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
+            'marks' => (float) $row->getMarks(),
+        ];
+    }
+
     /**
      * @return array<int, array{id: int, name: string, size: int, mimeType: string, url: string}>
      */
-    private function normalizeAttemptFiles(TrackEAttempt $row): array
+    private function normalizeAttemptFiles(TrackEAttempt $row, bool $withInlineUrl = false): array
     {
         $files = [];
         foreach ($row->getAttemptFiles() as $attemptFile) {
@@ -919,6 +1302,7 @@ private function normalizeAttemptFiles(TrackEAttempt $row): array
                 'size' => (int) ($resourceFile instanceof ResourceFile ? $resourceFile->getSize() : 0),
                 'mimeType' => (string) ($resourceFile instanceof ResourceFile ? $resourceFile->getMimeType() : ''),
                 'url' => $url,
+                'inlineUrl' => $withInlineUrl ? $this->getAttemptFileDownloadUrl($row, $resourceNode, true) : $url,
             ];
         }
 
@@ -926,7 +1310,7 @@ private function normalizeAttemptFiles(TrackEAttempt $row): array
     }
 
 
-    private function getAttemptFileDownloadUrl(TrackEAttempt $attemptRow, ResourceNode $resourceNode): string
+    private function getAttemptFileDownloadUrl(TrackEAttempt $attemptRow, ResourceNode $resourceNode, bool $inline = false): string
     {
         $attempt = $attemptRow->getTrackEExercise();
         $quiz = $attempt->getQuiz();
@@ -945,7 +1329,11 @@ private function getAttemptFileDownloadUrl(TrackEAttempt $attemptRow, ResourceNo
 
         $request = $this->requestStack->getCurrentRequest();
         if (null !== $request) {
-            foreach (['gid', 'origin', 'learnpath_id', 'learnpath_item_id', 'learnpath_item_view_id'] as $queryKey) {
+            if ($inline) {
+            $query['inline'] = 1;
+        }
+
+        foreach (['gid', 'origin', 'learnpath_id', 'learnpath_item_id', 'learnpath_item_view_id'] as $queryKey) {
                 $value = $request->query->get($queryKey);
                 if (null !== $value && '' !== (string) $value) {
                     $query[$queryKey] = (string) $value;
@@ -1206,9 +1594,14 @@ private function getFillBlankSeparators(int $separator): array
         };
     }
 
+    private function isStructuralContentQuestion(CQuizQuestion $question): bool
+    {
+        return \in_array((int) $question->getType(), [15, 31], true);
+    }
+
     private function requiresManualCorrection(CQuizQuestion $question): bool
     {
-        return \in_array((int) $question->getType(), [5, 23], true);
+        return \in_array((int) $question->getType(), [5, 13, 20, 23], true);
     }
 
     private function getQuestionTypeLabel(int $type): string
@@ -1219,6 +1612,7 @@ private function getQuestionTypeLabel(int $type): string
             3 => 'Fill in blanks',
             4 => 'Matching',
             5 => 'Open question',
+            6 => 'Hotspot',
             9 => 'Exact Selection',
             10 => 'Unique answer with unknown',
             11 => 'Multiple answer true/false',
@@ -1226,12 +1620,17 @@ private function getQuestionTypeLabel(int $type): string
             14 => 'Global multiple answer',
             17 => 'Unique answer with images',
             19 => 'Matching draggable',
+            20 => 'Annotation',
+            21 => 'Reading comprehension',
+            22 => 'Multiple answer true/false with degree of certainty',
             23 => 'Upload answer',
             24 => 'Matching combination',
             25 => 'Matching draggable combination',
+            26 => 'Hotspot combination',
             27 => 'Fill in blanks combination',
             28 => 'Multiple answer dropdown combination',
             29 => 'Multiple answer dropdown',
+            31 => 'Page break',
             default => 'Question',
         };
     }
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index f7861da7763..db32a8e202c 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -36,7 +36,7 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Uploads a learner file answer and attaches it to a track_e_attempt row as AttemptFile, matching legacy upload answer tracking.
+ * Uploads a learner file/audio answer and attaches it to a track_e_attempt row as AttemptFile, matching legacy manual answer tracking.
  *
  * @implements ProcessorInterface<ExerciseRuntimeUploadAnswer, ExerciseRuntimeUploadAnswer>
  */
@@ -44,8 +44,10 @@
 {
     private const VISIBILITY_PUBLISHED = 2;
     private const STATUS_INCOMPLETE = 'incomplete';
+    private const ORAL_EXPRESSION = 13;
     private const UPLOAD_ANSWER = 23;
     private const ATTEMPT_FILE_RESOURCE_TYPE = 'attempt_file';
+    private const ORAL_EXPRESSION_ALLOWED_EXTENSIONS = ['wav', 'ogg'];
 
     public function __construct(
         private RequestStack $requestStack,
@@ -93,8 +95,8 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new NotFoundHttpException('The requested question was not found in this exercise.');
         }
 
-        if (self::UPLOAD_ANSWER !== (int) $question->getType()) {
-            throw new BadRequestHttpException('This endpoint only supports upload answer questions.');
+        if (!\in_array((int) $question->getType(), [self::UPLOAD_ANSWER, self::ORAL_EXPRESSION], true)) {
+            throw new BadRequestHttpException('This endpoint only supports upload answer and oral expression questions.');
         }
 
         if (!$this->questionBelongsToAttempt($questionId, $attempt)) {
@@ -104,11 +106,12 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $uploadedFiles = $this->getUploadedFiles($request);
         $postedNodeIds = $this->getPostedResourceNodeIds($request);
         if ([] === $uploadedFiles && [] === $postedNodeIds) {
-            throw new BadRequestHttpException('A file is required for this upload answer.');
+            throw new BadRequestHttpException('A file is required for this answer.');
         }
 
         $resourceNodes = [];
         foreach ($uploadedFiles as $uploadedFile) {
+            $this->validateUploadedFileForQuestion($uploadedFile, $question);
             $resourceNodes[] = $this->createAttemptFileResourceNode($uploadedFile, $user);
         }
         foreach ($postedNodeIds as $postedNodeId) {
@@ -370,6 +373,22 @@ private function getPostedResourceNodeIds(Request $request): array
         return $nodeIds;
     }
 
+    private function validateUploadedFileForQuestion(UploadedFile $uploadedFile, CQuizQuestion $question): void
+    {
+        if (self::ORAL_EXPRESSION !== (int) $question->getType()) {
+            return;
+        }
+
+        $extension = strtolower((string) $uploadedFile->getClientOriginalExtension());
+        if ('' === $extension) {
+            $extension = strtolower((string) $uploadedFile->guessExtension());
+        }
+
+        if (!\in_array($extension, self::ORAL_EXPRESSION_ALLOWED_EXTENSIONS, true)) {
+            throw new BadRequestHttpException('Only WAV and OGG audio files are accepted for oral expression questions.');
+        }
+    }
+
     private function createAttemptFileResourceNode(UploadedFile $uploadedFile, User $user): ResourceNode
     {
         $resourceType = $this->entityManager->getRepository(ResourceType::class)->findOneBy(['title' => self::ATTEMPT_FILE_RESOURCE_TYPE]);

From e187f1753f56accbdc421ee2ae144a960a9750d7 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Sun, 14 Jun 2026 03:11:11 -0500
Subject: [PATCH 03/21] Exercise: Complete exercise Vue migration parity

---
 .../basecomponents/BaseCheckbox.vue           |    7 +-
 assets/vue/router/exercise.js                 |   65 +
 assets/vue/services/exerciseService.js        |  133 ++
 .../exercise/ExerciseCategoryManagerView.vue  |  475 ++++++
 .../exercise/ExerciseConfigurationView.vue    |  385 ++++-
 .../vue/views/exercise/ExerciseListView.vue   |  180 ++-
 .../exercise/ExerciseLiveResultsView.vue      |  476 ++++++
 .../views/exercise/ExerciseOverviewView.vue   |  368 +++++
 .../vue/views/exercise/ExercisePlayerView.vue |  672 ++++++++-
 .../exercise/ExerciseQuestionBankView.vue     |  466 ++++++
 .../exercise/ExerciseQuestionEditorView.vue   |   22 +-
 .../exercise/ExerciseQuestionImportView.vue   |  350 +++++
 .../exercise/ExerciseQuestionSelectorView.vue |   49 +-
 .../exercise/ExerciseQuestionStatsView.vue    |  305 ++++
 .../exercise/ExerciseReportByQuestionView.vue |  344 +++++
 .../vue/views/exercise/ExerciseReportView.vue |  471 +++++-
 .../vue/views/exercise/ExerciseResultView.vue |  319 ++++-
 .../Exercise/ExerciseCategoryManagement.php   |  128 ++
 .../Exercise/ExerciseConfiguration.php        |   39 +
 .../ApiResource/Exercise/ExerciseList.php     |   34 +-
 .../Exercise/ExerciseLiveResults.php          |   87 ++
 .../ApiResource/Exercise/ExerciseOverview.php |  145 ++
 .../Exercise/ExerciseQuestionBank.php         |  162 +++
 .../Exercise/ExerciseQuestionEditor.php       |    3 +
 .../Exercise/ExerciseQuestionImport.php       |  133 ++
 .../Exercise/ExerciseQuestionStats.php        |   73 +
 .../Exercise/ExerciseReportByQuestion.php     |   73 +
 .../Exercise/ExerciseRuntimeAnswer.php        |    6 +
 .../Exercise/ExerciseRuntimeAttemptClose.php  |   64 +
 .../Exercise/ExerciseRuntimeAttemptEmail.php  |   76 +
 .../ExerciseRuntimeAttemptRecalculate.php     |   70 +
 .../Exercise/ExerciseRuntimeReport.php        |   20 +-
 .../ExerciseRuntimeReportBulkAction.php       |   77 +
 .../Exercise/ExerciseRuntimeReportEmail.php   |   83 ++
 .../Exercise/ExerciseRuntimeResult.php        |    6 +
 .../Api/ExerciseExcelTemplateController.php   |   32 +
 .../Api/ExerciseQti2ExportController.php      |   33 +
 .../ExerciseQuestionReportPdfController.php   |   43 +
 ...ciseRuntimeAllAttemptsExportController.php |   33 +
 .../ExerciseRuntimeAttemptPdfController.php   |   33 +
 .../ExerciseRuntimeReportExportController.php |   45 +
 .../ExerciseAttemptScoringService.php         | 1271 +++++++++++++++++
 .../Exercise/ExerciseExcelTemplateService.php |  149 ++
 .../Exercise/ExerciseQti2ExportService.php    |  449 ++++++
 .../Exercise/ExerciseQti2ImportService.php    |  930 ++++++++++++
 .../ExerciseQuestionReportPdfService.php      |  227 +++
 ...xerciseRuntimeAllAttemptsExportService.php |  307 ++++
 .../ExerciseRuntimeAttemptPdfService.php      |  672 +++++++++
 .../ExerciseRuntimeReportExportService.php    |  382 +++++
 .../ExerciseRuntimeResultEmailService.php     |  485 +++++++
 ...iseSpecialQuestionReportCounterService.php |  593 ++++++++
 .../ExerciseCategoryManagementProcessor.php   |  496 +++++++
 .../ExerciseCategoryManagementProvider.php    |  274 ++++
 .../ExerciseConfigurationProcessor.php        | 1030 ++++++++++++-
 .../ExerciseConfigurationProvider.php         |  544 ++++++-
 .../Exercise/ExerciseListActionProcessor.php  |  510 +++++++
 .../State/Exercise/ExerciseListProvider.php   |   24 +-
 .../Exercise/ExerciseLiveResultsProvider.php  |  403 ++++++
 .../Exercise/ExerciseOverviewProvider.php     |  458 ++++++
 .../ExerciseQuestionBankProcessor.php         |  359 +++++
 .../Exercise/ExerciseQuestionBankProvider.php |  615 ++++++++
 .../ExerciseQuestionEditorProcessor.php       |   69 +-
 .../ExerciseQuestionEditorProvider.php        |   21 +
 .../ExerciseQuestionImportProcessor.php       | 1027 +++++++++++++
 .../ExerciseQuestionImportProvider.php        |  216 +++
 .../Exercise/ExerciseQuestionProvider.php     |   71 +-
 .../ExerciseQuestionStatsProvider.php         |  396 +++++
 .../ExerciseReportByQuestionProvider.php      |  500 +++++++
 .../ExerciseRuntimeAnswerProcessor.php        |  664 ++++++++-
 .../ExerciseRuntimeAttemptCloseProcessor.php  |  230 +++
 .../ExerciseRuntimeAttemptDeleteProcessor.php |   56 +
 .../ExerciseRuntimeAttemptEmailProcessor.php  |   58 +
 .../ExerciseRuntimeAttemptProcessor.php       |  364 ++++-
 ...ciseRuntimeAttemptRecalculateProcessor.php |  231 +++
 .../ExerciseRuntimeCorrectionProcessor.php    |   66 +-
 .../ExerciseRuntimeFinishProcessor.php        |   46 +
 .../Exercise/ExerciseRuntimeProvider.php      |  346 ++++-
 ...erciseRuntimeReportBulkActionProcessor.php |  406 ++++++
 .../ExerciseRuntimeReportEmailProcessor.php   |   68 +
 .../ExerciseRuntimeReportProvider.php         |  138 +-
 .../ExerciseRuntimeResultProvider.php         |  393 +++--
 .../ExerciseRuntimeUploadAnswerProcessor.php  |   30 +-
 82 files changed, 21698 insertions(+), 461 deletions(-)
 create mode 100644 assets/vue/views/exercise/ExerciseCategoryManagerView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseLiveResultsView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseOverviewView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseQuestionBankView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseQuestionImportView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseQuestionStatsView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseReportByQuestionView.vue
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseCategoryManagement.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseLiveResults.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseQuestionImport.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseQuestionStats.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseReportByQuestion.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptClose.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptEmail.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptRecalculate.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportBulkAction.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportEmail.php
 create mode 100644 src/CoreBundle/Controller/Api/ExerciseExcelTemplateController.php
 create mode 100644 src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php
 create mode 100644 src/CoreBundle/Controller/Api/ExerciseQuestionReportPdfController.php
 create mode 100644 src/CoreBundle/Controller/Api/ExerciseRuntimeAllAttemptsExportController.php
 create mode 100644 src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptPdfController.php
 create mode 100644 src/CoreBundle/Controller/Api/ExerciseRuntimeReportExportController.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseAttemptScoringService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseExcelTemplateService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseQti2ExportService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseQti2ImportService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseQuestionReportPdfService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseRuntimeAllAttemptsExportService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseRuntimeAttemptPdfService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseRuntimeResultEmailService.php
 create mode 100644 src/CoreBundle/Service/Exercise/ExerciseSpecialQuestionReportCounterService.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionImportProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptEmailProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseRuntimeReportEmailProcessor.php

diff --git a/assets/vue/components/basecomponents/BaseCheckbox.vue b/assets/vue/components/basecomponents/BaseCheckbox.vue
index 2d9d0bf5b73..532e33498db 100644
--- a/assets/vue/components/basecomponents/BaseCheckbox.vue
+++ b/assets/vue/components/basecomponents/BaseCheckbox.vue
@@ -3,13 +3,14 @@
     <Checkbox
       v-model="modelValue"
       :binary="value === undefined"
+      :disabled="disabled"
       :inputId="id"
       :name="name"
       :value="value"
     />
     <label
       :for="id"
-      class="ml-2 cursor-pointer"
+      :class="['ml-2', disabled ? 'cursor-not-allowed text-gray-50' : 'cursor-pointer']"
       >{{ label }}</label
     >
   </div>
@@ -40,5 +41,9 @@ defineProps({
     type: [String, Number, Object],
     default: undefined,
   },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
diff --git a/assets/vue/router/exercise.js b/assets/vue/router/exercise.js
index 06467aa58a0..23fed19e27e 100644
--- a/assets/vue/router/exercise.js
+++ b/assets/vue/router/exercise.js
@@ -22,6 +22,47 @@ export default {
       meta: { breadcrumb: "Create exercise" },
       component: () => import("../views/exercise/ExerciseConfigurationView.vue"),
     },
+    {
+      name: "ExerciseCategories",
+      path: "categories",
+      meta: { breadcrumb: "Exercise categories" },
+      component: () => import("../views/exercise/ExerciseCategoryManagerView.vue"),
+      props: { categoryType: "exercise" },
+    },
+    {
+      name: "ExerciseQuestionCategories",
+      path: "question-categories",
+      meta: { breadcrumb: "Question categories" },
+      component: () => import("../views/exercise/ExerciseCategoryManagerView.vue"),
+      props: { categoryType: "question" },
+    },
+    {
+      name: "ExerciseImportAiken",
+      path: "import/aiken",
+      meta: { breadcrumb: "Import Aiken quiz" },
+      component: () => import("../views/exercise/ExerciseQuestionImportView.vue"),
+      props: { importType: "aiken" },
+    },
+    {
+      name: "ExerciseImportExcel",
+      path: "import/excel",
+      meta: { breadcrumb: "Import quiz from Excel" },
+      component: () => import("../views/exercise/ExerciseQuestionImportView.vue"),
+      props: { importType: "excel" },
+    },
+    {
+      name: "ExerciseImportQti2",
+      path: "import/qti2",
+      meta: { breadcrumb: "Import exercises QTI2" },
+      component: () => import("../views/exercise/ExerciseQuestionImportView.vue"),
+      props: { importType: "qti2" },
+    },
+    {
+      name: "ExerciseOverview",
+      path: ":exerciseId/overview",
+      meta: { breadcrumb: "Exercise overview" },
+      component: () => import("../views/exercise/ExerciseOverviewView.vue"),
+    },
     {
       name: "ExerciseEdit",
       path: ":exerciseId/edit",
@@ -46,12 +87,36 @@ export default {
       meta: { breadcrumb: "Learner score" },
       component: () => import("../views/exercise/ExerciseReportView.vue"),
     },
+    {
+      name: "ExerciseQuestionStats",
+      path: ":exerciseId/question-stats",
+      meta: { breadcrumb: "Question stats" },
+      component: () => import("../views/exercise/ExerciseQuestionStatsView.vue"),
+    },
+    {
+      name: "ExerciseReportByQuestion",
+      path: ":exerciseId/report-by-question",
+      meta: { breadcrumb: "Report by question" },
+      component: () => import("../views/exercise/ExerciseReportByQuestionView.vue"),
+    },
+    {
+      name: "ExerciseLiveResults",
+      path: ":exerciseId/live-results",
+      meta: { breadcrumb: "Live results" },
+      component: () => import("../views/exercise/ExerciseLiveResultsView.vue"),
+    },
     {
       name: "ExerciseQuestions",
       path: ":exerciseId/questions",
       meta: { breadcrumb: "Questions" },
       component: () => import("../views/exercise/ExerciseQuestionSelectorView.vue"),
     },
+    {
+      name: "ExerciseQuestionBank",
+      path: ":exerciseId/question-bank",
+      meta: { breadcrumb: "Question bank" },
+      component: () => import("../views/exercise/ExerciseQuestionBankView.vue"),
+    },
     {
       name: "ExerciseQuestionCreate",
       path: ":exerciseId/questions/create/:questionType",
diff --git a/assets/vue/services/exerciseService.js b/assets/vue/services/exerciseService.js
index 79017d2fba3..e56d6342d6b 100644
--- a/assets/vue/services/exerciseService.js
+++ b/assets/vue/services/exerciseService.js
@@ -36,6 +36,31 @@ export default {
     return await baseService.get("/api/exercise/list", cleanParams(params), exerciseRequestConfig())
   },
 
+  async saveExerciseListAction(payload = {}, params = {}) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(`/api/exercise/list/action${queryString}`, payload, {}, exerciseRequestConfig())
+  },
+
+  async getExerciseOverview(params = {}, exerciseId) {
+    return await baseService.get(`/api/exercise/overview/${exerciseId}`, cleanParams(params), exerciseRequestConfig())
+  },
+
+  async getExerciseCategories(categoryType, params = {}) {
+    return await baseService.get(`/api/exercise/categories/${categoryType}`, cleanParams(params), exerciseRequestConfig())
+  },
+
+  async saveExerciseCategoryAction(categoryType, payload = {}, params = {}) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/categories/${categoryType}/action${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
   async getExerciseConfiguration(params = {}, exerciseId = null) {
     const endpoint = exerciseId ? `/api/exercise/configuration/${exerciseId}` : "/api/exercise/configuration"
 
@@ -111,6 +136,41 @@ export default {
     )
   },
 
+  async runExerciseRuntimeReportBulkAction(payload = {}, params = {}, exerciseId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempts/action${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async getExerciseQuestionStats(params = {}, exerciseId) {
+    return await baseService.get(
+      `/api/exercise/runtime/${exerciseId}/question-stats`,
+      cleanParams(params),
+      exerciseRequestConfig(),
+    )
+  },
+
+  async getExerciseReportByQuestion(params = {}, exerciseId) {
+    return await baseService.get(
+      `/api/exercise/runtime/${exerciseId}/report-by-question`,
+      cleanParams(params),
+      exerciseRequestConfig(),
+    )
+  },
+
+  async getExerciseLiveResults(params = {}, exerciseId) {
+    return await baseService.get(
+      `/api/exercise/runtime/${exerciseId}/live-results`,
+      cleanParams(params),
+      exerciseRequestConfig(),
+    )
+  },
+
   async deleteExerciseRuntimeAttempt(payload = {}, params = {}, exerciseId, attemptId) {
     const queryString = buildQueryString(params)
 
@@ -122,6 +182,54 @@ export default {
     )
   },
 
+  async closeExerciseRuntimeAttempt(payload = {}, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/close${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async recalculateExerciseRuntimeAttempt(payload = {}, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/recalculate${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async emailExerciseRuntimeAttempt(payload = {}, params = {}, exerciseId, attemptId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/email${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async emailExerciseRuntimeReportAttempts(payload = {}, params = {}, exerciseId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/runtime/${exerciseId}/attempts/email${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  buildExerciseRuntimeAttemptPdfUrl(params = {}, exerciseId, attemptId) {
+    return `/api/exercise/runtime/${exerciseId}/attempt/${attemptId}/pdf${buildQueryString(params)}`
+  },
+
   async saveExerciseRuntimeCorrection(payload = {}, params = {}, exerciseId, attemptId) {
     const queryString = buildQueryString(params)
 
@@ -167,6 +275,31 @@ export default {
     )
   },
 
+  async getExerciseQuestionBank(params = {}, exerciseId) {
+    return await baseService.get(`/api/exercise/questions/${exerciseId}/bank`, cleanParams(params), exerciseRequestConfig())
+  },
+
+  async saveExerciseQuestionBankAction(payload, params = {}, exerciseId) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.post(
+      `/api/exercise/questions/${exerciseId}/bank/action${queryString}`,
+      payload,
+      {},
+      exerciseRequestConfig(),
+    )
+  },
+
+  async getExerciseQuestionImport(importType, params = {}) {
+    return await baseService.get(`/api/exercise/import/${importType}`, cleanParams(params), exerciseRequestConfig())
+  },
+
+  async importExerciseQuestions(importType, formData, params = {}) {
+    const queryString = buildQueryString(params)
+
+    return await baseService.postForm(`/api/exercise/import/${importType}${queryString}`, formData, exerciseRequestConfig())
+  },
+
   async saveExerciseConfiguration(payload, params = {}, exerciseId = null) {
     const queryString = buildQueryString(params)
 
diff --git a/assets/vue/views/exercise/ExerciseCategoryManagerView.vue b/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
new file mode 100644
index 00000000000..31d0ccd1e29
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
@@ -0,0 +1,475 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+      <BaseButton
+        class="exercise-category-toolbar__button"
+        :label="t('Back to exercises')"
+        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-category-toolbar__button"
+        :label="t('Add category')"
+        icon="folder-plus"
+        only-icon
+        size="small"
+        type="success"
+        @click="startCreate"
+      />
+      <BaseButton
+        v-if="isQuestionCategoryPage && legacyUrls.export"
+        class="exercise-category-toolbar__button"
+        :label="t('CSV export')"
+        :to-url="legacyUrls.export"
+        icon="export"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="isQuestionCategoryPage"
+        class="exercise-category-toolbar__button"
+        :label="t('Import from a CSV')"
+        icon="import"
+        only-icon
+        size="small"
+        type="primary-text"
+        @click="startImport"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <section class="space-y-1">
+      <h1 class="text-xl font-semibold text-gray-90">
+        {{ pageTitle }}
+      </h1>
+      <p class="text-sm text-gray-600">
+        {{ pageDescription }}
+      </p>
+    </section>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="infoMessage"
+      class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
+    >
+      {{ infoMessage }}
+    </div>
+
+    <form
+      v-if="isFormVisible"
+      class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      @submit.prevent="saveCategory"
+    >
+      <div class="grid gap-4 md:grid-cols-2">
+        <BaseInputText
+          id="exercise-category-title"
+          v-model="form.title"
+          :label="t('Category name')"
+          name="categoryTitle"
+        />
+        <BaseTextArea
+          id="exercise-category-description"
+          v-model="form.description"
+          :label="t('Category description')"
+          name="categoryDescription"
+        />
+      </div>
+      <div class="mt-4 flex flex-wrap gap-2">
+        <BaseButton
+          :is-loading="isSaving"
+          :label="editingCategoryId ? t('Edit category') : t('Add category')"
+          icon="save"
+          :is-submit="true"
+          type="success"
+        />
+        <BaseButton
+          :label="t('Cancel')"
+          icon="close"
+          type="plain"
+          @click="cancelForm"
+        />
+      </div>
+    </form>
+
+    <form
+      v-if="isImportVisible && isQuestionCategoryPage"
+      class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      @submit.prevent="importCategories"
+    >
+      <div class="grid gap-4 md:grid-cols-2">
+        <div class="space-y-2">
+          <label
+            class="text-sm font-medium text-gray-700"
+            for="exercise-category-csv-file"
+          >
+            {{ t("CSV file") }}
+          </label>
+          <input
+            id="exercise-category-csv-file"
+            accept=".csv,text/csv"
+            class="block w-full rounded border border-gray-25 bg-white px-3 py-2 text-sm"
+            name="csvFile"
+            type="file"
+            @change="selectImportFile"
+          />
+          <p class="text-xs text-gray-600">
+            {{ t("Select a CSV file containing title and description columns.") }}
+          </p>
+        </div>
+      </div>
+      <div class="mt-4 flex flex-wrap gap-2">
+        <BaseButton
+          :is-loading="isImporting"
+          :label="t('Import from a CSV')"
+          icon="import"
+          :is-submit="true"
+          type="success"
+        />
+        <BaseButton
+          :label="t('Cancel')"
+          icon="close"
+          type="plain"
+          @click="cancelImport"
+        />
+      </div>
+    </form>
+
+    <BaseTable
+      :is-loading="isLoading"
+      :text-for-empty="t('No categories found')"
+      :total-items="categories.length"
+      :values="categories"
+      data-key="id"
+    >
+      <Column
+        :header="t('Title')"
+        field="title"
+      >
+        <template #body="{ data }">
+          <div class="space-y-1">
+            <div class="font-semibold text-gray-90">
+              {{ displayText(data.title, t('Untitled')) }}
+            </div>
+            <div
+              v-if="displayText(data.description)"
+              class="text-xs text-gray-600"
+            >
+              {{ displayText(data.description) }}
+            </div>
+          </div>
+        </template>
+      </Column>
+
+      <Column :header="usageHeader">
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-800">{{ data.usageCount || 0 }}</span>
+        </template>
+      </Column>
+
+      <Column
+        :header="t('Actions')"
+        class="w-32"
+      >
+        <template #body="{ data }">
+          <div class="flex justify-end gap-1">
+            <BaseButton
+              :label="t('Edit')"
+              icon="edit"
+              only-icon
+              size="small"
+              type="secondary-text"
+              @click="startEdit(data)"
+            />
+            <BaseButton
+              :disabled="isSaving"
+              :label="t('Delete')"
+              icon="delete"
+              only-icon
+              size="small"
+              type="danger-text"
+              @click="confirmDelete(data)"
+            />
+          </div>
+        </template>
+      </Column>
+    </BaseTable>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import BaseTextArea from "../../components/basecomponents/BaseTextArea.vue"
+import { useConfirmation } from "../../composables/useConfirmation"
+import exerciseService from "../../services/exerciseService"
+
+const props = defineProps({
+  categoryType: {
+    type: String,
+    required: true,
+  },
+})
+
+const { t } = useI18n()
+const route = useRoute()
+const { requireConfirmation } = useConfirmation()
+
+const categories = ref([])
+const legacyUrls = ref({})
+const csrfToken = ref("")
+const isLoading = ref(false)
+const isSaving = ref(false)
+const isImporting = ref(false)
+const isFormVisible = ref(false)
+const isImportVisible = ref(false)
+const importFile = ref(null)
+const errorMessage = ref("")
+const infoMessage = ref("")
+const editingCategoryId = ref(null)
+const form = reactive({
+  title: "",
+  description: "",
+})
+
+const isQuestionCategoryPage = computed(() => props.categoryType === "question")
+const pageTitle = computed(() => (isQuestionCategoryPage.value ? t("Question categories") : t("Exercise categories")))
+const pageDescription = computed(() =>
+  isQuestionCategoryPage.value
+    ? t("Manage categories used to classify questions.")
+    : t("Manage categories used to classify exercises."),
+)
+const usageHeader = computed(() => (isQuestionCategoryPage.value ? t("Questions") : t("Exercises")))
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+async function loadCategories() {
+  isLoading.value = true
+  errorMessage.value = ""
+  infoMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseCategories(props.categoryType, getContextParams())
+    categories.value = Array.isArray(response.items) ? response.items : []
+    legacyUrls.value = response.legacyUrls || {}
+    csrfToken.value = response.csrfToken || ""
+  } catch (error) {
+    console.error("Error loading exercise categories", error)
+    errorMessage.value = t("Could not load categories")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function startCreate() {
+  editingCategoryId.value = null
+  form.title = ""
+  form.description = ""
+  isImportVisible.value = false
+  infoMessage.value = ""
+  isFormVisible.value = true
+}
+
+function startEdit(category) {
+  editingCategoryId.value = Number(category.id || 0)
+  form.title = displayText(category.title)
+  form.description = displayText(category.description)
+  isImportVisible.value = false
+  infoMessage.value = ""
+  isFormVisible.value = true
+}
+
+function cancelForm() {
+  editingCategoryId.value = null
+  form.title = ""
+  form.description = ""
+  isFormVisible.value = false
+}
+
+function startImport() {
+  importFile.value = null
+  isFormVisible.value = false
+  isImportVisible.value = true
+  errorMessage.value = ""
+  infoMessage.value = ""
+}
+
+function cancelImport() {
+  importFile.value = null
+  isImportVisible.value = false
+}
+
+function selectImportFile(event) {
+  const files = event?.target?.files
+  importFile.value = files && files.length > 0 ? files[0] : null
+}
+
+function readFileAsText(file) {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = () => resolve(String(reader.result || ""))
+    reader.onerror = () => reject(reader.error)
+    reader.readAsText(file)
+  })
+}
+
+async function importCategories() {
+  if (!importFile.value) {
+    errorMessage.value = t("CSV file is required")
+    return
+  }
+
+  isImporting.value = true
+  errorMessage.value = ""
+  infoMessage.value = ""
+
+  try {
+    const csvContent = await readFileAsText(importFile.value)
+    const response = await exerciseService.saveExerciseCategoryAction(
+      props.categoryType,
+      {
+        action: "import_csv",
+        csvContent,
+        submittedCsrfToken: csrfToken.value,
+      },
+      getContextParams(),
+    )
+    cancelImport()
+    await loadCategories()
+    const importedCount = Number(response.importedCount || 0)
+    const skippedCount = Number(response.skippedCount || 0)
+    infoMessage.value =
+      skippedCount > 0
+        ? t("Imported categories: {0}. Skipped rows: {1}.", [importedCount, skippedCount])
+        : t("Imported categories: {0}.", [importedCount])
+  } catch (error) {
+    console.error("Error importing exercise categories", error)
+    errorMessage.value =
+      error?.response?.data?.hydra?.description || error?.response?.data?.detail || t("Could not import categories")
+  } finally {
+    isImporting.value = false
+  }
+}
+
+async function saveCategory() {
+  const title = form.title.trim()
+  if (!title) {
+    errorMessage.value = t("Category name is required")
+    return
+  }
+
+  isSaving.value = true
+  errorMessage.value = ""
+  infoMessage.value = ""
+
+  try {
+    await exerciseService.saveExerciseCategoryAction(
+      props.categoryType,
+      {
+        action: editingCategoryId.value ? "update" : "create",
+        categoryId: editingCategoryId.value,
+        categoryTitle: title,
+        description: form.description,
+        submittedCsrfToken: csrfToken.value,
+      },
+      getContextParams(),
+    )
+    cancelForm()
+    await loadCategories()
+  } catch (error) {
+    console.error("Error saving exercise category", error)
+    errorMessage.value = error?.response?.data?.hydra?.description || error?.response?.data?.detail || t("Could not save category")
+  } finally {
+    isSaving.value = false
+  }
+}
+
+function confirmDelete(category) {
+  requireConfirmation({
+    message: t("Are you sure you want to delete this category?"),
+    accept: () => deleteCategory(category),
+  })
+}
+
+async function deleteCategory(category) {
+  isSaving.value = true
+  errorMessage.value = ""
+  infoMessage.value = ""
+
+  try {
+    await exerciseService.saveExerciseCategoryAction(
+      props.categoryType,
+      {
+        action: "delete",
+        categoryId: Number(category.id || 0),
+        submittedCsrfToken: csrfToken.value,
+      },
+      getContextParams(),
+    )
+    await loadCategories()
+  } catch (error) {
+    console.error("Error deleting exercise category", error)
+    errorMessage.value = error?.response?.data?.hydra?.description || error?.response?.data?.detail || t("Could not delete category")
+  } finally {
+    isSaving.value = false
+  }
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadCategories)
+</script>
+
+<style scoped>
+:deep(.exercise-category-toolbar__button) {
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+:deep(.exercise-category-toolbar__button .p-button-icon) {
+  font-size: 1.25rem;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExerciseConfigurationView.vue b/assets/vue/views/exercise/ExerciseConfigurationView.vue
index bb59aa339a0..48335ac7877 100644
--- a/assets/vue/views/exercise/ExerciseConfigurationView.vue
+++ b/assets/vue/views/exercise/ExerciseConfigurationView.vue
@@ -187,6 +187,7 @@
                 v-if="showRandomQuestionCount"
                 id="exercise-random"
                 v-model="form.random"
+                :disabled="isFieldLocked('random')"
                 :help-text="t('Use 0 to keep all available questions. Use -1 for all questions where legacy accepts it.')"
                 :label="t('Random questions')"
                 name="random"
@@ -206,6 +207,64 @@
             </div>
           </div>
 
+          <div
+            v-if="showCategorySelectionOptions"
+            class="space-y-3 rounded-lg border border-gray-20 bg-gray-5 p-3"
+          >
+            <div class="flex flex-col gap-1 md:flex-row md:items-center md:justify-between">
+              <h3 class="text-sm font-semibold text-gray-90">{{ t("Question categories matrix") }}</h3>
+              <p class="text-xs text-gray-50">{{ t("-1 = All questions will be selected.") }}</p>
+            </div>
+
+            <div
+              v-if="hasCategoryMatrixWarning"
+              class="rounded-lg border border-yellow-200 bg-yellow-50 p-3 text-sm text-yellow-800"
+            >
+              {{ t("Make sure you have enough questions in your categories.") }}
+            </div>
+
+            <div
+              v-if="form.categoryMatrix.length"
+              class="overflow-x-auto"
+            >
+              <table class="min-w-full divide-y divide-gray-20 text-sm">
+                <thead>
+                  <tr class="text-left text-xs font-semibold uppercase tracking-wide text-gray-50">
+                    <th class="px-3 py-2">{{ t("Categories") }}</th>
+                    <th class="px-3 py-2">{{ t("Available questions") }}</th>
+                    <th class="px-3 py-2">{{ t("Number of questions") }}</th>
+                  </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-20 bg-white">
+                  <tr
+                    v-for="row in form.categoryMatrix"
+                    :key="`category-matrix-${row.categoryId}`"
+                  >
+                    <td class="px-3 py-2 font-medium text-gray-90">{{ row.title }}</td>
+                    <td class="px-3 py-2 text-gray-70">{{ row.availableQuestions }}</td>
+                    <td class="px-3 py-2">
+                      <BaseInputNumber
+                        :id="`exercise-category-matrix-${row.categoryId}`"
+                        v-model="row.countQuestions"
+                        class="max-w-32"
+                        :label="t('Number of questions')"
+                        :name="`categoryMatrix[${row.categoryId}]`"
+                        :min="-1"
+                      />
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+
+            <p
+              v-else
+              class="text-sm text-gray-50"
+            >
+              {{ t("No question categories are available for this exercise yet.") }}
+            </p>
+          </div>
+
           <div class="grid gap-6 md:grid-cols-2 xl:grid-cols-3">
             <FieldGroup :title="t('Shuffle answers')">
               <RadioChoice
@@ -268,10 +327,18 @@
         <section class="space-y-4 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
           <h2 class="text-base font-semibold text-gray-90">{{ t("Attempts and timing") }}</h2>
 
+          <p
+            v-if="effectiveLockedFields.length"
+            class="text-sm text-gray-50"
+          >
+            {{ t("Some options are locked after the exercise has been created.") }}
+          </p>
+
           <div class="grid gap-6 md:grid-cols-2 xl:grid-cols-3">
             <BaseInputNumber
               id="exercise-max-attempt"
               v-model="form.maxAttempt"
+              :disabled="isFieldLocked('maxAttempt')"
               :label="t('Max number of attempts')"
               name="maxAttempt"
               :min="0"
@@ -316,6 +383,7 @@
             <BaseCheckbox
               id="exercise-propagate-negative-results"
               v-model="form.propagateNeg"
+              :disabled="isFieldLocked('propagateNeg')"
               :label="t('Propagate negative results between questions')"
               name="propagateNeg"
             />
@@ -333,6 +401,7 @@
             <BaseCheckbox
               id="exercise-review-answers"
               v-model="form.reviewAnswers"
+              :disabled="isFieldLocked('reviewAnswers')"
               :label="t('Review my answers')"
               name="reviewAnswers"
             />
@@ -340,6 +409,7 @@
             <BaseCheckbox
               id="exercise-enable-time-control"
               v-model="form.enableTimeControl"
+              :disabled="isFieldLocked('enableTimeControl')"
               :label="t('Enable time control')"
               name="enableTimeControl"
             />
@@ -348,6 +418,7 @@
               v-if="form.enableTimeControl"
               id="exercise-expired-time"
               v-model="form.expiredTime"
+              :disabled="isFieldLocked('expiredTime')"
               :help-text="t('Legacy stores this value as total duration in minutes.')"
               :label="t('Total duration in minutes of the test')"
               name="expiredTime"
@@ -408,12 +479,105 @@
               option-value="value"
             />
 
+            <BaseSelect
+              v-if="languageOptions.length > 0"
+              id="exercise-language"
+              v-model="form.language"
+              :label="t('Language')"
+              name="language"
+              :options="languageOptions"
+              option-label="label"
+              option-value="value"
+            />
+
             <BaseCheckbox
               id="exercise-hide-attempts-table"
               v-model="form.hideAttemptsTable"
               :label="t('Hide attempts table on start page')"
               name="hideAttemptsTable"
             />
+
+            <BaseCheckbox
+              v-if="isEditMode"
+              id="exercise-update-title-in-learning-paths"
+              v-model="form.updateTitleInLearningPaths"
+              :label="t('Update this title in learning paths')"
+              name="updateTitleInLearningPaths"
+            />
+          </div>
+
+          <div
+            v-if="skillOptions.length || extraFieldDefinitions.length"
+            class="space-y-4 rounded-lg border border-gray-20 bg-gray-5 p-3"
+          >
+            <h3 class="text-sm font-semibold text-gray-90">{{ t("Metadata") }}</h3>
+
+            <BaseMultiSelect
+              v-if="skillOptions.length"
+              v-model="form.skillIds"
+              input-id="exercise-skills"
+              :label="t('Skills')"
+              :options="skillOptions"
+              option-label="label"
+              option-value="value"
+            />
+
+            <div
+              v-if="extraFieldDefinitions.length"
+              class="grid gap-4 md:grid-cols-2"
+            >
+              <template
+                v-for="field in extraFieldDefinitions"
+                :key="`exercise-extra-field-${field.variable}`"
+              >
+                <BaseTextArea
+                  v-if="isExtraTextAreaField(field)"
+                  :id="`exercise-extra-${field.variable}`"
+                  v-model="form.extraFieldValues[field.variable]"
+                  :label="field.label"
+                  :name="`extra_${field.variable}`"
+                  rows="4"
+                />
+
+                <BaseMultiSelect
+                  v-else-if="isExtraMultiChoiceField(field)"
+                  v-model="form.extraFieldValues[field.variable]"
+                  :input-id="`exercise-extra-${field.variable}`"
+                  :label="field.label"
+                  :options="field.options"
+                  option-label="label"
+                  option-value="value"
+                />
+
+                <BaseSelect
+                  v-else-if="isExtraChoiceField(field)"
+                  :id="`exercise-extra-${field.variable}`"
+                  v-model="form.extraFieldValues[field.variable]"
+                  :label="field.label"
+                  :name="`extra_${field.variable}`"
+                  :options="field.options"
+                  option-label="label"
+                  option-value="value"
+                />
+
+                <BaseCheckbox
+                  v-else-if="isExtraCheckboxField(field)"
+                  :id="`exercise-extra-${field.variable}`"
+                  v-model="form.extraFieldValues[field.variable]"
+                  :label="field.label"
+                  :name="`extra_${field.variable}`"
+                />
+
+                <BaseInputText
+                  v-else
+                  :id="`exercise-extra-${field.variable}`"
+                  v-model="form.extraFieldValues[field.variable]"
+                  :label="field.label"
+                  :name="`extra_${field.variable}`"
+                  :type="getExtraFieldInputType(field)"
+                />
+              </template>
+            </div>
           </div>
 
           <FieldGroup
@@ -471,7 +635,9 @@ import BaseCheckbox from "../../components/basecomponents/BaseCheckbox.vue"
 import BaseIcon from "../../components/basecomponents/BaseIcon.vue"
 import BaseInputNumber from "../../components/basecomponents/BaseInputNumber.vue"
 import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseMultiSelect from "../../components/basecomponents/BaseMultiSelect.vue"
 import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import BaseTextArea from "../../components/basecomponents/BaseTextArea.vue"
 import BaseTinyEditor from "../../components/basecomponents/BaseTinyEditor.vue"
 import exerciseService from "../../services/exerciseService"
 
@@ -489,6 +655,24 @@ const csrfToken = ref("")
 const questionsUrl = ref("")
 const settings = ref({})
 const options = ref({})
+const lockedFields = ref([])
+const defaultLockedFieldsOnEdit = [
+  "random",
+  "maxAttempt",
+  "propagateNeg",
+  "enableTimeControl",
+  "expiredTime",
+  "reviewAnswers",
+]
+const EXTRA_FIELD_TEXTAREA = 2
+const EXTRA_FIELD_RADIO = 3
+const EXTRA_FIELD_SELECT = 4
+const EXTRA_FIELD_SELECT_MULTIPLE = 5
+const EXTRA_FIELD_DATE = 6
+const EXTRA_FIELD_DATETIME = 7
+const EXTRA_FIELD_CHECKBOX = 13
+const EXTRA_FIELD_INTEGER = 15
+const EXTRA_FIELD_FLOAT = 17
 
 const mainEditorConfig = {
   height: 320,
@@ -564,6 +748,11 @@ const form = reactive({
   description: "",
   type: 2,
   categoryId: 0,
+  language: "",
+  updateTitleInLearningPaths: false,
+  skillIds: [],
+  extraFieldValues: {},
+  extraNotification: "",
   startTime: "",
   endTime: "",
   enableStartTime: false,
@@ -573,6 +762,7 @@ const form = reactive({
   passPercentage: 0,
   random: 0,
   randomByCategory: 0,
+  categoryMatrix: [],
   randomAnswers: false,
   showPreviousButton: true,
   preventBackwards: false,
@@ -615,12 +805,18 @@ const questionsRoute = computed(() => ({
   params: { ...route.params, exerciseId: exerciseId.value },
   query: getContextParams(),
 }))
-const typeOptions = computed(() =>
-  (options.value.typeOptions || []).map((option) => ({
+const typeOptions = computed(() => {
+  const items = (options.value.typeOptions || []).map((option) => ({
     value: Number(option.value),
     label: t(option.label),
-  })),
-)
+  }))
+
+  if ([1, 3].includes(Number(form.feedbackType))) {
+    return items.filter((option) => 2 === option.value)
+  }
+
+  return items
+})
 const categoryOptions = computed(() => [
   { value: 0, label: t("No category") },
   ...(options.value.categoryOptions || []).map((option) => ({
@@ -628,18 +824,62 @@ const categoryOptions = computed(() => [
     label: option.label,
   })),
 ])
+const languageOptions = computed(() =>
+  (options.value.languageOptions || []).map((option) => ({
+    value: option.value || "",
+    label: t(option.label),
+  })),
+)
+const skillOptions = computed(() =>
+  (options.value.skillOptions || []).map((option) => ({
+    value: Number(option.value),
+    label: option.label,
+  })),
+)
+const extraFieldDefinitions = computed(() => normalizeExtraFieldDefinitions(options.value.extraFieldDefinitions || []))
+const extraNotificationOptions = computed(() => {
+  const items = (options.value.extraNotificationOptions || []).map((option) => ({
+    value: String(option.value || ""),
+    label: option.label,
+  }))
+
+  return items.length ? [{ value: "", label: t("Please select an option") }, ...items] : []
+})
 const feedbackOptions = computed(() => mapTranslatedOptions(options.value.feedbackOptions || []))
-const resultOptions = computed(() => mapTranslatedOptions(options.value.resultOptions || []))
+const resultOptions = computed(() => {
+  const items = mapTranslatedOptions(options.value.resultOptions || [])
+
+  if ([1, 3].includes(Number(form.feedbackType))) {
+    return items.filter((option) => [0, 1, 2].includes(option.value))
+  }
+
+  return items
+})
 const questionSelectionTypeOptions = computed(() => mapTranslatedOptions(options.value.questionSelectionTypeOptions || []))
 const randomByCategoryOptions = computed(() => mapTranslatedOptions(options.value.randomByCategoryOptions || []))
 const notificationOptions = computed(() => mapTranslatedOptions(options.value.notificationOptions || []))
 const saveCorrectAnswerOptions = computed(() => mapTranslatedOptions(options.value.saveCorrectAnswerOptions || []))
 const showRandomQuestionCount = computed(() => [2, 3, 4, 5, 6].includes(Number(form.questionSelectionType)))
 const showCategorySelectionOptions = computed(() => 3 <= Number(form.questionSelectionType))
+const hasCategoryMatrixWarning = computed(() =>
+  form.categoryMatrix.some((row) => {
+    const count = Number(row.countQuestions || 0)
+    const available = Number(row.availableQuestions || 0)
+
+    return count > available && -1 !== count
+  }),
+)
 const booleanOptions = computed(() => [
   { booleanValue: true, label: t("Yes") },
   { booleanValue: false, label: t("No") },
 ])
+const effectiveLockedFields = computed(() => {
+  if (lockedFields.value.length > 0) {
+    return lockedFields.value
+  }
+
+  return isEditMode.value ? defaultLockedFieldsOnEdit : []
+})
 
 function mapTranslatedOptions(items) {
   return items.map((option) => ({
@@ -665,6 +905,10 @@ function fillForm(data) {
   form.description = data.description || ""
   form.type = Number(data.type || 2)
   form.categoryId = Number(data.categoryId || 0)
+  form.language = data.language || ""
+  form.updateTitleInLearningPaths = false
+  form.skillIds = normalizeIdValues(data.skillIds || [])
+  form.extraNotification = data.extraNotification || ""
   form.startTime = data.startTime || ""
   form.endTime = data.endTime || ""
   form.enableStartTime = Boolean(data.startTime)
@@ -674,6 +918,7 @@ function fillForm(data) {
   form.passPercentage = Number(data.passPercentage || 0)
   form.random = Number(data.random || 0)
   form.randomByCategory = Number(data.randomByCategory || 0)
+  form.categoryMatrix = normalizeCategoryMatrix(data.categoryMatrix || [])
   form.randomAnswers = true === data.randomAnswers
   form.showPreviousButton = true === data.showPreviousButton
   form.preventBackwards = true === data.preventBackwards
@@ -705,6 +950,124 @@ function fillForm(data) {
   questionsUrl.value = data.questionsUrl || ""
   settings.value = data.settings || {}
   options.value = data.options || {}
+  form.extraFieldValues = normalizeExtraFieldValues(data.extraFieldValues || {}, extraFieldDefinitions.value)
+  lockedFields.value = Array.isArray(data.lockedFields) ? data.lockedFields : []
+}
+
+function normalizeIdValues(values) {
+  if (!Array.isArray(values)) {
+    return []
+  }
+
+  return [...new Set(values.map((value) => Number(value)).filter((value) => value > 0))]
+}
+
+function normalizeExtraFieldDefinitions(definitions) {
+  if (!Array.isArray(definitions)) {
+    return []
+  }
+
+  return definitions
+    .filter((field) => field && field.variable)
+    .map((field) => ({
+      variable: field.variable,
+      label: field.label || field.variable,
+      type: Number(field.type || 1),
+      defaultValue: field.defaultValue ?? "",
+      options: Array.isArray(field.options)
+        ? field.options.map((option) => ({ value: String(option.value ?? ""), label: option.label || String(option.value ?? "") }))
+        : [],
+    }))
+}
+
+function normalizeExtraFieldValues(values, definitions) {
+  const normalized = {}
+
+  definitions.forEach((field) => {
+    const value = values[field.variable] ?? field.defaultValue ?? ""
+
+    if (isExtraMultiChoiceField(field)) {
+      normalized[field.variable] = Array.isArray(value)
+        ? value.map((item) => String(item)).filter((item) => item !== "")
+        : String(value || "")
+            .split(";")
+            .filter((item) => item !== "")
+      return
+    }
+
+    if (isExtraCheckboxField(field)) {
+      normalized[field.variable] = true === value || "1" === String(value) || "true" === String(value).toLowerCase()
+      return
+    }
+
+    normalized[field.variable] = value ?? ""
+  })
+
+  return normalized
+}
+
+function normalizeExtraFieldValuesForPayload() {
+  const normalized = {}
+
+  extraFieldDefinitions.value.forEach((field) => {
+    const value = form.extraFieldValues[field.variable]
+
+    if (isExtraMultiChoiceField(field)) {
+      normalized[field.variable] = Array.isArray(value) ? value : []
+      return
+    }
+
+    normalized[field.variable] = value ?? ""
+  })
+
+  return normalized
+}
+
+function isExtraTextAreaField(field) {
+  return EXTRA_FIELD_TEXTAREA === Number(field.type)
+}
+
+function isExtraChoiceField(field) {
+  return [EXTRA_FIELD_RADIO, EXTRA_FIELD_SELECT].includes(Number(field.type))
+}
+
+function isExtraMultiChoiceField(field) {
+  return EXTRA_FIELD_SELECT_MULTIPLE === Number(field.type) || (EXTRA_FIELD_CHECKBOX === Number(field.type) && field.options.length > 0)
+}
+
+function isExtraCheckboxField(field) {
+  return EXTRA_FIELD_CHECKBOX === Number(field.type) && 0 === field.options.length
+}
+
+function getExtraFieldInputType(field) {
+  const type = Number(field.type)
+
+  if (EXTRA_FIELD_INTEGER === type || EXTRA_FIELD_FLOAT === type) {
+    return "number"
+  }
+
+  if (EXTRA_FIELD_DATE === type) {
+    return "date"
+  }
+
+  if (EXTRA_FIELD_DATETIME === type) {
+    return "datetime-local"
+  }
+
+  return "text"
+}
+
+function normalizeCategoryMatrix(rows) {
+  if (!Array.isArray(rows)) {
+    return []
+  }
+
+  return rows.map((row) => ({
+    categoryId: Number(row.categoryId || 0),
+    title: row.title || t("General"),
+    availableQuestions: Number(row.availableQuestions || 0),
+    countQuestions: Number(row.countQuestions ?? -1),
+  }))
 }
 
 function normalizeNotificationValues(values) {
@@ -741,6 +1104,10 @@ function buildPageResultConfiguration(source) {
   }
 }
 
+function isFieldLocked(fieldName) {
+  return effectiveLockedFields.value.includes(fieldName)
+}
+
 function buildPayload() {
   return {
     exerciseId: isEditMode.value ? exerciseId.value : null,
@@ -748,6 +1115,11 @@ function buildPayload() {
     description: form.description,
     type: Number(form.type || 2),
     categoryId: Number(form.categoryId || 0),
+    language: form.language || "",
+    updateTitleInLearningPaths: form.updateTitleInLearningPaths,
+    skillIds: normalizeIdValues(form.skillIds),
+    extraFieldValues: normalizeExtraFieldValuesForPayload(),
+    extraNotification: form.extraNotification || "",
     startTime: form.enableStartTime ? form.startTime || null : null,
     endTime: form.enableEndTime ? form.endTime || null : null,
     duration: Number(form.duration || 0),
@@ -755,6 +1127,7 @@ function buildPayload() {
     passPercentage: Number(form.passPercentage || 0),
     random: Number(form.random || 0),
     randomByCategory: Number(form.randomByCategory || 0),
+    categoryMatrix: normalizeCategoryMatrix(form.categoryMatrix),
     randomAnswers: form.randomAnswers,
     showPreviousButton: form.showPreviousButton,
     preventBackwards: form.preventBackwards,
@@ -844,7 +1217,7 @@ watch(
       form.resultsDisabled = 0
     }
 
-    if (1 === Number(feedbackType)) {
+    if ([1, 3].includes(Number(feedbackType))) {
       form.type = 2
     }
   },
diff --git a/assets/vue/views/exercise/ExerciseListView.vue b/assets/vue/views/exercise/ExerciseListView.vue
index c5f5b624aba..091459e65bc 100644
--- a/assets/vue/views/exercise/ExerciseListView.vue
+++ b/assets/vue/views/exercise/ExerciseListView.vue
@@ -12,22 +12,12 @@
           size="small"
           type="primary-text"
         />
-        <BaseButton
-          v-if="canCreate"
-          class="exercise-list-toolbar__button"
-          :label="t('Create question')"
-          :to-url="legacyUrl('question_create.php')"
-          icon="help"
-          only-icon
-          size="small"
-          type="primary-text"
-        />
         <BaseButton
           v-if="canManage && settings.allowExerciseCategories"
           class="exercise-list-toolbar__button"
           :label="t('Exercise categories')"
-          :to-url="legacyUrl('category.php')"
-          icon="folder-generic"
+          :route="{ name: 'ExerciseCategories', params: route.params, query: getContextParams() }"
+          icon="folder-open"
           only-icon
           size="small"
           type="primary-text"
@@ -36,18 +26,8 @@
           v-if="canManage"
           class="exercise-list-toolbar__button"
           :label="t('Question categories')"
-          :to-url="legacyUrl('tests_category.php')"
-          icon="folder-generic"
-          only-icon
-          size="small"
-          type="primary-text"
-        />
-        <BaseButton
-          v-if="canManage"
-          class="exercise-list-toolbar__button"
-          :label="t('Question bank')"
-          :to-url="legacyUrl('question_pool.php')"
-          icon="table"
+          :route="{ name: 'ExerciseQuestionCategories', params: route.params, query: getContextParams() }"
+          icon="tag-outline"
           only-icon
           size="small"
           type="primary-text"
@@ -56,7 +36,7 @@
           v-if="canManage"
           class="exercise-list-toolbar__button"
           :label="t('Import exercises QTI2')"
-          :to-url="legacyUrl('qti2.php')"
+          :route="{ name: 'ExerciseImportQti2', params: route.params, query: getContextParams() }"
           icon="import"
           only-icon
           size="small"
@@ -66,7 +46,7 @@
           v-if="canManage"
           class="exercise-list-toolbar__button"
           :label="t('Import Aiken quiz')"
-          :to-url="legacyUrl('aiken.php')"
+          :route="{ name: 'ExerciseImportAiken', params: route.params, query: getContextParams() }"
           icon="file-text"
           only-icon
           size="small"
@@ -76,12 +56,22 @@
           v-if="canManage"
           class="exercise-list-toolbar__button"
           :label="t('Import quiz from Excel')"
-          :to-url="legacyUrl('upload_exercise.php')"
+          :route="{ name: 'ExerciseImportExcel', params: route.params, query: getContextParams() }"
           icon="file-excel"
           only-icon
           size="small"
           type="primary-text"
         />
+        <BaseButton
+          v-if="canManage && settings.exerciseGeneratorEnabled"
+          class="exercise-list-toolbar__button"
+          :label="t('AI Aiken generator')"
+          :to-url="aiAikenGeneratorUrl()"
+          :icon="safeIcon('robot', 'settings')"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
         <span
           class="mx-1 h-6 w-px bg-gray-20"
           aria-hidden="true"
@@ -173,13 +163,6 @@
       {{ errorMessage }}
     </div>
 
-    <div
-      v-if="usesLegacyActions"
-      class="rounded-xl border border-blue-100 bg-blue-50 p-4 text-sm text-blue-700"
-    >
-      {{ t("Exercise questions, attempts and reports are still handled by the legacy exercise tool in this batch.") }}
-    </div>
-
     <BaseTable
       :is-loading="isLoading"
       :text-for-empty="t('No exercises found')"
@@ -200,7 +183,17 @@
                 class="ch-tool-icon"
                 aria-hidden="true"
               />
-              <span class="font-semibold text-gray-90">
+              <router-link
+                v-if="data.canOverview"
+                class="font-semibold text-gray-90 hover:underline"
+                :to="{ name: 'ExerciseOverview', params: { ...route.params, exerciseId: data.iid }, query: getContextParams() }"
+              >
+                {{ displayText(data.title, t("Untitled")) }}
+              </router-link>
+              <span
+                v-else
+                class="font-semibold text-gray-90"
+              >
                 {{ displayText(data.title, t("Untitled")) }}
               </span>
             </div>
@@ -298,17 +291,8 @@
             <BaseButton
               v-if="data.canOpen"
               :label="t('Open exercise')"
-              :to-url="legacyUrl('overview.php', { exerciseId: data.iid })"
-              icon="play-box-outline"
-              only-icon
-              size="small"
-              type="primary-text"
-            />
-            <BaseButton
-              v-if="data.canOpen"
-              :label="t('Open Vue player')"
               :route="{ name: 'ExercisePlayer', params: { ...route.params, exerciseId: data.iid }, query: getContextParams() }"
-              icon="eye-on"
+              icon="play-box-outline"
               only-icon
               size="small"
               type="primary-text"
@@ -343,12 +327,39 @@
             <BaseButton
               v-if="data.canExport"
               :label="t('Export QTI2')"
-              :to-url="legacyUrl('exercise.php', { exerciseId: data.iid, action: 'exportqti2' })"
+              :to-url="qti2ExportUrl(data.iid)"
               icon="export"
               only-icon
               size="small"
               type="primary-text"
             />
+            <BaseButton
+              v-if="data.canToggleVisibility"
+              :label="data.visible ? t('Deactivate') : t('Activate')"
+              :icon="safeIcon(data.visible ? 'eye-on' : 'eye-off', data.visible ? 'visible' : 'invisible')"
+              only-icon
+              size="small"
+              type="primary-text"
+              @click="toggleVisibility(data)"
+            />
+            <BaseButton
+              v-if="data.canCopy"
+              :label="t('Copy this exercise as a new one')"
+              icon="copy"
+              only-icon
+              size="small"
+              type="secondary-text"
+              @click="confirmCopyExercise(data)"
+            />
+            <BaseButton
+              v-if="data.canDelete"
+              :label="t('Delete')"
+              icon="delete"
+              only-icon
+              size="small"
+              type="danger-text"
+              @click="confirmDeleteExercise(data)"
+            />
           </div>
         </template>
       </Column>
@@ -364,10 +375,12 @@ import BaseButton from "../../components/basecomponents/BaseButton.vue"
 import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
 import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
 import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { useConfirmation } from "../../composables/useConfirmation"
 import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
 import exerciseService from "../../services/exerciseService"
 
 const { t } = useI18n()
+const { requireConfirmation } = useConfirmation()
 const route = useRoute()
 const router = useRouter()
 
@@ -376,9 +389,9 @@ const categories = ref([])
 const settings = ref({})
 const canManage = ref(false)
 const canCreate = ref(false)
-const usesLegacyActions = ref(true)
 const isLoading = ref(false)
 const errorMessage = ref("")
+const actionCsrfToken = ref("")
 const searchTerm = ref(getSearchQuery())
 const selectedCategoryId = ref(getCategoryQuery())
 const isSearchVisible = ref(Boolean(getSearchQuery() || getCategoryQuery()))
@@ -388,6 +401,19 @@ const categoryOptions = computed(() => [
   { label: t("All categories"), value: 0 },
   ...categories.value.map((category) => ({ label: displayText(category.title, t("Untitled")), value: Number(category.id) })),
 ])
+const availableIcons = Object.keys(chamiloIconToClass)
+
+function safeIcon(icon, fallback = "information") {
+  if (icon && availableIcons.includes(icon)) {
+    return icon
+  }
+
+  if (fallback && availableIcons.includes(fallback)) {
+    return fallback
+  }
+
+  return availableIcons[0] || "information"
+}
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -439,8 +465,12 @@ function buildQueryString(params = {}) {
   return queryString ? `?${queryString}` : ""
 }
 
-function legacyUrl(path, params = {}) {
-  return `/main/exercise/${path}${buildQueryString({ ...getContextParams(), ...params })}`
+function qti2ExportUrl(exerciseId) {
+  return `/api/exercise/${exerciseId}/qti2-export.zip${buildQueryString(getContextParams())}`
+}
+
+function aiAikenGeneratorUrl() {
+  return `/main/exercise/exercise_aiken_generator.php${buildQueryString(getContextParams())}`
 }
 
 function toggleSearchForm() {
@@ -485,6 +515,48 @@ async function clearSearch() {
   await applySearch()
 }
 
+async function runExerciseAction(exercise, action) {
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    await exerciseService.saveExerciseListAction(
+      {
+        action,
+        exerciseId: Number(exercise.iid || 0),
+        submittedCsrfToken: actionCsrfToken.value,
+      },
+      getContextParams(),
+    )
+    await loadExercises()
+  } catch (error) {
+    console.error("Error running exercise action", error)
+    errorMessage.value = t("Could not update exercise")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function toggleVisibility(exercise) {
+  runExerciseAction(exercise, "toggle_visibility")
+}
+
+function confirmCopyExercise(exercise) {
+  requireConfirmation({
+    title: t("Copy exercise"),
+    message: t("Are you sure to copy {0}?", [displayText(exercise.title, t("Untitled"))]),
+    accept: () => runExerciseAction(exercise, "copy"),
+  })
+}
+
+function confirmDeleteExercise(exercise) {
+  requireConfirmation({
+    title: t("Delete exercise"),
+    message: t("Are you sure you want to delete {0}?", [displayText(exercise.title, t("Untitled"))]),
+    accept: () => runExerciseAction(exercise, "delete"),
+  })
+}
+
 async function loadExercises() {
   isLoading.value = true
   errorMessage.value = ""
@@ -494,9 +566,9 @@ async function loadExercises() {
     exercises.value = Array.isArray(response.items) ? response.items : []
     categories.value = Array.isArray(response.categories) ? response.categories : []
     settings.value = response.settings || {}
+    actionCsrfToken.value = response.submittedCsrfToken || ""
     canManage.value = true === response.canManage
     canCreate.value = true === response.canCreate
-    usesLegacyActions.value = true === response.usesLegacyActions
   } catch (error) {
     console.error("Error loading exercises", error)
     errorMessage.value = t("Could not load exercises")
@@ -587,12 +659,12 @@ watch(
 
 <style scoped>
 :deep(.exercise-list-toolbar__button) {
-  min-width: 2.25rem;
-  width: 2.25rem;
-  height: 2.25rem;
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
 }
 
 :deep(.exercise-list-toolbar__button .p-button-icon) {
-  font-size: 1.1rem;
+  font-size: 1.25rem;
 }
 </style>
diff --git a/assets/vue/views/exercise/ExerciseLiveResultsView.vue b/assets/vue/views/exercise/ExerciseLiveResultsView.vue
new file mode 100644
index 00000000000..f54872b58b2
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseLiveResultsView.vue
@@ -0,0 +1,476 @@
+<template>
+  <section class="space-y-5">
+    <div class="exercise-live-results-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <BaseButton
+        class="exercise-live-results-toolbar__button"
+        :label="t('Back to learner score')"
+        :route="{ name: 'ExerciseReport', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('back')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-live-results-toolbar__button"
+        :label="t('Question stats')"
+        :route="{ name: 'ExerciseQuestionStats', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('tracking', 'view-table')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-live-results-toolbar__button"
+        :label="t('Report by question')"
+        :route="{ name: 'ExerciseReportByQuestion', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('view-table', 'table')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-live-results-toolbar__button"
+        :label="t('Refresh')"
+        :icon="safeIcon('refresh', 'information')"
+        only-icon
+        size="small"
+        type="primary-text"
+        @click="loadLiveResults"
+      />
+      <BaseButton
+        class="exercise-live-results-toolbar__button"
+        :label="isAutoRefreshEnabled ? t('Disable auto refresh') : t('Enable auto refresh')"
+        :icon="isAutoRefreshEnabled ? safeIcon('stop', 'close') : safeIcon('usage', 'tracking')"
+        only-icon
+        size="small"
+        :type="isAutoRefreshEnabled ? 'secondary-text' : 'primary-text'"
+        @click="toggleAutoRefresh"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <header class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm">
+      <div class="border-l-4 border-l-primary p-5">
+        <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
+          <div class="space-y-2">
+            <h1 class="text-2xl font-semibold text-gray-90">
+              {{ displayText(title, t("Learners who're taking the exercise right now")) }}
+            </h1>
+            <p class="text-sm font-semibold text-gray-700">
+              {{ t('Live results') }} · {{ t('Live window') }}: {{ filters.minutes || DEFAULT_LIVE_MINUTES }} {{ t('Minutes') }}
+            </p>
+            <div
+              v-if="description"
+              class="exercise-live-results-html text-sm text-gray-700"
+              v-html="description"
+            />
+          </div>
+          <div class="flex flex-wrap gap-2">
+            <span class="rounded-full bg-info/10 px-3 py-1 text-sm font-semibold text-info">
+              {{ t('Attempts') }}: {{ summary.totalAttempts || 0 }}
+            </span>
+            <span class="rounded-full bg-warning/10 px-3 py-1 text-sm font-semibold text-warning">
+              {{ t('Ongoing attempts') }}: {{ summary.ongoingAttempts || 0 }}
+            </span>
+            <span class="rounded-full bg-success/10 px-3 py-1 text-sm font-semibold text-success">
+              {{ t('Completed attempts') }}: {{ summary.completedAttempts || 0 }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </header>
+
+    <form
+      class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      @submit.prevent="applyFilters"
+    >
+      <div class="grid gap-3 md:grid-cols-[12rem_16rem_auto] md:items-start">
+        <BaseSelect
+          id="exercise-live-results-status"
+          v-model="filterForm.status"
+          :label="t('Status')"
+          name="status"
+          :options="statusOptions"
+          option-label="label"
+          option-value="value"
+        />
+        <BaseSelect
+          id="exercise-live-results-minutes"
+          v-model="filterForm.minutes"
+          :label="t('Live window')"
+          name="minutes"
+          :options="minuteOptions"
+          option-label="label"
+          option-value="value"
+        />
+        <div class="flex items-center justify-start gap-2 md:pt-[0.9rem]">
+          <BaseButton
+            :is-loading="isLoading"
+            :label="t('Apply')"
+            :icon="safeIcon('search')"
+            :is-submit="true"
+            type="primary"
+          />
+          <BaseButton
+            :label="t('Reset')"
+            :icon="safeIcon('refresh', 'information')"
+            type="secondary"
+            @click="resetFilters"
+          />
+        </div>
+      </div>
+    </form>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <BaseTable
+      :is-loading="isLoading"
+      :text-for-empty="t('No live results found')"
+      :total-items="attempts.length"
+      :values="attempts"
+      data-key="id"
+    >
+      <Column :header="t('First name')" field="firstName" sortable>
+        <template #body="{ data }">
+          <div class="font-semibold text-gray-90">{{ displayText(data.firstName, '-') }}</div>
+          <div class="text-xs text-gray-500">{{ data.username }}</div>
+        </template>
+      </Column>
+      <Column :header="t('Last name')" field="lastName" sortable>
+        <template #body="{ data }">
+          {{ displayText(data.lastName, '-') }}
+        </template>
+      </Column>
+      <Column :header="t('Started')" field="startedAt" sortable>
+        <template #body="{ data }">
+          {{ formatDate(data.startedAt) }}
+        </template>
+      </Column>
+      <Column :header="t('Last activity')" field="lastActivityAt" sortable>
+        <template #body="{ data }">
+          {{ formatDate(data.lastActivityAt) }}
+        </template>
+      </Column>
+      <Column :header="t('Duration')" field="duration" sortable>
+        <template #body="{ data }">
+          {{ formatSeconds(data.duration) }}
+        </template>
+      </Column>
+      <Column :header="t('Questions already answered')" field="answeredQuestions" sortable>
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-90">
+            {{ data.answeredQuestions || 0 }}
+          </span>
+        </template>
+      </Column>
+      <Column :header="t('Score')" field="score" sortable>
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-90">
+            {{ formatNumber(data.percentage) }} % ({{ formatNumber(data.score) }} / {{ formatNumber(data.maxScore) }})
+          </span>
+        </template>
+      </Column>
+      <Column :header="t('IP')" field="ip">
+        <template #body="{ data }">
+          {{ displayText(data.ip, '-') }}
+        </template>
+      </Column>
+      <Column :header="t('Status')" field="status" sortable>
+        <template #body="{ data }">
+          <span
+            class="rounded-full px-3 py-1 text-xs font-semibold"
+            :class="statusClass(data.status)"
+          >
+            {{ t(data.statusLabel || 'Completed') }}
+          </span>
+        </template>
+      </Column>
+    </BaseTable>
+  </section>
+</template>
+
+<script setup>
+import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+
+const AUTO_REFRESH_DELAY = 10000
+const DEFAULT_LIVE_MINUTES = 60
+
+const isLoading = ref(false)
+const isAutoRefreshEnabled = ref(true)
+const errorMessage = ref("")
+const title = ref("")
+const description = ref("")
+const attempts = ref([])
+const summary = ref({})
+const filters = ref({ minutes: DEFAULT_LIVE_MINUTES, status: "all" })
+const availableIcons = Object.keys(chamiloIconToClass)
+let autoRefreshTimer = null
+
+const filterForm = reactive({
+  status: getQueryValue(route.query.status) || "all",
+  minutes: Number(getQueryValue(route.query.minutes) || DEFAULT_LIVE_MINUTES),
+})
+
+const statusOptions = computed(() => [
+  { label: t("All"), value: "all" },
+  { label: t("Ongoing"), value: "incomplete" },
+  { label: t("Completed"), value: "completed" },
+])
+const minuteOptions = computed(() => [
+  { label: `60 ${t("Minutes")}`, value: 60 },
+  { label: `15 ${t("Minutes")}`, value: 15 },
+  { label: `30 ${t("Minutes")}`, value: 30 },
+  { label: `120 ${t("Minutes")}`, value: 120 },
+  { label: `240 ${t("Minutes")}`, value: 240 },
+])
+
+function safeIcon(icon, fallback = "information") {
+  if (icon && availableIcons.includes(icon)) {
+    return icon
+  }
+
+  if (fallback && availableIcons.includes(fallback)) {
+    return fallback
+  }
+
+  return availableIcons[0] || "information"
+}
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function getLiveParams() {
+  return {
+    ...getContextParams(),
+    status: getQueryValue(route.query.status) || "all",
+    minutes: Number(getQueryValue(route.query.minutes) || DEFAULT_LIVE_MINUTES),
+  }
+}
+
+function getBaseRouteParams() {
+  return {
+    node: route.params.node,
+  }
+}
+
+function getExerciseRouteParams() {
+  return {
+    ...getBaseRouteParams(),
+    exerciseId: route.params.exerciseId,
+  }
+}
+
+function getExerciseId() {
+  return Number(route.params.exerciseId || 0)
+}
+
+async function loadLiveResults() {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    errorMessage.value = t("Invalid exercise")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseLiveResults(getLiveParams(), exerciseId)
+    title.value = response.title || ""
+    description.value = response.description || ""
+    attempts.value = Array.isArray(response.attempts) ? response.attempts : []
+    summary.value = response.summary || {}
+    filters.value = response.filters || {}
+  } catch (error) {
+    console.error("Error loading exercise live results", error)
+    errorMessage.value = t("Could not load live results")
+  } finally {
+    isLoading.value = false
+    restartAutoRefresh()
+  }
+}
+
+function applyFilters() {
+  const query = { ...route.query }
+  query.status = filterForm.status || "all"
+  query.minutes = Number(filterForm.minutes || DEFAULT_LIVE_MINUTES)
+
+  router.push({ name: route.name, params: route.params, query })
+}
+
+function resetFilters() {
+  filterForm.status = "all"
+  filterForm.minutes = DEFAULT_LIVE_MINUTES
+  const query = { ...route.query }
+  delete query.status
+  delete query.minutes
+
+  router.push({ name: route.name, params: route.params, query })
+}
+
+function toggleAutoRefresh() {
+  isAutoRefreshEnabled.value = !isAutoRefreshEnabled.value
+  restartAutoRefresh()
+}
+
+function restartAutoRefresh() {
+  if (autoRefreshTimer) {
+    clearTimeout(autoRefreshTimer)
+    autoRefreshTimer = null
+  }
+
+  if (!isAutoRefreshEnabled.value) {
+    return
+  }
+
+  autoRefreshTimer = window.setTimeout(() => {
+    loadLiveResults()
+  }, AUTO_REFRESH_DELAY)
+}
+
+function statusClass(status) {
+  if (status === "incomplete") {
+    return "bg-warning/10 text-warning"
+  }
+
+  return "bg-success/10 text-success"
+}
+
+function formatNumber(value) {
+  if (value === null || value === undefined || value === "") {
+    return "—"
+  }
+
+  const number = Number(value)
+  if (Number.isNaN(number)) {
+    return "—"
+  }
+
+  return number.toFixed(2).replace(/\.00$/, "")
+}
+
+function formatSeconds(seconds) {
+  const safeSeconds = Math.max(0, Number(seconds || 0))
+  const hours = Math.floor(safeSeconds / 3600)
+  const minutes = Math.floor((safeSeconds % 3600) / 60)
+  const remainingSeconds = safeSeconds % 60
+
+  if (hours > 0) {
+    return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`
+  }
+
+  return `${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`
+}
+
+function formatDate(value) {
+  if (!value) {
+    return ""
+  }
+
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) {
+    return ""
+  }
+
+  return date.toLocaleString()
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadLiveResults)
+
+onBeforeUnmount(() => {
+  if (autoRefreshTimer) {
+    clearTimeout(autoRefreshTimer)
+  }
+})
+
+watch(
+  () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid, route.query.status, route.query.minutes],
+  () => {
+    filterForm.status = getQueryValue(route.query.status) || "all"
+    filterForm.minutes = Number(getQueryValue(route.query.minutes) || DEFAULT_LIVE_MINUTES)
+    loadLiveResults()
+  },
+)
+</script>
+
+<style scoped>
+@media (max-width: 767px) {
+  form :deep(.p-dropdown),
+  form :deep(.p-inputtext) {
+    width: 100%;
+  }
+}
+
+:deep(.exercise-live-results-toolbar__button) {
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+:deep(.exercise-live-results-toolbar__button .p-button-icon) {
+  font-size: 1.25rem;
+}
+
+.exercise-live-results-html :deep(img) {
+  max-width: 100%;
+  height: auto;
+}
+
+.exercise-live-results-html :deep(p) {
+  margin-bottom: 0.25rem;
+}
+
+.exercise-live-results-html :deep(p:last-child) {
+  margin-bottom: 0;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExerciseOverviewView.vue b/assets/vue/views/exercise/ExerciseOverviewView.vue
new file mode 100644
index 00000000000..4da06b0667f
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseOverviewView.vue
@@ -0,0 +1,368 @@
+<template>
+  <section class="space-y-6">
+    <div class="flex flex-wrap items-center justify-between gap-3">
+      <div class="exercise-overview-toolbar flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+        <BaseButton
+          :label="t('Back to exercises')"
+          :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+          icon="back"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+        <BaseButton
+          v-if="overview.canManage"
+          :label="t('Edit')"
+          :route="{ name: 'ExerciseEdit', params: route.params, query: getContextParams() }"
+          icon="edit"
+          only-icon
+          size="small"
+          type="secondary-text"
+        />
+        <BaseButton
+          v-if="overview.canReport"
+          :label="t('Results and feedback')"
+          :route="{ name: 'ExerciseReport', params: route.params, query: getContextParams() }"
+          icon="tracking"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
+      </div>
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-6 text-sm text-gray-600 shadow-sm"
+    >
+      {{ t("Loading") }}
+    </div>
+
+    <template v-else>
+      <article class="exercise-overview rounded-xl border border-gray-20 bg-white p-6 shadow-sm">
+        <div class="flex flex-col gap-4 md:flex-row md:items-start md:justify-between">
+          <div class="space-y-3">
+            <div class="flex items-center gap-3">
+              <span
+                :class="chamiloIconToClass['multiple-marked']"
+                class="ch-tool-icon-gradient text-3xl"
+                aria-hidden="true"
+              />
+              <h1 class="text-2xl font-semibold text-gray-90">
+                {{ displayText(overview.title, t("Untitled")) }}
+              </h1>
+            </div>
+            <div
+              v-if="displayText(overview.description)"
+              class="max-w-4xl text-sm text-gray-700"
+            >
+              {{ displayText(overview.description) }}
+            </div>
+          </div>
+          <div class="flex flex-wrap gap-2">
+            <span :class="['rounded-full px-3 py-1 text-xs font-semibold', availabilityBadgeClass(overview.availabilityStatus)]">
+              {{ availabilityLabel(overview.availabilityStatus) }}
+            </span>
+            <span
+              v-if="!overview.visible"
+              class="rounded-full bg-gray-100 px-3 py-1 text-xs font-semibold text-gray-700"
+            >
+              {{ t("Hidden") }}
+            </span>
+          </div>
+        </div>
+      </article>
+
+      <div
+        v-if="overview.notice"
+        class="rounded-xl border border-blue-200 bg-blue-50 p-4 text-sm text-blue-700"
+      >
+        {{ t(overview.notice) }}
+      </div>
+
+      <div
+        v-if="overview.maxAttempt > 0"
+        :class="[
+          'rounded-xl border p-4 text-sm',
+          overview.attemptLimitReached ? 'border-red-200 bg-red-50 text-red-700' : 'border-blue-200 bg-blue-50 text-blue-700',
+        ]"
+      >
+        {{ t("Attempts {0} / {1}", [overview.currentUserAttemptCount || 0, overview.maxAttempt]) }}
+      </div>
+
+      <div
+        v-if="overview.attemptLimitReached"
+        class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
+      >
+        {{ t("Maximum number of attempts reached") }}
+      </div>
+
+      <div
+        v-if="overview.canStart"
+        class="rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
+      >
+        <BaseButton
+          :label="t(overview.startButtonLabel || 'Start test')"
+          :route="{ name: 'ExercisePlayer', params: route.params, query: getContextParams() }"
+          icon="play-box-outline"
+          size="normal"
+          type="success"
+        />
+      </div>
+
+      <section
+        v-if="overview.showAttemptsTable"
+        class="rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
+      >
+        <h2 class="mb-4 text-base font-semibold text-gray-90">{{ t("Attempt history") }}</h2>
+        <BaseTable
+          :values="overview.currentUserAttempts"
+          :total-items="overview.currentUserAttempts.length"
+          data-key="attemptId"
+          :text-for-empty="t('No attempts yet')"
+        >
+          <Column
+            :header="t('Attempt')"
+            field="number"
+          >
+            <template #body="{ data }">
+              {{ data.number }}
+            </template>
+          </Column>
+          <Column :header="t('Start date')">
+            <template #body="{ data }">
+              {{ formatDate(data.startDate) }}
+            </template>
+          </Column>
+          <Column :header="t('IP')">
+            <template #body="{ data }">
+              {{ data.userIp || "-" }}
+            </template>
+          </Column>
+          <Column
+            v-if="overview.showScoreColumn"
+            :header="t('Score')"
+          >
+            <template #body="{ data }">
+              {{ formatScore(data.score) }} / {{ formatScore(data.maxScore) }}
+            </template>
+          </Column>
+          <Column
+            v-if="overview.showDetailsColumn"
+            :header="t('Details')"
+          >
+            <template #body="{ data }">
+              <div class="flex flex-wrap items-center gap-2">
+                <BaseButton
+                  :label="t('Show')"
+                  :route="{
+                    name: 'ExerciseResult',
+                    params: { ...route.params, exerciseId: getExerciseId(), attemptId: data.attemptId },
+                    query: getContextParams(),
+                  }"
+                  icon="information"
+                  size="small"
+                  type="plain"
+                />
+                <span
+                  :class="[
+                    'rounded-full px-2 py-0.5 text-xs font-semibold',
+                    data.revised ? 'bg-green-100 text-green-700' : 'bg-blue-100 text-blue-700',
+                  ]"
+                >
+                  {{ data.revised ? t("Validated") : t("Not validated") }}
+                </span>
+              </div>
+            </template>
+          </Column>
+        </BaseTable>
+      </section>
+    </template>
+  </section>
+</template>
+
+<script setup>
+import { onMounted, reactive, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+
+const isLoading = ref(false)
+const errorMessage = ref("")
+const overview = reactive({
+  exerciseId: 0,
+  title: "",
+  description: "",
+  visible: false,
+  categoryTitle: "",
+  questionCount: 0,
+  attemptCount: 0,
+  currentUserAttemptCount: 0,
+  currentUserAttempts: [],
+  averageScore: 0,
+  maxScore: 0,
+  passPercentage: 0,
+  startTime: null,
+  endTime: null,
+  duration: null,
+  maxAttempt: 0,
+  feedbackType: 0,
+  resultsDisabled: 0,
+  randomAnswers: false,
+  random: 0,
+  randomByCategory: 0,
+  canManage: false,
+  canOpen: false,
+  canStart: false,
+  canReport: false,
+  availabilityStatus: "open",
+  showAttemptsTable: false,
+  showScoreColumn: false,
+  showDetailsColumn: false,
+  attemptLimitReached: false,
+  startButtonLabel: "Start test",
+  notice: "",
+})
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function addOptionalQueryParam(params, key) {
+  const value = getQueryValue(route.query[key])
+  if (value !== undefined && value !== null && value !== "") {
+    params[key] = value
+  }
+}
+
+function getContextParams() {
+  const params = {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+
+  addOptionalQueryParam(params, "learnpath_id")
+  addOptionalQueryParam(params, "learnpath_item_id")
+  addOptionalQueryParam(params, "learnpath_item_view_id")
+  addOptionalQueryParam(params, "preview")
+
+  return params
+}
+
+function getExerciseId() {
+  return Number(getQueryValue(route.params.exerciseId) || 0)
+}
+
+async function loadOverview() {
+  const exerciseId = getExerciseId()
+  if (exerciseId <= 0) {
+    errorMessage.value = t("Invalid exercise")
+
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseOverview(getContextParams(), exerciseId)
+    Object.assign(overview, response || {})
+    overview.currentUserAttempts = Array.isArray(response?.currentUserAttempts) ? response.currentUserAttempts : []
+  } catch (error) {
+    console.error("Error loading exercise overview", error)
+    errorMessage.value = t("Could not load exercise overview")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function formatDate(date) {
+  if (!date) {
+    return t("No date")
+  }
+
+  const parsedDate = new Date(date)
+  if (Number.isNaN(parsedDate.getTime())) {
+    return t("No date")
+  }
+
+  return parsedDate.toLocaleString()
+}
+
+function formatScore(score) {
+  return Number(score || 0).toFixed(2)
+}
+
+function availabilityLabel(status) {
+  switch (status) {
+    case "not_started":
+      return t("Not started")
+    case "closed":
+      return t("Closed")
+    default:
+      return t("Open")
+  }
+}
+
+function availabilityBadgeClass(status) {
+  switch (status) {
+    case "not_started":
+      return "bg-blue-100 text-blue-700"
+    case "closed":
+      return "bg-gray-100 text-gray-700"
+    default:
+      return "bg-green-100 text-green-700"
+  }
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadOverview)
+
+watch(
+  () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid],
+  () => loadOverview(),
+)
+</script>
+
+<style scoped>
+:deep(.exercise-overview-toolbar .p-button-icon) {
+  font-size: 1.25rem;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index 91b4984ffb2..1144bbcb37f 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -10,7 +10,7 @@
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.overview"
+        v-if="showLegacyRuntimeFallback"
         :label="t('Open legacy exercise')"
         :to-url="legacyUrls.overview"
         icon="play-box-outline"
@@ -95,16 +95,28 @@
           >
             {{ t("Random answers") }}
           </span>
+          <span
+            v-if="settings.preventBackwards"
+            class="rounded-full bg-gray-100 px-2 py-1 text-gray-700"
+          >
+            {{ t("Prevent moving backwards") }}
+          </span>
+          <span
+            v-if="settings.showPreviousButton === false"
+            class="rounded-full bg-gray-100 px-2 py-1 text-gray-700"
+          >
+            {{ t("Previous button hidden") }}
+          </span>
         </div>
       </header>
 
       <div
-        v-if="usesLegacySubmit && activeAttempt"
+        v-if="showLegacyRuntimeFallback"
         class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
       >
         <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
           <p>
-            {{ t("This Vue player can save draft answers for simple question types. Final submission, scoring, results and review still use the legacy exercise runtime in this batch.") }}
+            {{ t("This exercise contains options or question types that are not fully supported by the Vue runtime yet. You can continue with the legacy exercise runtime.") }}
           </p>
           <BaseButton
             v-if="legacyUrls.overview"
@@ -127,12 +139,13 @@
             </div>
             <div v-else-if="activeAttempt">
               {{ t("Attempt") }} #{{ activeAttempt.attemptId }} · {{ progressLabel }}
-              <span v-if="activeAttempt.remainingSeconds !== null && activeAttempt.remainingSeconds !== undefined">
-                · {{ t("Time left") }}: {{ formatSeconds(activeAttempt.remainingSeconds) }}
+              <span v-if="hasTimeControl">
+                · {{ t("Time left") }}:
+                <strong :class="isTimeExpired ? 'text-danger' : 'text-gray-90'">{{ formatSeconds(countdownRemainingSeconds) }}</strong>
               </span>
             </div>
             <div v-else>
-              {{ t("Start or resume a Vue attempt. Draft answers for simple question types can be saved before final legacy submission.") }}
+              {{ t("Start or resume an exercise attempt. Draft answers can be saved before final submission.") }}
             </div>
             <div v-if="attemptMessage" class="text-support-4">
               {{ attemptMessage }}
@@ -146,6 +159,9 @@
             <div v-if="answerSaveError" class="text-danger">
               {{ answerSaveError }}
             </div>
+            <div v-if="isTimeExpired" class="text-danger">
+              {{ t("Time limit reached. Finishing the attempt.") }}
+            </div>
             <div v-if="finishMessage" class="text-support-4">
               {{ finishMessage }}
             </div>
@@ -163,7 +179,7 @@
               @click="startAttempt"
             />
             <BaseButton
-              v-if="legacyUrls.overview"
+              v-if="showLegacyRuntimeFallback"
               :label="t('Use legacy runtime')"
               :to-url="legacyUrls.overview"
               icon="play-box-outline"
@@ -505,17 +521,98 @@
             </div>
 
             <div v-else-if="isDraggableQuestion(question)" class="space-y-3">
-              <div class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800">
-                {{ t("Sequence ordering is displayed here as a temporary list. Drag and drop submission will be migrated in the submit processor batch.") }}
+              <div class="rounded-lg border border-gray-20 bg-gray-15 p-3 text-sm text-gray-700">
+                {{ t("Put the items in the correct order.") }}
+              </div>
+
+              <div
+                v-if="isDraggableHorizontal(question)"
+                class="overflow-x-auto rounded-lg border border-gray-20 bg-white p-3"
+              >
+                <ol class="flex min-w-max items-stretch gap-3">
+                  <li
+                    v-for="(item, index) in draggableAnswerItems(question)"
+                    :key="item.id"
+                    class="flex w-64 shrink-0 flex-col gap-3 rounded-lg border border-gray-20 bg-white p-3 shadow-sm"
+                    draggable="true"
+                    @dragstart="onDraggableOrderDragStart(item.id)"
+                    @dragover.prevent
+                    @drop="onDraggableOrderDrop(question, item.id)"
+                  >
+                    <div class="flex min-w-0 flex-1 items-start gap-3">
+                      <span class="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-primary/10 text-sm font-semibold text-primary">
+                        {{ index + 1 }}
+                      </span>
+                      <span class="exercise-runtime-html min-w-0 flex-1" v-html="item.answer" />
+                    </div>
+
+                    <div class="flex shrink-0 flex-wrap gap-2">
+                      <button
+                        type="button"
+                        class="rounded border border-gray-30 px-2 py-1 text-xs text-gray-700 transition hover:border-primary hover:text-primary disabled:cursor-not-allowed disabled:opacity-40"
+                        :disabled="index === 0"
+                        @click="moveDraggableItem(question, index, index - 1)"
+                      >
+                        {{ t("Move left") }}
+                      </button>
+                      <button
+                        type="button"
+                        class="rounded border border-gray-30 px-2 py-1 text-xs text-gray-700 transition hover:border-primary hover:text-primary disabled:cursor-not-allowed disabled:opacity-40"
+                        :disabled="index === draggableAnswerItems(question).length - 1"
+                        @click="moveDraggableItem(question, index, index + 1)"
+                      >
+                        {{ t("Move right") }}
+                      </button>
+                    </div>
+                  </li>
+                </ol>
               </div>
-              <ol class="list-decimal space-y-2 pl-6">
+
+              <ol v-else class="space-y-2">
                 <li
-                  v-for="item in question.draggable.items"
+                  v-for="(item, index) in draggableAnswerItems(question)"
                   :key="item.id"
-                  class="exercise-runtime-html"
-                  v-html="item.answer"
-                />
+                  class="rounded-lg border border-gray-20 bg-white p-3 shadow-sm"
+                  draggable="true"
+                  @dragstart="onDraggableOrderDragStart(item.id)"
+                  @dragover.prevent
+                  @drop="onDraggableOrderDrop(question, item.id)"
+                >
+                  <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+                    <div class="flex min-w-0 flex-1 items-start gap-3">
+                      <span class="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-primary/10 text-sm font-semibold text-primary">
+                        {{ index + 1 }}
+                      </span>
+                      <span class="exercise-runtime-html min-w-0 flex-1" v-html="item.answer" />
+                    </div>
+
+                    <div class="flex shrink-0 flex-wrap gap-2">
+                      <button
+                        type="button"
+                        class="rounded border border-gray-30 px-2 py-1 text-xs text-gray-700 transition hover:border-primary hover:text-primary disabled:cursor-not-allowed disabled:opacity-40"
+                        :disabled="index === 0"
+                        @click="moveDraggableItem(question, index, index - 1)"
+                      >
+                        {{ t("Move up") }}
+                      </button>
+                      <button
+                        type="button"
+                        class="rounded border border-gray-30 px-2 py-1 text-xs text-gray-700 transition hover:border-primary hover:text-primary disabled:cursor-not-allowed disabled:opacity-40"
+                        :disabled="index === draggableAnswerItems(question).length - 1"
+                        @click="moveDraggableItem(question, index, index + 1)"
+                      >
+                        {{ t("Move down") }}
+                      </button>
+                    </div>
+                  </div>
+                </li>
               </ol>
+
+              <p class="text-xs text-gray-500">
+                {{ isDraggableHorizontal(question)
+                  ? t("You can drag items left or right, or use the move buttons to change the order.")
+                  : t("You can drag items or use the move buttons to change the order.") }}
+              </p>
             </div>
 
             <div v-else-if="isDropdownQuestion(question)" class="space-y-3">
@@ -579,7 +676,16 @@
                   v-for="file in answers[question.id].uploadedFiles"
                   :key="file.id || file.name"
                 >
-                  {{ file.name || t("Uploaded file") }}
+                  <a
+                    v-if="file.url"
+                    class="text-primary underline"
+                    :href="file.url"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    {{ file.name || t("Uploaded file") }}
+                  </a>
+                  <span v-else>{{ file.name || t("Uploaded file") }}</span>
                 </div>
               </div>
             </div>
@@ -591,6 +697,7 @@
                 </div>
                 <AudioRecorder
                   :multiple="false"
+                  :show-recorded-audios="false"
                   @recorded-audio="onOralRecorded(question, $event)"
                 />
               </div>
@@ -630,7 +737,16 @@
                   v-for="file in answers[question.id].uploadedFiles"
                   :key="file.id || file.name"
                 >
-                  {{ file.name || t("Uploaded audio") }}
+                  <a
+                    v-if="file.url"
+                    class="text-primary underline"
+                    :href="file.url"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    {{ file.name || t("Uploaded audio") }}
+                  </a>
+                  <span v-else>{{ file.name || t("Uploaded audio") }}</span>
                 </div>
               </div>
             </div>
@@ -882,10 +998,61 @@
               {{ t("This question type is pending runtime rendering in Vue.") }}
             </div>
           </div>
+
+          <div
+            v-if="directFeedbackForQuestion(question)"
+            class="mt-4 space-y-3 rounded-lg border p-4 text-sm"
+            :class="feedbackStatusClass(directFeedbackForQuestion(question))"
+          >
+            <div class="flex flex-col gap-2 md:flex-row md:items-start md:justify-between">
+              <div>
+                <div class="font-semibold">
+                  {{ t(directFeedbackForQuestion(question).title || "Feedback") }}
+                </div>
+                <div>
+                  {{ t("Score") }}: {{ formatScore(directFeedbackForQuestion(question).score) }} / {{ formatScore(directFeedbackForQuestion(question).maxScore) }}
+                </div>
+              </div>
+              <div class="flex flex-wrap gap-2">
+                <BaseButton
+                  :label="directFeedbackForQuestion(question).afterAction === 'finish' ? t('End test') : t('Proceed with the test')"
+                  icon="check"
+                  type="primary"
+                  @click="proceedAfterFeedback(directFeedbackForQuestion(question))"
+                />
+              </div>
+            </div>
+
+            <div
+              v-if="feedbackEntries(directFeedbackForQuestion(question)).length"
+              class="space-y-2"
+            >
+              <div
+                v-for="(entry, entryIndex) in feedbackEntries(directFeedbackForQuestion(question))"
+                :key="`${question.id}-feedback-${entryIndex}`"
+                class="rounded border border-gray-20 bg-white/80 p-3"
+              >
+                <div
+                  v-if="entry.answer"
+                  class="exercise-runtime-html font-medium text-gray-90"
+                  v-html="entry.answer"
+                />
+                <div
+                  v-if="entry.comment"
+                  class="exercise-runtime-html mt-1 text-gray-700"
+                  v-html="entry.comment"
+                />
+              </div>
+            </div>
+            <div v-else>
+              {{ t("No detailed feedback is available for this question.") }}
+            </div>
+          </div>
         </article>
 
         <div class="flex flex-wrap justify-between gap-2 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
           <BaseButton
+            v-if="showPreviousNavigationButton"
             :disabled="!canMovePrevious || isSavingAnswer"
             :label="previousNavigationLabel"
             icon="back"
@@ -895,29 +1062,29 @@
           <div class="flex flex-wrap gap-2">
             <BaseButton
               v-if="!canManage && activeAttempt"
-              :disabled="isSavingAnswer || !visibleQuestions.some(isDraftSaveSupported)"
+              :disabled="isSavingAnswer || isTimeExpired || !visibleQuestions.some(isDraftSaveSupported)"
               :label="isSavingAnswer ? t('Saving') : t('Save draft')"
               icon="check"
               type="success"
-              @click="saveVisibleAnswers"
+              @click="saveVisibleAnswers()"
             />
             <BaseButton
               v-if="canMoveNext"
-              :disabled="isSavingAnswer"
+              :disabled="isSavingAnswer || isTimeExpired"
               :label="nextNavigationLabel"
               type="primary"
               @click="goToNextQuestion"
             />
             <BaseButton
               v-if="!canManage && activeAttempt && canFinishCurrentPage"
-              :disabled="!canSubmit || isSavingAnswer || isFinishingAttempt"
+              :disabled="!canSubmit || isSavingAnswer || isFinishingAttempt || isAutoFinishingExpiredAttempt"
               :label="isFinishingAttempt ? t('Finishing') : t('Finish in Vue')"
               icon="check"
               type="primary"
               @click="finishAttempt"
             />
             <BaseButton
-              v-if="legacyUrls.overview"
+              v-if="showLegacyRuntimeFallback"
               :label="t('Continue in legacy exercise')"
               :to-url="legacyUrls.overview"
               icon="play-box-outline"
@@ -927,14 +1094,71 @@
         </div>
       </form>
     </template>
+
+    <BaseDialog
+      v-if="feedbackDialog"
+      v-model:is-visible="isFeedbackDialogVisible"
+      :show-close-button="false"
+      :title="feedbackDialogTitle"
+      header-icon="information"
+    >
+      <div class="space-y-3 text-sm">
+        <div
+          class="rounded-lg border p-4"
+          :class="feedbackStatusClass(feedbackDialog)"
+        >
+          <div class="font-semibold">
+            {{ t(feedbackDialog.title || "Feedback") }}
+          </div>
+          <div>
+            {{ t("Score") }}: {{ formatScore(feedbackDialog.score) }} / {{ formatScore(feedbackDialog.maxScore) }}
+          </div>
+        </div>
+
+        <div
+          v-if="feedbackEntries(feedbackDialog).length"
+          class="space-y-2"
+        >
+          <div
+            v-for="(entry, entryIndex) in feedbackEntries(feedbackDialog)"
+            :key="`popup-feedback-${entryIndex}`"
+            class="rounded border border-gray-20 bg-white p-3"
+          >
+            <div
+              v-if="entry.answer"
+              class="exercise-runtime-html font-medium text-gray-90"
+              v-html="entry.answer"
+            />
+            <div
+              v-if="entry.comment"
+              class="exercise-runtime-html mt-1 text-gray-700"
+              v-html="entry.comment"
+            />
+          </div>
+        </div>
+        <div v-else>
+          {{ t("No detailed feedback is available for this question.") }}
+        </div>
+      </div>
+
+      <template #footer>
+        <BaseButton
+          :label="feedbackDialog.afterAction === 'finish' ? t('End test') : t('Proceed with the test')"
+          icon="check"
+          type="primary"
+          @click="proceedAfterFeedback(feedbackDialog)"
+        />
+      </template>
+    </BaseDialog>
   </section>
 </template>
 
 <script setup>
-import { computed, onMounted, ref, watch } from "vue"
+import { computed, onBeforeUnmount, onMounted, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
 import { useRoute, useRouter } from "vue-router"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseDialog from "../../components/basecomponents/BaseDialog.vue"
 import AudioRecorder from "../../components/AudioRecorder.vue"
 import exerciseService from "../../services/exerciseService"
 
@@ -970,13 +1194,25 @@ const finishMessage = ref("")
 const savedQuestionIds = ref(new Set())
 const draggedMatchingOptionId = ref(null)
 const selectedMatchingOptions = ref({})
+const draggedDraggableItemId = ref(null)
+const countdownRemainingSeconds = ref(null)
+const countdownTimer = ref(null)
+const isTimeExpired = ref(false)
+const isAutoFinishingExpiredAttempt = ref(false)
+const directFeedbackByQuestion = ref({})
+const feedbackDialog = ref(null)
+const isFeedbackDialogVisible = ref(false)
+const feedbackShownOnLastSave = ref(false)
 
 const questionMap = computed(() => new Map(questions.value.map((question) => [Number(question.id), question])))
 
 const runtimePages = computed(() => {
   const pages = settings.value?.runtimePages
+  if (!Array.isArray(pages)) {
+    return []
+  }
 
-  return Array.isArray(pages) ? pages : []
+  return normalizeRuntimePages(pages)
 })
 
 const usesPagedNavigation = computed(() => {
@@ -987,6 +1223,10 @@ const usesPagedNavigation = computed(() => {
   return true === settings.value.oneQuestionPerPage
 })
 
+const showLegacyRuntimeFallback = computed(() => {
+  return !canManage.value && true === usesLegacySubmit.value && Boolean(legacyUrls.value?.overview)
+})
+
 const currentRuntimePage = computed(() => {
   if (runtimePages.value.length === 0) {
     return null
@@ -1013,19 +1253,128 @@ const visibleQuestions = computed(() => {
 
 const visibleQuestionTotal = computed(() => answerableQuestions.value.length)
 const navigationTotal = computed(() => usesPagedNavigation.value ? Math.max(1, runtimePages.value.length || visibleQuestionTotal.value) : visibleQuestionTotal.value)
-const canMovePrevious = computed(() => usesPagedNavigation.value && currentQuestionIndex.value > 0)
+const previousNavigationAllowed = computed(() => !settings.value.preventBackwards && settings.value.showPreviousButton !== false)
+const showPreviousNavigationButton = computed(() => usesPagedNavigation.value && previousNavigationAllowed.value)
+const canMovePrevious = computed(() => showPreviousNavigationButton.value && currentQuestionIndex.value > 0)
 const canMoveNext = computed(() => usesPagedNavigation.value && currentQuestionIndex.value < navigationTotal.value - 1)
 const canFinishCurrentPage = computed(() => !usesPagedNavigation.value || !canMoveNext.value)
+const hasTimeControl = computed(() => null !== countdownRemainingSeconds.value && undefined !== countdownRemainingSeconds.value)
 const answerableQuestions = computed(() => questions.value.filter((question) => !isStructuralQuestion(question)))
+const currentNavigationIndex = computed(() => Math.min(Math.max(0, currentQuestionIndex.value), Math.max(0, navigationTotal.value - 1)))
 const progressLabel = computed(() => {
   if (usesPagedNavigation.value && currentRuntimePage.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1)) {
-    return `${t("Page")} ${currentQuestionIndex.value + 1} / ${navigationTotal.value}`
+    return `${t("Page")} ${currentNavigationIndex.value + 1} / ${navigationTotal.value}`
   }
 
-  return `${t("Question")} ${currentQuestionIndex.value + 1} / ${navigationTotal.value}`
+  return `${t("Question")} ${currentNavigationIndex.value + 1} / ${navigationTotal.value}`
 })
 const previousNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Previous page") : t("Previous question"))
 const nextNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Next page") : t("Next question"))
+const feedbackDialogTitle = computed(() => t(feedbackDialog.value?.title || "Feedback"))
+
+watch(navigationTotal, (total) => {
+  const safeTotal = Number(total || 0)
+  if (safeTotal <= 0) {
+    currentQuestionIndex.value = 0
+    return
+  }
+
+  if (currentQuestionIndex.value > safeTotal - 1) {
+    currentQuestionIndex.value = safeTotal - 1
+  }
+})
+
+function normalizeRuntimePages(pages = []) {
+  const normalizedPages = []
+
+  for (const page of pages) {
+    if (!page || typeof page !== "object") {
+      continue
+    }
+
+    const questionIds = Array.isArray(page.questionIds)
+      ? page.questionIds
+        .map((questionId) => Number(questionId || 0))
+        .filter((questionId) => questionId > 0 && questionMap.value.has(questionId) && !isStructuralQuestion(questionMap.value.get(questionId)))
+      : []
+
+    if (questionIds.length > 0 || hasRuntimePageContent(page)) {
+      normalizedPages.push({
+        ...page,
+        questionIds,
+      })
+    }
+  }
+
+  return normalizedPages
+}
+
+function hasRuntimePageContent(page = {}) {
+  const media = page.media || null
+  const pageBreak = page.pageBreak || null
+
+  return Boolean(
+    nonEmptyText(media?.title)
+    || nonEmptyText(media?.description)
+    || nonEmptyText(media?.content?.description)
+    || nonEmptyText(pageBreak?.title)
+    || nonEmptyText(pageBreak?.description)
+    || nonEmptyText(pageBreak?.content?.description)
+  )
+}
+
+function nonEmptyText(value) {
+  return typeof value === "string" && value.trim() !== ""
+}
+
+
+function syncCountdownFromAttempt(attempt) {
+  stopCountdownTimer()
+  isTimeExpired.value = false
+  isAutoFinishingExpiredAttempt.value = false
+
+  if (!attempt?.expiredAt) {
+    countdownRemainingSeconds.value = null
+    return
+  }
+
+  updateCountdown(attempt.expiredAt)
+  countdownTimer.value = window.setInterval(() => updateCountdown(attempt.expiredAt), 1000)
+}
+
+function stopCountdownTimer() {
+  if (countdownTimer.value) {
+    window.clearInterval(countdownTimer.value)
+    countdownTimer.value = null
+  }
+}
+
+function updateCountdown(expiredAt) {
+  const expiresAt = new Date(expiredAt).getTime()
+  if (Number.isNaN(expiresAt)) {
+    countdownRemainingSeconds.value = null
+    return
+  }
+
+  const remaining = Math.max(0, Math.ceil((expiresAt - Date.now()) / 1000))
+  countdownRemainingSeconds.value = remaining
+
+  if (remaining <= 0 && !canManage.value && activeAttempt.value?.status === "incomplete") {
+    handleExpiredTimeLimit()
+  }
+}
+
+async function handleExpiredTimeLimit() {
+  if (isAutoFinishingExpiredAttempt.value || isFinishingAttempt.value) {
+    return
+  }
+
+  isTimeExpired.value = true
+  isAutoFinishingExpiredAttempt.value = true
+  attemptMessage.value = t("Time limit reached. Finishing the attempt.")
+
+  await finishAttempt({ skipDraftSave: false, expiredByTimer: true })
+}
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -1074,6 +1423,10 @@ async function loadRuntime() {
     applyAttemptState(activeAttempt.value)
     initializeAnswerState()
     applySavedAnswers(activeAttempt.value?.savedAnswers || {})
+    directFeedbackByQuestion.value = {}
+    feedbackDialog.value = null
+    isFeedbackDialogVisible.value = false
+    syncCountdownFromAttempt(activeAttempt.value)
   } catch (error) {
     console.error("Error loading exercise runtime", error)
     errorMessage.value = t("Could not load exercise")
@@ -1104,6 +1457,7 @@ async function startAttempt() {
       reorderQuestionsFromAttempt(response.questionIds || [])
       initializeAnswerState()
       applySavedAnswers(response.savedAnswers || {})
+      syncCountdownFromAttempt(response)
       return
     }
 
@@ -1125,6 +1479,7 @@ async function startAttempt() {
 function applyAttemptState(attempt) {
   if (!attempt) {
     currentQuestionIndex.value = 0
+    syncCountdownFromAttempt(null)
     return
   }
 
@@ -1179,26 +1534,30 @@ function reorderQuestionsFromAttempt(questionIds = []) {
 }
 
 async function goToPreviousQuestion() {
-  if (!canMovePrevious.value) {
+  if (isTimeExpired.value || !canMovePrevious.value) {
     return
   }
 
-  if (await saveVisibleAnswers()) {
-    currentQuestionIndex.value -= 1
+  if (await saveVisibleAnswers({ afterFeedback: "previous" })) {
+    if (!feedbackShownOnLastSave.value) {
+      currentQuestionIndex.value -= 1
+    }
   }
 }
 
 async function goToNextQuestion() {
-  if (!canMoveNext.value) {
+  if (isTimeExpired.value || !canMoveNext.value) {
     return
   }
 
-  if (await saveVisibleAnswers()) {
-    currentQuestionIndex.value += 1
+  if (await saveVisibleAnswers({ afterFeedback: "next" })) {
+    if (!feedbackShownOnLastSave.value) {
+      currentQuestionIndex.value += 1
+    }
   }
 }
 
-async function saveVisibleAnswers() {
+async function saveVisibleAnswers(options = {}) {
   if (canManage.value || !activeAttempt.value?.attemptId) {
     return true
   }
@@ -1211,10 +1570,11 @@ async function saveVisibleAnswers() {
   isSavingAnswer.value = true
   answerSaveError.value = ""
   answerSaveMessage.value = ""
+  feedbackShownOnLastSave.value = false
 
   try {
     for (const question of saveTargets) {
-      await saveQuestionDraftAnswer(question)
+      await saveQuestionDraftAnswer(question, options.afterFeedback || "none")
     }
 
     answerSaveMessage.value = t("Draft answer saved")
@@ -1230,14 +1590,20 @@ async function saveVisibleAnswers() {
   }
 }
 
-async function finishAttempt() {
+async function finishAttempt(options = {}) {
   const exerciseId = getExerciseId()
   const attemptId = Number(activeAttempt.value?.attemptId || 0)
   if (canManage.value || !exerciseId || !attemptId) {
     return
   }
 
-  if (!(await saveVisibleAnswers())) {
+  const skipDraftSave = true === options.skipDraftSave
+  const ignoreFeedback = true === options.ignoreFeedback
+  if (!skipDraftSave && !(await saveVisibleAnswers({ afterFeedback: "finish" }))) {
+    return
+  }
+
+  if (!ignoreFeedback && feedbackShownOnLastSave.value) {
     return
   }
 
@@ -1265,6 +1631,7 @@ async function finishAttempt() {
       status: response.status || "completed",
     }
     canSubmit.value = false
+    stopCountdownTimer()
     finishMessage.value = response.message ? t(response.message) : t("Attempt finished")
 
     await router.push({
@@ -1281,10 +1648,11 @@ async function finishAttempt() {
     finishError.value = t("Could not finish the attempt")
   } finally {
     isFinishingAttempt.value = false
+    isAutoFinishingExpiredAttempt.value = false
   }
 }
 
-async function saveQuestionDraftAnswer(question) {
+async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
   const exerciseId = getExerciseId()
   const attemptId = Number(activeAttempt.value?.attemptId || 0)
   if (!exerciseId || !attemptId || !question?.id) {
@@ -1325,6 +1693,10 @@ async function saveQuestionDraftAnswer(question) {
     nextSavedQuestionIds.delete(Number(question.id))
     savedQuestionIds.value = nextSavedQuestionIds
   }
+
+  handleRuntimeFeedback(question, response.feedback || null, afterFeedback)
+
+  return response
 }
 
 
@@ -1359,6 +1731,93 @@ async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
 }
 
 
+function isRuntimeFeedbackMode() {
+  return [1, 3].includes(Number(settings.value.feedbackType || 0))
+}
+
+function handleRuntimeFeedback(question, feedback, afterAction = "none") {
+  if (!isRuntimeFeedbackMode() || !feedback?.enabled) {
+    return
+  }
+
+  const normalizedFeedback = {
+    ...feedback,
+    questionId: Number(feedback.questionId || question.id || 0),
+    afterAction,
+  }
+
+  feedbackShownOnLastSave.value = true
+
+  if (feedback.mode === "popup") {
+    feedbackDialog.value = normalizedFeedback
+    isFeedbackDialogVisible.value = true
+    return
+  }
+
+  directFeedbackByQuestion.value = {
+    ...directFeedbackByQuestion.value,
+    [Number(question.id)]: normalizedFeedback,
+  }
+}
+
+function directFeedbackForQuestion(question) {
+  return directFeedbackByQuestion.value[Number(question?.id || 0)] || null
+}
+
+function feedbackEntries(feedback) {
+  return Array.isArray(feedback?.entries) ? feedback.entries : []
+}
+
+function feedbackStatusClass(feedback) {
+  const status = feedback?.status || ""
+
+  if (status === "correct") {
+    return "border-success/30 bg-success/10 text-success"
+  }
+
+  if (status === "partial" || status === "pending") {
+    return "border-warning/30 bg-warning/10 text-warning"
+  }
+
+  return "border-danger/30 bg-danger/10 text-danger"
+}
+
+function formatScore(value) {
+  const number = Number(value || 0)
+
+  return Number.isInteger(number) ? String(number) : number.toFixed(2)
+}
+
+async function proceedAfterFeedback(feedback) {
+  if (!feedback) {
+    return
+  }
+
+  const questionId = Number(feedback.questionId || 0)
+  if (questionId > 0) {
+    const nextFeedback = { ...directFeedbackByQuestion.value }
+    delete nextFeedback[questionId]
+    directFeedbackByQuestion.value = nextFeedback
+  }
+
+  isFeedbackDialogVisible.value = false
+  feedbackDialog.value = null
+
+  if (feedback.afterAction === "finish") {
+    await finishAttempt({ skipDraftSave: true, ignoreFeedback: true })
+    return
+  }
+
+  if (feedback.afterAction === "next" && canMoveNext.value) {
+    currentQuestionIndex.value += 1
+    return
+  }
+
+  if (feedback.afterAction === "previous" && canMovePrevious.value) {
+    currentQuestionIndex.value -= 1
+  }
+}
+
 function getMatchingAnswerState(question) {
   if (!answers.value[question.id]) {
     answers.value[question.id] = { matching: {} }
@@ -1529,6 +1988,10 @@ function buildAnswerPayload(question) {
     return { matching: questionAnswer.matching || {} }
   }
 
+  if (isDraggableQuestion(question)) {
+    return { order: draggableAnswerItems(question).map((item) => Number(item.id || 0)).filter((itemId) => itemId > 0) }
+  }
+
   if (isDropdownQuestion(question)) {
     return { dropdown: questionAnswer.dropdown }
   }
@@ -1564,6 +2027,7 @@ function isDraftSaveSupported(question) {
     || isDraftTrueFalseQuestion(question)
     || isFillBlanksQuestion(question)
     || isMatchingQuestion(question)
+    || isDraggableQuestion(question)
     || isDropdownQuestion(question)
     || isCalculatedQuestion(question)
     || isHotspotQuestion(question)
@@ -1650,6 +2114,24 @@ function applySavedAnswer(question, rows) {
     return
   }
 
+  if (isDraggableQuestion(question)) {
+    const orderedIds = [...rows]
+      .sort((left, right) => Number(left.answer || 0) - Number(right.answer || 0))
+      .map((row) => Number(row.position || 0))
+      .filter((itemId) => itemId > 0)
+    const availableItems = Array.isArray(question.draggable?.items) ? question.draggable.items : []
+    const availableIds = new Set(availableItems.map((item) => Number(item.id || 0)))
+    const restoredIds = orderedIds.filter((itemId) => availableIds.has(itemId))
+    for (const item of availableItems) {
+      const itemId = Number(item.id || 0)
+      if (itemId > 0 && !restoredIds.includes(itemId)) {
+        restoredIds.push(itemId)
+      }
+    }
+    questionAnswer.draggableOrder = restoredIds
+    return
+  }
+
   if (isDropdownQuestion(question)) {
     questionAnswer.dropdown = Number(rows[0]?.answer || 0) || ""
     return
@@ -1682,13 +2164,34 @@ function applySavedAnswer(question, rows) {
   }
 
   if (isUploadQuestion(question)) {
-    questionAnswer.uploadedFiles = rows.length > 0 ? [{ name: t("Uploaded file") }] : []
+    const files = extractSavedAttemptFiles(rows)
+    questionAnswer.uploadedFiles = files.length > 0 ? files : (rows.length > 0 ? [{ name: t("Uploaded file") }] : [])
     return
   }
 
   if (isOralQuestion(question)) {
-    questionAnswer.uploadedFiles = rows.length > 0 ? [{ name: t("Uploaded audio") }] : []
+    const files = extractSavedAttemptFiles(rows)
+    questionAnswer.uploadedFiles = files.length > 0 ? files : (rows.length > 0 ? [{ name: t("Uploaded audio") }] : [])
+  }
+}
+
+
+function extractSavedAttemptFiles(rows = []) {
+  const files = []
+
+  for (const row of rows) {
+    if (!Array.isArray(row?.files)) {
+      continue
+    }
+
+    for (const file of row.files) {
+      if (file && typeof file === "object") {
+        files.push(file)
+      }
+    }
   }
+
+  return files
 }
 
 function extractSavedBlankValues(savedAnswer, separator = 0) {
@@ -1743,6 +2246,7 @@ function initializeAnswerState() {
       degreeCertainty: {},
       blanks: {},
       matching: {},
+      draggableOrder: draggableInitialOrder(question),
       dropdown: "",
       calculated: "",
       calculatedAnswerId: currentCalculatedVariation(question).id || question.calculated?.answerId || null,
@@ -2251,6 +2755,94 @@ function isDraggableQuestion(question) {
   return Number(question.type) === 18 && question.draggable
 }
 
+
+function draggableOrientation(question) {
+  const orientation = String(question.draggable?.orientation || "").toLowerCase()
+
+  return ["h", "horizontal"].includes(orientation) ? "horizontal" : "vertical"
+}
+
+function isDraggableHorizontal(question) {
+  return draggableOrientation(question) === "horizontal"
+}
+
+function draggableInitialOrder(question) {
+  return (question.draggable?.items || [])
+    .map((item) => Number(item.id || 0))
+    .filter((itemId) => itemId > 0)
+}
+
+function draggableAnswerItems(question) {
+  const items = Array.isArray(question.draggable?.items) ? question.draggable.items : []
+  const itemMap = new Map(items.map((item) => [Number(item.id || 0), item]))
+  const storedOrder = Array.isArray(answers.value?.[question.id]?.draggableOrder)
+    ? answers.value[question.id].draggableOrder.map((itemId) => Number(itemId || 0)).filter((itemId) => itemId > 0)
+    : []
+
+  const orderedItems = []
+  const usedIds = new Set()
+  for (const itemId of storedOrder) {
+    if (itemMap.has(itemId) && !usedIds.has(itemId)) {
+      orderedItems.push(itemMap.get(itemId))
+      usedIds.add(itemId)
+    }
+  }
+
+  for (const item of items) {
+    const itemId = Number(item.id || 0)
+    if (itemId > 0 && !usedIds.has(itemId)) {
+      orderedItems.push(item)
+    }
+  }
+
+  return orderedItems
+}
+
+function setDraggableOrder(question, items) {
+  if (!answers.value?.[question.id]) {
+    return
+  }
+
+  answers.value[question.id].draggableOrder = items
+    .map((item) => Number(item.id || item || 0))
+    .filter((itemId) => itemId > 0)
+}
+
+function moveDraggableItem(question, fromIndex, toIndex) {
+  const items = draggableAnswerItems(question)
+  if (fromIndex < 0 || toIndex < 0 || fromIndex >= items.length || toIndex >= items.length) {
+    return
+  }
+
+  const [item] = items.splice(fromIndex, 1)
+  items.splice(toIndex, 0, item)
+  setDraggableOrder(question, items)
+}
+
+function onDraggableOrderDragStart(itemId) {
+  draggedDraggableItemId.value = Number(itemId || 0)
+}
+
+function onDraggableOrderDrop(question, targetItemId) {
+  const draggedItemId = Number(draggedDraggableItemId.value || 0)
+  draggedDraggableItemId.value = null
+  const safeTargetItemId = Number(targetItemId || 0)
+  if (draggedItemId <= 0 || safeTargetItemId <= 0 || draggedItemId === safeTargetItemId) {
+    return
+  }
+
+  const items = draggableAnswerItems(question)
+  const fromIndex = items.findIndex((item) => Number(item.id || 0) === draggedItemId)
+  const toIndex = items.findIndex((item) => Number(item.id || 0) === safeTargetItemId)
+  if (fromIndex < 0 || toIndex < 0) {
+    return
+  }
+
+  const [item] = items.splice(fromIndex, 1)
+  items.splice(toIndex, 0, item)
+  setDraggableOrder(question, items)
+}
+
 function isDropdownQuestion(question) {
   return [28, 29].includes(Number(question.type)) && question.dropdown
 }
@@ -2382,6 +2974,8 @@ function displayText(value, fallback = "") {
   return plainValue || fallback
 }
 
+onBeforeUnmount(stopCountdownTimer)
+
 onMounted(loadRuntime)
 
 watch(
diff --git a/assets/vue/views/exercise/ExerciseQuestionBankView.vue b/assets/vue/views/exercise/ExerciseQuestionBankView.vue
new file mode 100644
index 00000000000..739f8caf5ef
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseQuestionBankView.vue
@@ -0,0 +1,466 @@
+<template>
+  <section class="space-y-5">
+    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+      <BaseButton
+        :label="t('Back to questions')"
+        :route="{ name: 'ExerciseQuestions', params: { ...route.params, exerciseId }, query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <section class="space-y-1">
+      <h1 class="text-xl font-semibold text-gray-90">
+        {{ t("Question bank") }}
+      </h1>
+      <p class="text-sm text-gray-600">
+        {{ t("Reuse existing questions in this test.") }}
+      </p>
+    </section>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="infoMessage"
+      class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
+    >
+      {{ infoMessage }}
+    </div>
+
+    <form
+      class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      @submit.prevent="applyFilters"
+    >
+      <div class="grid gap-4 md:grid-cols-2 lg:grid-cols-5">
+        <BaseInputText
+          id="question-bank-search"
+          v-model="filters.search"
+          :label="t('Search')"
+          name="search"
+        />
+        <BaseSelect
+          id="question-bank-category"
+          v-model="filters.categoryId"
+          :label="t('Questions category')"
+          name="categoryId"
+          :options="categoryOptions"
+          option-label="label"
+          option-value="value"
+        />
+        <BaseSelect
+          id="question-bank-source-exercise"
+          v-model="filters.sourceExerciseId"
+          :label="t('Test')"
+          name="sourceExerciseId"
+          :options="exerciseOptions"
+          option-label="label"
+          option-value="value"
+        />
+        <BaseSelect
+          id="question-bank-difficulty"
+          v-model="filters.difficulty"
+          :label="t('Difficulty')"
+          name="difficulty"
+          :options="difficultyOptions"
+          option-label="label"
+          option-value="value"
+        />
+        <BaseSelect
+          id="question-bank-question-type"
+          v-model="filters.questionType"
+          :label="t('Answer type')"
+          name="questionType"
+          :options="questionTypeOptions"
+          option-label="label"
+          option-value="value"
+        />
+      </div>
+
+      <div class="mt-4 flex flex-wrap gap-2">
+        <BaseButton
+          :is-loading="isLoading"
+          :label="t('Filter')"
+          icon="search"
+          :is-submit="true"
+          type="primary"
+        />
+        <BaseButton
+          :label="t('Clear search')"
+          icon="close"
+          type="plain"
+          @click="clearFilters"
+        />
+      </div>
+    </form>
+
+    <div class="flex flex-wrap items-center justify-between gap-3 rounded-xl border border-gray-20 bg-white px-4 py-3 shadow-sm">
+      <div class="text-sm text-gray-700">
+        {{ t("{0} questions found", [totalItems]) }}
+      </div>
+      <div class="flex flex-wrap gap-2">
+        <BaseButton
+          :disabled="0 === selectedQuestionIds.length || isSaving"
+          :is-loading="isSaving"
+          :label="t('Add selected questions to the test')"
+          icon="plus"
+          type="success"
+          @click="addSelectedQuestions"
+        />
+      </div>
+    </div>
+
+    <BaseTable
+      :is-loading="isLoading"
+      :text-for-empty="t('No questions found')"
+      :total-items="totalItems"
+      :values="questions"
+      data-key="id"
+    >
+      <Column class="w-12">
+        <template #header>
+          <input
+            :checked="areAllReusableQuestionsSelected"
+            class="h-4 w-4 rounded border-gray-25"
+            name="selectAllQuestions"
+            type="checkbox"
+            @change="toggleAllQuestions"
+          />
+        </template>
+        <template #body="{ data }">
+          <input
+            v-if="data.canReuse"
+            v-model="selectedQuestionIds"
+            class="h-4 w-4 rounded border-gray-25"
+            name="questionIds[]"
+            type="checkbox"
+            :value="Number(data.id)"
+          />
+        </template>
+      </Column>
+
+      <Column :header="t('Question')">
+        <template #body="{ data }">
+          <div class="space-y-1">
+            <div class="font-semibold text-gray-90">
+              {{ displayText(data.title, t('Untitled')) }}
+            </div>
+            <div
+              v-if="displayText(data.description)"
+              class="text-xs text-gray-600"
+            >
+              {{ displayText(data.description) }}
+            </div>
+          </div>
+        </template>
+      </Column>
+
+      <Column
+        :header="t('Type')"
+        class="w-32"
+      >
+        <template #body="{ data }">
+          <div class="flex items-center justify-center">
+            <img
+              v-if="data.typeIcon"
+              :alt="t(data.typeLabel)"
+              class="h-9 w-9 object-contain"
+              :src="`/img/icons/64/${data.typeIcon}`"
+              @error="useFallbackIcon"
+            />
+          </div>
+          <div class="mt-1 text-center text-xs text-gray-600">
+            {{ t(data.typeLabel) }}
+          </div>
+        </template>
+      </Column>
+
+      <Column :header="t('Questions category')">
+        <template #body="{ data }">
+          {{ displayText(data.categoryLabel, '-') }}
+        </template>
+      </Column>
+
+      <Column
+        :header="t('Difficulty')"
+        class="w-24"
+      >
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-800">{{ data.difficulty }}</span>
+        </template>
+      </Column>
+
+      <Column
+        :header="t('Score')"
+        class="w-24"
+      >
+        <template #body="{ data }">
+          {{ formatScore(data.score) }}
+        </template>
+      </Column>
+
+      <Column
+        :header="t('Actions')"
+        class="w-40"
+      >
+        <template #body="{ data }">
+          <div class="flex justify-end gap-1">
+            <span
+              v-if="data.alreadyInExercise"
+              class="rounded-full bg-gray-100 px-2 py-1 text-xs font-semibold text-gray-700"
+            >
+              {{ t("Already in test") }}
+            </span>
+            <span
+              v-else-if="!data.canReuse"
+              class="rounded-full bg-yellow-100 px-2 py-1 text-xs font-semibold text-yellow-800"
+              :title="t(data.blockedReason || 'This question cannot be reused here.')"
+            >
+              {{ t("Not compatible") }}
+            </span>
+            <BaseButton
+              v-else
+              :disabled="isSaving"
+              :label="t('Use this question in the test as a link (not a copy)')"
+              icon="plus"
+              only-icon
+              size="small"
+              type="success-text"
+              @click="addQuestion(data)"
+            />
+          </div>
+        </template>
+      </Column>
+    </BaseTable>
+
+    <div class="flex flex-wrap items-center justify-between gap-3 rounded-xl border border-gray-20 bg-white px-4 py-3 shadow-sm">
+      <BaseButton
+        :disabled="1 >= filters.page || isLoading"
+        :label="t('Previous')"
+        icon="back"
+        type="plain"
+        @click="changePage(filters.page - 1)"
+      />
+      <span class="text-sm text-gray-700">
+        {{ t("Page {0} of {1}", [filters.page, pageCount]) }}
+      </span>
+      <BaseButton
+        :disabled="filters.page >= pageCount || isLoading"
+        :label="t('Next')"
+        icon="next"
+        type="plain"
+        @click="changePage(filters.page + 1)"
+      />
+    </div>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+
+const exerciseId = Number(getQueryValue(route.params.exerciseId) || 0)
+const questions = ref([])
+const categoryOptions = ref([])
+const exerciseOptions = ref([])
+const difficultyOptions = ref([])
+const questionTypeOptions = ref([])
+const selectedQuestionIds = ref([])
+const csrfToken = ref("")
+const totalItems = ref(0)
+const isLoading = ref(false)
+const isSaving = ref(false)
+const errorMessage = ref("")
+const infoMessage = ref("")
+const filters = reactive({
+  page: Number(getQueryValue(route.query.page) || 1),
+  itemsPerPage: Number(getQueryValue(route.query.itemsPerPage) || 20),
+  search: String(getQueryValue(route.query.search) || ""),
+  categoryId: Number(getQueryValue(route.query.categoryId) || 0),
+  sourceExerciseId: Number(getQueryValue(route.query.sourceExerciseId) || 0),
+  difficulty: Number(getQueryValue(route.query.difficulty) || -1),
+  questionType: Number(getQueryValue(route.query.questionType) || -1),
+})
+
+const reusableQuestionIds = computed(() => questions.value.filter((question) => question.canReuse).map((question) => Number(question.id)))
+const areAllReusableQuestionsSelected = computed(
+  () => reusableQuestionIds.value.length > 0 && reusableQuestionIds.value.every((id) => selectedQuestionIds.value.includes(id)),
+)
+const pageCount = computed(() => Math.max(1, Math.ceil(totalItems.value / Math.max(1, filters.itemsPerPage))))
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function getBankParams() {
+  return {
+    ...getContextParams(),
+    page: filters.page,
+    itemsPerPage: filters.itemsPerPage,
+    search: filters.search,
+    categoryId: filters.categoryId,
+    sourceExerciseId: filters.sourceExerciseId,
+    difficulty: filters.difficulty,
+    questionType: filters.questionType,
+  }
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+function formatScore(score) {
+  const value = Number(score || 0)
+
+  return Number.isInteger(value) ? String(value) : value.toFixed(2)
+}
+
+function useFallbackIcon(event) {
+  event.target.src = "/img/icons/64/new_question.png"
+}
+
+function applyFilters() {
+  filters.page = 1
+  loadQuestionBank()
+}
+
+function clearFilters() {
+  filters.page = 1
+  filters.search = ""
+  filters.categoryId = 0
+  filters.sourceExerciseId = 0
+  filters.difficulty = -1
+  filters.questionType = -1
+  loadQuestionBank()
+}
+
+function changePage(page) {
+  filters.page = Math.max(1, Math.min(page, pageCount.value))
+  loadQuestionBank()
+}
+
+function toggleAllQuestions(event) {
+  selectedQuestionIds.value = event.target.checked ? [...reusableQuestionIds.value] : []
+}
+
+async function addQuestion(question) {
+  await runReuseAction([Number(question.id)])
+}
+
+async function addSelectedQuestions() {
+  await runReuseAction(selectedQuestionIds.value)
+}
+
+async function runReuseAction(questionIds) {
+  if (isSaving.value) {
+    return
+  }
+
+  const safeQuestionIds = [...new Set(questionIds.map((id) => Number(id)).filter((id) => id > 0))]
+  if (0 === safeQuestionIds.length) {
+    errorMessage.value = t("Select at least one question.")
+    return
+  }
+
+  isSaving.value = true
+  errorMessage.value = ""
+  infoMessage.value = ""
+
+  try {
+    const response = await exerciseService.saveExerciseQuestionBankAction(
+      {
+        exerciseId,
+        action: "reuse",
+        questionIds: safeQuestionIds,
+        submittedCsrfToken: csrfToken.value,
+      },
+      getContextParams(),
+      exerciseId,
+    )
+    infoMessage.value = response?.message ? t(response.message) : t("Questions added to the test")
+    selectedQuestionIds.value = []
+    await loadQuestionBank()
+  } catch (error) {
+    console.error("Error processing exercise question bank action", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not update the question bank")
+  } finally {
+    isSaving.value = false
+  }
+}
+
+async function loadQuestionBank() {
+  if (!exerciseId) {
+    errorMessage.value = t("A valid exercise id is required.")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseQuestionBank(getBankParams(), exerciseId)
+    questions.value = Array.isArray(response.items) ? response.items : []
+    categoryOptions.value = Array.isArray(response.categoryOptions) ? response.categoryOptions : []
+    exerciseOptions.value = Array.isArray(response.exerciseOptions) ? response.exerciseOptions : []
+    difficultyOptions.value = Array.isArray(response.difficultyOptions) ? response.difficultyOptions : []
+    questionTypeOptions.value = Array.isArray(response.questionTypeOptions) ? response.questionTypeOptions : []
+    csrfToken.value = response.csrfToken || ""
+    totalItems.value = Number(response.totalItems || 0)
+    filters.page = Number(response.page || filters.page || 1)
+    filters.itemsPerPage = Number(response.itemsPerPage || filters.itemsPerPage || 20)
+    selectedQuestionIds.value = selectedQuestionIds.value.filter((id) => reusableQuestionIds.value.includes(Number(id)))
+  } catch (error) {
+    console.error("Error loading exercise question bank", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not load the question bank")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+onMounted(loadQuestionBank)
+</script>
diff --git a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
index 67abf9129cc..476ae91d29c 100644
--- a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
@@ -105,7 +105,10 @@
               :min="0"
             />
 
-            <div class="flex items-end pb-2">
+            <div
+              v-if="canMarkMandatoryQuestion"
+              class="flex items-end pb-2"
+            >
               <BaseCheckbox
                 id="exercise-question-mandatory"
                 v-model="form.mandatory"
@@ -1533,6 +1536,7 @@ const mediaOptions = ref([])
 const showAdvancedSettings = ref(false)
 const allowQuestionFeedback = ref(false)
 const imageZoomEnabled = ref(false)
+const allowMandatoryQuestion = ref(false)
 let answerCounter = 0
 let matchingOptionCounter = 0
 let matchingPairCounter = 0
@@ -1711,6 +1715,7 @@ const isMediaQuestion = computed(() => MEDIA_QUESTION === Number(form.type))
 const isReadingComprehensionQuestion = computed(() => READING_COMPREHENSION === Number(form.type))
 const isPageBreakQuestion = computed(() => PAGE_BREAK === Number(form.type))
 const isStructuralQuestion = computed(() => isMediaQuestion.value || isReadingComprehensionQuestion.value || isPageBreakQuestion.value)
+const canMarkMandatoryQuestion = computed(() => allowMandatoryQuestion.value && !isStructuralQuestion.value)
 const isFillBlanksQuestion = computed(() => [FILL_IN_BLANKS, FILL_IN_BLANKS_COMBINATION].includes(Number(form.type)))
 const isFillBlanksCombination = computed(() => FILL_IN_BLANKS_COMBINATION === Number(form.type))
 const isDropdownQuestion = computed(() => [MULTIPLE_ANSWER_DROPDOWN, MULTIPLE_ANSWER_DROPDOWN_COMBINATION].includes(Number(form.type)))
@@ -2214,6 +2219,7 @@ function fillForm(data) {
   csrfToken.value = data.csrfToken || ""
   allowQuestionFeedback.value = true === data.allowQuestionFeedback
   imageZoomEnabled.value = true === data.imageZoomEnabled
+  allowMandatoryQuestion.value = true === data.allowMandatoryQuestion
 
   if (isDropdownQuestion.value) {
     form.matchingOptions = []
@@ -2992,6 +2998,16 @@ function displayText(value, fallback = "") {
   return plainValue || fallback
 }
 
+function normalizeParentMediaIdForPayload() {
+  const mediaId = Number(form.parentMediaId || 0)
+
+  if (mediaId <= 0) {
+    return 0
+  }
+
+  return mediaOptions.value.some((option) => Number(option.value) === mediaId) ? mediaId : 0
+}
+
 function buildPayload() {
   return {
     exerciseId: exerciseId.value,
@@ -3048,11 +3064,11 @@ function buildPayload() {
     wrongScore: Number(form.wrongScore || 0),
     unknownScore: isDegreeCertaintyQuestion.value ? 0 : Number(form.unknownScore || 0),
     noNegativeScore: true === form.noNegativeScore,
-    mandatory: isStructuralQuestion.value ? false : form.mandatory,
+    mandatory: canMarkMandatoryQuestion.value ? form.mandatory : false,
     duration: isStructuralQuestion.value ? null : (form.duration ? Number(form.duration) : null),
     difficulty: Number(form.difficulty || 1),
     categoryId: isStructuralQuestion.value ? 0 : Number(form.categoryId || 0),
-    parentMediaId: isStructuralQuestion.value ? 0 : Number(form.parentMediaId || 0),
+    parentMediaId: isStructuralQuestion.value ? 0 : normalizeParentMediaIdForPayload(),
     matchingOptions: isMatchingQuestion.value
       ? form.matchingOptions.map((option, index) => ({
           localId: option.localId,
diff --git a/assets/vue/views/exercise/ExerciseQuestionImportView.vue b/assets/vue/views/exercise/ExerciseQuestionImportView.vue
new file mode 100644
index 00000000000..f4770f74a83
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseQuestionImportView.vue
@@ -0,0 +1,350 @@
+<template>
+  <section class="space-y-6">
+    <div class="flex flex-wrap items-center justify-between gap-3">
+      <div>
+        <h2 class="text-h2 font-semibold text-gray-90">
+          {{ t(title || defaultTitle) }}
+        </h2>
+        <p class="mt-1 text-body-2 text-gray-60">
+          {{ t(descriptionText) }}
+        </p>
+      </div>
+      <BaseButton
+        :label="t('Back to Tests tool')"
+        icon="back"
+        type="secondary"
+        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+      />
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="successMessage"
+      class="rounded-xl border border-green-200 bg-green-50 p-4 text-sm text-green-700"
+    >
+      <p class="font-semibold">{{ successMessage }}</p>
+      <p
+        v-if="importedQuestionCount > 0"
+        class="mt-1"
+      >
+        {{ t("Imported questions") }}: {{ importedQuestionCount }}
+      </p>
+      <p
+        v-if="skippedQuestionCount > 0"
+        class="mt-1"
+      >
+        {{ t("Skipped questions") }}: {{ skippedQuestionCount }}
+      </p>
+      <div
+        v-if="createdExerciseId"
+        class="mt-3 flex flex-wrap gap-2"
+      >
+        <BaseButton
+          :label="t('Edit questions')"
+          icon="edit"
+          type="primary"
+          :route="{
+            name: 'ExerciseQuestions',
+            params: { ...route.params, exerciseId: createdExerciseId },
+            query: getContextParams(),
+          }"
+        />
+        <BaseButton
+          :label="t('Configure')"
+          icon="settings"
+          type="secondary"
+          :route="{
+            name: 'ExerciseEdit',
+            params: { ...route.params, exerciseId: createdExerciseId },
+            query: getContextParams(),
+          }"
+        />
+      </div>
+    </div>
+
+    <form
+      class="rounded-xl border border-gray-20 bg-white p-6 shadow-sm"
+      @submit.prevent="submitImport"
+    >
+      <div class="space-y-4">
+        <BaseInputText
+          v-if="isAikenImport"
+          id="aiken-total-weight"
+          v-model="totalWeight"
+          :help-text="t('Aiken import distributes this total weight across imported questions unless a question defines SCORE.')"
+          :label="t('Total weight')"
+          name="totalWeight"
+        />
+
+        <div
+          v-if="isExcelImport"
+          class="space-y-3 rounded-xl border border-gray-20 bg-gray-10 p-4"
+        >
+          <BaseCheckbox
+            id="excel-use-custom-score"
+            v-model="useCustomScore"
+            :label="t('Use custom score for all questions')"
+            name="useCustomScore"
+          />
+          <div
+            v-if="useCustomScore"
+            class="grid gap-3 md:grid-cols-2"
+          >
+            <BaseInputText
+              id="excel-correct-score"
+              v-model="correctScore"
+              :label="t('Correct score')"
+              name="correctScore"
+            />
+            <BaseInputText
+              id="excel-incorrect-score"
+              v-model="incorrectScore"
+              :label="t('Incorrect score')"
+              name="incorrectScore"
+            />
+          </div>
+        </div>
+
+        <div class="space-y-2">
+          <label class="text-body-2 font-semibold text-gray-90">
+            {{ t("File") }}
+          </label>
+          <BaseFileUpload
+            :accept="acceptedFileTypes"
+            :label="t('Choose file')"
+            @file-selected="selectFile"
+          />
+          <p class="text-caption text-gray-50">
+            {{ t(fileHelpText) }}
+          </p>
+        </div>
+
+        <div class="flex flex-wrap gap-2">
+          <BaseButton
+            :disabled="!selectedFile || isLoading"
+            :is-loading="isLoading"
+            :is-submit="true"
+            :label="t('Upload')"
+            icon="file-upload"
+            type="success"
+          />
+          <BaseButton
+            v-if="isExcelImport && actionUrls.excelTemplate"
+            :label="t('Download the Excel Template')"
+            icon="file-excel"
+            type="primary"
+            :to-url="actionUrls.excelTemplate"
+          />
+        </div>
+      </div>
+    </form>
+
+    <div class="rounded-xl border border-blue-100 bg-blue-50 p-4 text-sm text-blue-700">
+      <p class="font-semibold">{{ t(sampleTitle) }}</p>
+      <pre class="mt-3 overflow-x-auto whitespace-pre-wrap rounded-lg bg-white p-4 text-xs text-gray-800">{{ sample }}</pre>
+    </div>
+
+    <div
+      v-if="rowErrors.length > 0"
+      class="rounded-xl border border-yellow-200 bg-yellow-50 p-4 text-sm text-yellow-800"
+    >
+      <p class="font-semibold">{{ t("Import warnings") }}</p>
+      <ul class="mt-2 list-disc space-y-1 pl-5">
+        <li
+          v-for="(rowError, index) in rowErrors"
+          :key="index"
+        >
+          {{ rowError }}
+        </li>
+      </ul>
+    </div>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, ref } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseCheckbox from "../../components/basecomponents/BaseCheckbox.vue"
+import BaseFileUpload from "../../components/basecomponents/BaseFileUpload.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import exerciseService from "../../services/exerciseService"
+
+const props = defineProps({
+  importType: {
+    type: String,
+    default: "aiken",
+  },
+})
+
+const { t } = useI18n()
+const route = useRoute()
+
+const title = ref("")
+const csrfToken = ref("")
+const sample = ref("")
+const actionUrls = ref({})
+const totalWeight = ref("20")
+const useCustomScore = ref(false)
+const correctScore = ref("")
+const incorrectScore = ref("")
+const selectedFile = ref(null)
+const isLoading = ref(false)
+const errorMessage = ref("")
+const successMessage = ref("")
+const rowErrors = ref([])
+const createdExerciseId = ref(null)
+const importedQuestionCount = ref(0)
+const skippedQuestionCount = ref(0)
+
+const isAikenImport = computed(() => props.importType === "aiken")
+const isExcelImport = computed(() => props.importType === "excel")
+const isQti2Import = computed(() => props.importType === "qti2")
+const defaultTitle = computed(() => {
+  if (isExcelImport.value) {
+    return "Import quiz from Excel"
+  }
+
+  if (isQti2Import.value) {
+    return "Import exercises QTI2"
+  }
+
+  return "Import Aiken quiz"
+})
+const descriptionText = computed(() => {
+  if (isExcelImport.value) {
+    return "Upload an Excel file that follows the Chamilo quiz template."
+  }
+
+  if (isQti2Import.value) {
+    return "Upload a QTI2 ZIP file to create a new test with its questions."
+  }
+
+  return "Upload an Aiken text file to create a new test with its questions."
+})
+const acceptedFileTypes = computed(() => {
+  if (isExcelImport.value) {
+    return ".xls,.xlsx,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+  }
+
+  if (isQti2Import.value) {
+    return ".zip,application/zip"
+  }
+
+  return ".txt,.zip,text/plain,application/zip"
+})
+const fileHelpText = computed(() => {
+  if (isExcelImport.value) {
+    return "You must upload a .xls or .xlsx file"
+  }
+
+  if (isQti2Import.value) {
+    return "You must upload a .zip file"
+  }
+
+  return "You must upload a .txt or .zip file"
+})
+const sampleTitle = computed(() => {
+  if (isExcelImport.value) {
+    return "Excel format example"
+  }
+
+  if (isQti2Import.value) {
+    return "QTI2 import notes"
+  }
+
+  return "Aiken format example"
+})
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function selectFile(file) {
+  selectedFile.value = file || null
+  errorMessage.value = ""
+}
+
+async function loadImportData() {
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseQuestionImport(props.importType, getContextParams())
+    title.value = response.title || defaultTitle.value
+    csrfToken.value = response.csrfToken || ""
+    sample.value = response.sample || ""
+    actionUrls.value = response.actionUrls || {}
+  } catch (error) {
+    console.error("Error loading exercise question import data", error)
+    errorMessage.value = t("Could not load import data")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+async function submitImport() {
+  if (!selectedFile.value) {
+    errorMessage.value = t("A file is required")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+  successMessage.value = ""
+  rowErrors.value = []
+
+  const formData = new FormData()
+  formData.append("submittedCsrfToken", csrfToken.value)
+  formData.append("file", selectedFile.value)
+
+  if (isAikenImport.value) {
+    formData.append("totalWeight", totalWeight.value)
+  }
+
+  if (isExcelImport.value) {
+    formData.append("useCustomScore", useCustomScore.value ? "1" : "0")
+    formData.append("correctScore", correctScore.value)
+    formData.append("incorrectScore", incorrectScore.value)
+  }
+
+  try {
+    const response = await exerciseService.importExerciseQuestions(props.importType, formData, getContextParams())
+    successMessage.value = t(response.message || defaultSuccessMessage())
+    createdExerciseId.value = response.exerciseId || null
+    importedQuestionCount.value = Number(response.importedQuestionCount || 0)
+    skippedQuestionCount.value = Number(response.skippedQuestionCount || 0)
+    rowErrors.value = Array.isArray(response.errors) ? response.errors : []
+  } catch (error) {
+    console.error("Error importing exercise questions", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not import questions")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function defaultSuccessMessage() {
+  if (isExcelImport.value || isQti2Import.value) {
+    return "File imported"
+  }
+
+  return "Aiken quiz imported"
+}
+
+onMounted(loadImportData)
+</script>
diff --git a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
index 188e952a5a0..7a7a182e9da 100644
--- a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
@@ -1,7 +1,8 @@
 <template>
   <section class="space-y-5">
-    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+    <div class="exercise-question-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
       <BaseButton
+        class="exercise-question-toolbar__button"
         :label="t('Back to exercises')"
         :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
         icon="back"
@@ -10,15 +11,16 @@
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.preview"
+        class="exercise-question-toolbar__button"
         :label="t('Preview')"
-        :to-url="legacyUrls.preview"
-        icon="eye-on"
+        :route="{ name: 'ExercisePlayer', params: { ...route.params, exerciseId }, query: getContextParams() }"
+        icon="play-box-outline"
         only-icon
         size="small"
         type="primary-text"
       />
       <BaseButton
+        class="exercise-question-toolbar__button"
         :label="t('Results')"
         :route="{ name: 'ExerciseReport', params: { ...route.params, exerciseId }, query: getContextParams() }"
         icon="tracking"
@@ -27,7 +29,7 @@
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.configure"
+        class="exercise-question-toolbar__button"
         :label="t('Edit test name and settings')"
         :route="{ name: 'ExerciseEdit', params: { ...route.params, exerciseId }, query: getContextParams() }"
         icon="settings"
@@ -65,9 +67,8 @@
             </p>
           </div>
           <BaseButton
-            v-if="legacyUrls.questionPool"
             :label="t('Question bank')"
-            :to-url="legacyUrls.questionPool"
+            :route="{ name: 'ExerciseQuestionBank', params: { ...route.params, exerciseId }, query: getContextParams() }"
             icon="table"
             type="primary"
           />
@@ -202,7 +203,7 @@
                     <div class="flex justify-end gap-1" @click.stop>
                       <BaseButton
                         :label="expandedQuestionId === question.id ? t('Hide preview') : t('Preview')"
-                        :icon="expandedQuestionId === question.id ? 'fold' : 'eye-on'"
+                        :icon="expandedQuestionId === question.id ? 'fold' : 'information'"
                         only-icon
                         size="small"
                         type="primary-text"
@@ -623,7 +624,6 @@ const questionCount = ref(0)
 const totalScore = ref(0)
 const questionTypes = ref([])
 const questions = ref([])
-const legacyUrls = ref({})
 const csrfToken = ref("")
 const expandedQuestionId = ref(null)
 const draggedQuestionId = ref(null)
@@ -701,6 +701,7 @@ function questionTypeHelp(questionTypeOrId) {
     4: "Match each item with the correct option. Score per item.",
     5: "Learners write a free text answer.",
     6: "Select areas in an image.",
+    8: "Draw or delineate an area.",
     9: "Score only when the exact selection is correct.",
     10: "Single choice with a fixed Don't know option.",
     11: "Mark each statement as True, False or Don't know.",
@@ -741,21 +742,24 @@ function questionTypeHref(questionType) {
 function questionTypeTitle(questionType) {
   const label = t(questionType.label)
 
+  if (!questionType.enabled) {
+    return `${label} - ${t("Not available with the current exercise feedback mode")}`
+  }
+
   return `${label} - ${t(questionTypeHelp(questionType))}`
 }
 
 function questionTypeCardClass(questionType) {
   return [
-    "group inline-flex h-20 w-20 items-center justify-center rounded-lg border bg-white p-1 text-center shadow-none transition duration-150 focus:outline-none focus:ring-2 focus:ring-info/20",
-    questionType.enabled
-      ? "border-gray-25 hover:border-info/50 hover:bg-support-2 hover:shadow-sm"
-      : "pointer-events-none border-gray-20 bg-gray-10 opacity-60",
+    "group inline-flex h-20 w-20 items-center justify-center rounded-md border-2 text-center transition hover:bg-primary/5 focus:outline-none focus:ring-2 focus:ring-primary/30",
+    isVueQuestionType(questionType) ? "border-primary/60 bg-primary/5" : "border-transparent",
+    !questionType.enabled ? "pointer-events-none opacity-50" : "",
   ]
 }
 
 function questionTypeIconClass(questionType) {
   return [
-    "relative flex h-16 w-16 items-center justify-center rounded-md transition duration-150 group-hover:scale-105",
+    "relative flex h-16 w-16 items-center justify-center transition group-hover:scale-105",
   ]
 }
 
@@ -847,7 +851,9 @@ function legacyQuestionEditUrl(questionId) {
 }
 
 function questionIconUrl(questionType) {
-  return `/img/icons/64/${questionType.icon || "new_question.png"}`
+  const icon = questionType.enabled ? questionType.icon : questionType.icon?.replace(/\.png$/, "_na.png")
+
+  return `/img/icons/64/${icon || "new_question.png"}`
 }
 
 function useFallbackIcon(event) {
@@ -994,7 +1000,6 @@ async function loadQuestionSelector() {
     totalScore.value = Number(response.totalScore || 0)
     questionTypes.value = Array.isArray(response.questionTypes) ? response.questionTypes : []
     questions.value = Array.isArray(response.questions) ? response.questions : []
-    legacyUrls.value = response.legacyUrls || {}
     csrfToken.value = response.csrfToken || ""
   } catch (error) {
     console.error("Error loading exercise questions", error)
@@ -1006,3 +1011,15 @@ async function loadQuestionSelector() {
 
 onMounted(loadQuestionSelector)
 </script>
+
+<style scoped>
+:deep(.exercise-question-toolbar__button) {
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+:deep(.exercise-question-toolbar__button .p-button-icon) {
+  font-size: 1.25rem;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExerciseQuestionStatsView.vue b/assets/vue/views/exercise/ExerciseQuestionStatsView.vue
new file mode 100644
index 00000000000..268b30d1cf9
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseQuestionStatsView.vue
@@ -0,0 +1,305 @@
+<template>
+  <section class="space-y-5">
+    <div class="exercise-question-stats-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <BaseButton
+        class="exercise-question-stats-toolbar__button"
+        :label="t('Back to learner score')"
+        :route="{ name: 'ExerciseReport', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('back')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-question-stats-toolbar__button"
+        :label="t('Report by question')"
+        :route="{ name: 'ExerciseReportByQuestion', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('view-table', 'table')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="actionUrls.questionStatsPdf"
+        class="exercise-question-stats-toolbar__button"
+        :label="t('Export PDF')"
+        :to-url="actionUrls.questionStatsPdf"
+        :icon="safeIcon('file-pdf', 'file-excel')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-question-stats-toolbar__button"
+        :label="t('Live results')"
+        :route="{ name: 'ExerciseLiveResults', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('usage', 'tracking')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <header class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm">
+      <div class="border-l-4 border-l-primary p-5">
+        <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
+          <div class="space-y-2">
+            <h1 class="text-2xl font-semibold text-gray-90">
+              {{ displayText(title, t('Question statistics')) }}
+            </h1>
+            <p class="text-sm font-semibold text-gray-700">
+              {{ t('Question statistics') }}
+            </p>
+            <div
+              v-if="description"
+              class="exercise-question-stats-html text-sm text-gray-700"
+              v-html="description"
+            />
+          </div>
+          <div class="flex flex-wrap gap-2">
+            <span class="rounded-full bg-info/10 px-3 py-1 text-sm font-semibold text-info">
+              {{ t('Questions') }}: {{ summary.totalQuestions || 0 }}
+            </span>
+            <span class="rounded-full bg-success/10 px-3 py-1 text-sm font-semibold text-success">
+              {{ t('Answered') }}: {{ summary.totalAnswered || 0 }}
+            </span>
+            <span class="rounded-full bg-warning/10 px-3 py-1 text-sm font-semibold text-warning">
+              {{ t('Wrong answers') }}: {{ summary.totalWrong || 0 }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </header>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <BaseTable
+      :is-loading="isLoading"
+      :text-for-empty="t('No question statistics found')"
+      :total-items="questions.length"
+      :values="questions"
+      data-key="id"
+    >
+      <Column :header="t('Question')" field="title" sortable>
+        <template #body="{ data }">
+          <div class="max-w-xl space-y-1">
+            <div class="font-semibold text-gray-90">
+              {{ displayText(data.title, '-') }}
+            </div>
+            <div class="text-xs text-gray-500">
+              #{{ data.questionId }} · {{ t(data.typeLabel || 'Question') }}
+            </div>
+          </div>
+        </template>
+      </Column>
+      <Column :header="t('Question type')" field="typeLabel" sortable>
+        <template #body="{ data }">
+          {{ t(data.typeLabel || 'Question') }}
+        </template>
+      </Column>
+      <Column :header="t('Number of times the question was answered')" field="answeredAttempts" sortable>
+        <template #body="{ data }">
+          {{ data.answeredAttempts || 0 }}
+        </template>
+      </Column>
+      <Column :header="t('Lowest score')" field="lowestScore" sortable>
+        <template #body="{ data }">
+          {{ formatNumber(data.lowestScore) }}
+        </template>
+      </Column>
+      <Column :header="t('Average score')" field="averageScore" sortable>
+        <template #body="{ data }">
+          {{ formatNumber(data.averageScore) }}
+        </template>
+      </Column>
+      <Column :header="t('Highest score')" field="highestScore" sortable>
+        <template #body="{ data }">
+          {{ formatNumber(data.highestScore) }}
+        </template>
+      </Column>
+      <Column :header="t('Score')" field="maxScore" sortable>
+        <template #body="{ data }">
+          {{ formatNumber(data.maxScore) }}
+        </template>
+      </Column>
+      <Column :header="`${t('Wrong answer')} / ${t('Total')}`" field="wrongAttempts" sortable>
+        <template #body="{ data }">
+          <span class="font-semibold text-gray-90">
+            {{ data.wrongAttempts || 0 }} / {{ data.answeredAttempts || 0 }}
+          </span>
+        </template>
+      </Column>
+      <Column :header="'%'" field="wrongPercentage" sortable>
+        <template #body="{ data }">
+          {{ formatNumber(data.wrongPercentage) }} %
+        </template>
+      </Column>
+    </BaseTable>
+  </section>
+</template>
+
+<script setup>
+import { onMounted, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+
+const isLoading = ref(false)
+const errorMessage = ref("")
+const title = ref("")
+const description = ref("")
+const questions = ref([])
+const summary = ref({})
+const actionUrls = ref({})
+const availableIcons = Object.keys(chamiloIconToClass)
+
+function safeIcon(icon, fallback = "information") {
+  if (icon && availableIcons.includes(icon)) {
+    return icon
+  }
+
+  if (fallback && availableIcons.includes(fallback)) {
+    return fallback
+  }
+
+  return availableIcons[0] || "information"
+}
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function getBaseRouteParams() {
+  return {
+    node: route.params.node,
+  }
+}
+
+function getExerciseRouteParams() {
+  return {
+    ...getBaseRouteParams(),
+    exerciseId: route.params.exerciseId,
+  }
+}
+
+function getExerciseId() {
+  return Number(route.params.exerciseId || 0)
+}
+
+async function loadQuestionStats() {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    errorMessage.value = t("Invalid exercise")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseQuestionStats(getContextParams(), exerciseId)
+    title.value = response.title || ""
+    description.value = response.description || ""
+    questions.value = Array.isArray(response.questions) ? response.questions : []
+    summary.value = response.summary || {}
+    actionUrls.value = response.actionUrls || {}
+  } catch (error) {
+    console.error("Error loading exercise question statistics", error)
+    errorMessage.value = t("Could not load question statistics")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function formatNumber(value) {
+  if (value === null || value === undefined || value === "") {
+    return "—"
+  }
+
+  const number = Number(value)
+  if (Number.isNaN(number)) {
+    return "—"
+  }
+
+  return number.toFixed(2).replace(/\.00$/, "")
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadQuestionStats)
+
+watch(
+  () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid],
+  () => {
+    loadQuestionStats()
+  },
+)
+</script>
+
+<style scoped>
+:deep(.exercise-question-stats-toolbar__button) {
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+:deep(.exercise-question-stats-toolbar__button .p-button-icon) {
+  font-size: 1.25rem;
+}
+
+.exercise-question-stats-html :deep(img) {
+  max-width: 100%;
+  height: auto;
+}
+
+.exercise-question-stats-html :deep(p) {
+  margin-bottom: 0.25rem;
+}
+
+.exercise-question-stats-html :deep(p:last-child) {
+  margin-bottom: 0;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExerciseReportByQuestionView.vue b/assets/vue/views/exercise/ExerciseReportByQuestionView.vue
new file mode 100644
index 00000000000..f2d657b3fc4
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseReportByQuestionView.vue
@@ -0,0 +1,344 @@
+<template>
+  <section class="space-y-5">
+    <div class="exercise-report-by-question-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <BaseButton
+        class="exercise-report-by-question-toolbar__button"
+        :label="t('Back to learner score')"
+        :route="{ name: 'ExerciseReport', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('back')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-report-by-question-toolbar__button"
+        :label="t('Question stats')"
+        :route="{ name: 'ExerciseQuestionStats', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('tracking', 'view-table')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="actionUrls.reportByQuestionPdf"
+        class="exercise-report-by-question-toolbar__button"
+        :label="t('Export PDF')"
+        :to-url="actionUrls.reportByQuestionPdf"
+        :icon="safeIcon('file-pdf', 'file-excel')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        class="exercise-report-by-question-toolbar__button"
+        :label="t('Live results')"
+        :route="{ name: 'ExerciseLiveResults', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('usage', 'tracking')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <header class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm">
+      <div class="border-l-4 border-l-primary p-5">
+        <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
+          <div class="space-y-2">
+            <h1 class="text-2xl font-semibold text-gray-90">
+              {{ displayText(title, t('Report by question')) }}
+            </h1>
+            <p class="text-sm font-semibold text-gray-700">
+              {{ t('Answer distribution') }}
+            </p>
+            <div
+              v-if="description"
+              class="exercise-report-by-question-html text-sm text-gray-700"
+              v-html="description"
+            />
+          </div>
+          <div class="flex flex-wrap gap-2">
+            <span class="rounded-full bg-info/10 px-3 py-1 text-sm font-semibold text-info">
+              {{ t('Questions') }}: {{ summary.totalQuestions || 0 }}
+            </span>
+            <span class="rounded-full bg-success/10 px-3 py-1 text-sm font-semibold text-success">
+              {{ t('Configured answers') }}: {{ summary.totalAnswers || 0 }}
+            </span>
+            <span class="rounded-full bg-warning/10 px-3 py-1 text-sm font-semibold text-warning">
+              {{ t('Selections') }}: {{ summary.totalSelections || 0 }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </header>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="summary.specialCountingQuestions"
+      class="rounded-xl border border-info/30 bg-info/10 p-4 text-sm text-info"
+    >
+      {{ t('Detailed answer counting for some question types is not available in the migrated report yet.') }}
+    </div>
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-6 text-center text-sm text-gray-600 shadow-sm"
+    >
+      {{ t('Loading') }}...
+    </div>
+
+    <div
+      v-else-if="questions.length === 0 && !errorMessage"
+      class="rounded-xl border border-gray-20 bg-white p-6 text-center text-sm text-gray-600 shadow-sm"
+    >
+      {{ t('No report by question data found') }}
+    </div>
+
+    <template v-else>
+      <article
+        v-for="question in questions"
+        :key="question.id"
+        class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm"
+      >
+      <div class="border-l-4 border-l-primary p-4">
+        <div class="flex flex-col gap-2 lg:flex-row lg:items-start lg:justify-between">
+          <div class="space-y-1">
+            <h2 class="text-lg font-semibold text-gray-90">
+              {{ displayText(question.title, '-') }}
+            </h2>
+            <p class="text-xs text-gray-500">
+              #{{ question.questionId }} · {{ t(question.typeLabel || 'Question') }} · {{ t('Score') }}: {{ formatNumber(question.maxScore) }}
+            </p>
+          </div>
+          <span class="w-fit rounded-full bg-gray-15 px-3 py-1 text-sm font-semibold text-gray-700">
+            {{ t('Selections') }}: {{ question.totalSelections || 0 }}
+          </span>
+        </div>
+      </div>
+
+      <div
+        v-if="question.usesSpecialCounting && !question.countingAvailable"
+        class="border-t border-gray-20 bg-info/5 px-4 py-3 text-sm text-info"
+      >
+        {{ t('Detailed answer counting for this question type is not available in the migrated report yet.') }}
+      </div>
+
+      <BaseTable
+        :text-for-empty="t('No answer distribution found')"
+        :total-items="question.answers.length"
+        :values="question.answers"
+        data-key="id"
+      >
+        <Column :header="t('Answer')" field="answer" sortable>
+          <template #body="{ data }">
+            <div class="max-w-xl space-y-1">
+              <div class="font-semibold text-gray-90">
+                {{ displayText(data.answer, '-') }}
+              </div>
+              <div class="text-xs text-gray-500">
+                #{{ data.answerId }} · {{ t('Score') }}: {{ formatNumber(data.score) }}
+              </div>
+            </div>
+          </template>
+        </Column>
+        <Column :header="t('Correct')" field="correct" sortable>
+          <template #body="{ data }">
+            <span
+              class="rounded-full px-2 py-1 text-xs font-semibold"
+              :class="!question.usesSpecialCounting && data.correct ? 'bg-success/10 text-success' : 'bg-gray-15 text-gray-700'"
+            >
+              {{ question.usesSpecialCounting ? '—' : data.correct ? t('Yes') : t('No') }}
+            </span>
+          </template>
+        </Column>
+        <Column :header="t('Number of times this answer was selected')" field="selectedCount" sortable>
+          <template #body="{ data }">
+            <span class="font-semibold text-gray-90">
+              {{ formatCount(data.selectedCount) }}
+            </span>
+          </template>
+        </Column>
+        <Column :header="t('Selection %')" field="selectedPercentage" sortable>
+          <template #body="{ data }">
+            {{ data.selectedCount === null ? '—' : `${formatNumber(data.selectedPercentage)} %` }}
+          </template>
+        </Column>
+      </BaseTable>
+      </article>
+    </template>
+  </section>
+</template>
+
+<script setup>
+import { onMounted, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+
+const isLoading = ref(false)
+const errorMessage = ref("")
+const title = ref("")
+const description = ref("")
+const questions = ref([])
+const summary = ref({})
+const actionUrls = ref({})
+const availableIcons = Object.keys(chamiloIconToClass)
+
+function safeIcon(icon, fallback = "information") {
+  if (icon && availableIcons.includes(icon)) {
+    return icon
+  }
+
+  if (fallback && availableIcons.includes(fallback)) {
+    return fallback
+  }
+
+  return availableIcons[0] || "information"
+}
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function getBaseRouteParams() {
+  return {
+    node: route.params.node,
+  }
+}
+
+function getExerciseRouteParams() {
+  return {
+    ...getBaseRouteParams(),
+    exerciseId: route.params.exerciseId,
+  }
+}
+
+function getExerciseId() {
+  return Number(route.params.exerciseId || 0)
+}
+
+async function loadReportByQuestion() {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    errorMessage.value = t("Invalid exercise")
+    return
+  }
+
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseReportByQuestion(getContextParams(), exerciseId)
+    title.value = response.title || ""
+    description.value = response.description || ""
+    questions.value = Array.isArray(response.questions) ? response.questions : []
+    summary.value = response.summary || {}
+    actionUrls.value = response.actionUrls || {}
+  } catch (error) {
+    console.error("Error loading exercise report by question", error)
+    errorMessage.value = t("Could not load report by question")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+function formatNumber(value) {
+  if (value === null || value === undefined || value === "") {
+    return "—"
+  }
+
+  const number = Number(value)
+  if (Number.isNaN(number)) {
+    return "—"
+  }
+
+  return number.toFixed(2).replace(/\.00$/, "")
+}
+
+function formatCount(value) {
+  if (value === null || value === undefined) {
+    return "—"
+  }
+
+  return Number(value) || 0
+}
+
+function decodeHtml(value) {
+  if (!value) {
+    return ""
+  }
+
+  if (typeof document === "undefined") {
+    return String(value)
+  }
+
+  const textarea = document.createElement("textarea")
+  textarea.innerHTML = String(value)
+
+  return textarea.value
+}
+
+function displayText(value, fallback = "") {
+  const decodedValue = decodeHtml(value)
+  const plainValue = decodeHtml(decodedValue.replace(/<[^>]*>/g, " "))
+    .replace(/\s+/g, " ")
+    .trim()
+
+  return plainValue || fallback
+}
+
+onMounted(loadReportByQuestion)
+
+watch(
+  () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid],
+  () => {
+    loadReportByQuestion()
+  },
+)
+</script>
+
+<style scoped>
+:deep(.exercise-report-by-question-toolbar__button) {
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+:deep(.exercise-report-by-question-toolbar__button .p-button-icon) {
+  font-size: 1.25rem;
+}
+
+.exercise-report-by-question-html :deep(img) {
+  max-width: 100%;
+  height: auto;
+}
+
+.exercise-report-by-question-html :deep(p) {
+  margin-bottom: 0.25rem;
+}
+
+.exercise-report-by-question-html :deep(p:last-child) {
+  margin-bottom: 0;
+}
+</style>
diff --git a/assets/vue/views/exercise/ExerciseReportView.vue b/assets/vue/views/exercise/ExerciseReportView.vue
index 28686b5d12a..f5a25c77b7c 100644
--- a/assets/vue/views/exercise/ExerciseReportView.vue
+++ b/assets/vue/views/exercise/ExerciseReportView.vue
@@ -1,7 +1,8 @@
 <template>
   <section class="space-y-5">
-    <div class="flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+    <div class="exercise-report-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
       <BaseButton
+        class="exercise-report-toolbar__button"
         :label="t('Back to exercises')"
         :route="{ name: 'ExerciseList', params: getBaseRouteParams(), query: getContextParams() }"
         :icon="safeIcon('back')"
@@ -10,6 +11,7 @@
         type="primary-text"
       />
       <BaseButton
+        class="exercise-report-toolbar__button"
         :label="t('Edit questions')"
         :route="{ name: 'ExerciseQuestions', params: getExerciseRouteParams(), query: getContextParams() }"
         :icon="safeIcon('edit')"
@@ -18,77 +20,105 @@
         type="secondary-text"
       />
       <BaseButton
-        v-if="legacyUrls.liveStats"
+        class="exercise-report-toolbar__button"
         :label="t('Live results')"
-        :to-url="legacyUrls.liveStats"
-        :icon="safeIcon('table', 'information')"
+        :route="{ name: 'ExerciseLiveResults', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('usage', 'table')"
         only-icon
         size="small"
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.questionReport"
+        class="exercise-report-toolbar__button"
         :label="t('Report by question')"
-        :to-url="legacyUrls.questionReport"
-        :icon="safeIcon('table', 'information')"
+        :route="{ name: 'ExerciseReportByQuestion', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('view-table', 'table')"
         only-icon
         size="small"
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.export"
-        :label="t('Export')"
-        :to-url="legacyUrls.export"
+        v-if="actionUrls.exportCsv"
+        class="exercise-report-toolbar__button"
+        :label="t('Export CSV')"
+        :to-url="actionUrls.exportCsv"
+        :icon="safeIcon('file-delimited-outline', 'file-excel')"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+      <BaseButton
+        v-if="actionUrls.exportXlsx"
+        class="exercise-report-toolbar__button"
+        :label="t('Export XLSX')"
+        :to-url="actionUrls.exportXlsx"
         :icon="safeIcon('file-excel', 'information')"
         only-icon
         size="small"
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.recalculateAll"
-        :label="t('Recalculate results')"
-        :to-url="legacyUrls.recalculateAll"
+        v-if="canBulkDelete"
+        class="exercise-report-toolbar__button"
+        :class="{ 'opacity-50': !hasSelectedAttempts }"
+        :label="t('Delete selected attempts')"
+        :icon="safeIcon('delete', 'information')"
+        only-icon
+        size="small"
+        type="danger-text"
+        @click="confirmDeleteSelected"
+      />
+      <BaseButton
+        v-if="canCleanResults"
+        class="exercise-report-toolbar__button"
+        :label="t('Clean all results before a selected date')"
+        :icon="safeIcon('delete-clock', 'delete')"
+        only-icon
+        size="small"
+        type="danger-text"
+        @click="toggleCleanForm"
+      />
+      <BaseButton
+        v-if="canBulkRecalculate"
+        class="exercise-report-toolbar__button"
+        :label="t('Recalculate all results')"
         :icon="safeIcon('refresh', 'information')"
         only-icon
         size="small"
         type="secondary-text"
+        @click="confirmRecalculateAll"
       />
       <BaseButton
-        v-if="legacyUrls.exportAllPdf"
+        v-if="actionUrls.exportAllAttempts"
+        class="exercise-report-toolbar__button"
         :label="t('Export all attempts')"
-        :to-url="legacyUrls.exportAllPdf"
-        :icon="safeIcon('file-excel', 'information')"
+        :to-url="actionUrls.exportAllAttempts"
+        :icon="safeIcon('file-pdf', 'file-excel')"
         only-icon
         size="small"
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.sendAllEmails"
+        class="exercise-report-toolbar__button"
         :label="t('Send all results/corrections by email')"
-        :to-url="legacyUrls.sendAllEmails"
-        :icon="safeIcon('information')"
+        :icon="safeIcon('email-plus', 'send')"
+        :is-loading="isEmailActionLoading"
         only-icon
         size="small"
         type="primary-text"
+        @click="confirmEmailAllAttempts"
       />
       <BaseButton
-        v-if="legacyUrls.questionStats"
+        class="exercise-report-toolbar__button"
         :label="t('Question stats')"
-        :to-url="legacyUrls.questionStats"
-        :icon="safeIcon('table', 'information')"
-        size="small"
-        type="primary-text"
-      />
-      <BaseButton
-        v-if="legacyUrls.legacyReport"
-        :label="t('Open legacy report')"
-        :to-url="legacyUrls.legacyReport"
-        :icon="safeIcon('table', 'information')"
+        :route="{ name: 'ExerciseQuestionStats', params: getExerciseRouteParams(), query: getContextParams() }"
+        :icon="safeIcon('tracking', 'view-table')"
         only-icon
         size="small"
-        type="secondary-text"
+        type="primary-text"
       />
       <BaseButton
+        class="exercise-report-toolbar__button"
         :label="isSearchVisible ? t('Hide search') : t('Search')"
         :icon="isSearchVisible ? safeIcon('close', 'information') : safeIcon('search')"
         only-icon
@@ -98,6 +128,35 @@
       />
     </div>
 
+    <form
+      v-if="isCleanFormVisible"
+      class="flex flex-wrap items-end gap-3 rounded-xl border border-danger/20 bg-danger/5 p-4 shadow-sm"
+      @submit.prevent="confirmCleanBeforeDate"
+    >
+      <label class="flex flex-col gap-1 text-sm font-semibold text-gray-700">
+        {{ t('Before date') }}
+        <input
+          v-model="cleanBeforeDateValue"
+          class="rounded border border-gray-30 px-3 py-2 text-sm font-normal text-gray-90"
+          name="cleanBeforeDate"
+          type="date"
+        />
+      </label>
+      <BaseButton
+        :is-loading="isBulkActionLoading"
+        :label="t('Delete')"
+        :icon="safeIcon('delete', 'information')"
+        :is-submit="true"
+        type="danger"
+      />
+      <BaseButton
+        :label="t('Cancel')"
+        :icon="safeIcon('close', 'information')"
+        type="plain"
+        @click.prevent="toggleCleanForm"
+      />
+    </form>
+
     <div class="border-b border-gray-20" />
 
     <header class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm">
@@ -188,13 +247,26 @@
       {{ successMessage }}
     </div>
 
+    <div
+      v-if="lockedByGradebook"
+      class="rounded-xl border border-warning/30 bg-warning/10 p-4 text-sm text-warning"
+    >
+      {{ t("This exercise is locked by gradebook. Attempt cleanup actions are disabled.") }}
+    </div>
+
     <BaseTable
       :is-loading="isLoading"
       :text-for-empty="t('No attempts found')"
       :total-items="attempts.length"
+      v-model:selected-items="selectedAttempts"
       :values="attempts"
       data-key="id"
     >
+      <Column
+        v-if="canBulkDelete"
+        selection-mode="multiple"
+        header-style="width: 3rem"
+      />
       <Column :header="t('First name')" field="firstName" sortable>
         <template #body="{ data }">
           <div class="font-semibold text-gray-90">{{ displayText(data.firstName, '-') }}</div>
@@ -255,57 +327,63 @@
       </Column>
       <Column :header="t('Detail')">
         <template #body="{ data }">
-          <div class="flex flex-wrap justify-end gap-1">
+          <div class="exercise-report-row-actions flex flex-wrap justify-end gap-2">
             <BaseButton
               v-if="data.canReview"
-              :label="data.pendingCorrection ? t('Review / Correct') : t('Review attempt')"
-              :route="{ name: 'ExerciseResult', params: { ...getExerciseRouteParams(), attemptId: data.attemptId }, query: getContextParams() }"
-              :icon="data.pendingCorrection ? safeIcon('edit') : safeIcon('information')"
+              class="exercise-report-row-action"
+              :label="data.pendingCorrection ? t('Correct') : t('Review')"
               only-icon
+              :route="{ name: 'ExerciseResult', params: { ...getExerciseRouteParams(), attemptId: data.attemptId }, query: getContextParams() }"
+              :icon="data.pendingCorrection ? safeIcon('edit') : safeIcon('eye-on', 'information')"
               size="small"
               :type="data.pendingCorrection ? 'secondary-text' : 'primary-text'"
             />
             <BaseButton
-              v-if="data.legacyUrls?.result"
-              :label="t('Open legacy result')"
-              :to-url="data.legacyUrls.result"
-              :icon="safeIcon('information')"
+              v-if="data.canRecalculate"
+              class="exercise-report-row-action"
+              :label="t('Recalculate')"
               only-icon
+              :icon="safeIcon('refresh', 'information')"
               size="small"
-              type="primary-text"
+              type="secondary-text"
+              @click="confirmRecalculateAttempt(data)"
             />
             <BaseButton
-              v-if="data.legacyUrls?.recalculate"
-              :label="t('Recalculate results')"
-              :to-url="data.legacyUrls.recalculate"
-              :icon="safeIcon('refresh', 'information')"
+              v-if="data.canReview"
+              class="exercise-report-row-action"
+              :label="t('Print/PDF')"
               only-icon
+              :to-url="getAttemptPdfUrl(data)"
+              :icon="safeIcon('file-pdf', 'file-excel')"
               size="small"
-              type="secondary-text"
+              type="primary-text"
             />
             <BaseButton
-              v-if="data.legacyUrls?.pdf"
-              :label="t('Export to PDF')"
-              :to-url="data.legacyUrls.pdf"
-              :icon="safeIcon('file-excel', 'information')"
+              v-if="data.canReview"
+              class="exercise-report-row-action"
+              :label="t('Email')"
               only-icon
+              :icon="safeIcon('email-plus', 'send')"
               size="small"
               type="primary-text"
+              @click="confirmEmailAttempt(data)"
             />
             <BaseButton
-              v-if="data.legacyUrls?.sendEmail"
-              :label="t('Send by e-mail')"
-              :to-url="data.legacyUrls.sendEmail"
-              :icon="safeIcon('information')"
+              v-if="data.canClose"
+              class="exercise-report-row-action"
+              :label="t('Close')"
               only-icon
+              :icon="safeIcon('stop', 'close')"
               size="small"
-              type="primary-text"
+              type="secondary-text"
+              @click="confirmCloseAttempt(data)"
             />
             <BaseButton
               v-if="data.canDelete"
-              :label="t('Delete attempt')"
-              :icon="safeIcon('delete', 'information')"
+              class="exercise-report-row-action"
+              :label="t('Delete')"
               only-icon
+              :icon="safeIcon('delete', 'information')"
               size="small"
               type="danger-text"
               @click="confirmDeleteAttempt(data)"
@@ -335,12 +413,23 @@ const router = useRouter()
 const { requireConfirmation } = useConfirmation()
 
 const isLoading = ref(false)
+const isBulkActionLoading = ref(false)
+const isEmailActionLoading = ref(false)
 const errorMessage = ref("")
 const successMessage = ref("")
 const title = ref("")
 const description = ref("")
 const attempts = ref([])
-const legacyUrls = ref({})
+const selectedAttempts = ref([])
+const actionUrls = ref({})
+const lockedByGradebook = ref(false)
+const canBulkDelete = ref(false)
+const canCleanResults = ref(false)
+const canBulkRecalculate = ref(false)
+const bulkActionToken = ref("")
+const emailActionToken = ref("")
+const isCleanFormVisible = ref(false)
+const cleanBeforeDateValue = ref("")
 const filterForm = reactive({
   firstName: getQueryValue(route.query.firstName) || "",
   lastName: getQueryValue(route.query.lastName) || "",
@@ -355,6 +444,10 @@ const statusOptions = computed(() => [
   { label: t("Ongoing"), value: "incomplete" },
 ])
 const pendingCorrectionCount = computed(() => attempts.value.filter((attempt) => attempt.pendingCorrection).length)
+const selectedAttemptIds = computed(() =>
+  selectedAttempts.value.map((attempt) => Number(attempt.attemptId || attempt.id || 0)).filter((attemptId) => attemptId > 0),
+)
+const hasSelectedAttempts = computed(() => selectedAttemptIds.value.length > 0)
 const hasFilters = computed(() => Boolean(getQueryValue(route.query.firstName) || getQueryValue(route.query.lastName) || getQueryValue(route.query.status)))
 const availableIcons = Object.keys(chamiloIconToClass)
 
@@ -408,6 +501,17 @@ function getReportParams() {
   }
 }
 
+function getAttemptPdfUrl(attempt) {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(attempt?.attemptId || 0)
+
+  if (!exerciseId || !attemptId) {
+    return '#'
+  }
+
+  return exerciseService.buildExerciseRuntimeAttemptPdfUrl(getContextParams(), exerciseId, attemptId)
+}
+
 async function loadReport() {
   const exerciseId = getExerciseId()
   if (!exerciseId) {
@@ -423,7 +527,14 @@ async function loadReport() {
     title.value = response.title || ""
     description.value = response.description || ""
     attempts.value = Array.isArray(response.attempts) ? response.attempts : []
-    legacyUrls.value = response.legacyUrls || {}
+    selectedAttempts.value = []
+    actionUrls.value = response.actionUrls || {}
+    lockedByGradebook.value = true === response.lockedByGradebook
+    canBulkDelete.value = true === response.canBulkDelete
+    canCleanResults.value = true === response.canCleanResults
+    canBulkRecalculate.value = true === response.canBulkRecalculate
+    bulkActionToken.value = response.bulkActionToken || ""
+    emailActionToken.value = response.emailActionToken || ""
   } catch (error) {
     console.error("Error loading exercise report", error)
     errorMessage.value = t("Could not load exercise report")
@@ -471,6 +582,230 @@ function clearFilters() {
   router.push({ name: route.name, params: route.params, query })
 }
 
+function toggleCleanForm() {
+  isCleanFormVisible.value = !isCleanFormVisible.value
+}
+
+function confirmDeleteSelected() {
+  if (!hasSelectedAttempts.value) {
+    errorMessage.value = t("Select at least one attempt")
+    return
+  }
+
+  requireConfirmation({
+    message: t("Delete selected attempts?"),
+    accept: () => runBulkAction("delete_selected", { attemptIds: selectedAttemptIds.value }),
+  })
+}
+
+function confirmCleanBeforeDate() {
+  if (!cleanBeforeDateValue.value) {
+    errorMessage.value = t("Select a date from the calendar")
+    return
+  }
+
+  requireConfirmation({
+    message: `${t("Are you sure you want to clean results for this test before the selected date ?")} ${cleanBeforeDateValue.value}`,
+    accept: () => runBulkAction("clean_before_date", { beforeDate: cleanBeforeDateValue.value }),
+  })
+}
+
+function confirmRecalculateAll() {
+  requireConfirmation({
+    message: t("Recalculate all results?"),
+    accept: () => runBulkAction("recalculate_all"),
+  })
+}
+
+function confirmEmailAllAttempts() {
+  requireConfirmation({
+    message: t("Send reviewed attempt result emails?"),
+    accept: () => emailAllAttempts(),
+  })
+}
+
+async function emailAllAttempts() {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    return
+  }
+
+  errorMessage.value = ""
+  successMessage.value = ""
+  isEmailActionLoading.value = true
+
+  try {
+    const response = await exerciseService.emailExerciseRuntimeReportAttempts(
+      {
+        node: String(route.params.node || ""),
+        submittedCsrfToken: emailActionToken.value,
+      },
+      getReportParams(),
+      exerciseId,
+    )
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not send emails")
+    }
+
+    successMessage.value = formatEmailActionMessage(response)
+  } catch (error) {
+    console.error("Error sending exercise report emails", error)
+    errorMessage.value = t("Could not send emails")
+  } finally {
+    isEmailActionLoading.value = false
+  }
+}
+
+function formatEmailActionMessage(response) {
+  const sentCount = Number(response?.sentCount || 0)
+  const skippedCount = Number(response?.skippedCount || 0)
+  const failedCount = Number(response?.failedCount || 0)
+  const message = response?.message ? t(response.message) : t("Exercise result emails sent")
+
+  return `${message} (${t("Sent")}: ${sentCount}, ${t("Skipped")}: ${skippedCount}, ${t("Failed")}: ${failedCount})`
+}
+
+async function runBulkAction(action, extraPayload = {}) {
+  const exerciseId = getExerciseId()
+  if (!exerciseId) {
+    return
+  }
+
+  errorMessage.value = ""
+  successMessage.value = ""
+  isBulkActionLoading.value = true
+
+  try {
+    const response = await exerciseService.runExerciseRuntimeReportBulkAction(
+      {
+        action,
+        submittedCsrfToken: bulkActionToken.value,
+        ...extraPayload,
+      },
+      getContextParams(),
+      exerciseId,
+    )
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not run bulk action")
+    }
+
+    successMessage.value = getBulkActionMessage(response)
+    isCleanFormVisible.value = false
+    cleanBeforeDateValue.value = ""
+    selectedAttempts.value = []
+    await loadReport()
+  } catch (error) {
+    console.error("Error running exercise report bulk action", error)
+    errorMessage.value = t("Could not run bulk action")
+  } finally {
+    isBulkActionLoading.value = false
+  }
+}
+
+function getBulkActionMessage(response) {
+  const processedCount = Number(response?.processedCount || 0)
+
+  if (response?.message) {
+    return `${t(response.message)} (${processedCount})`
+  }
+
+  return t("Bulk action completed")
+}
+
+function confirmCloseAttempt(attempt) {
+  requireConfirmation({
+    message: t("Close attempt?"),
+    accept: () => closeAttempt(attempt),
+  })
+}
+
+async function closeAttempt(attempt) {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(attempt.attemptId || 0)
+  if (!exerciseId || !attemptId) {
+    return
+  }
+
+  errorMessage.value = ""
+  successMessage.value = ""
+  try {
+    const response = await exerciseService.closeExerciseRuntimeAttempt({}, getContextParams(), exerciseId, attemptId)
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not close attempt")
+    }
+
+    successMessage.value = t("Attempt closed")
+    await loadReport()
+  } catch (error) {
+    console.error("Error closing exercise attempt", error)
+    errorMessage.value = t("Could not close attempt")
+  }
+}
+
+function confirmRecalculateAttempt(attempt) {
+  requireConfirmation({
+    message: t("Recalculate attempt?"),
+    accept: () => recalculateAttempt(attempt),
+  })
+}
+
+async function recalculateAttempt(attempt) {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(attempt.attemptId || 0)
+  if (!exerciseId || !attemptId) {
+    return
+  }
+
+  errorMessage.value = ""
+  successMessage.value = ""
+  try {
+    const response = await exerciseService.recalculateExerciseRuntimeAttempt({}, getContextParams(), exerciseId, attemptId)
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not recalculate attempt")
+    }
+
+    successMessage.value = t("Attempt recalculated")
+    await loadReport()
+  } catch (error) {
+    console.error("Error recalculating exercise attempt", error)
+    errorMessage.value = t("Could not recalculate attempt")
+  }
+}
+
+function confirmEmailAttempt(attempt) {
+  requireConfirmation({
+    message: t("Send this attempt result by email to the learner?"),
+    accept: () => emailAttempt(attempt),
+  })
+}
+
+async function emailAttempt(attempt) {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(attempt.attemptId || 0)
+  if (!exerciseId || !attemptId) {
+    return
+  }
+
+  errorMessage.value = ""
+  successMessage.value = ""
+  try {
+    const response = await exerciseService.emailExerciseRuntimeAttempt(
+      { node: String(route.params.node || "") },
+      getContextParams(),
+      exerciseId,
+      attemptId,
+    )
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not send email")
+    }
+
+    successMessage.value = t("Email sent")
+  } catch (error) {
+    console.error("Error sending exercise attempt email", error)
+    errorMessage.value = t("Could not send email")
+  }
+}
+
 function confirmDeleteAttempt(attempt) {
   requireConfirmation({
     message: t("Delete attempt?"),
@@ -593,6 +928,26 @@ watch(
 </script>
 
 <style scoped>
+
+:deep(.exercise-report-toolbar__button) {
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+:deep(.exercise-report-toolbar__button .p-button-icon) {
+  font-size: 1.25rem;
+}
+
+:deep(.exercise-report-row-action) {
+  min-width: 2rem;
+  width: 2rem;
+  height: 2rem;
+}
+
+:deep(.exercise-report-row-action .p-button-icon) {
+  font-size: 1rem;
+}
 .exercise-report-html :deep(img) {
   max-width: 100%;
   height: auto;
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index 4e0cd28da2e..c00ee77c73c 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -1,6 +1,9 @@
 <template>
-  <section class="space-y-5">
-    <div class="flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+  <section
+    class="exercise-result-page space-y-5"
+    :class="{ 'exercise-result-print-mode': shouldAutoPrint() }"
+  >
+    <div class="exercise-result-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
       <BaseButton
         :label="t('Back to exercises')"
         :route="{ name: 'ExerciseList', params: getBaseRouteParams(), query: getContextParams() }"
@@ -18,13 +21,12 @@
         type="primary-text"
       />
       <BaseButton
-        v-if="legacyUrls.legacyResult"
-        :label="t('Open legacy result')"
-        :to-url="legacyUrls.legacyResult"
-        icon="tracking"
+        :label="t('Export PDF')"
+        icon="file-pdf"
         only-icon
         size="small"
-        type="secondary-text"
+        type="primary-text"
+        @click="downloadResultPdf"
       />
     </div>
 
@@ -182,7 +184,66 @@
         </div>
       </header>
 
-      <div class="space-y-4">
+      <div
+        v-if="visibility.showRadar"
+        class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
+      >
+        {{ t("This exercise uses the radar/spiderweb result mode. The chart is not available in the Vue result page yet.") }}
+      </div>
+
+      <div
+        v-if="visibility.showRanking"
+        class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm"
+      >
+        <div class="border-b border-gray-20 bg-gray-10 p-4">
+          <h2 class="text-lg font-semibold text-gray-90">{{ t("Ranking") }}</h2>
+        </div>
+        <div class="overflow-x-auto p-4">
+          <table class="min-w-full text-sm">
+            <thead>
+              <tr class="border-b border-gray-20 text-left text-xs font-semibold uppercase tracking-wide text-gray-500">
+                <th class="px-3 py-2 text-right">{{ t("Position") }}</th>
+                <th class="px-3 py-2">{{ t("Username") }}</th>
+                <th class="px-3 py-2 text-right">{{ t("Score") }}</th>
+                <th class="px-3 py-2 text-center">{{ t("Date") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="item in ranking"
+                :key="`${item.position}-${item.userId}`"
+                class="border-b border-gray-20"
+                :class="item.currentUser ? 'bg-warning/10' : ''"
+              >
+                <td class="px-3 py-2 text-right font-semibold">{{ item.position }}</td>
+                <td class="px-3 py-2">{{ item.user }}</td>
+                <td class="px-3 py-2 text-right">{{ formatNumber(item.score) }} / {{ formatNumber(item.maxScore) }}</td>
+                <td class="px-3 py-2 text-center">{{ formatDate(item.date) }}</td>
+              </tr>
+              <tr v-if="!ranking.length">
+                <td
+                  class="px-3 py-3 text-center text-gray-500"
+                  colspan="4"
+                >
+                  {{ t("No ranking data available") }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+      <div
+        v-if="!questions.length && visibility.showQuestionDetails === false"
+        class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
+      >
+        {{ t("Question details are hidden according to the exercise result settings.") }}
+      </div>
+
+      <div
+        v-else
+        class="space-y-4"
+      >
         <article
           v-for="(question, index) in questions"
           :key="question.id"
@@ -276,7 +337,7 @@
                   </div>
                   <div class="flex flex-wrap gap-2 text-xs font-semibold">
                     <span
-                      v-if="choice.selected"
+                      v-if="visibility.showStudentAnswers !== false && choice.selected"
                       class="rounded-full bg-info/10 px-2 py-1 text-info"
                     >
                       {{ t("Your answer") }}
@@ -312,7 +373,10 @@
                   />
                 </div>
                 <div class="mt-2 flex flex-wrap gap-2 text-xs font-semibold">
-                  <span class="rounded-full bg-info/10 px-2 py-1 text-info">
+                  <span
+                    v-if="visibility.showStudentAnswers !== false"
+                    class="rounded-full bg-info/10 px-2 py-1 text-info"
+                  >
                     {{ t("Your answer") }}: {{ choice.selectedOptionLabel || t("No answer") }}
                   </span>
                   <span
@@ -350,8 +414,10 @@
                       :class="blankIconClass(blank)"
                     />
                     <div>
-                      <span class="font-semibold">{{ t("Blank {0}", [blank.position]) }}:</span>
-                      {{ blank.studentAnswer || t("No answer") }}
+                      <span class="font-semibold">{{ t("Blank {0}", [blank.position]) }}</span>
+                      <template v-if="visibility.showStudentAnswers !== false">
+                        : {{ blank.studentAnswer || t("No answer") }}
+                      </template>
                     </div>
                   </div>
                   <div
@@ -379,7 +445,10 @@
                   />
                 </div>
                 <div class="mt-2 grid gap-2 text-sm md:grid-cols-2">
-                  <div class="rounded bg-info/10 p-2 text-info">
+                  <div
+                    v-if="visibility.showStudentAnswers !== false"
+                    class="rounded bg-info/10 p-2 text-info"
+                  >
                     <span class="font-semibold">{{ t("Your answer") }}:</span>
                     {{ displayText(prompt.selectedOptionAnswer, t("No answer")) }}
                   </div>
@@ -400,6 +469,69 @@
             </template>
 
 
+            <template v-else-if="question.answer.kind === 'draggable'">
+              <div class="grid gap-3 md:grid-cols-2">
+                <div
+                  v-if="visibility.showStudentAnswers !== false"
+                  class="rounded-lg border border-gray-20 bg-gray-10 p-3"
+                >
+                  <h3 class="mb-3 text-sm font-semibold text-gray-80">{{ t("Your order") }}</h3>
+                  <ol
+                    :class="question.answer.orientation === 'h'
+                      ? 'flex gap-2 overflow-x-auto text-sm'
+                      : 'list-decimal space-y-2 pl-5 text-sm'"
+                  >
+                    <li
+                      v-for="(item, index) in question.answer.studentItems"
+                      :key="`student-${item.id}`"
+                      :class="question.answer.orientation === 'h'
+                        ? 'flex min-w-[12rem] items-center gap-2 rounded border border-gray-20 bg-white p-2'
+                        : 'exercise-result-html'"
+                    >
+                      <span
+                        v-if="question.answer.orientation === 'h'"
+                        class="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-primary/10 text-xs font-semibold text-primary"
+                      >
+                        {{ index + 1 }}
+                      </span>
+                      <span class="exercise-result-html" v-html="item.answer" />
+                    </li>
+                  </ol>
+                  <p v-if="!question.answer.studentItems?.length" class="text-sm text-gray-500">
+                    {{ t("No answer") }}
+                  </p>
+                </div>
+
+                <div
+                  v-if="question.answer.expectedItems?.length"
+                  class="rounded-lg border border-success/30 bg-success/10 p-3"
+                >
+                  <h3 class="mb-3 text-sm font-semibold text-success">{{ t("Correct order") }}</h3>
+                  <ol
+                    :class="question.answer.orientation === 'h'
+                      ? 'flex gap-2 overflow-x-auto text-sm'
+                      : 'list-decimal space-y-2 pl-5 text-sm'"
+                  >
+                    <li
+                      v-for="(item, index) in question.answer.expectedItems"
+                      :key="`expected-${item.id}`"
+                      :class="question.answer.orientation === 'h'
+                        ? 'flex min-w-[12rem] items-center gap-2 rounded border border-success/30 bg-white p-2'
+                        : 'exercise-result-html'"
+                    >
+                      <span
+                        v-if="question.answer.orientation === 'h'"
+                        class="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-success/10 text-xs font-semibold text-success"
+                      >
+                        {{ index + 1 }}
+                      </span>
+                      <span class="exercise-result-html" v-html="item.answer" />
+                    </li>
+                  </ol>
+                </div>
+              </div>
+            </template>
+
             <template v-else-if="question.answer.kind === 'calculated'">
               <div class="space-y-3 rounded-lg border border-gray-20 bg-gray-10 p-3 text-sm">
                 <div
@@ -408,7 +540,10 @@
                   v-html="question.answer.text"
                 />
                 <div class="grid gap-2 md:grid-cols-2">
-                  <div class="rounded bg-info/10 p-2 text-info">
+                  <div
+                    v-if="visibility.showStudentAnswers !== false"
+                    class="rounded bg-info/10 p-2 text-info"
+                  >
                     <span class="font-semibold">{{ t("Your answer") }}:</span>
                     {{ question.answer.studentAnswer || t("No answer") }}
                   </div>
@@ -425,7 +560,10 @@
 
             <template v-else-if="question.answer.kind === 'hotspot'">
               <div class="space-y-3">
-                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                <div
+                  v-if="visibility.showStudentAnswers !== false"
+                  class="rounded-lg border border-gray-20 bg-gray-10 p-3"
+                >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
                     {{ t("Learner clicks") }}
                   </div>
@@ -487,7 +625,10 @@
 
             <template v-else-if="question.answer.kind === 'annotation'">
               <div class="space-y-3">
-                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                <div
+                  v-if="visibility.showStudentAnswers !== false"
+                  class="rounded-lg border border-gray-20 bg-gray-10 p-3"
+                >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
                     {{ t("Learner annotation") }}
                   </div>
@@ -561,7 +702,7 @@
 
                 <div
                   v-if="question.canCorrect && correctionForms[question.id]"
-                  class="rounded-lg border border-gray-20 bg-white p-4"
+                  class="exercise-result-correction-form rounded-lg border border-gray-20 bg-white p-4"
                 >
                   <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
                     <BaseIcon icon="edit" size="small" />
@@ -601,7 +742,10 @@
 
             <template v-else-if="question.answer.kind === 'oral_expression'">
               <div class="space-y-3">
-                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                <div
+                  v-if="visibility.showStudentAnswers !== false"
+                  class="rounded-lg border border-gray-20 bg-gray-10 p-3"
+                >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
                     {{ t("Learner audio") }}
                   </div>
@@ -657,7 +801,7 @@
 
                 <div
                   v-if="question.canCorrect && correctionForms[question.id]"
-                  class="rounded-lg border border-gray-20 bg-white p-4"
+                  class="exercise-result-correction-form rounded-lg border border-gray-20 bg-white p-4"
                 >
                   <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
                     <BaseIcon icon="edit" size="small" />
@@ -697,7 +841,10 @@
 
             <template v-else-if="question.answer.kind === 'upload_answer'">
               <div class="space-y-3">
-                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                <div
+                  v-if="visibility.showStudentAnswers !== false"
+                  class="rounded-lg border border-gray-20 bg-gray-10 p-3"
+                >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
                     {{ t("Learner file") }}
                   </div>
@@ -744,7 +891,7 @@
 
                 <div
                   v-if="question.canCorrect && correctionForms[question.id]"
-                  class="rounded-lg border border-gray-20 bg-white p-4"
+                  class="exercise-result-correction-form rounded-lg border border-gray-20 bg-white p-4"
                 >
                   <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
                     <BaseIcon icon="edit" size="small" />
@@ -798,7 +945,10 @@
 
             <template v-else-if="question.answer.kind === 'free_answer'">
               <div class="space-y-3">
-                <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
+                <div
+                  v-if="visibility.showStudentAnswers !== false"
+                  class="rounded-lg border border-gray-20 bg-gray-10 p-3"
+                >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
                     {{ t("Learner answer") }}
                   </div>
@@ -826,7 +976,7 @@
 
                 <div
                   v-if="question.canCorrect && correctionForms[question.id]"
-                  class="rounded-lg border border-gray-20 bg-white p-4"
+                  class="exercise-result-correction-form rounded-lg border border-gray-20 bg-white p-4"
                 >
                   <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-gray-800">
                     <BaseIcon icon="edit" size="small" />
@@ -883,7 +1033,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, watch } from "vue"
+import { nextTick, onMounted, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
 import { useRoute } from "vue-router"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
@@ -902,12 +1052,13 @@ const description = ref("")
 const attempt = ref({})
 const visibility = ref({})
 const questions = ref([])
-const legacyUrls = ref({})
+const ranking = ref([])
 const correctionForms = ref({})
 const correctionSavingQuestionId = ref(null)
 const correctionError = ref("")
 const correctionMessage = ref("")
 const resultHotspotImageSizes = ref({})
+const autoPrintDone = ref(false)
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -964,8 +1115,9 @@ async function loadResult() {
     attempt.value = response.attempt || {}
     visibility.value = response.visibility || {}
     questions.value = Array.isArray(response.questions) ? response.questions : []
-    legacyUrls.value = response.legacyUrls || {}
+    ranking.value = Array.isArray(response.ranking) ? response.ranking : []
     initializeCorrectionForms()
+    scheduleAutoPrintIfRequested()
   } catch (error) {
     console.error("Error loading exercise result", error)
     errorMessage.value = t("Could not load exercise result")
@@ -1182,6 +1334,10 @@ function trueFalseClass(choice) {
     return "border-success/40 bg-success/10"
   }
 
+  if (visibility.value.showStudentAnswers === false && choice.correctOptionLabel) {
+    return "border-success/40 bg-success/10"
+  }
+
   if (choice.selectedOptionLabel) {
     return "border-danger/40 bg-danger/10"
   }
@@ -1194,6 +1350,10 @@ function trueFalseIconClass(choice) {
     return "mdi-check-circle text-success"
   }
 
+  if (visibility.value.showStudentAnswers === false && choice.correctOptionLabel) {
+    return "mdi-check-circle text-success"
+  }
+
   if (choice.selectedOptionLabel) {
     return "mdi-alert-circle text-danger"
   }
@@ -1206,6 +1366,10 @@ function isTrueFalseChoiceCorrect(choice) {
 }
 
 function blankClass(blank) {
+  if (visibility.value.showStudentAnswers === false && blank.correctAnswer) {
+    return "border-success/30"
+  }
+
   if (isBlankCorrect(blank)) {
     return "border-success/30"
   }
@@ -1214,6 +1378,10 @@ function blankClass(blank) {
 }
 
 function blankIconClass(blank) {
+  if (visibility.value.showStudentAnswers === false && blank.correctAnswer) {
+    return "mdi-check-circle text-success"
+  }
+
   return isBlankCorrect(blank) ? "mdi-check-circle text-success" : "mdi-alert-circle text-danger"
 }
 
@@ -1226,6 +1394,10 @@ function matchingClass(prompt) {
     return "border-success/40 bg-success/10"
   }
 
+  if (visibility.value.showStudentAnswers === false && prompt.correctOptionAnswer) {
+    return "border-success/40 bg-success/10"
+  }
+
   if (prompt.selectedOptionAnswer) {
     return "border-danger/40 bg-danger/10"
   }
@@ -1238,6 +1410,10 @@ function matchingIconClass(prompt) {
     return "mdi-check-circle text-success"
   }
 
+  if (visibility.value.showStudentAnswers === false && prompt.correctOptionAnswer) {
+    return "mdi-check-circle text-success"
+  }
+
   if (prompt.selectedOptionAnswer) {
     return "mdi-alert-circle text-danger"
   }
@@ -1315,6 +1491,39 @@ async function saveManualCorrection(question) {
   }
 }
 
+function shouldAutoPrint() {
+  return ['1', 'true', 'pdf', 'print'].includes(String(getQueryValue(route.query.print) || '').toLowerCase())
+}
+
+function scheduleAutoPrintIfRequested() {
+  if (!shouldAutoPrint() || autoPrintDone.value) {
+    return
+  }
+
+  autoPrintDone.value = true
+  nextTick(() => {
+    window.setTimeout(() => printResult(), 350)
+  })
+}
+
+function downloadResultPdf() {
+  const exerciseId = getExerciseId()
+  const attemptId = getAttemptId()
+  if (!exerciseId || !attemptId || typeof window === "undefined") {
+    return
+  }
+
+  window.open(exerciseService.buildExerciseRuntimeAttemptPdfUrl(getContextParams(), exerciseId, attemptId), "_blank", "noopener")
+}
+
+function printResult() {
+  if (typeof window === 'undefined') {
+    return
+  }
+
+  window.print()
+}
+
 function formatNumber(value) {
   if (value === null || value === undefined || value === "") {
     return "—"
@@ -1381,12 +1590,38 @@ function displayText(value, fallback = "") {
 onMounted(loadResult)
 
 watch(
-  () => [route.params.exerciseId, route.params.attemptId, route.query.cid, route.query.sid, route.query.gid],
-  () => loadResult(),
+  () => [route.params.exerciseId, route.params.attemptId, route.query.cid, route.query.sid, route.query.gid, route.query.print],
+  () => {
+    autoPrintDone.value = false
+    loadResult()
+  },
 )
 </script>
 
 <style scoped>
+:deep(.exercise-result-toolbar .p-button) {
+  min-width: 2.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+:deep(.exercise-result-toolbar .p-button-icon) {
+  font-size: 1.25rem;
+}
+
+@media print {
+  .exercise-result-toolbar,
+  .exercise-result-correction-form {
+    display: none !important;
+  }
+
+  article,
+  header {
+    break-inside: avoid;
+    page-break-inside: avoid;
+  }
+}
+
 .exercise-result-html :deep(img) {
   max-width: 100%;
   height: auto;
@@ -1404,3 +1639,31 @@ watch(
   margin-bottom: 0;
 }
 </style>
+
+<style>
+@media print {
+  body:has(.exercise-result-print-mode) * {
+    visibility: hidden !important;
+  }
+
+  body:has(.exercise-result-print-mode) .exercise-result-print-mode,
+  body:has(.exercise-result-print-mode) .exercise-result-print-mode * {
+    visibility: visible !important;
+  }
+
+  body:has(.exercise-result-print-mode) .exercise-result-print-mode {
+    position: absolute !important;
+    top: 0 !important;
+    left: 0 !important;
+    width: 100% !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    background: #fff !important;
+  }
+
+  body:has(.exercise-result-print-mode) .exercise-result-toolbar,
+  body:has(.exercise-result-print-mode) .exercise-result-correction-form {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseCategoryManagement.php b/src/CoreBundle/ApiResource/Exercise/ExerciseCategoryManagement.php
new file mode 100644
index 00000000000..c73fc309e5f
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseCategoryManagement.php
@@ -0,0 +1,128 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseCategoryManagementProcessor;
+use Chamilo\CoreBundle\State\Exercise\ExerciseCategoryManagementProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseCategoryManagement',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/categories/{categoryType}',
+            requirements: ['categoryType' => 'exercise|question'],
+            openapi: new Operation(
+                summary: 'Exercise category management data',
+                parameters: [
+                    new Parameter(name: 'categoryType', in: 'path', required: true, schema: ['type' => 'string']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_category_management',
+            provider: ExerciseCategoryManagementProvider::class,
+        ),
+        new Post(
+            uriTemplate: '/exercise/categories/{categoryType}/action',
+            requirements: ['categoryType' => 'exercise|question'],
+            openapi: new Operation(
+                summary: 'Run an exercise category action',
+                parameters: [
+                    new Parameter(name: 'categoryType', in: 'path', required: true, schema: ['type' => 'string']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_category_management_action',
+            processor: ExerciseCategoryManagementProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_category_management:read']],
+    denormalizationContext: ['groups' => ['exercise_category_management:write']],
+)]
+final class ExerciseCategoryManagement
+{
+    #[ApiProperty(identifier: false)]
+    #[Groups(['exercise_category_management:read'])]
+    public string $id = 'exercise_categories';
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_category_management:read', 'exercise_category_management:write'])]
+    public string $categoryType = '';
+
+    #[Groups(['exercise_category_management:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_category_management:read', 'exercise_category_management:write'])]
+    public string $action = '';
+
+    #[Groups(['exercise_category_management:read', 'exercise_category_management:write'])]
+    public ?int $categoryId = null;
+
+    #[Groups(['exercise_category_management:read', 'exercise_category_management:write'])]
+    public string $categoryTitle = '';
+
+    #[Groups(['exercise_category_management:read', 'exercise_category_management:write'])]
+    public string $description = '';
+
+    #[Groups(['exercise_category_management:write'])]
+    public string $submittedCsrfToken = '';
+
+    #[Groups(['exercise_category_management:write'])]
+    public string $csvContent = '';
+
+    #[Groups(['exercise_category_management:read'])]
+    public int $importedCount = 0;
+
+    #[Groups(['exercise_category_management:read'])]
+    public int $skippedCount = 0;
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_category_management:read'])]
+    public array $items = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_category_management:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_category_management:read'])]
+    public string $csrfToken = '';
+
+    #[Groups(['exercise_category_management:read'])]
+    public bool $canManage = false;
+
+    #[Groups(['exercise_category_management:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_category_management:read'])]
+    public string $message = '';
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function getCategoryType(): string
+    {
+        return $this->categoryType;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php b/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
index 82c76040476..dbc447a3412 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
@@ -106,6 +106,29 @@ final class ExerciseConfiguration
     #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
     public ?int $categoryId = null;
 
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $language = '';
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $updateTitleInLearningPaths = false;
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public array $skillIds = [];
+
+    /**
+     * Legacy extra field values keyed by extra field variable.
+     *
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public array $extraFieldValues = [];
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public string $extraNotification = '';
+
     #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
     public ?string $startTime = null;
 
@@ -127,6 +150,14 @@ final class ExerciseConfiguration
     #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
     public int $randomByCategory = 0;
 
+    /**
+     * Legacy category matrix stored in c_quiz_rel_category.
+     *
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public array $categoryMatrix = [];
+
     #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
     public bool $randomAnswers = false;
 
@@ -231,6 +262,14 @@ final class ExerciseConfiguration
     #[Groups(['exercise_configuration:read'])]
     public bool $canEdit = false;
 
+    /**
+     * Legacy freezes these fields after an exercise has been created.
+     *
+     * @var array<int, string>
+     */
+    #[Groups(['exercise_configuration:read'])]
+    public array $lockedFields = [];
+
     #[Groups(['exercise_configuration:read'])]
     public bool $canCreate = false;
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseList.php b/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
index f035e534e2f..effcc1d173a 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
@@ -9,9 +9,11 @@
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Post;
 use ApiPlatform\OpenApi\Model\Operation;
 use ApiPlatform\OpenApi\Model\Parameter;
 use Chamilo\CoreBundle\State\Exercise\ExerciseListProvider;
+use Chamilo\CoreBundle\State\Exercise\ExerciseListActionProcessor;
 use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ApiResource(
@@ -33,8 +35,23 @@
             name: 'get_exercise_list',
             provider: ExerciseListProvider::class,
         ),
+        new Post(
+            uriTemplate: '/exercise/list/action',
+            openapi: new Operation(
+                summary: 'Run an exercise list action',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_list_action',
+            processor: ExerciseListActionProcessor::class,
+        ),
     ],
     normalizationContext: ['groups' => ['exercise_list:read']],
+    denormalizationContext: ['groups' => ['exercise_list:write']],
 )]
 final class ExerciseList
 {
@@ -70,7 +87,22 @@ final class ExerciseList
     public bool $canCreate = false;
 
     #[Groups(['exercise_list:read'])]
-    public bool $usesLegacyActions = true;
+    public bool $usesLegacyActions = false;
+
+    #[Groups(['exercise_list:read', 'exercise_list:write'])]
+    public int $exerciseId = 0;
+
+    #[Groups(['exercise_list:read', 'exercise_list:write'])]
+    public string $action = '';
+
+    #[Groups(['exercise_list:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_list:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_list:read', 'exercise_list:write'])]
+    public string $submittedCsrfToken = '';
 
     public function getId(): string
     {
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseLiveResults.php b/src/CoreBundle/ApiResource/Exercise/ExerciseLiveResults.php
new file mode 100644
index 00000000000..a1f9bdc59c2
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseLiveResults.php
@@ -0,0 +1,87 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseLiveResultsProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseLiveResults',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/runtime/{exerciseId}/live-results',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise live results',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'minutes', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'status', in: 'query', required: false, schema: ['type' => 'string']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_live_results',
+            provider: ExerciseLiveResultsProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_live_results:read']],
+)]
+final class ExerciseLiveResults
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_live_results:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_live_results:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_live_results:read'])]
+    public string $description = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_live_results:read'])]
+    public array $attempts = [];
+
+    /**
+     * @var array<string, int|float|string>
+     */
+    #[Groups(['exercise_live_results:read'])]
+    public array $summary = [];
+
+    /**
+     * @var array<string, int|string>
+     */
+    #[Groups(['exercise_live_results:read'])]
+    public array $filters = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_live_results:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_live_results:read'])]
+    public int $totalItems = 0;
+
+    #[Groups(['exercise_live_results:read'])]
+    public bool $canManage = true;
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php b/src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php
new file mode 100644
index 00000000000..4f8df4607c9
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php
@@ -0,0 +1,145 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseOverviewProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseOverview',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/overview/{exerciseId}',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise overview for a course',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_STUDENT') or is_granted('ROLE_CURRENT_COURSE_SESSION_STUDENT') or is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_overview',
+            provider: ExerciseOverviewProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_overview:read']],
+)]
+final class ExerciseOverview
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_overview:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_overview:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_overview:read'])]
+    public string $description = '';
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $visible = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public string $categoryTitle = '';
+
+    #[Groups(['exercise_overview:read'])]
+    public int $questionCount = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public int $attemptCount = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public float $averageScore = 0.0;
+
+    #[Groups(['exercise_overview:read'])]
+    public float $maxScore = 0.0;
+
+    #[Groups(['exercise_overview:read'])]
+    public int $passPercentage = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public ?string $startTime = null;
+
+    #[Groups(['exercise_overview:read'])]
+    public ?string $endTime = null;
+
+    #[Groups(['exercise_overview:read'])]
+    public ?int $duration = null;
+
+    #[Groups(['exercise_overview:read'])]
+    public int $maxAttempt = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public int $feedbackType = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public int $resultsDisabled = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $randomAnswers = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public int $random = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public int $randomByCategory = 0;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $canManage = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $canOpen = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $canReport = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public string $availabilityStatus = 'open';
+
+    #[Groups(['exercise_overview:read'])]
+    public int $currentUserAttemptCount = 0;
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_overview:read'])]
+    public array $currentUserAttempts = [];
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $showAttemptsTable = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $showScoreColumn = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $showDetailsColumn = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $attemptLimitReached = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public bool $canStart = false;
+
+    #[Groups(['exercise_overview:read'])]
+    public string $startButtonLabel = 'Start test';
+
+    #[Groups(['exercise_overview:read'])]
+    public string $notice = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php
new file mode 100644
index 00000000000..16ce43d763c
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php
@@ -0,0 +1,162 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionBankProcessor;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionBankProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseQuestionBank',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/questions/{exerciseId}/bank',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise question bank data',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'page', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'itemsPerPage', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'search', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'categoryId', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sourceExerciseId', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'difficulty', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'questionType', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_question_bank',
+            provider: ExerciseQuestionBankProvider::class,
+        ),
+        new Post(
+            uriTemplate: '/exercise/questions/{exerciseId}/bank/action',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Run an exercise question bank action',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_question_bank_action',
+            processor: ExerciseQuestionBankProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_question_bank:read']],
+    denormalizationContext: ['groups' => ['exercise_question_bank:write']],
+)]
+final class ExerciseQuestionBank
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_question_bank:read', 'exercise_question_bank:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_question_bank:read', 'exercise_question_bank:write'])]
+    public string $action = '';
+
+    #[Groups(['exercise_question_bank:read', 'exercise_question_bank:write'])]
+    public ?int $questionId = null;
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_question_bank:read', 'exercise_question_bank:write'])]
+    public array $questionIds = [];
+
+    #[Groups(['exercise_question_bank:write'])]
+    public string $submittedCsrfToken = '';
+
+    #[Groups(['exercise_question_bank:read'])]
+    public string $title = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_bank:read'])]
+    public array $items = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_bank:read'])]
+    public array $categoryOptions = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_bank:read'])]
+    public array $exerciseOptions = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_bank:read'])]
+    public array $difficultyOptions = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_bank:read'])]
+    public array $questionTypeOptions = [];
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_question_bank:read'])]
+    public array $filters = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_question_bank:read'])]
+    public array $legacyUrls = [];
+
+    #[Groups(['exercise_question_bank:read'])]
+    public int $page = 1;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public int $itemsPerPage = 20;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public int $totalItems = 0;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public string $csrfToken = '';
+
+    #[Groups(['exercise_question_bank:read'])]
+    public bool $canManage = false;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public int $addedCount = 0;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public int $skippedCount = 0;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public string $message = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
index 0599c3ffd86..352637e2b39 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
@@ -303,6 +303,9 @@ final class ExerciseQuestionEditor
     #[Groups(['exercise_question_editor:read'])]
     public bool $imageZoomEnabled = false;
 
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $allowMandatoryQuestion = false;
+
     #[Groups(['exercise_question_editor:write'])]
     public string $submittedCsrfToken = '';
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionImport.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionImport.php
new file mode 100644
index 00000000000..a42b67ec9df
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionImport.php
@@ -0,0 +1,133 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use ApiPlatform\OpenApi\Model\RequestBody;
+use ArrayObject;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionImportProcessor;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionImportProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseQuestionImport',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/import/{importType}',
+            requirements: ['importType' => 'aiken|excel|qti2'],
+            openapi: new Operation(
+                summary: 'Exercise question import data',
+                parameters: [
+                    new Parameter(name: 'importType', in: 'path', required: true, schema: ['type' => 'string']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_question_import',
+            provider: ExerciseQuestionImportProvider::class,
+        ),
+        new Post(
+            uriTemplate: '/exercise/import/{importType}',
+            requirements: ['importType' => 'aiken|excel|qti2'],
+            openapi: new Operation(
+                summary: 'Import exercise questions',
+                parameters: [
+                    new Parameter(name: 'importType', in: 'path', required: true, schema: ['type' => 'string']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+                requestBody: new RequestBody(
+                    content: new ArrayObject([
+                        'multipart/form-data' => [
+                            'schema' => [
+                                'type' => 'object',
+                                'properties' => [
+                                    'submittedCsrfToken' => ['type' => 'string'],
+                                    'totalWeight' => ['type' => 'number'],
+                                    'useCustomScore' => ['type' => 'boolean'],
+                                    'correctScore' => ['type' => 'number'],
+                                    'incorrectScore' => ['type' => 'number'],
+                                    'file' => [
+                                        'type' => 'string',
+                                        'format' => 'binary',
+                                        'description' => 'Aiken .txt/.zip file, Excel .xls/.xlsx file or QTI2 .zip file',
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ]),
+                ),
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            deserialize: false,
+            name: 'post_exercise_question_import',
+            processor: ExerciseQuestionImportProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_question_import:read']],
+)]
+final class ExerciseQuestionImport
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_question_import:read'])]
+    public string $importType = 'aiken';
+
+    #[Groups(['exercise_question_import:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_question_import:read'])]
+    public string $csrfToken = '';
+
+    #[Groups(['exercise_question_import:read'])]
+    public bool $canManage = false;
+
+    #[Groups(['exercise_question_import:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_question_import:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_question_import:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_question_import:read'])]
+    public string $exerciseTitle = '';
+
+    #[Groups(['exercise_question_import:read'])]
+    public int $importedQuestionCount = 0;
+
+    #[Groups(['exercise_question_import:read'])]
+    public int $skippedQuestionCount = 0;
+
+    /**
+     * @var array<int, string>
+     */
+    #[Groups(['exercise_question_import:read'])]
+    public array $errors = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_question_import:read'])]
+    public array $actionUrls = [];
+
+    #[Groups(['exercise_question_import:read'])]
+    public string $sample = '';
+
+    public function getImportType(): string
+    {
+        return $this->importType;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionStats.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionStats.php
new file mode 100644
index 00000000000..d409ea352ed
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionStats.php
@@ -0,0 +1,73 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionStatsProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseQuestionStats',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/runtime/{exerciseId}/question-stats',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise question statistics',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_question_stats',
+            provider: ExerciseQuestionStatsProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_question_stats:read']],
+)]
+final class ExerciseQuestionStats
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_question_stats:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_question_stats:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_question_stats:read'])]
+    public string $description = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_question_stats:read'])]
+    public array $questions = [];
+
+    /**
+     * @var array<string, int|float>
+     */
+    #[Groups(['exercise_question_stats:read'])]
+    public array $summary = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_question_stats:read'])]
+    public array $actionUrls = [];
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseReportByQuestion.php b/src/CoreBundle/ApiResource/Exercise/ExerciseReportByQuestion.php
new file mode 100644
index 00000000000..a92cdcbb2f9
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseReportByQuestion.php
@@ -0,0 +1,73 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseReportByQuestionProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseReportByQuestion',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/runtime/{exerciseId}/report-by-question',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise report by question',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_report_by_question',
+            provider: ExerciseReportByQuestionProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_report_by_question:read']],
+)]
+final class ExerciseReportByQuestion
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_report_by_question:read'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_report_by_question:read'])]
+    public string $title = '';
+
+    #[Groups(['exercise_report_by_question:read'])]
+    public string $description = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_report_by_question:read'])]
+    public array $questions = [];
+
+    /**
+     * @var array<string, int|float>
+     */
+    #[Groups(['exercise_report_by_question:read'])]
+    public array $summary = [];
+
+    /**
+     * @var array<string, string>
+     */
+    #[Groups(['exercise_report_by_question:read'])]
+    public array $actionUrls = [];
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
index 517fb86e7a8..f183e0c40e6 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
@@ -84,6 +84,12 @@ final class ExerciseRuntimeAnswer
     #[Groups(['exercise_runtime_answer:read'])]
     public bool $canFinish = false;
 
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_answer:read'])]
+    public array $feedback = [];
+
     public function getExerciseId(): ?int
     {
         return $this->exerciseId;
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptClose.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptClose.php
new file mode 100644
index 00000000000..5e18aa49945
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptClose.php
@@ -0,0 +1,64 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeAttemptCloseProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeAttemptClose',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/close',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Close an incomplete exercise attempt from the migrated report',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_attempt_close',
+            processor: ExerciseRuntimeAttemptCloseProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_attempt_close:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_attempt_close:write']],
+)]
+final class ExerciseRuntimeAttemptClose
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_close:read', 'exercise_runtime_attempt_close:write'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_close:read', 'exercise_runtime_attempt_close:write'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_attempt_close:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_attempt_close:read'])]
+    public string $message = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptEmail.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptEmail.php
new file mode 100644
index 00000000000..c5b49faedad
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptEmail.php
@@ -0,0 +1,76 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeAttemptEmailProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeAttemptEmail',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/email',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Send one exercise attempt result email from the migrated report',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_attempt_email',
+            processor: ExerciseRuntimeAttemptEmailProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_attempt_email:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_attempt_email:write']],
+)]
+final class ExerciseRuntimeAttemptEmail
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_email:read', 'exercise_runtime_attempt_email:write'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_email:read', 'exercise_runtime_attempt_email:write'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_attempt_email:write'])]
+    public ?string $node = null;
+
+    #[Groups(['exercise_runtime_attempt_email:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_attempt_email:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_runtime_attempt_email:read'])]
+    public ?int $recipientId = null;
+
+    #[Groups(['exercise_runtime_attempt_email:read'])]
+    public string $recipientName = '';
+
+    #[Groups(['exercise_runtime_attempt_email:read'])]
+    public string $recipientEmail = '';
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptRecalculate.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptRecalculate.php
new file mode 100644
index 00000000000..99154b122df
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttemptRecalculate.php
@@ -0,0 +1,70 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeAttemptRecalculateProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeAttemptRecalculate',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempt/{attemptId}/recalculate',
+            requirements: [
+                'exerciseId' => '\\d+',
+                'attemptId' => '\\d+',
+            ],
+            openapi: new Operation(
+                summary: 'Recalculate an exercise attempt score from the migrated report',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'attemptId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_attempt_recalculate',
+            processor: ExerciseRuntimeAttemptRecalculateProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_attempt_recalculate:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_attempt_recalculate:write']],
+)]
+final class ExerciseRuntimeAttemptRecalculate
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_recalculate:read', 'exercise_runtime_attempt_recalculate:write'])]
+    public ?int $exerciseId = null;
+
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_attempt_recalculate:read', 'exercise_runtime_attempt_recalculate:write'])]
+    public ?int $attemptId = null;
+
+    #[Groups(['exercise_runtime_attempt_recalculate:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_attempt_recalculate:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_runtime_attempt_recalculate:read'])]
+    public float $score = 0.0;
+
+    #[Groups(['exercise_runtime_attempt_recalculate:read'])]
+    public float $maxScore = 0.0;
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
index 6cce54254a7..25c95609bb8 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
@@ -67,7 +67,7 @@ final class ExerciseRuntimeReport
      * @var array<string, string>
      */
     #[Groups(['exercise_runtime_report:read'])]
-    public array $legacyUrls = [];
+    public array $actionUrls = [];
 
     #[Groups(['exercise_runtime_report:read'])]
     public int $totalItems = 0;
@@ -75,6 +75,24 @@ final class ExerciseRuntimeReport
     #[Groups(['exercise_runtime_report:read'])]
     public bool $canManage = true;
 
+    #[Groups(['exercise_runtime_report:read'])]
+    public bool $lockedByGradebook = false;
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public bool $canBulkDelete = false;
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public bool $canCleanResults = false;
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public bool $canBulkRecalculate = false;
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public string $bulkActionToken = '';
+
+    #[Groups(['exercise_runtime_report:read'])]
+    public string $emailActionToken = '';
+
     public function getExerciseId(): ?int
     {
         return $this->exerciseId;
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportBulkAction.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportBulkAction.php
new file mode 100644
index 00000000000..6a06fb28c87
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportBulkAction.php
@@ -0,0 +1,77 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeReportBulkActionProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeReportBulkAction',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempts/action',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Run a migrated bulk action on exercise report attempts',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_report_bulk_action',
+            processor: ExerciseRuntimeReportBulkActionProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_report_bulk_action:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_report_bulk_action:write']],
+)]
+final class ExerciseRuntimeReportBulkAction
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_report_bulk_action:read', 'exercise_runtime_report_bulk_action:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_runtime_report_bulk_action:read', 'exercise_runtime_report_bulk_action:write'])]
+    public string $action = '';
+
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_runtime_report_bulk_action:read', 'exercise_runtime_report_bulk_action:write'])]
+    public array $attemptIds = [];
+
+    #[Groups(['exercise_runtime_report_bulk_action:read', 'exercise_runtime_report_bulk_action:write'])]
+    public string $beforeDate = '';
+
+    #[Groups(['exercise_runtime_report_bulk_action:write'])]
+    public string $submittedCsrfToken = '';
+
+    #[Groups(['exercise_runtime_report_bulk_action:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_report_bulk_action:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_runtime_report_bulk_action:read'])]
+    public int $processedCount = 0;
+
+    #[Groups(['exercise_runtime_report_bulk_action:read'])]
+    public int $failedCount = 0;
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportEmail.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportEmail.php
new file mode 100644
index 00000000000..e07b555aa20
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReportEmail.php
@@ -0,0 +1,83 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeReportEmailProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseRuntimeReportEmail',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/runtime/{exerciseId}/attempts/email',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Send reviewed exercise attempt result emails from the migrated report',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'firstName', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'lastName', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'status', in: 'query', required: false, schema: ['type' => 'string']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_runtime_report_email',
+            processor: ExerciseRuntimeReportEmailProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_runtime_report_email:read']],
+    denormalizationContext: ['groups' => ['exercise_runtime_report_email:write']],
+)]
+final class ExerciseRuntimeReportEmail
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_runtime_report_email:read', 'exercise_runtime_report_email:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_runtime_report_email:write'])]
+    public string $node = '';
+
+    #[Groups(['exercise_runtime_report_email:write'])]
+    public string $submittedCsrfToken = '';
+
+    #[Groups(['exercise_runtime_report_email:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_runtime_report_email:read'])]
+    public string $message = '';
+
+    #[Groups(['exercise_runtime_report_email:read'])]
+    public int $totalCount = 0;
+
+    #[Groups(['exercise_runtime_report_email:read'])]
+    public int $sentCount = 0;
+
+    #[Groups(['exercise_runtime_report_email:read'])]
+    public int $skippedCount = 0;
+
+    #[Groups(['exercise_runtime_report_email:read'])]
+    public int $failedCount = 0;
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_runtime_report_email:read'])]
+    public array $failures = [];
+
+    public function getExerciseId(): ?int
+    {
+        return $this->exerciseId;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
index a2c82347e55..8fa730fcdb4 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
@@ -74,6 +74,12 @@ final class ExerciseRuntimeResult
     #[Groups(['exercise_runtime_result:read'])]
     public array $questions = [];
 
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $ranking = [];
+
     /**
      * @var array<string, string>
      */
diff --git a/src/CoreBundle/Controller/Api/ExerciseExcelTemplateController.php b/src/CoreBundle/Controller/Api/ExerciseExcelTemplateController.php
new file mode 100644
index 00000000000..b614b138c01
--- /dev/null
+++ b/src/CoreBundle/Controller/Api/ExerciseExcelTemplateController.php
@@ -0,0 +1,32 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Service\Exercise\ExerciseExcelTemplateService;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_USER')]
+final class ExerciseExcelTemplateController extends AbstractController
+{
+    public function __construct(
+        private readonly ExerciseExcelTemplateService $templateService,
+    ) {}
+
+    #[Route(
+        '/api/exercise/import/excel/template.xlsx',
+        name: 'chamilo_core_exercise_excel_import_template',
+        methods: ['GET']
+    )]
+    public function __invoke(Request $request): BinaryFileResponse
+    {
+        return $this->templateService->downloadTemplate($request);
+    }
+}
diff --git a/src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php b/src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php
new file mode 100644
index 00000000000..f8bb43f1d8f
--- /dev/null
+++ b/src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php
@@ -0,0 +1,33 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Service\Exercise\ExerciseQti2ExportService;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_USER')]
+final class ExerciseQti2ExportController extends AbstractController
+{
+    public function __construct(
+        private readonly ExerciseQti2ExportService $exportService,
+    ) {}
+
+    #[Route(
+        '/api/exercise/{exerciseId}/qti2-export.zip',
+        name: 'chamilo_core_exercise_qti2_export_zip',
+        requirements: ['exerciseId' => '\\d+'],
+        methods: ['GET']
+    )]
+    public function __invoke(int $exerciseId, Request $request): BinaryFileResponse
+    {
+        return $this->exportService->exportExerciseZip($exerciseId, $request);
+    }
+}
diff --git a/src/CoreBundle/Controller/Api/ExerciseQuestionReportPdfController.php b/src/CoreBundle/Controller/Api/ExerciseQuestionReportPdfController.php
new file mode 100644
index 00000000000..956efe03afe
--- /dev/null
+++ b/src/CoreBundle/Controller/Api/ExerciseQuestionReportPdfController.php
@@ -0,0 +1,43 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Service\Exercise\ExerciseQuestionReportPdfService;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_USER')]
+final class ExerciseQuestionReportPdfController extends AbstractController
+{
+    public function __construct(
+        private readonly ExerciseQuestionReportPdfService $pdfService,
+    ) {}
+
+    #[Route(
+        '/api/exercise/runtime/{exerciseId}/report-by-question.pdf',
+        name: 'chamilo_core_exercise_report_by_question_pdf',
+        requirements: ['exerciseId' => '\\d+'],
+        methods: ['GET']
+    )]
+    public function reportByQuestion(int $exerciseId): Response
+    {
+        return $this->pdfService->exportReportByQuestionPdf($exerciseId);
+    }
+
+    #[Route(
+        '/api/exercise/runtime/{exerciseId}/question-stats.pdf',
+        name: 'chamilo_core_exercise_question_stats_pdf',
+        requirements: ['exerciseId' => '\\d+'],
+        methods: ['GET']
+    )]
+    public function questionStats(int $exerciseId): Response
+    {
+        return $this->pdfService->exportQuestionStatsPdf($exerciseId);
+    }
+}
diff --git a/src/CoreBundle/Controller/Api/ExerciseRuntimeAllAttemptsExportController.php b/src/CoreBundle/Controller/Api/ExerciseRuntimeAllAttemptsExportController.php
new file mode 100644
index 00000000000..36257e2c75d
--- /dev/null
+++ b/src/CoreBundle/Controller/Api/ExerciseRuntimeAllAttemptsExportController.php
@@ -0,0 +1,33 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Service\Exercise\ExerciseRuntimeAllAttemptsExportService;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_USER')]
+final class ExerciseRuntimeAllAttemptsExportController extends AbstractController
+{
+    public function __construct(
+        private readonly ExerciseRuntimeAllAttemptsExportService $exportService,
+    ) {}
+
+    #[Route(
+        '/api/exercise/runtime/{exerciseId}/attempts/export-all.zip',
+        name: 'chamilo_core_exercise_runtime_all_attempts_export_zip',
+        requirements: ['exerciseId' => '\\d+'],
+        methods: ['GET']
+    )]
+    public function __invoke(int $exerciseId, Request $request): BinaryFileResponse
+    {
+        return $this->exportService->exportAllAttemptsZip($exerciseId, $request);
+    }
+}
diff --git a/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptPdfController.php b/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptPdfController.php
new file mode 100644
index 00000000000..505f4d83e84
--- /dev/null
+++ b/src/CoreBundle/Controller/Api/ExerciseRuntimeAttemptPdfController.php
@@ -0,0 +1,33 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Service\Exercise\ExerciseRuntimeAttemptPdfService;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_USER')]
+final class ExerciseRuntimeAttemptPdfController extends AbstractController
+{
+    public function __construct(
+        private readonly ExerciseRuntimeAttemptPdfService $pdfService,
+    ) {}
+
+    #[Route(
+        '/api/exercise/runtime/{exerciseId}/attempt/{attemptId}/pdf',
+        name: 'chamilo_core_exercise_runtime_attempt_pdf',
+        requirements: ['exerciseId' => '\\d+', 'attemptId' => '\\d+'],
+        methods: ['GET']
+    )]
+    public function __invoke(int $exerciseId, int $attemptId, Request $request): Response
+    {
+        return $this->pdfService->exportAttemptPdf($exerciseId, $attemptId, $request);
+    }
+}
diff --git a/src/CoreBundle/Controller/Api/ExerciseRuntimeReportExportController.php b/src/CoreBundle/Controller/Api/ExerciseRuntimeReportExportController.php
new file mode 100644
index 00000000000..bf38e8bbf98
--- /dev/null
+++ b/src/CoreBundle/Controller/Api/ExerciseRuntimeReportExportController.php
@@ -0,0 +1,45 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Service\Exercise\ExerciseRuntimeReportExportService;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+#[IsGranted('ROLE_USER')]
+final class ExerciseRuntimeReportExportController extends AbstractController
+{
+    public function __construct(
+        private readonly ExerciseRuntimeReportExportService $exportService,
+    ) {}
+
+    #[Route(
+        '/api/exercise/runtime/{exerciseId}/attempts/export.csv',
+        name: 'chamilo_core_exercise_runtime_report_export_csv',
+        requirements: ['exerciseId' => '\\d+'],
+        methods: ['GET']
+    )]
+    public function csv(int $exerciseId, Request $request): StreamedResponse
+    {
+        return $this->exportService->exportCsv($exerciseId, $request);
+    }
+
+    #[Route(
+        '/api/exercise/runtime/{exerciseId}/attempts/export.xlsx',
+        name: 'chamilo_core_exercise_runtime_report_export_xlsx',
+        requirements: ['exerciseId' => '\\d+'],
+        methods: ['GET']
+    )]
+    public function xlsx(int $exerciseId, Request $request): BinaryFileResponse
+    {
+        return $this->exportService->exportXlsx($exerciseId, $request);
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseAttemptScoringService.php b/src/CoreBundle/Service/Exercise/ExerciseAttemptScoringService.php
new file mode 100644
index 00000000000..c47088f730b
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseAttemptScoringService.php
@@ -0,0 +1,1271 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use DateTime;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * Recalculates persisted exercise attempt scores using the migrated runtime scoring rules.
+ */
+final readonly class ExerciseAttemptScoringService
+{
+    private const MEDIA_QUESTION = 15;
+    private const UNIQUE_ANSWER = 1;
+    private const MULTIPLE_ANSWER = 2;
+    private const FILL_IN_BLANKS = 3;
+    private const MATCHING = 4;
+    private const FREE_ANSWER = 5;
+    private const HOT_SPOT = 6;
+    private const CALCULATED_ANSWER = 16;
+    private const DRAGGABLE = 18;
+    private const READING_COMPREHENSION = 21;
+    private const PAGE_BREAK = 31;
+    private const ORAL_EXPRESSION = 13;
+    private const UPLOAD_ANSWER = 23;
+    private const ANNOTATION = 20;
+    private const MULTIPLE_ANSWER_COMBINATION = 9;
+    private const UNIQUE_ANSWER_NO_OPTION = 10;
+    private const MULTIPLE_ANSWER_TRUE_FALSE = 11;
+    private const MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE = 12;
+    private const MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY = 22;
+    private const GLOBAL_MULTIPLE_ANSWER = 14;
+    private const UNIQUE_ANSWER_IMAGE = 17;
+    private const MATCHING_DRAGGABLE = 19;
+    private const FILL_IN_BLANKS_COMBINATION = 27;
+    private const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28;
+    private const MULTIPLE_ANSWER_DROPDOWN = 29;
+    private const MATCHING_COMBINATION = 24;
+    private const MATCHING_DRAGGABLE_COMBINATION = 25;
+    private const HOT_SPOT_COMBINATION = 26;
+
+    /**
+     * @var array<int, string>
+     */
+    private const SUPPORTED_TYPE_NAMES = [
+        self::UNIQUE_ANSWER => 'Unique answer',
+        self::UNIQUE_ANSWER_NO_OPTION => 'Unique answer no option',
+        self::UNIQUE_ANSWER_IMAGE => 'Unique answer with images',
+        self::MULTIPLE_ANSWER => 'Multiple answer',
+        self::GLOBAL_MULTIPLE_ANSWER => 'Global multiple answer',
+        self::MULTIPLE_ANSWER_COMBINATION => 'Multiple answer combination',
+        self::MULTIPLE_ANSWER_TRUE_FALSE => 'Multiple answer true/false',
+        self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => 'Multiple answer combination true/false',
+        self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => 'Multiple answer true/false with degree of certainty',
+        self::FILL_IN_BLANKS => 'Fill in blanks',
+        self::FILL_IN_BLANKS_COMBINATION => 'Fill in blanks combination',
+        self::MATCHING => 'Matching',
+        self::MATCHING_DRAGGABLE => 'Matching draggable',
+        self::MATCHING_COMBINATION => 'Matching combination',
+        self::MATCHING_DRAGGABLE_COMBINATION => 'Matching draggable combination',
+        self::HOT_SPOT_COMBINATION => 'Hotspot combination',
+        self::MULTIPLE_ANSWER_DROPDOWN => 'Multiple answer dropdown',
+        self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => 'Multiple answer dropdown combination',
+        self::FREE_ANSWER => 'Free answer',
+        self::HOT_SPOT => 'Hotspot',
+        self::CALCULATED_ANSWER => 'Calculated answer',
+        self::DRAGGABLE => 'Sequence ordering',
+        self::ORAL_EXPRESSION => 'Oral expression',
+        self::UPLOAD_ANSWER => 'Upload answer',
+        self::ANNOTATION => 'Annotation',
+        self::MEDIA_QUESTION => 'Media question',
+        self::READING_COMPREHENSION => 'Reading comprehension',
+        self::PAGE_BREAK => 'Page break',
+    ];
+
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    /**
+     * @return array{score: float, maxScore: float, questionsToCheck: array<int, int>}
+     */
+    public function recalculateAttempt(TrackEExercise $attempt, CQuiz $quiz): array
+    {
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if ([] === $questionIds) {
+            throw new BadRequestHttpException('The attempt does not contain a persisted question list.');
+        }
+
+        $questions = $this->getQuestions($quiz, $questionIds);
+        $unsupportedTypes = $this->getUnsupportedQuestionTypes($questions);
+        if ([] !== $unsupportedTypes) {
+            throw new BadRequestHttpException('This attempt contains question types that are not supported by the migrated scorer yet: '.implode(', ', $unsupportedTypes).'.');
+        }
+
+        $totalScore = 0.0;
+        $totalWeight = 0.0;
+        $pendingQuestionIds = array_flip($this->parseQuestionIds((string) $attempt->getQuestionsToCheck()));
+        $questionsToCheck = [];
+
+        foreach ($questionIds as $questionId) {
+            $question = $questions[$questionId] ?? null;
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $rows = $this->getAttemptRows((int) $attempt->getExeId(), $questionId);
+            $answers = $this->getQuestionAnswers($questionId);
+            $options = $this->getQuestionOptions($questionId);
+            $score = $this->scoreQuestion($quiz, $question, $answers, $options, $rows);
+            $weight = $this->getQuestionWeight($question, $answers);
+
+            if (0 === (int) $quiz->getPropagateNeg() && 0 > $score) {
+                $score = 0.0;
+            }
+
+            $this->updateQuestionAttemptRows($question, $rows, $score);
+
+            if ($this->requiresManualCorrection($question) && isset($pendingQuestionIds[$questionId])) {
+                $questionsToCheck[] = $questionId;
+            }
+
+            $totalScore += $score;
+            $totalWeight += $weight;
+        }
+
+        if (0.0 >= $totalWeight) {
+            $totalWeight = (float) $attempt->getMaxScore();
+        }
+
+        $attempt
+            ->setScore($totalScore)
+            ->setMaxScore($totalWeight)
+            ->setQuestionsToCheck(implode(',', $questionsToCheck))
+        ;
+
+        $this->syncLearningPathScore($attempt, $totalScore);
+
+        return [
+            'score' => $totalScore,
+            'maxScore' => $totalWeight,
+            'questionsToCheck' => $questionsToCheck,
+        ];
+    }
+
+    private function syncLearningPathScore(TrackEExercise $attempt, float $score): void
+    {
+        if (0 >= $attempt->getOrigLpId() || 0 >= $attempt->getOrigLpItemId() || 0 >= $attempt->getOrigLpItemViewId()) {
+            return;
+        }
+
+        $lpItem = $this->entityManager->getRepository(CLpItem::class)->find($attempt->getOrigLpItemId());
+        if (!$lpItem instanceof CLpItem || 'quiz' !== $lpItem->getItemType()) {
+            return;
+        }
+
+        $lpItemView = $this->entityManager->getRepository(CLpItemView::class)->find($attempt->getOrigLpItemViewId());
+        if (!$lpItemView instanceof CLpItemView) {
+            return;
+        }
+
+        $lpItemView->setScore($score);
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseQuestionIds(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+    }
+
+    /**
+     * @param array<int, int> $questionIds
+     *
+     * @return array<int, CQuizQuestion>
+     */
+    private function getQuestions(CQuiz $quiz, array $questionIds): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion')
+            ->addSelect('question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) IN (:questionIds)')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questions = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (null === $question->getIid()) {
+                continue;
+            }
+
+            $questions[(int) $question->getIid()] = $question;
+        }
+
+        return $questions;
+    }
+
+    /**
+     * @param array<int, CQuizQuestion> $questions
+     *
+     * @return array<int, string>
+     */
+    private function getUnsupportedQuestionTypes(array $questions): array
+    {
+        $unsupportedTypes = [];
+        foreach ($questions as $question) {
+            $type = (int) $question->getType();
+            if (!$this->isSupportedQuestionType($type)) {
+                $unsupportedTypes[$type] = self::SUPPORTED_TYPE_NAMES[$type] ?? (string) $type;
+            }
+        }
+
+        return $unsupportedTypes;
+    }
+
+    private function isSupportedQuestionType(int $type): bool
+    {
+        return isset(self::SUPPORTED_TYPE_NAMES[$type]);
+    }
+
+    /**
+     * @return array<int, TrackEAttempt>
+     */
+    private function getAttemptRows(int $attemptId, int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $result = [];
+        foreach ($rows as $row) {
+            if ($row instanceof TrackEAttempt) {
+                $result[] = $row;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getQuestionAnswers(int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->addOrderBy('answer.iid', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $answers = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CQuizAnswer || null === $row->getIid()) {
+                continue;
+            }
+
+            $answers[(int) $row->getIid()] = $row;
+        }
+
+        return $answers;
+    }
+
+    /**
+     * @return array<int, CQuizQuestionOption>
+     */
+    private function getQuestionOptions(int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('questionOption')
+            ->from(CQuizQuestionOption::class, 'questionOption')
+            ->andWhere('IDENTITY(questionOption.question) = :questionId')
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $options = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CQuizQuestionOption || null === $row->getIid()) {
+                continue;
+            }
+
+            $options[(int) $row->getIid()] = $row;
+        }
+
+        return $options;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, TrackEAttempt>       $rows
+     */
+    private function scoreQuestion(CQuiz $quiz, CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        return match ((int) $question->getType()) {
+            self::UNIQUE_ANSWER,
+            self::UNIQUE_ANSWER_NO_OPTION,
+            self::UNIQUE_ANSWER_IMAGE,
+            self::READING_COMPREHENSION => $this->scoreUniqueAnswer($answers, $rows),
+            self::MULTIPLE_ANSWER,
+            self::GLOBAL_MULTIPLE_ANSWER,
+            self::MULTIPLE_ANSWER_DROPDOWN => $this->scoreMultipleAnswer($answers, $rows),
+            self::MULTIPLE_ANSWER_COMBINATION,
+            self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => $this->scoreMultipleCombination($question, $answers, $rows),
+            self::MULTIPLE_ANSWER_TRUE_FALSE => $this->scoreTrueFalseAnswer($question, $answers, $options, $rows),
+            self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => $this->scoreTrueFalseDegreeCertaintyAnswer($question, $answers, $options, $rows),
+            self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE => $this->scoreTrueFalseCombination($question, $answers, $options, $rows),
+            self::FILL_IN_BLANKS,
+            self::FILL_IN_BLANKS_COMBINATION => $this->scoreFillBlanks($quiz, $question, $answers, $rows),
+            self::MATCHING,
+            self::MATCHING_DRAGGABLE => $this->scoreMatchingAnswer($answers, $rows),
+            self::DRAGGABLE => $this->scoreDraggableAnswer($answers, $rows),
+            self::MATCHING_COMBINATION,
+            self::MATCHING_DRAGGABLE_COMBINATION => $this->scoreMatchingCombination($question, $answers, $rows),
+            self::CALCULATED_ANSWER => $this->scoreCalculatedAnswer($question, $answers, $rows),
+            self::HOT_SPOT => $this->scoreHotspotAnswer($answers, $rows, false, (float) $question->getPonderation()),
+            self::HOT_SPOT_COMBINATION => $this->scoreHotspotAnswer($answers, $rows, true, (float) $question->getPonderation()),
+            self::FREE_ANSWER,
+            self::ORAL_EXPRESSION,
+            self::UPLOAD_ANSWER,
+            self::ANNOTATION => $this->scoreManualAnswer($rows),
+            default => 0.0,
+        };
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreUniqueAnswer(array $answers, array $rows): float
+    {
+        $selectedAnswerId = $this->getFirstSavedAnswerId($rows);
+        if (0 >= $selectedAnswerId || !isset($answers[$selectedAnswerId])) {
+            return 0.0;
+        }
+
+        return $answers[$selectedAnswerId]->getPonderation();
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMultipleAnswer(array $answers, array $rows): float
+    {
+        $score = 0.0;
+        foreach ($this->getSavedAnswerIds($rows) as $answerId) {
+            if (!isset($answers[$answerId])) {
+                continue;
+            }
+
+            $score += $answers[$answerId]->getPonderation();
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMultipleCombination(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $selectedAnswerIds = array_flip($this->getSavedAnswerIds($rows));
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $isCorrect = 1 === (int) $answer->getCorrect();
+            $isSelected = isset($selectedAnswerIds[$answerId]);
+            if ($isCorrect !== $isSelected) {
+                return 0.0;
+            }
+        }
+
+        $firstAnswer = reset($answers);
+        if ($firstAnswer instanceof CQuizAnswer && 0.0 !== $firstAnswer->getPonderation()) {
+            return $firstAnswer->getPonderation();
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, TrackEAttempt>       $rows
+     */
+    private function scoreTrueFalseAnswer(CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        [$trueScore, $falseScore, $doubtScore] = $this->getTrueFalseScores((string) $question->getExtra());
+        $choices = $this->getSavedTrueFalseChoices($rows);
+        $score = 0.0;
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $studentChoice = $choices[$answerId] ?? 0;
+            if (0 >= $studentChoice) {
+                $score += $doubtScore;
+                continue;
+            }
+
+            if ($this->isTrueFalseChoiceCorrect($studentChoice, (int) $answer->getCorrect(), $options)) {
+                $score += $trueScore;
+                continue;
+            }
+
+            $optionTitle = $this->getTrueFalseOptionTitle($studentChoice, $options);
+            $score += \in_array($optionTitle, ["Don't know", 'DoubtScore'], true) ? $doubtScore : $falseScore;
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, TrackEAttempt>       $rows
+     */
+    private function scoreTrueFalseDegreeCertaintyAnswer(CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        [$trueScore, $falseScore, $doubtScore] = $this->getTrueFalseScores((string) $question->getExtra());
+        $choices = $this->getSavedTrueFalseDegreeCertaintyChoices($rows);
+        $score = 0.0;
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $studentChoice = (int) ($choices[$answerId]['choice'] ?? 0);
+            if (0 >= $studentChoice) {
+                continue;
+            }
+
+            $studentDegreeChoice = (int) ($choices[$answerId]['degree'] ?? 0);
+            $studentDegreeChoicePosition = $this->getTrueFalseOptionPosition($studentDegreeChoice, $options);
+            $hasCertainty = 3 <= $studentDegreeChoicePosition && 9 > $studentDegreeChoicePosition;
+
+            if ($this->isTrueFalseChoiceCorrect($studentChoice, (int) $answer->getCorrect(), $options)) {
+                $score += $hasCertainty ? $trueScore : $doubtScore;
+                continue;
+            }
+
+            $score += $hasCertainty ? $falseScore : $doubtScore;
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, array{choice: int, degree: int}>
+     */
+    private function getSavedTrueFalseDegreeCertaintyChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $parts = explode(':', (string) $row->getAnswer());
+            $answerId = isset($parts[0]) ? (int) $parts[0] : 0;
+            $optionId = isset($parts[1]) ? (int) $parts[1] : 0;
+            $degreeId = isset($parts[2]) ? (int) $parts[2] : 0;
+            if (0 < $answerId && 0 < $optionId) {
+                $choices[$answerId] = [
+                    'choice' => $optionId,
+                    'degree' => $degreeId,
+                ];
+            }
+        }
+
+        return $choices;
+    }
+
+    private function scoreTrueFalseCombination(CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        $choices = $this->getSavedTrueFalseChoices($rows);
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            if (!$this->isTrueFalseChoiceCorrect($choices[$answerId] ?? 0, (int) $answer->getCorrect(), $options)) {
+                return 0.0;
+            }
+        }
+
+        $firstAnswer = reset($answers);
+        if ($firstAnswer instanceof CQuizAnswer && 0.0 !== $firstAnswer->getPonderation()) {
+            return $firstAnswer->getPonderation();
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @return array{0: float, 1: float, 2: float}
+     */
+    private function getTrueFalseScores(string $extra): array
+    {
+        if ('' === trim($extra)) {
+            return [1.0, -0.5, 0.0];
+        }
+
+        $parts = explode(':', $extra);
+
+        return [
+            isset($parts[0]) ? (float) trim($parts[0]) : 1.0,
+            isset($parts[1]) ? (float) trim($parts[1]) : -0.5,
+            isset($parts[2]) ? (float) trim($parts[2]) : 0.0,
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedTrueFalseChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $parts = explode(':', (string) $row->getAnswer());
+            $answerId = isset($parts[0]) ? (int) $parts[0] : 0;
+            $optionId = isset($parts[1]) ? (int) $parts[1] : 0;
+            if (0 < $answerId && 0 < $optionId) {
+                $choices[$answerId] = $optionId;
+            }
+        }
+
+        return $choices;
+    }
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function isTrueFalseChoiceCorrect(int $studentChoice, int $correctChoice, array $options): bool
+    {
+        if (0 >= $studentChoice || 0 >= $correctChoice) {
+            return false;
+        }
+
+        if ($studentChoice === $correctChoice) {
+            return true;
+        }
+
+        $studentPosition = $this->getTrueFalseOptionPosition($studentChoice, $options);
+        $correctPosition = $this->getTrueFalseOptionPosition($correctChoice, $options);
+
+        return 0 < $studentPosition && $studentPosition === $correctPosition;
+    }
+
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function getTrueFalseOptionPosition(int $choice, array $options): int
+    {
+        $option = $options[$choice] ?? null;
+        if ($option instanceof CQuizQuestionOption) {
+            return (int) $option->getPosition();
+        }
+
+        foreach ($options as $candidate) {
+            if (!$candidate instanceof CQuizQuestionOption) {
+                continue;
+            }
+
+            if ((int) $candidate->getPosition() === $choice) {
+                return (int) $candidate->getPosition();
+            }
+        }
+
+        return $choice;
+    }
+
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function getTrueFalseOptionTitle(int $choice, array $options): string
+    {
+        $option = $options[$choice] ?? null;
+        if ($option instanceof CQuizQuestionOption) {
+            return (string) $option->getTitle();
+        }
+
+        foreach ($options as $candidate) {
+            if (!$candidate instanceof CQuizQuestionOption) {
+                continue;
+            }
+
+            if ((int) $candidate->getPosition() === $choice) {
+                return (string) $candidate->getTitle();
+            }
+        }
+
+        return '';
+    }
+
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreFillBlanks(CQuiz $quiz, CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return 0.0;
+        }
+
+        $answer = reset($answers);
+        if (!$answer instanceof CQuizAnswer) {
+            return 0.0;
+        }
+
+        $teacherInfo = $this->parseFillBlankAnswer($answer->getAnswer(), false);
+        $studentInfo = $this->parseFillBlankAnswer($row->getAnswer(), true);
+        $caseInsensitive = 'case:false' === (string) $question->getExtra();
+        $studentScores = [];
+        $score = 0.0;
+        $blankCount = \count($teacherInfo['words']);
+
+        for ($index = 0; $index < $blankCount; ++$index) {
+            $correctAnswer = (string) ($teacherInfo['words'][$index] ?? '');
+            $studentAnswer = (string) ($studentInfo['student_answer'][$index] ?? '');
+            $isCorrect = $this->isFillBlankStudentAnswerGood($studentAnswer, $correctAnswer, $caseInsensitive);
+            $studentScores[$index] = $isCorrect ? '1' : '0';
+            if ($isCorrect) {
+                $score += (float) ($teacherInfo['weighting'][$index] ?? 0.0);
+            }
+        }
+
+        if (self::FILL_IN_BLANKS_COMBINATION === (int) $question->getType()) {
+            $score = $blankCount > 0 && !\in_array('0', $studentScores, true) ? (float) $question->getPonderation() : 0.0;
+        }
+
+        $row->setAnswer($this->rebuildFillBlankStudentAnswer($teacherInfo, $studentInfo['student_answer'], $studentScores));
+
+        return $score;
+    }
+
+    /**
+     * @return array{
+     *     text: string,
+     *     system_string: string,
+     *     words_count: int,
+     *     words: array<int, string>,
+     *     words_with_bracket: array<int, string>,
+     *     weighting: array<int, string>,
+     *     common_words: array<int, string>,
+     *     student_answer: array<int, string>,
+     *     student_score: array<int, string>,
+     *     blank_separator_start: string,
+     *     blank_separator_end: string
+     * }
+     */
+    private function parseFillBlankAnswer(string $answer, bool $isStudentAnswer): array
+    {
+        $parts = [];
+        if (1 === preg_match('/(.*)::(.*)$/s', $answer, $matches)) {
+            $parts = [(string) ($matches[1] ?? ''), (string) ($matches[2] ?? '')];
+        } else {
+            $parts = ['', ''];
+        }
+
+        $systemString = $parts[1];
+        $systemParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($systemParts[0] ?? ''));
+        $weighting = '' !== (string) ($details[0] ?? '') ? explode(',', (string) $details[0]) : [];
+        $separatorNumber = \count($details) >= 3 ? (int) ($details[2] ?? 0) : 0;
+        [$start, $end] = $this->getFillBlankSeparators($separatorNumber);
+        $startPattern = preg_quote($start, '/');
+        $endPattern = preg_quote($end, '/');
+        $wordMatches = [];
+        preg_match_all('/'.$startPattern.'[^'.$endPattern.']*'.$endPattern.'/', $parts[0], $wordMatches);
+        $wordsWithBracket = \is_array($wordMatches[0] ?? null) ? $wordMatches[0] : [];
+        $words = [];
+        foreach ($wordsWithBracket as $word) {
+            $words[] = trim((string) $word, $start.$end);
+        }
+
+        $commonWordsString = preg_replace('/'.$startPattern.'[^'.$endPattern.']*'.$endPattern.'/', '::', $parts[0]);
+        if (!\is_string($commonWordsString)) {
+            $commonWordsString = '';
+        }
+
+        $studentAnswer = [];
+        $studentScore = [];
+        if ($isStudentAnswer) {
+            $baseWords = [];
+            $baseWordsWithBracket = [];
+            $count = \count($words);
+            for ($index = 0; $index < $count; ++$index) {
+                $baseWordsWithBracket[] = $wordsWithBracket[$index] ?? '';
+                $baseWords[] = $words[$index] ?? '';
+                ++$index;
+                $studentAnswer[] = $words[$index] ?? '';
+                ++$index;
+                $studentScore[] = $words[$index] ?? '0';
+            }
+            $words = $baseWords;
+            $wordsWithBracket = $baseWordsWithBracket;
+            $commonWordsString = preg_replace('/::::::/', '::', $commonWordsString) ?: '';
+        }
+
+        return [
+            'text' => $parts[0],
+            'system_string' => $systemString,
+            'words_count' => \count($words),
+            'words' => $words,
+            'words_with_bracket' => $wordsWithBracket,
+            'weighting' => $weighting,
+            'common_words' => explode('::', $commonWordsString),
+            'student_answer' => $studentAnswer,
+            'student_score' => $studentScore,
+            'blank_separator_start' => $start,
+            'blank_separator_end' => $end,
+        ];
+    }
+
+    /**
+     * @param array{
+     *     common_words: array<int, string>,
+     *     words_with_bracket: array<int, string>,
+     *     system_string: string,
+     *     blank_separator_start: string,
+     *     blank_separator_end: string
+     * } $teacherInfo
+     * @param array<int, string> $studentAnswers
+     * @param array<int, string> $studentScores
+     */
+    private function rebuildFillBlankStudentAnswer(array $teacherInfo, array $studentAnswers, array $studentScores): string
+    {
+        $start = (string) $teacherInfo['blank_separator_start'];
+        $end = (string) $teacherInfo['blank_separator_end'];
+        $commonWords = $teacherInfo['common_words'];
+        $result = '';
+        $count = \count($teacherInfo['words_with_bracket']);
+
+        for ($index = 0; $index < $count; ++$index) {
+            $result .= (string) ($commonWords[$index] ?? '');
+            $result .= (string) ($teacherInfo['words_with_bracket'][$index] ?? '');
+            $result .= $start.(string) ($studentAnswers[$index] ?? '').$end;
+            $result .= $start.(string) ($studentScores[$index] ?? '0').$end;
+        }
+
+        $result .= (string) ($commonWords[$count] ?? '');
+        $result .= '::'.(string) $teacherInfo['system_string'];
+
+        return $result;
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    private function isFillBlankStudentAnswerGood(string $studentAnswer, string $correctAnswer, bool $caseInsensitive): bool
+    {
+        $normalizedStudentAnswer = $caseInsensitive ? mb_strtolower($studentAnswer) : $studentAnswer;
+
+        if (false !== strpos($correctAnswer, '|') && false === strpos($correctAnswer, '||')) {
+            $menuAnswers = array_map([$this, 'trimFillBlankOption'], explode('|', $correctAnswer));
+            $firstAnswer = (string) ($menuAnswers[0] ?? '');
+            $normalizedFirstAnswer = $caseInsensitive ? mb_strtolower($firstAnswer) : $firstAnswer;
+
+            return $normalizedStudentAnswer === $normalizedFirstAnswer || $normalizedStudentAnswer === sha1($normalizedFirstAnswer);
+        }
+
+        if (false !== strpos($correctAnswer, '||')) {
+            $answers = array_map([$this, 'trimFillBlankOption'], preg_split('/\|\|/', $correctAnswer) ?: []);
+            foreach ($answers as $answer) {
+                $candidate = $caseInsensitive ? mb_strtolower($answer) : $answer;
+                if ($normalizedStudentAnswer === $candidate) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        $normalizedCorrectAnswer = $caseInsensitive ? mb_strtolower($this->trimFillBlankOption($correctAnswer)) : $this->trimFillBlankOption($correctAnswer);
+
+        return $normalizedStudentAnswer === $normalizedCorrectAnswer;
+    }
+
+    private function trimFillBlankOption(string $value): string
+    {
+        return trim(html_entity_decode($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMatchingAnswer(array $answers, array $rows): float
+    {
+        $choices = $this->getSavedMatchingChoices($rows);
+        $score = 0.0;
+        foreach ($answers as $answer) {
+            if (0 === (int) $answer->getCorrect()) {
+                continue;
+            }
+
+            $answerId = (int) $answer->getIid();
+            if (($choices[$answerId] ?? 0) === (int) $answer->getCorrect()) {
+                $score += $answer->getPonderation();
+            }
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreDraggableAnswer(array $answers, array $rows): float
+    {
+        $positions = $this->getSavedDraggablePositions($rows);
+        $score = 0.0;
+
+        foreach ($answers as $answer) {
+            $correctPosition = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correctPosition) {
+                continue;
+            }
+
+            $answerId = (int) $answer->getIid();
+            if (($positions[$answerId] ?? 0) === $correctPosition) {
+                $score += $answer->getPonderation();
+            }
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreMatchingCombination(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $choices = $this->getSavedMatchingChoices($rows);
+        $optionCount = 0;
+        $correctCount = 0;
+
+        foreach ($answers as $answer) {
+            if (0 === (int) $answer->getCorrect()) {
+                continue;
+            }
+
+            ++$optionCount;
+            $answerId = (int) $answer->getIid();
+            if (($choices[$answerId] ?? 0) === (int) $answer->getCorrect()) {
+                ++$correctCount;
+            }
+        }
+
+        return 0 < $optionCount && $correctCount === $optionCount ? (float) $question->getPonderation() : 0.0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedMatchingChoices(array $rows): array
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $position = $row->getPosition();
+            if (null === $position || 0 >= $position) {
+                continue;
+            }
+
+            $choices[(int) $position] = (int) $row->getAnswer();
+        }
+
+        return $choices;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreHotspotAnswer(array $answers, array $rows, bool $combination, float $questionWeight): float
+    {
+        $points = $this->getSavedHotspotPoints($rows);
+        if ([] === $points) {
+            return 0.0;
+        }
+
+        $matchedAnswerIds = [];
+        $score = 0.0;
+        $scoringZoneCount = 0;
+
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $hotspotType = (string) ($answer->getHotspotType() ?: 'square');
+            if (!\in_array($hotspotType, ['square', 'circle', 'poly'], true)) {
+                continue;
+            }
+
+            if (0.0 < (float) $answer->getPonderation()) {
+                ++$scoringZoneCount;
+            }
+
+            foreach ($points as $point) {
+                $pointAnswerId = (int) ($point['answerId'] ?? 0);
+                if (0 < $pointAnswerId && $pointAnswerId !== $answerId) {
+                    continue;
+                }
+
+                if ($this->isPointInHotspot($point, $hotspotType, (string) $answer->getHotspotCoordinates())) {
+                    $matchedAnswerIds[$answerId] = true;
+                    if (!$combination) {
+                        $score += (float) $answer->getPonderation();
+                    }
+                    break;
+                }
+            }
+        }
+
+        if (!$combination) {
+            return $score;
+        }
+
+        return 0 < $scoringZoneCount && \count($matchedAnswerIds) >= $scoringZoneCount ? $questionWeight : 0.0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, array{x: float, y: float, answerId?: int}>
+     */
+    private function getSavedHotspotPoints(array $rows): array
+    {
+        $points = [];
+        foreach ($rows as $row) {
+            foreach (explode('|', (string) $row->getAnswer()) as $coordinate) {
+                $point = $this->decodeHotspotPoint($coordinate);
+                if (null !== $point) {
+                    $points[] = $point;
+                }
+            }
+        }
+
+        return $points;
+    }
+
+    /**
+     * @return array{x: float, y: float, answerId?: int}|null
+     */
+    private function decodeHotspotPoint(string $coordinate): ?array
+    {
+        $answerId = 0;
+        $coordinateValue = trim($coordinate);
+        if (str_contains($coordinateValue, ':')) {
+            [$answerIdValue, $coordinateValue] = explode(':', $coordinateValue, 2);
+            $answerId = (int) $answerIdValue;
+        }
+
+        $parts = array_map('trim', explode(';', $coordinateValue));
+        if (2 > \count($parts) || !is_numeric($parts[0]) || !is_numeric($parts[1])) {
+            return null;
+        }
+
+        $point = ['x' => (float) $parts[0], 'y' => (float) $parts[1]];
+        if (0 < $answerId) {
+            $point['answerId'] = $answerId;
+        }
+
+        return $point;
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInHotspot(array $point, string $hotspotType, string $coordinates): bool
+    {
+        return match ($hotspotType) {
+            'square' => $this->isPointInSquare($point, $coordinates),
+            'circle' => $this->isPointInEllipse($point, $coordinates),
+            'poly' => $this->isPointInPolygon($point, $coordinates),
+            default => false,
+        };
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInSquare(array $point, string $coordinates): bool
+    {
+        [$origin, $width, $height] = $this->parseBoxCoordinates($coordinates);
+        if (null === $origin) {
+            return false;
+        }
+
+        return $point['x'] >= $origin['x']
+            && $point['x'] <= $origin['x'] + $width
+            && $point['y'] >= $origin['y']
+            && $point['y'] <= $origin['y'] + $height;
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInEllipse(array $point, string $coordinates): bool
+    {
+        [$origin, $width, $height] = $this->parseBoxCoordinates($coordinates);
+        if (null === $origin || 0.0 >= $width || 0.0 >= $height) {
+            return false;
+        }
+
+        $radiusX = $width / 2;
+        $radiusY = $height / 2;
+        $centerX = $origin['x'] + $radiusX;
+        $centerY = $origin['y'] + $radiusY;
+
+        return ((($point['x'] - $centerX) ** 2) / ($radiusX ** 2))
+            + ((($point['y'] - $centerY) ** 2) / ($radiusY ** 2)) <= 1.0;
+    }
+
+    /**
+     * @return array{0: array{x: float, y: float}|null, 1: float, 2: float}
+     */
+    private function parseBoxCoordinates(string $coordinates): array
+    {
+        $parts = explode('|', $coordinates);
+        $origin = $this->decodeHotspotPoint((string) ($parts[0] ?? ''));
+        $width = isset($parts[1]) && is_numeric($parts[1]) ? (float) $parts[1] : 0.0;
+        $height = isset($parts[2]) && is_numeric($parts[2]) ? (float) $parts[2] : 0.0;
+
+        return [$origin, $width, $height];
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInPolygon(array $point, string $coordinates): bool
+    {
+        $vertices = [];
+        foreach (explode('|', $coordinates) as $coordinate) {
+            $decoded = $this->decodeHotspotPoint($coordinate);
+            if (null !== $decoded) {
+                $vertices[] = $decoded;
+            }
+        }
+
+        $count = \count($vertices);
+        if (3 > $count) {
+            return false;
+        }
+
+        $inside = false;
+        for ($i = 0, $j = $count - 1; $i < $count; $j = $i++) {
+            $xi = $vertices[$i]['x'];
+            $yi = $vertices[$i]['y'];
+            $xj = $vertices[$j]['x'];
+            $yj = $vertices[$j]['y'];
+
+            $intersects = (($yi > $point['y']) !== ($yj > $point['y']))
+                && ($point['x'] < ($xj - $xi) * ($point['y'] - $yi) / (($yj - $yi) ?: 0.000001) + $xi);
+            if ($intersects) {
+                $inside = !$inside;
+            }
+        }
+
+        return $inside;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreCalculatedAnswer(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return 0.0;
+        }
+
+        [$answerId, $studentAnswer] = $this->parseCalculatedStudentAnswer((string) $row->getAnswer());
+        $teacherAnswer = 0 < $answerId && isset($answers[$answerId]) ? $answers[$answerId] : reset($answers);
+        if (!$teacherAnswer instanceof CQuizAnswer) {
+            return 0.0;
+        }
+
+        $expectedAnswer = $this->extractCalculatedExpectedAnswer((string) $teacherAnswer->getAnswer());
+        if ('' === $expectedAnswer || '' === $studentAnswer) {
+            return 0.0;
+        }
+
+        return trim($studentAnswer) === trim($expectedAnswer) ? (float) $question->getPonderation() : 0.0;
+    }
+
+    /**
+     * @return array{0: int, 1: string}
+     */
+    private function parseCalculatedStudentAnswer(string $value): array
+    {
+        $parts = explode(':', $value, 2);
+        if (2 === \count($parts)) {
+            return [(int) $parts[0], trim((string) $parts[1])];
+        }
+
+        return [0, trim($value)];
+    }
+
+    private function extractCalculatedExpectedAnswer(string $answer): string
+    {
+        $parts = explode('@@', $answer, 2);
+        $text = (string) ($parts[0] ?? $answer);
+        if (1 === preg_match('/\[([^\[\]]*)\]\s*$/', $text, $matches)) {
+            return trim((string) ($matches[1] ?? ''));
+        }
+
+        return '';
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreManualAnswer(array $rows): float
+    {
+        $row = $rows[0] ?? null;
+
+        return $row instanceof TrackEAttempt ? (float) $row->getMarks() : 0.0;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     */
+    private function getQuestionWeight(CQuizQuestion $question, array $answers): float
+    {
+        $type = (int) $question->getType();
+        if (\in_array($type, [self::MEDIA_QUESTION, self::PAGE_BREAK], true)) {
+            return 0.0;
+        }
+
+        if (self::CALCULATED_ANSWER === $type) {
+            return (float) $question->getPonderation();
+        }
+
+        if (\in_array($type, [self::MULTIPLE_ANSWER_COMBINATION, self::MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE], true)) {
+            $firstAnswer = reset($answers);
+            if ($firstAnswer instanceof CQuizAnswer && 0.0 !== $firstAnswer->getPonderation()) {
+                return $firstAnswer->getPonderation();
+            }
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function getFirstSavedAnswerId(array $rows): int
+    {
+        $row = $rows[0] ?? null;
+
+        return $row instanceof TrackEAttempt ? (int) $row->getAnswer() : 0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedDraggablePositions(array $rows): array
+    {
+        $positions = [];
+        foreach ($rows as $row) {
+            $answerId = (int) $row->getPosition();
+            $selectedPosition = (int) $row->getAnswer();
+            if (0 < $answerId && 0 < $selectedPosition) {
+                $positions[$answerId] = $selectedPosition;
+            }
+        }
+
+        return $positions;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function requiresManualCorrection(CQuizQuestion $question): bool
+    {
+        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::UPLOAD_ANSWER, self::ANNOTATION], true);
+    }
+
+    private function getSavedAnswerIds(array $rows): array
+    {
+        $answerIds = [];
+        foreach ($rows as $row) {
+            $answerId = (int) $row->getAnswer();
+            if (0 < $answerId && !\in_array($answerId, $answerIds, true)) {
+                $answerIds[] = $answerId;
+            }
+        }
+
+        return $answerIds;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function updateQuestionAttemptRows(CQuizQuestion $question, array $rows, float $score): void
+    {
+        foreach ($rows as $row) {
+            $row->setMarks($score);
+            $row->setTms(new DateTime());
+        }
+
+        if ([] === $rows && !$this->requiresManualCorrection($question)) {
+            return;
+        }
+    }
+
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseExcelTemplateService.php b/src/CoreBundle/Service/Exercise/ExerciseExcelTemplateService.php
new file mode 100644
index 00000000000..81964bd6789
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseExcelTemplateService.php
@@ -0,0 +1,149 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Doctrine\ORM\EntityManagerInterface;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * Generates the modern Excel import template used by the exercise import screen.
+ *
+ * The rows match the parser in ExerciseQuestionImportProcessor and replace the
+ * old static quiz template download without changing the
+ * expected import format.
+ */
+final readonly class ExerciseExcelTemplateService
+{
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+    ) {}
+
+    public function downloadTemplate(Request $request): BinaryFileResponse
+    {
+        $this->assertCanDownloadTemplate($request);
+
+        $spreadsheet = $this->createTemplateSpreadsheet();
+        $path = $this->createTemporaryFilePath();
+
+        $writer = new Xlsx($spreadsheet);
+        $writer->save($path);
+        $spreadsheet->disconnectWorksheets();
+
+        $response = new BinaryFileResponse(new File($path));
+        $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'quiz_template.xlsx');
+        $response->deleteFileAfterSend(true);
+
+        return $response;
+    }
+
+    private function assertCanDownloadTemplate(Request $request): void
+    {
+        if (!$this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            && !$this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER')
+        ) {
+            throw new AccessDeniedHttpException('You are not allowed to download the exercise import template in this context.');
+        }
+
+        $course = $this->getCourse($request);
+        $this->getSession($request);
+
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function createTemplateSpreadsheet(): Spreadsheet
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('Quiz');
+
+        $rows = [
+            ['Quiz', 'Imported Excel quiz', ''],
+            ['Question', 'What is PHP?', ''],
+            ['Answer 1', 'A programming language', 'x'],
+            ['Answer 2', 'A database', ''],
+            ['Score', '', '10'],
+            ['FeedbackTrue', 'Correct.', ''],
+            ['FeedbackFalse', 'Incorrect.', ''],
+            ['Category', 'PHP basics', ''],
+            ['QuestionType', '', '1'],
+            ['', '', ''],
+            ['Question', 'Select the web technologies.', ''],
+            ['Answer 1', 'HTML', 'x'],
+            ['Answer 2', 'CSS', 'x'],
+            ['Answer 3', 'SQL', ''],
+            ['Score', '', '10'],
+            ['QuestionType', '', '2'],
+        ];
+
+        foreach ($rows as $index => $row) {
+            $rowNumber = $index + 1;
+            $sheet->setCellValue('A'.$rowNumber, $row[0]);
+            $sheet->setCellValue('B'.$rowNumber, $row[1]);
+            $sheet->setCellValue('C'.$rowNumber, $row[2]);
+        }
+
+        foreach (['A', 'B', 'C'] as $column) {
+            $sheet->getColumnDimension($column)->setAutoSize(true);
+        }
+
+        return $spreadsheet;
+    }
+
+    private function createTemporaryFilePath(): string
+    {
+        $path = tempnam(sys_get_temp_dir(), 'chamilo_exercise_excel_template_');
+        if (false === $path) {
+            throw new BadRequestHttpException('The Excel template file could not be created.');
+        }
+
+        return $path;
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseQti2ExportService.php b/src/CoreBundle/Service/Exercise/ExerciseQti2ExportService.php
new file mode 100644
index 00000000000..97754e0b4dd
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseQti2ExportService.php
@@ -0,0 +1,449 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use DOMDocument;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use ZipArchive;
+
+/**
+ * Modern IMS/QTI 2 exporter for the same exercise-level subset exported by legacy Chamilo.
+ *
+ * The legacy exercise QTI2 action only exported Unique answer, Multiple answer and Free answer
+ * questions through export_question_qti(). Other question types were silently skipped.
+ */
+final readonly class ExerciseQti2ExportService
+{
+    private const UNIQUE_ANSWER = 1;
+    private const MULTIPLE_ANSWER = 2;
+    private const FREE_ANSWER = 5;
+    private const VISIBILITY_PUBLISHED = 2;
+
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+    ) {}
+
+    public function exportExerciseZip(int $exerciseId, Request $request): BinaryFileResponse
+    {
+        $quiz = $this->getValidatedExercise($exerciseId, $request);
+        $xml = $this->buildExerciseXml($quiz);
+        $this->assertXmlCanBeParsed($xml);
+
+        $zipPath = $this->createZipFile();
+        $zip = new ZipArchive();
+        if (true !== $zip->open($zipPath, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
+            throw new BadRequestHttpException('The QTI2 export archive could not be created.');
+        }
+
+        $zip->addFromString(sprintf('qti2export_%d.xml', $exerciseId), $xml);
+        if (!$zip->close()) {
+            throw new BadRequestHttpException('The QTI2 export archive could not be finalized.');
+        }
+
+        $response = new BinaryFileResponse(new File($zipPath));
+        $response->headers->set('Content-Type', 'application/zip');
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, sprintf('qti2_export_%d.zip', $exerciseId));
+        $response->deleteFileAfterSend(true);
+
+        return $response;
+    }
+
+    private function getValidatedExercise(int $exerciseId, Request $request): CQuiz
+    {
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        if (!$this->canExportExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to export this exercise.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+
+        return $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new NotFoundHttpException('The requested exercise was not found in the current course context.');
+        }
+
+        $quiz = null;
+        $visibility = self::VISIBILITY_PUBLISHED;
+        if ($row instanceof CQuiz) {
+            $quiz = $row;
+        } elseif (\is_array($row)) {
+            $candidate = $row[0] ?? $row['quiz'] ?? null;
+            if ($candidate instanceof CQuiz) {
+                $quiz = $candidate;
+            }
+            $visibility = (int) ($row['linkVisibility'] ?? self::VISIBILITY_PUBLISHED);
+        }
+
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canExportExercises()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    private function buildExerciseXml(CQuiz $quiz): string
+    {
+        $exerciseId = (int) $quiz->getIid();
+        $xml = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>'."\n";
+        $xml .= '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n";
+        $xml .= '<questestinterop>'."\n";
+        $xml .= '<section'."\n";
+        $xml .= '            ident = "EXO_'.$exerciseId.'"'."\n";
+        $xml .= '            title = "'.$this->formatDescription($quiz->getTitle()).'"'."\n";
+        $xml .= '        >'."\n";
+        $xml .= $this->exportDuration($quiz);
+        $xml .= $this->exportPresentation($quiz);
+        $xml .= $this->exportOrdering($quiz);
+
+        foreach ($this->getExerciseQuestions($quiz) as $question) {
+            $xml .= $this->exportQuestion($question);
+        }
+
+        $xml .= '</section>'."\n";
+        $xml .= '</questestinterop>'."\n";
+
+        return $xml;
+    }
+
+    private function exportDuration(CQuiz $quiz): string
+    {
+        $duration = (int) ($quiz->getDuration() ?? 0);
+        if (0 >= $duration) {
+            return '';
+        }
+
+        $minutes = (int) floor($duration / 60);
+        $seconds = $duration % 60;
+
+        return '<duration>PT'.$minutes.'M'.$seconds.'S</duration>'."\n";
+    }
+
+    private function exportPresentation(CQuiz $quiz): string
+    {
+        return "<presentation_material><flow_mat><material>\n"
+            .'  <mattext><![CDATA['.$this->formatDescription((string) $quiz->getDescription())."]]></mattext>\n"
+            ."</material></flow_mat></presentation_material>\n";
+    }
+
+    private function exportOrdering(CQuiz $quiz): string
+    {
+        $random = (int) $quiz->getRandom();
+        if (0 < $random) {
+            return '<selection_ordering>'
+                ."  <selection>\n"
+                .'    <selection_number>'.$random."</selection_number>\n"
+                ."  </selection>\n"
+                .'  <order order_type="Random" />'
+                ."\n</selection_ordering>\n";
+        }
+
+        return '<selection_ordering sequence_type="Normal">'."\n"
+            ."  <selection />\n"
+            ."</selection_ordering>\n";
+    }
+
+    /**
+     * @return array<int, CQuizQuestion>
+     */
+    private function getExerciseQuestions(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question', 'answer')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->leftJoin('question.answers', 'answer')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->addOrderBy('question.position', 'ASC')
+            ->addOrderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questions = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$this->isLegacyExportableQuestion($question)) {
+                continue;
+            }
+
+            $questionId = (int) $question->getIid();
+            if (0 < $questionId) {
+                $questions[$questionId] = $question;
+            }
+        }
+
+        return array_values($questions);
+    }
+
+    private function isLegacyExportableQuestion(CQuizQuestion $question): bool
+    {
+        return \in_array((int) $question->getType(), [self::UNIQUE_ANSWER, self::MULTIPLE_ANSWER, self::FREE_ANSWER], true);
+    }
+
+    private function exportQuestion(CQuizQuestion $question): string
+    {
+        $questionIdent = 'QST_'.(int) $question->getIid();
+        $categoryTitle = $this->getQuestionCategoryTitle($question);
+        $xml = '<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p1"'."\n";
+        $xml .= '                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'."\n";
+        $xml .= '                xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p1 imsqti_v2p1.xsd"'."\n";
+        $xml .= '                identifier="'.$questionIdent.'"'."\n";
+        $xml .= '                title = "'.$this->escapeAttribute($this->formatText($question->getQuestion())).'"'."\n";
+        $xml .= '                category = "'.$this->escapeAttribute($this->formatText($categoryTitle)).'"'."\n";
+        $xml .= '        >'."\n";
+        $xml .= $this->exportQuestionResponseDeclaration($question, $questionIdent);
+        $xml .= "  <itemBody>\n";
+        $xml .= $this->exportQuestionResponses($question, $questionIdent);
+        $xml .= "  </itemBody>\n";
+        $xml .= '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>'."\n";
+        $xml .= '</assessmentItem>'."\n";
+
+        return $xml;
+    }
+
+    private function exportQuestionResponseDeclaration(CQuizQuestion $question, string $questionIdent): string
+    {
+        if (self::FREE_ANSWER === (int) $question->getType()) {
+            $xml = '  <responseDeclaration identifier="'.$questionIdent.'" cardinality="single" baseType="string">';
+            $xml .= '<outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float">' .
+                '<defaultValue><value>'.$this->formatScore((float) $question->getPonderation()).'</value></defaultValue></outcomeDeclaration>';
+            $xml .= '  </responseDeclaration>'."\n";
+
+            return $xml;
+        }
+
+        $answers = $this->getSortedAnswers($question);
+        $cardinality = self::MULTIPLE_ANSWER === (int) $question->getType() ? 'multiple' : 'single';
+        $xml = '  <responseDeclaration identifier="'.$questionIdent.'" cardinality="'.$cardinality.'" baseType="identifier">'."\n";
+        $xml .= "    <correctResponse>\n";
+        foreach ($answers as $answer) {
+            if ((int) ($answer->getCorrect() ?? 0) > 0) {
+                $xml .= '      <value>answer_'.(int) $answer->getIid().'</value>'."\n";
+            }
+        }
+        $xml .= "    </correctResponse>\n";
+        $xml .= "    <mapping>\n";
+        foreach ($answers as $answer) {
+            $xml .= ' <mapEntry mapKey="answer_'.(int) $answer->getIid().'" mappedValue="'.$this->formatScore($answer->getPonderation()).'" />'."\n";
+        }
+        $xml .= "    </mapping>\n";
+        $xml .= '  </responseDeclaration>'."\n";
+
+        return $xml;
+    }
+
+    private function exportQuestionResponses(CQuizQuestion $question, string $questionIdent): string
+    {
+        if (self::FREE_ANSWER === (int) $question->getType()) {
+            return '<extendedTextInteraction responseIdentifier="'.$questionIdent.'" >
+            <prompt>
+            '.$this->formatText((string) $question->getDescription()).'
+            </prompt>
+            </extendedTextInteraction>';
+        }
+
+        $xml = '    <choiceInteraction responseIdentifier="'.$questionIdent.'" >'."\n";
+        $xml .= '      <prompt><![CDATA['.$this->escapeCdata($this->formatText($question->getQuestion())).']]></prompt>'."\n";
+        foreach ($this->getSortedAnswers($question) as $answer) {
+            $answerId = (int) $answer->getIid();
+            $xml .= '<simpleChoice identifier="answer_'.$answerId.'" fixed="false">
+                         <![CDATA['.$this->escapeCdata($this->formatText($answer->getAnswer())).']]>';
+            $comment = (string) ($answer->getComment() ?? '');
+            if ('' !== $comment) {
+                $xml .= '<feedbackInline identifier="answer_'.$answerId.'">
+                             <![CDATA['.$this->escapeCdata($this->formatText($comment)).']]>
+                             </feedbackInline>';
+            }
+            $xml .= '</simpleChoice>'."\n";
+        }
+        $xml .= '    </choiceInteraction>'."\n";
+
+        return $xml;
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getSortedAnswers(CQuizQuestion $question): array
+    {
+        $answers = [];
+        foreach ($question->getAnswers() as $answer) {
+            if ($answer instanceof CQuizAnswer) {
+                $answers[] = $answer;
+            }
+        }
+
+        usort(
+            $answers,
+            static fn (CQuizAnswer $left, CQuizAnswer $right): int => $left->getPosition() <=> $right->getPosition()
+        );
+
+        return $answers;
+    }
+
+    private function getQuestionCategoryTitle(CQuizQuestion $question): string
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                return $category->getTitle();
+            }
+        }
+
+        return '';
+    }
+
+    private function assertXmlCanBeParsed(string $xml): void
+    {
+        $document = new DOMDocument('1.0', 'UTF-8');
+        $previous = libxml_use_internal_errors(true);
+        try {
+            if (!$document->loadXML($xml, LIBXML_NONET | LIBXML_NOERROR | LIBXML_NOWARNING)) {
+                throw new BadRequestHttpException('The QTI2 export XML could not be generated.');
+            }
+        } finally {
+            libxml_clear_errors();
+            libxml_use_internal_errors($previous);
+        }
+    }
+
+    private function createZipFile(): string
+    {
+        if (!class_exists(ZipArchive::class)) {
+            throw new BadRequestHttpException('ZIP support is not available on this platform.');
+        }
+
+        $zipPath = tempnam(sys_get_temp_dir(), 'exercise-qti2-');
+        if (false === $zipPath) {
+            throw new BadRequestHttpException('The QTI2 export file could not be created.');
+        }
+
+        return $zipPath;
+    }
+
+    private function canExportExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function formatDescription(string $text): string
+    {
+        return htmlspecialchars(html_entity_decode($text, ENT_QUOTES | ENT_HTML5, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    }
+
+    private function formatText(string $text): string
+    {
+        return htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    }
+
+    private function escapeAttribute(string $text): string
+    {
+        return htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    }
+
+    private function escapeCdata(string $text): string
+    {
+        return str_replace(']]>', ']]]]><![CDATA[>', $text);
+    }
+
+    private function formatScore(float $score): string
+    {
+        $formatted = rtrim(rtrim(sprintf('%.6F', $score), '0'), '.');
+
+        return '' === $formatted ? '0' : $formatted;
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseQti2ImportService.php b/src/CoreBundle/Service/Exercise/ExerciseQti2ImportService.php
new file mode 100644
index 00000000000..91720794146
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseQti2ImportService.php
@@ -0,0 +1,930 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionCategoryRepository;
+use DOMDocument;
+use DOMElement;
+use DOMNode;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use ZipArchive;
+
+/**
+ * Modern IMS/QTI 2 importer for the subset supported by the legacy Chamilo importer.
+ *
+ * This service intentionally ports the legacy parsing rules instead of calling
+ * the legacy importer file.
+ */
+final readonly class ExerciseQti2ImportService
+{
+    private const UNIQUE_ANSWER = 1;
+    private const MULTIPLE_ANSWER = 2;
+    private const FILL_IN_BLANKS = 3;
+    private const FREE_ANSWER = 5;
+
+    /**
+     * @var array<int, string>
+     */
+    private const SUPPORTED_TYPES = [
+        self::UNIQUE_ANSWER => 'Unique answer',
+        self::MULTIPLE_ANSWER => 'Multiple answer',
+        self::FREE_ANSWER => 'Free answer',
+        self::FILL_IN_BLANKS => 'Fill in blanks',
+    ];
+
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private CQuizQuestionCategoryRepository $questionCategoryRepository,
+    ) {}
+
+    /**
+     * @return array{quiz: CQuiz, importedCount: int, skippedCount: int, errors: array<int, string>}
+     */
+    public function import(UploadedFile $uploadedFile, Course $course, ?Session $session): array
+    {
+        if (!$uploadedFile->isValid()) {
+            throw new BadRequestHttpException('The uploaded file is not valid.');
+        }
+
+        $extension = strtolower((string) $uploadedFile->getClientOriginalExtension());
+        if ('zip' !== $extension) {
+            throw new BadRequestHttpException('You must upload a .zip file.');
+        }
+
+        if (!class_exists(ZipArchive::class)) {
+            throw new BadRequestHttpException('ZIP support is not available on this platform.');
+        }
+
+        $package = $this->readQti2Package($uploadedFile);
+        if ([] === $package['questions']) {
+            throw new BadRequestHttpException('No valid QTI2 questions were found in the uploaded file.');
+        }
+
+        $quiz = $this->createExercise(
+            '' !== $package['name'] ? $package['name'] : $this->buildExerciseTitle($uploadedFile),
+            $course,
+            $session,
+            (string) $package['description'],
+            'Random' === $package['orderType'],
+        );
+
+        $result = $this->createQuestions($quiz, $package['questions'], $course, $session);
+        if (0 === $result['importedCount']) {
+            throw new BadRequestHttpException('No valid QTI2 questions were imported.');
+        }
+
+        $this->entityManager->flush();
+
+        return [
+            'quiz' => $quiz,
+            'importedCount' => $result['importedCount'],
+            'skippedCount' => $result['skippedCount'],
+            'errors' => $result['errors'],
+        ];
+    }
+
+    /**
+     * @return array{name: string, description: string, orderType: ?string, questions: array<string, array<string, mixed>>}
+     */
+    private function readQti2Package(UploadedFile $uploadedFile): array
+    {
+        $zip = new ZipArchive();
+        if (true !== $zip->open($uploadedFile->getPathname())) {
+            throw new BadRequestHttpException('The uploaded ZIP file could not be opened.');
+        }
+
+        $package = [
+            'name' => $this->buildExerciseTitle($uploadedFile),
+            'description' => '',
+            'orderType' => null,
+            'questions' => [],
+        ];
+        $fileFound = false;
+
+        try {
+            for ($index = 0; $index < $zip->numFiles; ++$index) {
+                $name = (string) $zip->getNameIndex($index);
+                if ('' === $name || str_ends_with($name, '/')) {
+                    continue;
+                }
+
+                $content = $zip->getFromIndex($index);
+                if (!is_string($content) || '' === trim($content)) {
+                    continue;
+                }
+
+                if (!$this->isQtiQuestionBank($content)) {
+                    continue;
+                }
+
+                $fileFound = true;
+                $this->parseQti2Xml($content, $package);
+            }
+        } finally {
+            $zip->close();
+        }
+
+        if (!$fileFound) {
+            throw new BadRequestHttpException('NoXMLFileFoundInTheZip');
+        }
+
+        return $package;
+    }
+
+    private function buildExerciseTitle(UploadedFile $uploadedFile): string
+    {
+        $baseName = $uploadedFile->getClientOriginalName();
+        $baseName = '' !== $baseName ? $baseName : 'qti2-import.zip';
+        $baseName = preg_replace('/\.zip$/i', '', $baseName) ?? $baseName;
+
+        return trim($baseName) ?: 'QTI2 import';
+    }
+
+    private function isQtiQuestionBank(string $content): bool
+    {
+        return 1 === preg_match('/ims_qtiasiv(\d)p(\d)/', $content);
+    }
+
+    /**
+     * @param array{name: string, description: string, orderType: ?string, questions: array<string, array<string, mixed>>} $package
+     */
+    private function parseQti2Xml(string $content, array &$package): void
+    {
+        $content = $this->stripGivenTags($content, ['p', 'front']);
+        $version = [];
+        $matched = preg_match('/ims_qtiasiv(\d)p(\d)/', $content, $version);
+        $mainVersion = $matched ? (int) $version[1] : 2;
+        if (2 !== $mainVersion) {
+            throw new BadRequestHttpException('Unsupported IMS/QTI version.');
+        }
+
+        $document = new DOMDocument('1.0', 'UTF-8');
+        $previous = libxml_use_internal_errors(true);
+        try {
+            if (!$document->loadXML($content, LIBXML_NONET | LIBXML_NOERROR | LIBXML_NOWARNING)) {
+                throw new BadRequestHttpException('Error opening XML file');
+            }
+        } finally {
+            libxml_clear_errors();
+            libxml_use_internal_errors($previous);
+        }
+
+        $nodes = $document->getElementsByTagName('*');
+        $currentQuestionIdent = '';
+        $currentAnswerId = '';
+        $currentQuestionItemBody = '';
+        $cardinality = '';
+        $currentMatchSet = null;
+        $nonHtmlTagsToAvoid = [
+            'prompt',
+            'simpleChoice',
+            'choiceInteraction',
+            'inlineChoiceInteraction',
+            'inlineChoice',
+            'soMPLEMATCHSET',
+            'simpleAssociableChoice',
+            'textEntryInteraction',
+            'feedbackInline',
+            'matchInteraction',
+            'extendedTextInteraction',
+            'itemBody',
+            'br',
+            'img',
+        ];
+
+        foreach ($nodes as $node) {
+            if (!$node instanceof DOMElement) {
+                continue;
+            }
+
+            $nodeName = $this->localName($node);
+            switch ($nodeName) {
+                case 'assessmentItem':
+                    $currentQuestionIdent = $node->getAttribute('identifier');
+                    if ('' === $currentQuestionIdent) {
+                        $currentQuestionIdent = 'question_'.(count($package['questions']) + 1);
+                    }
+
+                    $package['questions'][$currentQuestionIdent] = [
+                        'answer' => [],
+                        'correct_answers' => [],
+                        'title' => $node->getAttribute('title'),
+                        'category' => $node->getAttribute('category'),
+                        'type' => null,
+                        'subtype' => null,
+                        'description' => null,
+                        'response_text' => null,
+                        'fib_options' => [],
+                        'statement' => '',
+                    ];
+                    $currentMatchSet = null;
+                    break;
+
+                case 'section':
+                    $title = trim($node->getAttribute('title'));
+                    if ('' !== $title) {
+                        $package['name'] = $this->formatPlainText($title);
+                    }
+                    break;
+
+                case 'responseDeclaration':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+
+                    $currentAnswerId = $node->getAttribute('identifier');
+                    $cardinality = $node->getAttribute('cardinality');
+
+                    if (str_starts_with($currentAnswerId, 'fill_')) {
+                        $package['questions'][$currentQuestionIdent]['type'] = self::FILL_IN_BLANKS;
+                        $package['questions'][$currentQuestionIdent]['subtype'] = 'TEXTFIELD_FILL';
+                        break;
+                    }
+
+                    if ('multiple' === $cardinality) {
+                        $package['questions'][$currentQuestionIdent]['type'] = self::MULTIPLE_ANSWER;
+                    } elseif ('single' === $cardinality) {
+                        $package['questions'][$currentQuestionIdent]['type'] = self::UNIQUE_ANSWER;
+                    }
+                    break;
+
+                case 'inlineChoiceInteraction':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $package['questions'][$currentQuestionIdent]['type'] = self::FILL_IN_BLANKS;
+                    $package['questions'][$currentQuestionIdent]['subtype'] = 'LISTBOX_FILL';
+                    $currentAnswerId = $node->getAttribute('responseIdentifier');
+                    break;
+
+                case 'inlineChoice':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+
+                    $parent = $node->parentNode;
+                    if (!$parent instanceof DOMElement || 'inlineChoiceInteraction' !== $this->localName($parent)) {
+                        break;
+                    }
+
+                    $responseId = $parent->getAttribute('responseIdentifier');
+                    if ('' === $responseId) {
+                        break;
+                    }
+
+                    $correctChoiceId = $package['questions'][$currentQuestionIdent]['correct_answers'][$responseId] ?? null;
+                    $choiceId = $node->getAttribute('identifier');
+                    $choiceText = trim($node->textContent);
+
+                    if (!isset($package['questions'][$currentQuestionIdent]['fib_options'][$responseId])) {
+                        $package['questions'][$currentQuestionIdent]['fib_options'][$responseId] = [
+                            'correct' => null,
+                            'wrongs' => [],
+                        ];
+                    }
+
+                    if (null !== $correctChoiceId && $choiceId === $correctChoiceId) {
+                        $package['questions'][$currentQuestionIdent]['fib_options'][$responseId]['correct'] = $choiceText;
+                    } else {
+                        $package['questions'][$currentQuestionIdent]['fib_options'][$responseId]['wrongs'][] = $choiceText;
+                    }
+                    break;
+
+                case 'textEntryInteraction':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $package['questions'][$currentQuestionIdent]['type'] = self::FILL_IN_BLANKS;
+                    $package['questions'][$currentQuestionIdent]['subtype'] = 'TEXTFIELD_FILL';
+                    $package['questions'][$currentQuestionIdent]['response_text'] = $currentQuestionItemBody;
+                    break;
+
+                case 'matchInteraction':
+                    if ($this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        // The legacy importer detected matching but did not save it in the supported list.
+                        $package['questions'][$currentQuestionIdent]['type'] = 4;
+                    }
+                    break;
+
+                case 'extendedTextInteraction':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $package['questions'][$currentQuestionIdent]['type'] = self::FREE_ANSWER;
+                    $package['questions'][$currentQuestionIdent]['description'] = trim($node->textContent);
+                    break;
+
+                case 'simpleMatchSet':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $currentMatchSet = null === $currentMatchSet ? 1 : $currentMatchSet + 1;
+                    $package['questions'][$currentQuestionIdent]['answer'][$currentMatchSet] = [];
+                    break;
+
+                case 'simpleAssociableChoice':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent) || null === $currentMatchSet) {
+                        break;
+                    }
+                    $choiceId = $node->getAttribute('identifier');
+                    $package['questions'][$currentQuestionIdent]['answer'][$currentMatchSet][$choiceId] = trim($node->textContent);
+                    break;
+
+                case 'simpleChoice':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $currentAnswerId = $node->getAttribute('identifier');
+                    if ('' === $currentAnswerId) {
+                        break;
+                    }
+                    $simpleChoiceValue = $this->extractSimpleChoiceText($node);
+                    $package['questions'][$currentQuestionIdent]['answer'][$currentAnswerId]['value'] = ($package['questions'][$currentQuestionIdent]['answer'][$currentAnswerId]['value'] ?? '').$simpleChoiceValue;
+                    break;
+
+                case 'mapEntry':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $parentName = $this->localName($node->parentNode);
+                    if ('mapping' === $parentName || 'mapEntry' === $parentName) {
+                        $answerId = $node->getAttribute('mapKey');
+                        if ('' !== $answerId) {
+                            $package['questions'][$currentQuestionIdent]['weighting'][$answerId] = $node->getAttribute('mappedValue');
+                        }
+                    }
+                    break;
+
+                case 'mapping':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $defaultValue = $node->getAttribute('defaultValue');
+                    if ('' !== $defaultValue) {
+                        $package['questions'][$currentQuestionIdent]['default_weighting'] = $defaultValue;
+                    }
+                    break;
+
+                case 'itemBody':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $currentQuestionItemBody = $this->buildItemBodyText($node, $nonHtmlTagsToAvoid);
+                    $questionType = (int) ($package['questions'][$currentQuestionIdent]['type'] ?? 0);
+
+                    if (self::FILL_IN_BLANKS === $questionType) {
+                        $candidate = (string) $currentQuestionItemBody;
+                        $hasPlaceholders = false !== strpos($candidate, '**claroline_start**');
+                        $hasRealContent = '' !== trim(strip_tags($candidate));
+                        if ($hasPlaceholders || $hasRealContent) {
+                            $package['questions'][$currentQuestionIdent]['response_text'] = $candidate;
+                        }
+                    } elseif (self::FREE_ANSWER === $questionType) {
+                        $candidate = trim($currentQuestionItemBody);
+                        if ('' !== $candidate) {
+                            $package['questions'][$currentQuestionIdent]['description'] = $candidate;
+                        }
+                    } else {
+                        $package['questions'][$currentQuestionIdent]['statement'] = $currentQuestionItemBody;
+                    }
+                    break;
+
+                case 'order':
+                    $orderType = $node->getAttribute('order_type');
+                    if ('' !== $orderType) {
+                        $package['orderType'] = $orderType;
+                    }
+                    break;
+
+                case 'feedbackInline':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent) || '' === $currentAnswerId) {
+                        break;
+                    }
+                    $package['questions'][$currentQuestionIdent]['answer'][$currentAnswerId]['feedback'] = ($package['questions'][$currentQuestionIdent]['answer'][$currentAnswerId]['feedback'] ?? '').trim($node->textContent);
+                    break;
+
+                case 'value':
+                    if (!$this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        break;
+                    }
+                    $parentName = $this->localName($node->parentNode);
+                    if ('correctResponse' === $parentName) {
+                        $nodeValue = trim($node->textContent);
+                        if ('' !== $currentAnswerId && str_starts_with($currentAnswerId, 'fill_')) {
+                            $package['questions'][$currentQuestionIdent]['type'] = self::FILL_IN_BLANKS;
+                            $package['questions'][$currentQuestionIdent]['subtype'] = $package['questions'][$currentQuestionIdent]['subtype'] ?? 'TEXTFIELD_FILL';
+                            $package['questions'][$currentQuestionIdent]['correct_answers'][$currentAnswerId] = $nodeValue;
+                            if (empty($package['questions'][$currentQuestionIdent]['response_text'])) {
+                                $package['questions'][$currentQuestionIdent]['response_text'] = $nodeValue;
+                            }
+                        } elseif ('single' === $cardinality) {
+                            $package['questions'][$currentQuestionIdent]['correct_answers'][$nodeValue] = $nodeValue;
+                        } else {
+                            $package['questions'][$currentQuestionIdent]['correct_answers'][] = $nodeValue;
+                        }
+                    }
+
+                    $grandParentName = $this->localName($node->parentNode?->parentNode);
+                    if ('outcomeDeclaration' === $grandParentName) {
+                        $nodeValue = trim($node->textContent);
+                        if ('' !== $nodeValue) {
+                            $package['questions'][$currentQuestionIdent]['weighting'][0] = $nodeValue;
+                        }
+                    }
+                    break;
+
+                case 'mattext':
+                    $nodeValue = trim($node->textContent);
+                    if ('' !== $nodeValue) {
+                        $package['description'] = $nodeValue;
+                    }
+                    break;
+
+                case 'prompt':
+                    if ($this->hasCurrentQuestion($package, $currentQuestionIdent)) {
+                        $description = $this->sanitizePrompt(trim($node->textContent));
+                        if ('' !== $description) {
+                            $package['questions'][$currentQuestionIdent]['description'] = $description;
+                        }
+                    }
+                    break;
+            }
+        }
+
+        $this->postProcessFibQuestions($package['questions']);
+    }
+
+    /**
+     * @param array{name: string, description: string, orderType: ?string, questions: array<string, array<string, mixed>>} $package
+     */
+    private function hasCurrentQuestion(array $package, string $currentQuestionIdent): bool
+    {
+        return '' !== $currentQuestionIdent && isset($package['questions'][$currentQuestionIdent]);
+    }
+
+    /**
+     * @param array<int, string> $tags
+     */
+    private function stripGivenTags(string $content, array $tags): string
+    {
+        foreach ($tags as $tag) {
+            $content = preg_replace(sprintf('#</?%s(?:\s[^>]*)?>#i', preg_quote($tag, '#')), '', $content) ?? $content;
+        }
+
+        return $content;
+    }
+
+    private function localName(?DOMNode $node): string
+    {
+        if (!$node instanceof DOMNode) {
+            return '';
+        }
+
+        return $node->localName ?: $node->nodeName;
+    }
+
+    private function extractSimpleChoiceText(DOMElement $node): string
+    {
+        $value = '';
+        foreach ($node->childNodes as $childNode) {
+            if ($childNode instanceof DOMElement && 'feedbackInline' === $this->localName($childNode)) {
+                continue;
+            }
+            $value .= $childNode->textContent;
+        }
+
+        return trim($value);
+    }
+
+    /**
+     * @param array<int, string> $nonHtmlTagsToAvoid
+     */
+    private function buildItemBodyText(DOMElement $node, array $nonHtmlTagsToAvoid): string
+    {
+        $content = '';
+        foreach ($node->childNodes as $childNode) {
+            if ('#text' === $childNode->nodeName) {
+                continue;
+            }
+
+            $childName = $this->localName($childNode);
+            if (!$childNode instanceof DOMElement) {
+                continue;
+            }
+
+            if (!in_array($childName, $nonHtmlTagsToAvoid, true)) {
+                $content .= '<'.$childName;
+                foreach ($childNode->attributes ?? [] as $attribute) {
+                    $content .= ' '.$attribute->nodeName.'="'.htmlspecialchars($attribute->nodeValue, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8').'"';
+                }
+                $content .= '>'.$childNode->textContent.'</'.$childName.'>';
+                continue;
+            }
+
+            if ('inlineChoiceInteraction' === $childName || 'textEntryInteraction' === $childName) {
+                $responseId = $childNode->getAttribute('responseIdentifier');
+                $content .= '**claroline_start**'.$responseId.'**claroline_end**';
+                continue;
+            }
+
+            if ('br' === $childName) {
+                $content .= '<br>';
+            }
+        }
+
+        $firstChild = $node->firstChild;
+        if ($firstChild instanceof DOMNode && '#text' === $firstChild->nodeName) {
+            $firstText = trim($firstChild->nodeValue ?? '');
+            if ('' !== $firstText) {
+                $content .= $firstText;
+            }
+        }
+
+        return $content;
+    }
+
+    private function sanitizePrompt(string $text): string
+    {
+        $text = html_entity_decode($text, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+        $text = preg_replace('#<\s*(script|style)[^>]*>.*?<\s*/\s*\1\s*>#is', '', $text) ?? $text;
+        $text = preg_replace('/\son[a-z]+\s*=\s*("[^"]*"|\'[^\']*\'|[^\s>]+)/i', '', $text) ?? $text;
+
+        return trim($text);
+    }
+
+    /**
+     * @param array<string, array<string, mixed>> $questions
+     */
+    private function postProcessFibQuestions(array &$questions): void
+    {
+        foreach ($questions as &$question) {
+            if ((int) ($question['type'] ?? 0) !== self::FILL_IN_BLANKS) {
+                continue;
+            }
+
+            $text = (string) ($question['response_text'] ?? '');
+            if ('' === $text) {
+                continue;
+            }
+
+            $subtype = $question['subtype'] ?? null;
+            if ('LISTBOX_FILL' === $subtype) {
+                $options = is_array($question['fib_options'] ?? null) ? $question['fib_options'] : [];
+                foreach ($options as $responseId => $data) {
+                    $correct = (string) ($data['correct'] ?? '');
+                    $wrongs = is_array($data['wrongs'] ?? null) ? $data['wrongs'] : [];
+                    $final = [];
+                    if ('' !== $correct) {
+                        $final[] = $correct;
+                    }
+                    foreach ($wrongs as $wrong) {
+                        $wrong = trim((string) $wrong);
+                        if ('' === $wrong || $wrong === $correct) {
+                            continue;
+                        }
+                        $final[] = $wrong;
+                    }
+                    $text = str_replace('**claroline_start**'.$responseId.'**claroline_end**', '['.implode('|', $final).']', $text);
+                }
+            } else {
+                $corrects = is_array($question['correct_answers'] ?? null) ? $question['correct_answers'] : [];
+                foreach ($corrects as $responseId => $answerValue) {
+                    if (!str_starts_with((string) $responseId, 'fill_')) {
+                        continue;
+                    }
+                    $text = str_replace('**claroline_start**'.$responseId.'**claroline_end**', '['.trim((string) $answerValue).']', $text);
+                }
+            }
+
+            $question['response_text'] = preg_replace('/\*\*claroline_start\*\*fill_[^*]+\*\*claroline_end\*\*/', '[]', $text) ?? $text;
+        }
+        unset($question);
+    }
+
+    private function createExercise(string $title, Course $course, ?Session $session, string $description, bool $randomQuestions): CQuiz
+    {
+        $quiz = new CQuiz();
+        $quiz
+            ->setTitle($this->formatPlainText($title))
+            ->setDescription('' !== trim($description) ? $this->formatPlainText(strip_tags($description)) : '')
+            ->setType(CQuiz::ONE_PER_PAGE)
+            ->setRandom($randomQuestions ? -1 : 0)
+            ->setRandomAnswers(false)
+            ->setResultsDisabled(0)
+            ->setMaxAttempt(1)
+            ->setFeedbackType(0)
+            ->setExpiredTime(0)
+            ->setPropagateNeg(0)
+            ->setSaveCorrectAnswers(0)
+            ->setReviewAnswers(0)
+            ->setRandomByCategory(0)
+            ->setDisplayCategoryName(0)
+            ->setPassPercentage(0)
+            ->setPreventBackwards(0)
+            ->setHideQuestionTitle(false)
+            ->setHideQuestionNumber(0)
+            ->setShowPreviousButton(true)
+            ->setNotifications('')
+            ->setAutoLaunch(false)
+            ->setHideAttemptsTable(false)
+            ->setPageResultConfiguration([])
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        if ($randomQuestions) {
+            $quiz->setQuestionSelectionType(2);
+        }
+
+        $this->entityManager->persist($quiz);
+
+        return $quiz;
+    }
+
+    /**
+     * @param array<string, array<string, mixed>> $questions
+     *
+     * @return array{importedCount: int, skippedCount: int, errors: array<int, string>}
+     */
+    private function createQuestions(CQuiz $quiz, array $questions, Course $course, ?Session $session): array
+    {
+        $importedCount = 0;
+        $skippedCount = 0;
+        $errors = [];
+        $questionOrder = 1;
+
+        foreach ($questions as $identifier => $questionData) {
+            $questionType = (int) ($questionData['type'] ?? 0);
+            if (!isset(self::SUPPORTED_TYPES[$questionType])) {
+                ++$skippedCount;
+                continue;
+            }
+
+            $title = $this->formatPlainText(strip_tags((string) ($questionData['title'] ?? '')));
+            if ('' === $title) {
+                ++$skippedCount;
+                $errors[] = sprintf('QTI question %s skipped because it has no title.', (string) $identifier);
+                continue;
+            }
+
+            $description = (string) ($questionData['description'] ?? '');
+            $question = $this->createQuestion($quiz, $course, $session, $title, $description, $questionType, 0.0, $questionOrder);
+            $category = $this->findOrCreateQuestionCategory((string) ($questionData['category'] ?? ''), $course, $session);
+            if ($category instanceof CQuizQuestionCategory) {
+                $question->updateCategory($category);
+            }
+
+            if (self::FILL_IN_BLANKS === $questionType) {
+                [$answerString, $totalWeight] = $this->buildFibAnswerString($questionData);
+                $question->setPonderation($totalWeight);
+                $this->createSingleAnswer($question, $answerString, 0, '', $totalWeight, 1);
+            } elseif (self::FREE_ANSWER === $questionType) {
+                $question->setPonderation($this->scoreFromValue($questionData['weighting'][0] ?? 0));
+            } else {
+                $this->createChoiceAnswers($question, $questionData);
+            }
+
+            ++$importedCount;
+            ++$questionOrder;
+        }
+
+        return [
+            'importedCount' => $importedCount,
+            'skippedCount' => $skippedCount,
+            'errors' => $errors,
+        ];
+    }
+
+    private function createQuestion(
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        string $title,
+        string $description,
+        int $type,
+        float $ponderation,
+        int $questionOrder,
+    ): CQuizQuestion {
+        $question = new CQuizQuestion();
+        $question
+            ->setQuestion($title)
+            ->setDescription($description)
+            ->setFeedback('')
+            ->setExtra(null)
+            ->setType($type)
+            ->setLevel(0)
+            ->setPosition($questionOrder)
+            ->setPonderation($ponderation)
+            ->setMandatory(0)
+            ->setDuration(null)
+            ->setParentMediaId(null)
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+        $this->entityManager->persist($question);
+
+        $relation = new CQuizRelQuestion();
+        $relation
+            ->setQuiz($quiz)
+            ->setQuestion($question)
+            ->setQuestionOrder($questionOrder)
+        ;
+        $this->entityManager->persist($relation);
+
+        return $question;
+    }
+
+    /**
+     * @param array<string, mixed> $questionData
+     */
+    private function createChoiceAnswers(CQuizQuestion $question, array $questionData): void
+    {
+        $answerList = is_array($questionData['answer'] ?? null) ? $questionData['answer'] : [];
+        $correctAnswersRaw = is_array($questionData['correct_answers'] ?? null) ? $questionData['correct_answers'] : [];
+        $correctAnswerIds = array_values($correctAnswersRaw);
+        $defaultWeight = $this->scoreFromValue($questionData['default_weighting'] ?? 0);
+        $totalCorrectWeight = 0.0;
+        $position = 1;
+
+        foreach ($answerList as $key => $answerData) {
+            $answerData = is_array($answerData) ? $answerData : [];
+            $answerValue = $this->formatHtml((string) ($answerData['value'] ?? ''));
+            $answerFeedback = $this->formatHtml((string) ($answerData['feedback'] ?? ''));
+            $isCorrect = in_array((string) $key, array_map('strval', $correctAnswerIds), true);
+            $weight = $defaultWeight;
+            if (isset($questionData['weighting']) && is_array($questionData['weighting']) && array_key_exists((string) $key, $questionData['weighting'])) {
+                $weight = $this->scoreFromValue($questionData['weighting'][(string) $key]);
+            }
+
+            $this->createSingleAnswer($question, $answerValue, $isCorrect ? 1 : 0, $answerFeedback, $weight, $position);
+            if ($isCorrect) {
+                $totalCorrectWeight += $weight;
+            }
+            ++$position;
+        }
+
+        $question->setPonderation($totalCorrectWeight);
+    }
+
+    private function createSingleAnswer(CQuizQuestion $question, string $answerText, int $correct, string $comment, float $weight, int $position): void
+    {
+        $answer = new CQuizAnswer();
+        $answer
+            ->setQuestion($question)
+            ->setAnswer($answerText)
+            ->setCorrect($correct)
+            ->setComment($comment)
+            ->setPonderation($weight)
+            ->setPosition($position)
+        ;
+        $this->entityManager->persist($answer);
+    }
+
+    /**
+     * @param array<string, mixed> $questionData
+     *
+     * @return array{0: string, 1: float}
+     */
+    private function buildFibAnswerString(array $questionData): array
+    {
+        $text = trim((string) ($questionData['response_text'] ?? ''));
+        $looksEmptyOrWrong = '' === $text
+            || (false === strpos($text, '[') && false === strpos($text, '::') && false === strpos($text, '**claroline_start**'));
+
+        if ($looksEmptyOrWrong && isset($questionData['correct_answers']) && is_array($questionData['correct_answers'])) {
+            foreach ($questionData['correct_answers'] as $key => $value) {
+                if (str_starts_with((string) $key, 'fill_')) {
+                    $text = trim((string) $value);
+                    break;
+                }
+            }
+        }
+
+        $text = str_replace("\xc2\xa0", ' ', $this->formatHtml($text));
+        $text = trim($text);
+
+        $existing = $this->parseExistingFibMeta($text);
+        if (null !== $existing) {
+            return $existing;
+        }
+
+        $text = str_replace('::', '', $text);
+        $text = str_replace("\xc2\xa0", ' ', $text);
+        $weightsMap = is_array($questionData['weighting'] ?? null) ? $questionData['weighting'] : [];
+        preg_match_all('/\[[^\]]*\]/', $text, $matches);
+        $weights = [];
+        $sizes = [];
+        $total = 0.0;
+
+        foreach ($matches[0] ?? [] as $blankRaw) {
+            $inside = trim((string) $blankRaw, '[]');
+            $correct = $inside;
+            if (false !== strpos($correct, '||')) {
+                $parts = explode('||', $correct);
+                $correct = $parts[0] ?? $correct;
+            } elseif (false !== strpos($correct, '|')) {
+                $parts = explode('|', $correct);
+                $correct = $parts[0] ?? $correct;
+            }
+            $correct = trim((string) $correct);
+            $weight = 1.0;
+            if ('' !== $correct && array_key_exists($correct, $weightsMap)) {
+                $weight = $this->scoreFromValue($weightsMap[$correct]);
+            }
+            $weights[] = $weight;
+            $sizes[] = 200;
+            $total += $weight;
+        }
+
+        if ([] !== $weights) {
+            $text .= '::'.implode(',', $weights).':'.implode(',', $sizes);
+        }
+
+        $text .= ':0@0';
+
+        return [$text, $total];
+    }
+
+    /**
+     * @return array{0: string, 1: float}|null
+     */
+    private function parseExistingFibMeta(string $text): ?array
+    {
+        $position = strrpos(trim($text), '::');
+        if (false === $position) {
+            return null;
+        }
+
+        $tail = substr($text, $position + 2);
+        if (1 === preg_match('/^([0-9]+(?:\.[0-9]+)?(?:,[0-9]+(?:\.[0-9]+)?)*)\:([0-9]+(?:,[0-9]+)*)\:(\d+)@(\d+)$/', $tail, $matches)) {
+            $weights = array_map('floatval', explode(',', $matches[1]));
+
+            return [$text, array_sum($weights)];
+        }
+
+        if (1 === preg_match('/^([0-9]+(?:\.[0-9]+)?(?:,[0-9]+(?:\.[0-9]+)?)*)\:([0-9]+(?:,[0-9]+)*)\:(\d+)@$/', $tail, $matches)) {
+            $weights = array_map('floatval', explode(',', $matches[1]));
+
+            return [$text.'0', array_sum($weights)];
+        }
+
+        return null;
+    }
+
+    private function scoreFromValue(mixed $value): float
+    {
+        $value = str_replace(',', '.', trim((string) $value));
+        if ('' === $value || !is_numeric($value)) {
+            return 0.0;
+        }
+
+        return (float) $value;
+    }
+
+    private function formatPlainText(string $text): string
+    {
+        return trim(html_entity_decode($text, ENT_QUOTES | ENT_HTML5, 'UTF-8'));
+    }
+
+    private function formatHtml(string $text): string
+    {
+        return html_entity_decode($text, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+    }
+
+    private function findOrCreateQuestionCategory(string $categoryTitle, Course $course, ?Session $session): ?CQuizQuestionCategory
+    {
+        $categoryTitle = $this->formatPlainText(strip_tags($categoryTitle));
+        if ('' === $categoryTitle) {
+            return null;
+        }
+
+        $existingCategory = $this->questionCategoryRepository->findCourseResourceByTitle($categoryTitle, $course->getResourceNode(), $course);
+        if ($existingCategory instanceof CQuizQuestionCategory) {
+            return $existingCategory;
+        }
+
+        $category = new CQuizQuestionCategory();
+        $category
+            ->setTitle($categoryTitle)
+            ->setDescription('')
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+        $this->questionCategoryRepository->create($category);
+
+        return $category;
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseQuestionReportPdfService.php b/src/CoreBundle/Service/Exercise/ExerciseQuestionReportPdfService.php
new file mode 100644
index 00000000000..91d7c4143b1
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseQuestionReportPdfService.php
@@ -0,0 +1,227 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use ApiPlatform\Metadata\Get;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionStats;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseReportByQuestion;
+use Chamilo\CoreBundle\State\Exercise\ExerciseQuestionStatsProvider;
+use Chamilo\CoreBundle\State\Exercise\ExerciseReportByQuestionProvider;
+use Mpdf\Mpdf;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+final readonly class ExerciseQuestionReportPdfService
+{
+    public function __construct(
+        private ExerciseReportByQuestionProvider $reportByQuestionProvider,
+        private ExerciseQuestionStatsProvider $questionStatsProvider,
+    ) {}
+
+    public function exportReportByQuestionPdf(int $exerciseId): Response
+    {
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $report = $this->reportByQuestionProvider->provide(new Get(), ['exerciseId' => $exerciseId]);
+        if (!$report instanceof ExerciseReportByQuestion) {
+            throw new NotFoundHttpException('The requested report by question was not found.');
+        }
+
+        return $this->createPdfResponse(
+            $this->renderReportByQuestionHtml($report),
+            sprintf('exercise_%d_report_by_question.pdf', $exerciseId),
+            $this->text($report->title) ?: 'Report by question'
+        );
+    }
+
+    public function exportQuestionStatsPdf(int $exerciseId): Response
+    {
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $stats = $this->questionStatsProvider->provide(new Get(), ['exerciseId' => $exerciseId]);
+        if (!$stats instanceof ExerciseQuestionStats) {
+            throw new NotFoundHttpException('The requested question statistics were not found.');
+        }
+
+        return $this->createPdfResponse(
+            $this->renderQuestionStatsHtml($stats),
+            sprintf('exercise_%d_question_statistics.pdf', $exerciseId),
+            $this->text($stats->title) ?: 'Question statistics'
+        );
+    }
+
+    private function createPdfResponse(string $html, string $fileName, string $title): Response
+    {
+        $pdf = new Mpdf([
+            'format' => 'A4',
+            'mode' => 'utf-8',
+            'tempDir' => sys_get_temp_dir(),
+        ]);
+        $pdf->SetTitle($title);
+        $pdf->WriteHTML($html);
+
+        $response = new Response($pdf->Output('', 'S'));
+        $response->headers->set('Content-Type', 'application/pdf');
+        $response->headers->set(
+            'Content-Disposition',
+            $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $fileName)
+        );
+
+        return $response;
+    }
+
+    private function renderReportByQuestionHtml(ExerciseReportByQuestion $report): string
+    {
+        $summary = $report->summary;
+        $html = '<html><head><meta charset="UTF-8"><style>'.$this->getCss().'</style></head><body>';
+        $html .= '<h1>'.$this->escape($report->title ?: 'Report by question').'</h1>';
+        if ('' !== $this->text($report->description)) {
+            $html .= '<div class="description">'.$this->escape($report->description).'</div>';
+        }
+
+        $html .= '<table class="summary"><tbody>';
+        $html .= $this->summaryRow('Questions', (string) ($summary['totalQuestions'] ?? 0));
+        $html .= $this->summaryRow('Configured answers', (string) ($summary['totalAnswers'] ?? 0));
+        $html .= $this->summaryRow('Selections', (string) ($summary['totalSelections'] ?? 0));
+        $html .= '</tbody></table>';
+
+        foreach ($report->questions as $question) {
+            $html .= '<div class="question">';
+            $html .= '<h2>'.$this->escape($this->text($question['title'] ?? 'Question')).'</h2>';
+            $html .= '<div class="muted">#'.(int) ($question['questionId'] ?? 0).' · '.$this->escape($this->text($question['typeLabel'] ?? 'Question')).' · Score: '.$this->formatNumber($question['maxScore'] ?? 0).'</div>';
+
+            if (!empty($question['usesSpecialCounting']) && empty($question['countingAvailable'])) {
+                $html .= '<div class="notice">Detailed answer counting for this question type is not available in the migrated report yet.</div>';
+            }
+
+            $html .= '<table><thead><tr>';
+            $html .= '<th>Answer</th><th>Correct</th><th>Selected</th><th>Selection %</th>';
+            $html .= '</tr></thead><tbody>';
+
+            foreach (($question['answers'] ?? []) as $answer) {
+                $selectedCount = $answer['selectedCount'] ?? null;
+                $selectedPercentage = $answer['selectedPercentage'] ?? null;
+                $html .= '<tr>';
+                $html .= '<td>'.$this->escape($this->text($answer['answer'] ?? '-')).'<br><span class="muted">#'.$this->escape($answer['answerId'] ?? 0).' · Score: '.$this->formatNumber($answer['score'] ?? 0).'</span></td>';
+                $html .= '<td>'.(!empty($question['usesSpecialCounting']) ? '—' : (!empty($answer['correct']) ? 'Yes' : 'No')).'</td>';
+                $html .= '<td>'.(null === $selectedCount ? '—' : (string) (int) $selectedCount).'</td>';
+                $html .= '<td>'.(null === $selectedCount ? '—' : $this->formatNumber($selectedPercentage).' %').'</td>';
+                $html .= '</tr>';
+            }
+
+            if ([] === ($question['answers'] ?? [])) {
+                $html .= '<tr><td colspan="4">No answer distribution found</td></tr>';
+            }
+
+            $html .= '</tbody></table>';
+            $html .= '</div>';
+        }
+
+        if ([] === $report->questions) {
+            $html .= '<div class="notice">No report by question data found.</div>';
+        }
+
+        $html .= '</body></html>';
+
+        return $html;
+    }
+
+    private function renderQuestionStatsHtml(ExerciseQuestionStats $stats): string
+    {
+        $summary = $stats->summary;
+        $html = '<html><head><meta charset="UTF-8"><style>'.$this->getCss().'</style></head><body>';
+        $html .= '<h1>'.$this->escape($stats->title ?: 'Question statistics').'</h1>';
+        if ('' !== $this->text($stats->description)) {
+            $html .= '<div class="description">'.$this->escape($stats->description).'</div>';
+        }
+
+        $html .= '<table class="summary"><tbody>';
+        $html .= $this->summaryRow('Questions', (string) ($summary['totalQuestions'] ?? 0));
+        $html .= $this->summaryRow('Answered', (string) ($summary['totalAnswered'] ?? 0));
+        $html .= $this->summaryRow('Wrong answers', (string) ($summary['totalWrong'] ?? 0));
+        $html .= $this->summaryRow('Wrong %', $this->formatNumber($summary['wrongPercentage'] ?? 0).' %');
+        $html .= '</tbody></table>';
+
+        $html .= '<table><thead><tr>';
+        $html .= '<th>Question</th><th>Question type</th><th>Answered</th><th>Lowest</th><th>Average</th><th>Highest</th><th>Score</th><th>Wrong / Total</th><th>%</th>';
+        $html .= '</tr></thead><tbody>';
+
+        foreach ($stats->questions as $question) {
+            $html .= '<tr>';
+            $html .= '<td>'.$this->escape($this->text($question['title'] ?? '-')).'<br><span class="muted">#'.(int) ($question['questionId'] ?? 0).'</span></td>';
+            $html .= '<td>'.$this->escape($this->text($question['typeLabel'] ?? 'Question')).'</td>';
+            $html .= '<td>'.(int) ($question['answeredAttempts'] ?? 0).'</td>';
+            $html .= '<td>'.$this->formatNumber($question['lowestScore'] ?? 0).'</td>';
+            $html .= '<td>'.$this->formatNumber($question['averageScore'] ?? 0).'</td>';
+            $html .= '<td>'.$this->formatNumber($question['highestScore'] ?? 0).'</td>';
+            $html .= '<td>'.$this->formatNumber($question['maxScore'] ?? 0).'</td>';
+            $html .= '<td>'.(int) ($question['wrongAttempts'] ?? 0).' / '.(int) ($question['answeredAttempts'] ?? 0).'</td>';
+            $html .= '<td>'.$this->formatNumber($question['wrongPercentage'] ?? 0).' %</td>';
+            $html .= '</tr>';
+        }
+
+        if ([] === $stats->questions) {
+            $html .= '<tr><td colspan="9">No question statistics found.</td></tr>';
+        }
+
+        $html .= '</tbody></table>';
+        $html .= '</body></html>';
+
+        return $html;
+    }
+
+    private function summaryRow(string $label, string $value): string
+    {
+        return '<tr><th>'.$this->escape($label).'</th><td>'.$this->escape($value).'</td></tr>';
+    }
+
+    private function formatNumber(mixed $value): string
+    {
+        if (null === $value || '' === $value) {
+            return '—';
+        }
+
+        $number = (float) $value;
+        $formatted = number_format($number, 2, '.', '');
+
+        return rtrim(rtrim($formatted, '0'), '.') ?: '0';
+    }
+
+    private function text(mixed $value): string
+    {
+        return trim(strip_tags(html_entity_decode((string) $value, ENT_QUOTES | ENT_HTML5, 'UTF-8')));
+    }
+
+    private function escape(mixed $value): string
+    {
+        return htmlspecialchars($this->text($value), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    }
+
+    private function getCss(): string
+    {
+        return <<<'CSS'
+body { font-family: DejaVu Sans, sans-serif; color: #222; font-size: 11px; line-height: 1.4; }
+h1 { color: #1f3763; font-size: 20px; margin: 0 0 12px; }
+h2 { color: #1f3763; font-size: 14px; margin: 0 0 4px; }
+.description { border-left: 3px solid #2b7bb9; padding: 8px 10px; background: #f5f8fb; margin-bottom: 12px; }
+.summary { width: 100%; margin-bottom: 16px; border-collapse: collapse; }
+.summary th { width: 30%; text-align: left; background: #eef3f8; }
+table { width: 100%; border-collapse: collapse; margin: 8px 0 16px; }
+th, td { border: 1px solid #d7dee8; padding: 6px; vertical-align: top; }
+th { background: #eef3f8; color: #1f3763; font-weight: bold; }
+.question { page-break-inside: avoid; margin-bottom: 14px; padding-bottom: 4px; }
+.muted { color: #6b7280; font-size: 10px; }
+.notice { border: 1px solid #b7d7f0; background: #eef8ff; color: #1f5f93; padding: 8px; margin: 8px 0; }
+CSS;
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseRuntimeAllAttemptsExportService.php b/src/CoreBundle/Service/Exercise/ExerciseRuntimeAllAttemptsExportService.php
new file mode 100644
index 00000000000..3359e732707
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseRuntimeAllAttemptsExportService.php
@@ -0,0 +1,307 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use ZipArchive;
+
+final readonly class ExerciseRuntimeAllAttemptsExportService
+{
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const STATUS_PENDING_CORRECTION = 'pending_correction';
+    private const STATUS_COMPLETED = 'completed';
+    private const VISIBILITY_PUBLISHED = 2;
+
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private ExerciseRuntimeAttemptPdfService $attemptPdfService,
+    ) {}
+
+    public function exportAllAttemptsZip(int $exerciseId, Request $request): BinaryFileResponse
+    {
+        $quiz = $this->getValidatedExercise($exerciseId, $request);
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $attempts = $this->getAttempts($quiz, $course, $session, $request);
+        $zipPath = $this->createZipFile();
+
+        $zip = new ZipArchive();
+        if (true !== $zip->open($zipPath, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
+            throw new BadRequestHttpException('The attempts export archive could not be created.');
+        }
+
+        if ([] === $attempts) {
+            $zip->addFromString('README.txt', 'No attempts found for the current filters.');
+        }
+
+        $usedNames = [];
+        foreach ($attempts as $attempt) {
+            $pdfFile = $this->attemptPdfService->buildAttemptPdfFile($exerciseId, (int) $attempt->getExeId(), $request);
+            $fileName = $this->buildAttemptFileName($pdfFile['fileName'], $attempt, $usedNames);
+            $zip->addFromString($fileName, $pdfFile['content']);
+        }
+
+        if (!$zip->close()) {
+            throw new BadRequestHttpException('The attempts export archive could not be finalized.');
+        }
+
+        $response = new BinaryFileResponse(new File($zipPath));
+        $response->headers->set('Content-Type', 'application/zip');
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $this->buildArchiveFileName($quiz));
+        $response->deleteFileAfterSend(true);
+
+        return $response;
+    }
+
+    private function getValidatedExercise(int $exerciseId, Request $request): CQuiz
+    {
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        if (!$this->canExportAttempts()) {
+            throw new AccessDeniedHttpException('You are not allowed to export attempts for this exercise.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+
+        return $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canExportAttempts()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    /**
+     * @return array<int, TrackEExercise>
+     */
+    private function getAttempts(CQuiz $quiz, Course $course, ?Session $session, Request $request): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt', 'user')
+            ->from(TrackEExercise::class, 'attempt')
+            ->innerJoin('attempt.user', 'user')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('attempt.exeDate', 'DESC')
+            ->addOrderBy('attempt.exeId', 'DESC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $firstName = trim((string) $request->query->get('firstName', ''));
+        if ('' !== $firstName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.firstname) LIKE :firstName')
+                ->setParameter('firstName', '%'.mb_strtolower($firstName).'%', Types::STRING)
+            ;
+        }
+
+        $lastName = trim((string) $request->query->get('lastName', ''));
+        if ('' !== $lastName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.lastname) LIKE :lastName')
+                ->setParameter('lastName', '%'.mb_strtolower($lastName).'%', Types::STRING)
+            ;
+        }
+
+        $status = trim((string) $request->query->get('status', ''));
+        if (self::STATUS_PENDING_CORRECTION === $status) {
+            $queryBuilder->andWhere("attempt.questionsToCheck <> ''");
+        } elseif (self::STATUS_INCOMPLETE === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->setParameter('status', self::STATUS_INCOMPLETE, Types::STRING)
+            ;
+        } elseif (self::STATUS_COMPLETED === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->andWhere("attempt.questionsToCheck = ''")
+                ->setParameter('status', self::STATUS_COMPLETED, Types::STRING)
+            ;
+        }
+
+        $attempts = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
+            if ($attempt instanceof TrackEExercise) {
+                $attempts[] = $attempt;
+            }
+        }
+
+        return $attempts;
+    }
+
+    private function canExportAttempts(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function createZipFile(): string
+    {
+        $filePath = tempnam(sys_get_temp_dir(), 'exercise-attempts-');
+        if (false === $filePath) {
+            throw new BadRequestHttpException('The attempts export archive could not be created.');
+        }
+
+        $zipPath = $filePath.'.zip';
+        if (!rename($filePath, $zipPath)) {
+            throw new BadRequestHttpException('The attempts export archive could not be prepared.');
+        }
+
+        return $zipPath;
+    }
+
+    /**
+     * @param array<string, bool> $usedNames
+     */
+    private function buildAttemptFileName(string $baseFileName, TrackEExercise $attempt, array &$usedNames): string
+    {
+        $user = $attempt->getUser();
+        $learnerName = $this->safeFileSegment(trim($user->getLastname().'-'.$user->getFirstname()));
+        if ('' === $learnerName) {
+            $learnerName = $this->safeFileSegment($user->getUsername());
+        }
+
+        $baseName = $this->safeFileSegment(pathinfo($baseFileName, PATHINFO_FILENAME));
+        if ('' === $baseName) {
+            $baseName = 'attempt-'.(int) $attempt->getExeId();
+        }
+
+        $fileName = $learnerName.'-'.$baseName.'.pdf';
+        $fileName = strtolower(trim($fileName, '-'));
+        if (!isset($usedNames[$fileName])) {
+            $usedNames[$fileName] = true;
+
+            return $fileName;
+        }
+
+        $counter = 2;
+        do {
+            $candidate = preg_replace('/\.pdf$/', '-'.$counter.'.pdf', $fileName) ?: $fileName;
+            ++$counter;
+        } while (isset($usedNames[$candidate]));
+
+        $usedNames[$candidate] = true;
+
+        return $candidate;
+    }
+
+    private function buildArchiveFileName(CQuiz $quiz): string
+    {
+        $safeTitle = $this->safeFileSegment($quiz->getTitle());
+        if ('' === $safeTitle) {
+            $safeTitle = 'exercise';
+        }
+
+        return strtolower($safeTitle).'-attempts.zip';
+    }
+
+    private function safeFileSegment(string $value): string
+    {
+        $segment = preg_replace('/[^A-Za-z0-9_-]+/', '-', $value) ?: '';
+        $segment = trim($segment, '-');
+
+        return substr($segment, 0, 80);
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseRuntimeAttemptPdfService.php b/src/CoreBundle/Service/Exercise/ExerciseRuntimeAttemptPdfService.php
new file mode 100644
index 00000000000..7eda314c7ea
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseRuntimeAttemptPdfService.php
@@ -0,0 +1,672 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use ApiPlatform\Metadata\Get;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeResult;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\State\Exercise\ExerciseRuntimeResultProvider;
+use DateTimeInterface;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Mpdf\Mpdf;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+final readonly class ExerciseRuntimeAttemptPdfService
+{
+    public function __construct(
+        private ExerciseRuntimeResultProvider $resultProvider,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    public function exportAttemptPdf(int $exerciseId, int $attemptId, Request $request): Response
+    {
+        $pdfFile = $this->buildAttemptPdfFile($exerciseId, $attemptId, $request);
+
+        $response = new Response($pdfFile['content']);
+        $response->headers->set('Content-Type', 'application/pdf');
+        $response->headers->set(
+            'Content-Disposition',
+            $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $pdfFile['fileName'])
+        );
+
+        return $response;
+    }
+
+    /**
+     * @return array{fileName: string, content: string}
+     */
+    public function buildAttemptPdfFile(int $exerciseId, int $attemptId, Request $request): array
+    {
+        if (0 >= $exerciseId || 0 >= $attemptId) {
+            throw new BadRequestHttpException('A valid exercise and attempt are required.');
+        }
+
+        $result = $this->resultProvider->provide(new Get(), [
+            'exerciseId' => $exerciseId,
+            'attemptId' => $attemptId,
+        ]);
+        if (!$result instanceof ExerciseRuntimeResult) {
+            throw new NotFoundHttpException('The requested attempt result was not found.');
+        }
+
+        $attempt = $this->getAttempt($exerciseId, $attemptId, $request);
+        $html = $this->renderHtml($result, $attempt);
+
+        $pdf = new Mpdf([
+            'format' => 'A4',
+            'mode' => 'utf-8',
+            'tempDir' => sys_get_temp_dir(),
+        ]);
+        $pdf->SetTitle($this->text($result->title));
+        $pdf->WriteHTML($html);
+
+        return [
+            'fileName' => $this->buildFileName($result, $attempt),
+            'content' => $pdf->Output('', 'S'),
+        ];
+    }
+
+    private function getAttempt(int $exerciseId, int $attemptId, Request $request): TrackEExercise
+    {
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt', 'user')
+            ->from(TrackEExercise::class, 'attempt')
+            ->innerJoin('attempt.user', 'user')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function renderHtml(ExerciseRuntimeResult $result, TrackEExercise $attempt): string
+    {
+        $attemptData = $result->attempt;
+        $visibility = $result->visibility;
+        $user = $attempt->getUser();
+        $course = $attempt->getCourse();
+        $session = $attempt->getSession();
+
+        $score = $this->formatScore($attemptData);
+        $percentage = isset($attemptData['percentage']) && null !== $attemptData['percentage']
+            ? $this->formatNumber((float) $attemptData['percentage']).'%'
+            : 'Hidden';
+
+        $html = '<html><head><meta charset="UTF-8"><style>'.$this->getCss().'</style></head><body>';
+        $html .= '<h1>'.$this->escape($result->title).'</h1>';
+        if ('' !== $this->text($result->description)) {
+            $html .= '<div class="description">'.$this->escape($result->description).'</div>';
+        }
+
+        $html .= '<table class="summary"><tbody>';
+        $html .= $this->summaryRow('Learner', trim($user->getFirstname().' '.$user->getLastname()));
+        $html .= $this->summaryRow('Username', $user->getUsername());
+        $html .= $this->summaryRow('Course', $course->getTitle());
+        if (null !== $session) {
+            $html .= $this->summaryRow('Session', '#'.(int) $session->getId());
+        }
+        $html .= $this->summaryRow('Attempt', '#'.(int) $attempt->getExeId());
+        $html .= $this->summaryRow('Status', (string) ($attemptData['status'] ?? $attempt->getStatus()));
+        $html .= $this->summaryRow('Started at', $this->formatDateValue($attemptData['startedAt'] ?? null));
+        $html .= $this->summaryRow('Completed at', $this->formatDateValue($attemptData['completedAt'] ?? null));
+        $html .= $this->summaryRow('Duration', $this->formatDuration((int) ($attemptData['duration'] ?? $attempt->getExeDuration())));
+        $html .= $this->summaryRow('Score', $score);
+        $html .= $this->summaryRow('Percentage', $percentage);
+        $html .= '</tbody></table>';
+
+        if ('' !== $this->text($attemptData['textWhenFinished'] ?? '')) {
+            $html .= '<div class="notice">'.$this->escape((string) $attemptData['textWhenFinished']).'</div>';
+        }
+
+        if (true !== ($visibility['showQuestionDetails'] ?? false)) {
+            $html .= '<div class="notice">Question details are hidden according to the exercise result settings.</div>';
+        } elseif ([] === $result->questions) {
+            $html .= '<div class="notice">No question details available.</div>';
+        } else {
+            foreach ($result->questions as $question) {
+                $html .= $this->renderQuestion($question);
+            }
+        }
+
+        $html .= '</body></html>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $attemptData
+     */
+    private function formatScore(array $attemptData): string
+    {
+        if (!isset($attemptData['score'], $attemptData['maxScore']) || null === $attemptData['score'] || null === $attemptData['maxScore']) {
+            return 'Hidden';
+        }
+
+        return $this->formatNumber((float) $attemptData['score']).' / '.$this->formatNumber((float) $attemptData['maxScore']);
+    }
+
+    /**
+     * @param array<string, mixed> $question
+     */
+    private function renderQuestion(array $question): string
+    {
+        $title = $this->text($question['title'] ?? 'Question');
+        $typeLabel = $this->text($question['typeLabel'] ?? '');
+        $position = (int) ($question['position'] ?? 0);
+        $score = $this->questionScore($question);
+
+        $html = '<div class="question">';
+        $html .= '<h2>'.(0 < $position ? $position.'. ' : '').$this->escape($title).'</h2>';
+        if ('' !== $typeLabel) {
+            $html .= '<div class="muted">'.$this->escape($typeLabel).'</div>';
+        }
+        if ('' !== $this->text($question['description'] ?? '')) {
+            $html .= '<div class="description small">'.$this->escape((string) $question['description']).'</div>';
+        }
+        if ('' !== $score) {
+            $html .= '<div class="score">'.$this->escape($score).'</div>';
+        }
+        if (true === ($question['pendingCorrection'] ?? false)) {
+            $html .= '<div class="warning">Pending correction</div>';
+        }
+        if (null !== ($question['feedback'] ?? null) && '' !== $this->text($question['feedback'])) {
+            $html .= '<div class="feedback"><strong>Feedback:</strong> '.$this->escape((string) $question['feedback']).'</div>';
+        }
+
+        $answer = $question['answer'] ?? [];
+        if (\is_array($answer)) {
+            $html .= $this->renderAnswer($answer);
+        }
+
+        $html .= '</div>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $question
+     */
+    private function questionScore(array $question): string
+    {
+        if (!isset($question['score'], $question['maxScore']) || null === $question['score'] || null === $question['maxScore']) {
+            return '';
+        }
+
+        return 'Score: '.$this->formatNumber((float) $question['score']).' / '.$this->formatNumber((float) $question['maxScore']);
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderAnswer(array $answer): string
+    {
+        $kind = (string) ($answer['kind'] ?? '');
+
+        return match ($kind) {
+            'choice', 'dropdown' => $this->renderChoiceAnswer($answer),
+            'true_false' => $this->renderTrueFalseAnswer($answer),
+            'fill_blanks' => $this->renderFillBlankAnswer($answer),
+            'matching' => $this->renderMatchingAnswer($answer),
+            'draggable' => $this->renderDraggableAnswer($answer),
+            'calculated' => $this->renderCalculatedAnswer($answer),
+            'hotspot' => $this->renderHotspotAnswer($answer),
+            'free_answer', 'annotation', 'upload_answer', 'oral_expression' => $this->renderManualAnswer($answer),
+            default => $this->renderGenericAnswer($answer),
+        };
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderChoiceAnswer(array $answer): string
+    {
+        $items = $answer['choices'] ?? $answer['options'] ?? [];
+        if (!\is_array($items) || [] === $items) {
+            return '<p class="muted">No answer data available.</p>';
+        }
+
+        $html = '<ul class="answers">';
+        foreach ($items as $item) {
+            if (!\is_array($item)) {
+                continue;
+            }
+
+            $badges = [];
+            if (true === ($item['selected'] ?? false)) {
+                $badges[] = 'Your answer';
+            }
+            if (true === ($item['correct'] ?? false)) {
+                $badges[] = 'Correct answer';
+            }
+
+            $html .= '<li>'.$this->escape($item['answer'] ?? '').$this->renderBadges($badges);
+            if ('' !== $this->text($item['comment'] ?? '')) {
+                $html .= '<div class="comment">'.$this->escape((string) $item['comment']).'</div>';
+            }
+            $html .= '</li>';
+        }
+        $html .= '</ul>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderTrueFalseAnswer(array $answer): string
+    {
+        $items = $answer['choices'] ?? [];
+        if (!\is_array($items) || [] === $items) {
+            return '<p class="muted">No answer data available.</p>';
+        }
+
+        $html = '<ul class="answers">';
+        foreach ($items as $item) {
+            if (!\is_array($item)) {
+                continue;
+            }
+
+            $html .= '<li>'.$this->escape($item['answer'] ?? '');
+            if ('' !== $this->text($item['selectedOptionLabel'] ?? '')) {
+                $html .= '<div>Your answer: '.$this->escape((string) $item['selectedOptionLabel']).'</div>';
+            }
+            if ('' !== $this->text($item['correctOptionLabel'] ?? '')) {
+                $html .= '<div>Correct answer: '.$this->escape((string) $item['correctOptionLabel']).'</div>';
+            }
+            if ('' !== $this->text($item['selectedDegreeLabel'] ?? '')) {
+                $html .= '<div>Degree of certainty: '.$this->escape((string) $item['selectedDegreeLabel']).'</div>';
+            }
+            $html .= '</li>';
+        }
+        $html .= '</ul>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderFillBlankAnswer(array $answer): string
+    {
+        $blanks = $answer['blanks'] ?? [];
+        if (!\is_array($blanks) || [] === $blanks) {
+            return '<p class="muted">No blank answer data available.</p>';
+        }
+
+        $html = '<table class="details"><thead><tr><th>Blank</th><th>Your answer</th><th>Correct answer</th></tr></thead><tbody>';
+        foreach ($blanks as $blank) {
+            if (!\is_array($blank)) {
+                continue;
+            }
+
+            $html .= '<tr>';
+            $html .= '<td>'.$this->escape($blank['position'] ?? '').'</td>';
+            $html .= '<td>'.$this->escape($blank['studentAnswer'] ?? 'No answer').'</td>';
+            $html .= '<td>'.$this->escape($blank['correctAnswer'] ?? '').'</td>';
+            $html .= '</tr>';
+        }
+        $html .= '</tbody></table>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderMatchingAnswer(array $answer): string
+    {
+        $prompts = $answer['prompts'] ?? [];
+        if (!\is_array($prompts) || [] === $prompts) {
+            return '<p class="muted">No matching answer data available.</p>';
+        }
+
+        $html = '<table class="details"><thead><tr><th>Prompt</th><th>Your answer</th><th>Correct answer</th></tr></thead><tbody>';
+        foreach ($prompts as $prompt) {
+            if (!\is_array($prompt)) {
+                continue;
+            }
+
+            $html .= '<tr>';
+            $html .= '<td>'.$this->escape($prompt['answer'] ?? '').'</td>';
+            $html .= '<td>'.$this->escape($prompt['selectedOptionAnswer'] ?? 'No answer').'</td>';
+            $html .= '<td>'.$this->escape($prompt['correctOptionAnswer'] ?? '').'</td>';
+            $html .= '</tr>';
+        }
+        $html .= '</tbody></table>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderDraggableAnswer(array $answer): string
+    {
+        $studentItems = $answer['studentItems'] ?? [];
+        $correctItems = $answer['correctItems'] ?? [];
+        $html = '<div class="columns">';
+        $html .= '<div><h3>Your order</h3>'.$this->renderOrderedItems($studentItems).'</div>';
+        if (\is_array($correctItems) && [] !== $correctItems) {
+            $html .= '<div><h3>Correct order</h3>'.$this->renderOrderedItems($correctItems).'</div>';
+        }
+        $html .= '</div>';
+
+        return $html;
+    }
+
+    /**
+     * @param mixed $items
+     */
+    private function renderOrderedItems(mixed $items): string
+    {
+        if (!\is_array($items) || [] === $items) {
+            return '<p class="muted">No answer</p>';
+        }
+
+        $html = '<ol>';
+        foreach ($items as $item) {
+            if (\is_array($item)) {
+                $html .= '<li>'.$this->escape($item['answer'] ?? $item['text'] ?? '').'</li>';
+            }
+        }
+        $html .= '</ol>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderCalculatedAnswer(array $answer): string
+    {
+        $html = '<div class="answer-block">';
+        if ('' !== $this->text($answer['text'] ?? '')) {
+            $html .= '<div>'.$this->escape($answer['text']).'</div>';
+        }
+        $html .= '<div><strong>Your answer:</strong> '.$this->escape($answer['studentAnswer'] ?? 'No answer').'</div>';
+        if ('' !== $this->text($answer['expectedAnswer'] ?? '')) {
+            $html .= '<div><strong>Expected answer:</strong> '.$this->escape($answer['expectedAnswer']).'</div>';
+        }
+        $html .= '</div>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderHotspotAnswer(array $answer): string
+    {
+        $html = '<div class="answer-block">';
+        if ('' !== $this->text($answer['imageName'] ?? '')) {
+            $html .= '<div><strong>Image:</strong> '.$this->escape($answer['imageName']).'</div>';
+        }
+
+        $points = $answer['studentPoints'] ?? [];
+        if (\is_array($points) && [] !== $points) {
+            $html .= '<div><strong>Your points:</strong> '.$this->escape($this->compactList($points)).'</div>';
+        }
+
+        $zones = $answer['zones'] ?? [];
+        if (\is_array($zones) && [] !== $zones) {
+            $html .= '<div><strong>Expected zones:</strong> '.$this->escape($this->compactList($zones)).'</div>';
+        }
+        $html .= '</div>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderManualAnswer(array $answer): string
+    {
+        $html = '<div class="answer-block">';
+        if ('' !== $this->text($answer['studentAnswer'] ?? '')) {
+            $html .= '<div><strong>Your answer:</strong><br>'.$this->nl2br($answer['studentAnswer']).'</div>';
+        }
+
+        $files = $answer['files'] ?? [];
+        if (\is_array($files) && [] !== $files) {
+            $html .= '<div><strong>Files:</strong><ul>';
+            foreach ($files as $file) {
+                if (\is_array($file)) {
+                    $html .= '<li>'.$this->escape($file['name'] ?? 'File').'</li>';
+                }
+            }
+            $html .= '</ul></div>';
+        }
+
+        if ('' !== $this->text($answer['teacherComment'] ?? '')) {
+            $html .= '<div><strong>Teacher comment:</strong><br>'.$this->nl2br($answer['teacherComment']).'</div>';
+        }
+        if (isset($answer['marks'])) {
+            $html .= '<div><strong>Marks:</strong> '.$this->escape($this->formatNumber((float) $answer['marks'])).'</div>';
+        }
+        $html .= '</div>';
+
+        return $html;
+    }
+
+    /**
+     * @param array<string, mixed> $answer
+     */
+    private function renderGenericAnswer(array $answer): string
+    {
+        return '<pre class="generic">'.$this->escape(json_encode($answer, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) ?: '').'</pre>';
+    }
+
+    /**
+     * @param array<int, string> $badges
+     */
+    private function renderBadges(array $badges): string
+    {
+        if ([] === $badges) {
+            return '';
+        }
+
+        $html = ' ';
+        foreach ($badges as $badge) {
+            $html .= '<span class="badge">'.$this->escape($badge).'</span> ';
+        }
+
+        return $html;
+    }
+
+    /**
+     * @param mixed $items
+     */
+    private function compactList(mixed $items): string
+    {
+        if (!\is_array($items)) {
+            return '';
+        }
+
+        $values = [];
+        foreach ($items as $item) {
+            if (!\is_array($item)) {
+                continue;
+            }
+
+            $parts = [];
+            foreach ($item as $key => $value) {
+                if (\is_scalar($value)) {
+                    $parts[] = $key.': '.$value;
+                }
+            }
+            if ([] !== $parts) {
+                $values[] = implode(', ', $parts);
+            }
+        }
+
+        return implode(' | ', $values);
+    }
+
+    private function summaryRow(string $label, string $value): string
+    {
+        return '<tr><th>'.$this->escape($label).'</th><td>'.$this->escape('' !== $value ? $value : '-').'</td></tr>';
+    }
+
+    private function formatDateValue(mixed $value): string
+    {
+        if ($value instanceof DateTimeInterface) {
+            return $value->format('Y-m-d H:i:s');
+        }
+
+        if (\is_string($value) && '' !== $value) {
+            try {
+                return (new \DateTimeImmutable($value))->format('Y-m-d H:i:s');
+            } catch (\Throwable) {
+                return $value;
+            }
+        }
+
+        return '';
+    }
+
+    private function formatDuration(int $duration): string
+    {
+        $seconds = max(0, $duration);
+        $hours = intdiv($seconds, 3600);
+        $minutes = intdiv($seconds % 3600, 60);
+        $remainingSeconds = $seconds % 60;
+
+        if (0 < $hours) {
+            return sprintf('%02d:%02d:%02d', $hours, $minutes, $remainingSeconds);
+        }
+
+        return sprintf('%02d:%02d', $minutes, $remainingSeconds);
+    }
+
+    private function formatNumber(float $value): string
+    {
+        return rtrim(rtrim(number_format($value, 2, '.', ''), '0'), '.');
+    }
+
+    private function buildFileName(ExerciseRuntimeResult $result, TrackEExercise $attempt): string
+    {
+        $safeTitle = preg_replace('/[^A-Za-z0-9_-]+/', '-', $this->text($result->title)) ?: 'exercise-attempt';
+        $safeTitle = trim($safeTitle, '-');
+        if ('' === $safeTitle) {
+            $safeTitle = 'exercise-attempt';
+        }
+
+        return strtolower($safeTitle).'-attempt-'.(int) $attempt->getExeId().'.pdf';
+    }
+
+    private function nl2br(mixed $value): string
+    {
+        return nl2br($this->escape((string) $value));
+    }
+
+    private function escape(mixed $value): string
+    {
+        return htmlspecialchars($this->text($value), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    }
+
+    private function text(mixed $value): string
+    {
+        if (null === $value) {
+            return '';
+        }
+
+        $text = \is_scalar($value) ? (string) $value : json_encode($value, JSON_UNESCAPED_UNICODE);
+        if (false === $text) {
+            return '';
+        }
+
+        return trim(html_entity_decode(strip_tags($text), ENT_QUOTES | ENT_HTML5, 'UTF-8'));
+    }
+
+    private function getCss(): string
+    {
+        return <<<'CSS'
+body { font-family: DejaVu Sans, sans-serif; color: #222; font-size: 11pt; line-height: 1.45; }
+h1 { color: #1f4e79; font-size: 20pt; margin: 0 0 10px; }
+h2 { color: #1f4e79; font-size: 13pt; margin: 0 0 4px; }
+h3 { color: #333; font-size: 11pt; margin: 8px 0 4px; }
+.summary, .details { border-collapse: collapse; width: 100%; margin: 12px 0; }
+.summary th { width: 30%; background: #f2f5f8; text-align: left; }
+.summary th, .summary td, .details th, .details td { border: 1px solid #d9e2ec; padding: 6px 8px; vertical-align: top; }
+.details th { background: #f2f5f8; text-align: left; }
+.question { page-break-inside: avoid; border: 1px solid #d9e2ec; border-left: 4px solid #1f4e79; padding: 12px; margin: 14px 0; }
+.description { color: #555; margin: 8px 0; }
+.small { font-size: 10pt; }
+.muted { color: #666; font-size: 9.5pt; }
+.score { background: #eef7ff; border: 1px solid #cce5ff; color: #1f4e79; display: inline-block; margin: 8px 0; padding: 4px 8px; }
+.warning { background: #fff3cd; border: 1px solid #ffeeba; color: #856404; display: inline-block; margin: 8px 0; padding: 4px 8px; }
+.notice { background: #eef7ff; border: 1px solid #cce5ff; margin: 12px 0; padding: 8px; }
+.feedback, .comment { background: #f8f9fa; border: 1px solid #e9ecef; margin-top: 8px; padding: 6px; }
+.answers { margin: 8px 0; padding-left: 18px; }
+.answers li { margin-bottom: 8px; }
+.badge { background: #e8f5e9; border: 1px solid #c8e6c9; border-radius: 10px; color: #2e7d32; font-size: 8.5pt; padding: 2px 6px; }
+.answer-block { border: 1px solid #e9ecef; background: #fbfbfb; padding: 8px; margin: 8px 0; }
+.columns { width: 100%; }
+.columns div { width: 48%; display: inline-block; vertical-align: top; }
+.generic { background: #f8f9fa; border: 1px solid #e9ecef; padding: 8px; white-space: pre-wrap; }
+CSS;
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php b/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
new file mode 100644
index 00000000000..c0419509ba1
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
@@ -0,0 +1,382 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeInterface;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+final readonly class ExerciseRuntimeReportExportService
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const STATUS_PENDING_CORRECTION = 'pending_correction';
+    private const STATUS_COMPLETED = 'completed';
+
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    public function exportCsv(int $exerciseId, Request $request): StreamedResponse
+    {
+        $quiz = $this->getValidatedExercise($exerciseId, $request);
+        $rows = $this->buildExportRows($quiz, $request);
+        $fileName = $this->buildFileName($quiz, 'csv');
+
+        $response = new StreamedResponse(static function () use ($rows): void {
+            $handle = fopen('php://output', 'w');
+            if (!\is_resource($handle)) {
+                return;
+            }
+
+            fputcsv($handle, self::getHeaders());
+            foreach ($rows as $row) {
+                fputcsv($handle, $row);
+            }
+            fclose($handle);
+        });
+
+        $response->headers->set('Content-Type', 'text/csv; charset=UTF-8');
+        $response->headers->set(
+            'Content-Disposition',
+            $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $fileName)
+        );
+
+        return $response;
+    }
+
+    public function exportXlsx(int $exerciseId, Request $request): BinaryFileResponse
+    {
+        $quiz = $this->getValidatedExercise($exerciseId, $request);
+        $rows = $this->buildExportRows($quiz, $request);
+        $fileName = $this->buildFileName($quiz, 'xlsx');
+
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('Learner score');
+        $sheet->fromArray(self::getHeaders(), null, 'A1');
+
+        $rowNumber = 2;
+        foreach ($rows as $row) {
+            $sheet->fromArray($row, null, 'A'.$rowNumber);
+            ++$rowNumber;
+        }
+
+        foreach (range('A', 'M') as $column) {
+            $sheet->getColumnDimension($column)->setAutoSize(true);
+        }
+
+        $filePath = tempnam(sys_get_temp_dir(), 'exercise-report-');
+        if (false === $filePath) {
+            throw new BadRequestHttpException('The export file could not be created.');
+        }
+
+        $xlsxPath = $filePath.'.xlsx';
+        rename($filePath, $xlsxPath);
+
+        $writer = new Xlsx($spreadsheet);
+        $writer->save($xlsxPath);
+        $spreadsheet->disconnectWorksheets();
+
+        $response = new BinaryFileResponse(new File($xlsxPath));
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $fileName);
+        $response->deleteFileAfterSend(true);
+
+        return $response;
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private static function getHeaders(): array
+    {
+        return [
+            'First name',
+            'Last name',
+            'Username',
+            'Group',
+            'Duration',
+            'Started at',
+            'Completed at',
+            'Score',
+            'Max score',
+            'Percentage',
+            'IP',
+            'Status',
+            'Learning path',
+        ];
+    }
+
+    private function getValidatedExercise(int $exerciseId, Request $request): CQuiz
+    {
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        if (!$this->canExportReport()) {
+            throw new AccessDeniedHttpException('You are not allowed to export this exercise report.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+
+        return $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canExportReport()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    /**
+     * @return array<int, array<int, int|float|string>>
+     */
+    private function buildExportRows(CQuiz $quiz, Request $request): array
+    {
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $attempts = $this->getAttempts($quiz, $course, $session, $request);
+        $rows = [];
+
+        foreach ($attempts as $attempt) {
+            $score = $attempt->getScore();
+            $maxScore = $attempt->getMaxScore();
+            $percentage = 0.0 < $maxScore ? round(($score * 100) / $maxScore, 2) : 0.0;
+
+            $rows[] = [
+                (string) $attempt->getUser()->getFirstname(),
+                (string) $attempt->getUser()->getLastname(),
+                (string) $attempt->getUser()->getUsername(),
+                '-',
+                $this->formatDuration($attempt->getExeDuration()),
+                $this->formatDate($attempt->getStartDate()),
+                $this->formatDate($attempt->getExeDate()),
+                round($score, 2),
+                round($maxScore, 2),
+                $percentage,
+                $attempt->getUserIp(),
+                $this->getAttemptStatusLabel($attempt),
+                $this->formatLearningPath($attempt),
+            ];
+        }
+
+        return $rows;
+    }
+
+    /**
+     * @return array<int, TrackEExercise>
+     */
+    private function getAttempts(CQuiz $quiz, Course $course, ?Session $session, Request $request): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt', 'user')
+            ->from(TrackEExercise::class, 'attempt')
+            ->innerJoin('attempt.user', 'user')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('attempt.exeDate', 'DESC')
+            ->addOrderBy('attempt.exeId', 'DESC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $firstName = trim((string) $request->query->get('firstName', ''));
+        if ('' !== $firstName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.firstname) LIKE :firstName')
+                ->setParameter('firstName', '%'.mb_strtolower($firstName).'%', Types::STRING)
+            ;
+        }
+
+        $lastName = trim((string) $request->query->get('lastName', ''));
+        if ('' !== $lastName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.lastname) LIKE :lastName')
+                ->setParameter('lastName', '%'.mb_strtolower($lastName).'%', Types::STRING)
+            ;
+        }
+
+        $status = trim((string) $request->query->get('status', ''));
+        if (self::STATUS_PENDING_CORRECTION === $status) {
+            $queryBuilder->andWhere("attempt.questionsToCheck <> ''");
+        } elseif (self::STATUS_INCOMPLETE === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->setParameter('status', self::STATUS_INCOMPLETE, Types::STRING)
+            ;
+        } elseif (self::STATUS_COMPLETED === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->andWhere("attempt.questionsToCheck = ''")
+                ->setParameter('status', self::STATUS_COMPLETED, Types::STRING)
+            ;
+        }
+
+        $attempts = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
+            if ($attempt instanceof TrackEExercise) {
+                $attempts[] = $attempt;
+            }
+        }
+
+        return $attempts;
+    }
+
+    private function canExportReport(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getAttemptStatusLabel(TrackEExercise $attempt): string
+    {
+        if ('' !== trim($attempt->getQuestionsToCheck())) {
+            return 'Pending correction';
+        }
+
+        if (self::STATUS_INCOMPLETE === (string) $attempt->getStatus()) {
+            return 'Ongoing';
+        }
+
+        return 'Completed';
+    }
+
+    private function formatLearningPath(TrackEExercise $attempt): string
+    {
+        if (0 < $attempt->getOrigLpId()) {
+            return '#'.$attempt->getOrigLpId();
+        }
+
+        return '-';
+    }
+
+    private function formatDuration(int $duration): string
+    {
+        $seconds = max(0, $duration);
+        $hours = intdiv($seconds, 3600);
+        $minutes = intdiv($seconds % 3600, 60);
+        $remainingSeconds = $seconds % 60;
+
+        if (0 < $hours) {
+            return sprintf('%02d:%02d:%02d', $hours, $minutes, $remainingSeconds);
+        }
+
+        return sprintf('%02d:%02d', $minutes, $remainingSeconds);
+    }
+
+    private function formatDate(DateTimeInterface $date): string
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
+
+    private function buildFileName(CQuiz $quiz, string $extension): string
+    {
+        $safeTitle = preg_replace('/[^A-Za-z0-9_-]+/', '-', $quiz->getTitle()) ?: 'exercise-report';
+        $safeTitle = trim($safeTitle, '-');
+        if ('' === $safeTitle) {
+            $safeTitle = 'exercise-report';
+        }
+
+        return strtolower($safeTitle).'-learner-score.'.$extension;
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseRuntimeResultEmailService.php b/src/CoreBundle/Service/Exercise/ExerciseRuntimeResultEmailService.php
new file mode 100644
index 00000000000..3050df6fab5
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseRuntimeResultEmailService.php
@@ -0,0 +1,485 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Twig\Environment;
+
+use const FILTER_VALIDATE_EMAIL;
+
+final readonly class ExerciseRuntimeResultEmailService
+{
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const STATUS_PENDING_CORRECTION = 'pending_correction';
+    private const STATUS_COMPLETED = 'completed';
+    private const VISIBILITY_PUBLISHED = 2;
+
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private MailerInterface $mailer,
+        private SettingsManager $settingsManager,
+        private Environment $twig,
+        private TranslatorInterface $translator,
+    ) {}
+
+    /**
+     * @return array{success: bool, message: string, totalCount: int, sentCount: int, skippedCount: int, failedCount: int, failures: array<int, array<string, mixed>>}
+     */
+    public function sendReviewedAttempts(int $exerciseId, Request $request, string $node = ''): array
+    {
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to email exercise results.');
+        }
+
+        $sender = $this->getCurrentUser();
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempts = $this->getReviewedAttempts($quiz, $course, $session, $request);
+
+        return $this->sendAttempts($attempts, $quiz, $course, $session, $sender, $request, $node);
+    }
+
+    /**
+     * @return array{success: bool, message: string, totalCount: int, sentCount: int, skippedCount: int, failedCount: int, failures: array<int, array<string, mixed>>, recipientId: int|null, recipientName: string, recipientEmail: string}
+     */
+    public function sendAttempt(int $exerciseId, int $attemptId, Request $request, string $node = ''): array
+    {
+        if (0 >= $exerciseId || 0 >= $attemptId) {
+            throw new BadRequestHttpException('A valid exercise and attempt are required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to email this exercise attempt.');
+        }
+
+        $sender = $this->getCurrentUser();
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $attempt = $this->getAttempt($attemptId, $quiz, $course, $session);
+        $result = $this->sendAttempts([$attempt], $quiz, $course, $session, $sender, $request, $node);
+        $recipient = $attempt->getUser();
+
+        return $result + [
+            'recipientId' => (int) $recipient->getId(),
+            'recipientName' => $recipient->getFullName(),
+            'recipientEmail' => $recipient->getEmail(),
+        ];
+    }
+
+    /**
+     * @param array<int, TrackEExercise> $attempts
+     *
+     * @return array{success: bool, message: string, totalCount: int, sentCount: int, skippedCount: int, failedCount: int, failures: array<int, array<string, mixed>>}
+     */
+    private function sendAttempts(
+        array $attempts,
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        User $sender,
+        Request $request,
+        string $node,
+    ): array {
+        $sentCount = 0;
+        $skippedCount = 0;
+        $failedCount = 0;
+        $failures = [];
+
+        foreach ($attempts as $attempt) {
+            $recipient = $attempt->getUser();
+            $recipientEmail = trim($recipient->getEmail());
+            if ('' === $recipientEmail || !filter_var($recipientEmail, FILTER_VALIDATE_EMAIL)) {
+                ++$skippedCount;
+                $failures[] = [
+                    'attemptId' => (int) $attempt->getExeId(),
+                    'recipientId' => (int) $recipient->getId(),
+                    'reason' => 'Invalid recipient email',
+                ];
+                continue;
+            }
+
+            try {
+                $this->sendAttemptEmail($attempt, $quiz, $course, $session, $sender, $request, $node);
+                ++$sentCount;
+            } catch (\Throwable $exception) {
+                ++$failedCount;
+                $failures[] = [
+                    'attemptId' => (int) $attempt->getExeId(),
+                    'recipientId' => (int) $recipient->getId(),
+                    'reason' => $exception->getMessage(),
+                ];
+            }
+        }
+
+        $totalCount = \count($attempts);
+        $success = 0 === $totalCount || 0 < $sentCount;
+        $message = match (true) {
+            0 === $totalCount => 'No reviewed attempts found',
+            0 < $sentCount && 0 === $failedCount && 0 === $skippedCount => 'Exercise result emails sent',
+            0 < $sentCount => 'Exercise result emails sent with warnings',
+            default => 'Could not send emails',
+        };
+
+        return [
+            'success' => $success,
+            'message' => $message,
+            'totalCount' => $totalCount,
+            'sentCount' => $sentCount,
+            'skippedCount' => $skippedCount,
+            'failedCount' => $failedCount,
+            'failures' => $failures,
+        ];
+    }
+
+    private function sendAttemptEmail(
+        TrackEExercise $attempt,
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        User $sender,
+        Request $request,
+        string $node,
+    ): void {
+        $recipient = $attempt->getUser();
+        $resultUrl = $this->buildResultUrl($request, $node, $course, $session, (int) $quiz->getIid(), (int) $attempt->getExeId());
+        $body = $this->twig->render('@ChamiloCore/Mailer/Exercise/result_alert_body.html.twig', [
+            'course_title' => $this->getCourseTitle($course),
+            'test_title' => $quiz->getTitle(),
+            'url' => $resultUrl,
+            'teacher_name' => $sender->getFullName(),
+        ]);
+
+        $email = (new Email())
+            ->from($this->getFromAddress($request))
+            ->to(new Address($recipient->getEmail(), $this->getUserDisplayName($recipient)))
+            ->subject($this->translator->trans('Corrected test result'))
+            ->html($body)
+            ->text($this->htmlToText($body))
+        ;
+
+        $senderEmail = trim($sender->getEmail());
+        if (filter_var($senderEmail, FILTER_VALIDATE_EMAIL)) {
+            $email->replyTo(new Address($senderEmail, $this->getUserDisplayName($sender)));
+        }
+
+        $this->mailer->send($email);
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getCurrentUser(): User
+    {
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('A valid user is required.');
+        }
+
+        return $user;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    private function getAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt', 'user')
+            ->from(TrackEExercise::class, 'attempt')
+            ->innerJoin('attempt.user', 'user')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    /**
+     * @return array<int, TrackEExercise>
+     */
+    private function getReviewedAttempts(CQuiz $quiz, Course $course, ?Session $session, Request $request): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('DISTINCT attempt', 'user')
+            ->from(TrackEExercise::class, 'attempt')
+            ->innerJoin('attempt.user', 'user')
+            ->innerJoin('attempt.revisedAttempts', 'qualify', 'WITH', 'qualify.author > 0')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('attempt.exeDate', 'DESC')
+            ->addOrderBy('attempt.exeId', 'DESC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $firstName = trim((string) $request->query->get('firstName', ''));
+        if ('' !== $firstName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.firstname) LIKE :firstName')
+                ->setParameter('firstName', '%'.mb_strtolower($firstName).'%', Types::STRING)
+            ;
+        }
+
+        $lastName = trim((string) $request->query->get('lastName', ''));
+        if ('' !== $lastName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.lastname) LIKE :lastName')
+                ->setParameter('lastName', '%'.mb_strtolower($lastName).'%', Types::STRING)
+            ;
+        }
+
+        $status = trim((string) $request->query->get('status', ''));
+        if (self::STATUS_PENDING_CORRECTION === $status) {
+            $queryBuilder->andWhere("attempt.questionsToCheck <> ''");
+        } elseif (self::STATUS_INCOMPLETE === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->setParameter('status', self::STATUS_INCOMPLETE, Types::STRING)
+            ;
+        } elseif (self::STATUS_COMPLETED === $status) {
+            $queryBuilder
+                ->andWhere('attempt.status = :status')
+                ->andWhere("attempt.questionsToCheck = ''")
+                ->setParameter('status', self::STATUS_COMPLETED, Types::STRING)
+            ;
+        }
+
+        $attempts = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
+            if ($attempt instanceof TrackEExercise) {
+                $attempts[] = $attempt;
+            }
+        }
+
+        return $attempts;
+    }
+
+    private function buildResultUrl(
+        Request $request,
+        string $node,
+        Course $course,
+        ?Session $session,
+        int $exerciseId,
+        int $attemptId,
+    ): string {
+        $safeNode = trim($node);
+        if ('' === $safeNode) {
+            $referer = (string) $request->headers->get('referer', '');
+            if (preg_match('#/resources/exercise/([^/]+)/#', $referer, $matches)) {
+                $safeNode = rawurldecode((string) $matches[1]);
+            }
+        }
+
+        if ('' === $safeNode) {
+            $safeNode = (string) $exerciseId;
+        }
+
+        $query = [
+            'cid' => (int) $course->getId(),
+            'gid' => $request->query->getInt('gid'),
+        ];
+
+        if (null !== $session) {
+            $query['sid'] = (int) $session->getId();
+        }
+
+        $baseUrl = rtrim($request->getSchemeAndHttpHost().$request->getBaseUrl(), '/');
+
+        return sprintf(
+            '%s/resources/exercise/%s/%d/result/%d?%s',
+            $baseUrl,
+            rawurlencode($safeNode),
+            $exerciseId,
+            $attemptId,
+            http_build_query($query),
+        );
+    }
+
+    private function getFromAddress(Request $request): Address
+    {
+        $fromEmail = trim((string) $this->settingsManager->getSetting('mail.mailer_from_email', true));
+        $fromName = trim((string) $this->settingsManager->getSetting('mail.mailer_from_name', true));
+
+        if ('' === $fromName) {
+            $fromName = trim((string) $this->settingsManager->getSetting('platform.site_name', true));
+        }
+
+        if ('' === $fromName) {
+            $fromName = 'Chamilo';
+        }
+
+        if ('' === $fromEmail || !filter_var($fromEmail, FILTER_VALIDATE_EMAIL)) {
+            $fromEmail = trim((string) $this->settingsManager->getSetting('admin.administrator_email', true));
+        }
+
+        if ('' === $fromEmail || !filter_var($fromEmail, FILTER_VALIDATE_EMAIL)) {
+            $host = preg_replace('/[^A-Za-z0-9.-]+/', '', $request->getHost()) ?: 'example.org';
+            $fromEmail = 'noreply@'.$host;
+        }
+
+        return new Address($fromEmail, $fromName);
+    }
+
+    private function getUserDisplayName(User $user): string
+    {
+        $name = trim($user->getFullName());
+        if ('' !== $name) {
+            return $name;
+        }
+
+        return $user->getUsername();
+    }
+
+    private function getCourseTitle(Course $course): string
+    {
+        if (method_exists($course, 'getTitle')) {
+            return (string) $course->getTitle();
+        }
+
+        if (method_exists($course, 'getName')) {
+            return (string) $course->getName();
+        }
+
+        if (method_exists($course, 'getCode')) {
+            return (string) $course->getCode();
+        }
+
+        return 'Course';
+    }
+
+    private function htmlToText(string $html): string
+    {
+        return trim(html_entity_decode(strip_tags(str_replace(['<br>', '<br/>', '<br />'], "\n", $html)), ENT_QUOTES | ENT_HTML5, 'UTF-8'));
+    }
+}
diff --git a/src/CoreBundle/Service/Exercise/ExerciseSpecialQuestionReportCounterService.php b/src/CoreBundle/Service/Exercise/ExerciseSpecialQuestionReportCounterService.php
new file mode 100644
index 00000000000..20cd483656b
--- /dev/null
+++ b/src/CoreBundle/Service/Exercise/ExerciseSpecialQuestionReportCounterService.php
@@ -0,0 +1,593 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Service\Exercise;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * Legacy-equivalent counters for answer distributions that cannot be counted by
+ * the simple track_e_attempt.answer = c_quiz_answer.iid rule.
+ */
+final readonly class ExerciseSpecialQuestionReportCounterService
+{
+    private const FILL_IN_BLANKS = 3;
+    private const MATCHING = 4;
+    private const HOT_SPOT = 6;
+    private const MATCHING_DRAGGABLE = 19;
+    private const MATCHING_COMBINATION = 24;
+    private const MATCHING_DRAGGABLE_COMBINATION = 25;
+    private const HOT_SPOT_COMBINATION = 26;
+    private const FILL_IN_BLANKS_COMBINATION = 27;
+
+    /**
+     * @var array<int, true>
+     */
+    private const FILL_BLANK_TYPES = [
+        self::FILL_IN_BLANKS => true,
+        self::FILL_IN_BLANKS_COMBINATION => true,
+    ];
+
+    /**
+     * @var array<int, true>
+     */
+    private const MATCHING_TYPES = [
+        self::MATCHING => true,
+        self::MATCHING_DRAGGABLE => true,
+        self::MATCHING_COMBINATION => true,
+        self::MATCHING_DRAGGABLE_COMBINATION => true,
+    ];
+
+    /**
+     * @var array<int, true>
+     */
+    private const HOTSPOT_TYPES = [
+        self::HOT_SPOT => true,
+        self::HOT_SPOT_COMBINATION => true,
+    ];
+
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     *
+     * @return array<int, array{answers: array<int, array<string, mixed>>, totalSelections: int, countingAvailable: bool}>
+     */
+    public function buildDistributions(CQuiz $quiz, Course $course, ?Session $session, array $questions): array
+    {
+        $distributions = [];
+
+        foreach ($questions as $questionId => $question) {
+            $type = (int) ($question['type'] ?? 0);
+            $answers = $question['answers'] ?? [];
+            if (!\is_array($answers)) {
+                $answers = [];
+            }
+
+            if (isset(self::FILL_BLANK_TYPES[$type])) {
+                $distribution = $this->buildFillBlankDistribution($quiz, $course, $session, (int) $questionId, $question, $answers);
+            } elseif (isset(self::MATCHING_TYPES[$type])) {
+                $distribution = $this->buildMatchingDistribution($quiz, $course, $session, (int) $questionId, $answers);
+            } elseif (isset(self::HOTSPOT_TYPES[$type])) {
+                $distribution = $this->buildHotspotDistribution($quiz, $course, $session, (int) $questionId, $answers);
+            } else {
+                $distribution = null;
+            }
+
+            if (null !== $distribution) {
+                $distributions[(int) $questionId] = $distribution;
+            }
+        }
+
+        return $distributions;
+    }
+
+    /**
+     * @param array<string, mixed>              $question
+     * @param array<int, array<string, mixed>> $answers
+     *
+     * @return array{answers: array<int, array<string, mixed>>, totalSelections: int, countingAvailable: bool}|null
+     */
+    private function buildFillBlankDistribution(CQuiz $quiz, Course $course, ?Session $session, int $questionId, array $question, array $answers): ?array
+    {
+        $sourceAnswer = $answers[0] ?? null;
+        if (!\is_array($sourceAnswer)) {
+            return null;
+        }
+
+        $teacherInfo = $this->parseFillBlankAnswer((string) ($sourceAnswer['answer'] ?? ''), false);
+        $blankLabels = $teacherInfo['words_with_bracket'];
+        if ([] === $blankLabels) {
+            return [
+                'answers' => [],
+                'totalSelections' => 0,
+                'countingAvailable' => true,
+            ];
+        }
+
+        $caseInsensitive = 'case:false' === (string) ($question['extra'] ?? '');
+        $userResults = [];
+        foreach ($this->getCompletedAttemptAnswerRows($quiz, $course, $session, $questionId) as $attemptRow) {
+            $userId = (int) ($attemptRow['userId'] ?? 0);
+            if (0 >= $userId) {
+                continue;
+            }
+
+            $studentInfo = $this->parseFillBlankAnswer((string) ($attemptRow['answer'] ?? ''), true);
+            foreach ($teacherInfo['words'] as $index => $correctAnswer) {
+                $studentAnswer = (string) ($studentInfo['student_answer'][$index] ?? '');
+                $studentScore = (string) ($studentInfo['student_score'][$index] ?? '');
+
+                if ('' !== $studentScore) {
+                    $userResults[$userId][$index] = '1' === $studentScore ? 0 : (-2 === $this->normalizeFillBlankState($studentAnswer) ? -2 : -1);
+                    continue;
+                }
+
+                if ('' === trim($studentAnswer)) {
+                    if (!isset($userResults[$userId][$index])) {
+                        $userResults[$userId][$index] = -2;
+                    }
+                    continue;
+                }
+
+                $userResults[$userId][$index] = $this->isFillBlankStudentAnswerGood($studentAnswer, (string) $correctAnswer, $caseInsensitive) ? 0 : -1;
+            }
+        }
+
+        $rows = [];
+        $totalSelections = 0;
+        $baseAnswerId = (string) ($sourceAnswer['answerId'] ?? $sourceAnswer['id'] ?? $questionId);
+        foreach ($blankLabels as $index => $label) {
+            $selectedCount = 0;
+            foreach ($userResults as $result) {
+                if (0 === (int) ($result[$index] ?? -2)) {
+                    ++$selectedCount;
+                }
+            }
+
+            $totalSelections += $selectedCount;
+            $rows[] = [
+                'id' => sprintf('%d-blank-%d', $questionId, $index + 1),
+                'answerId' => sprintf('%s:%d', $baseAnswerId, $index + 1),
+                'answer' => $this->stripFillBlankBrackets((string) $label, (string) $teacherInfo['blank_separator_start'], (string) $teacherInfo['blank_separator_end']),
+                'correct' => false,
+                'correctValue' => 0,
+                'score' => round((float) ($teacherInfo['weighting'][$index] ?? 0.0), 2),
+                'position' => $index + 1,
+                'selectedCount' => $selectedCount,
+                'selectedPercentage' => 0.0,
+            ];
+        }
+
+        return $this->withPercentages($rows, $totalSelections);
+    }
+
+    private function normalizeFillBlankState(string $studentAnswer): int
+    {
+        return '' === trim($studentAnswer) ? -2 : -1;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $answers
+     *
+     * @return array{answers: array<int, array<string, mixed>>, totalSelections: int, countingAvailable: bool}
+     */
+    private function buildMatchingDistribution(CQuiz $quiz, Course $course, ?Session $session, int $questionId, array $answers): array
+    {
+        $selectedCounts = $this->getAnswerValueCounts($quiz, $course, $session, $questionId);
+        $answersByPosition = [];
+        foreach ($answers as $answer) {
+            $position = (int) ($answer['position'] ?? 0);
+            if (0 < $position) {
+                $answersByPosition[$position] = $answer;
+            }
+        }
+
+        $rows = [];
+        $totalSelections = 0;
+        foreach ($answers as $answer) {
+            $correctValue = (int) ($answer['correctValue'] ?? 0);
+            if (0 !== $correctValue) {
+                continue;
+            }
+
+            $answerId = (int) ($answer['answerId'] ?? 0);
+            if (0 >= $answerId) {
+                continue;
+            }
+
+            $sourceAnswer = $this->findMatchingSourceAnswer($answer, $answersByPosition);
+            $selectedCount = (int) ($selectedCounts[(string) $answerId] ?? 0);
+            $totalSelections += $selectedCount;
+            $rows[] = [
+                'id' => $answerId,
+                'answerId' => $answerId,
+                'answer' => $this->formatMatchingAnswerLabel($sourceAnswer, (string) ($answer['answer'] ?? '')),
+                'correct' => false,
+                'correctValue' => 0,
+                'score' => (float) ($sourceAnswer['score'] ?? $answer['score'] ?? 0.0),
+                'position' => (int) ($answer['position'] ?? 0),
+                'selectedCount' => $selectedCount,
+                'selectedPercentage' => 0.0,
+            ];
+        }
+
+        return $this->withPercentages($rows, $totalSelections);
+    }
+
+    /**
+     * @param array<string, mixed>              $targetAnswer
+     * @param array<int, array<string, mixed>> $answersByPosition
+     *
+     * @return array<string, mixed>
+     */
+    private function findMatchingSourceAnswer(array $targetAnswer, array $answersByPosition): array
+    {
+        $targetPosition = (int) ($targetAnswer['position'] ?? 0);
+        foreach ($answersByPosition as $answer) {
+            if ((int) ($answer['correctValue'] ?? 0) === $targetPosition) {
+                return $answer;
+            }
+        }
+
+        return [];
+    }
+
+    private function formatMatchingAnswerLabel(array $sourceAnswer, string $targetAnswer): string
+    {
+        $source = trim(strip_tags(html_entity_decode((string) ($sourceAnswer['answer'] ?? ''), ENT_QUOTES | ENT_HTML5, 'UTF-8')));
+        $target = trim(strip_tags(html_entity_decode($targetAnswer, ENT_QUOTES | ENT_HTML5, 'UTF-8')));
+
+        if ('' === $source) {
+            return $target;
+        }
+        if ('' === $target) {
+            return $source;
+        }
+
+        return sprintf('%s → %s', $source, $target);
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $answers
+     *
+     * @return array{answers: array<int, array<string, mixed>>, totalSelections: int, countingAvailable: bool}|null
+     */
+    private function buildHotspotDistribution(CQuiz $quiz, Course $course, ?Session $session, int $questionId, array $answers): ?array
+    {
+        $answerIds = [];
+        foreach ($answers as $answer) {
+            $answerId = (int) ($answer['answerId'] ?? 0);
+            if (0 < $answerId) {
+                $answerIds[] = $answerId;
+            }
+        }
+        if ([] === $answerIds) {
+            return [
+                'answers' => [],
+                'totalSelections' => 0,
+                'countingAvailable' => true,
+            ];
+        }
+
+        $selectedCounts = $this->getHotspotCorrectAnswerCounts($quiz, $course, $session, $questionId, $answerIds);
+        if (null === $selectedCounts) {
+            return null;
+        }
+
+        $rows = [];
+        $totalSelections = 0;
+        foreach ($answers as $answer) {
+            $answerId = (int) ($answer['answerId'] ?? 0);
+            if (0 >= $answerId) {
+                continue;
+            }
+
+            $selectedCount = (int) ($selectedCounts[$answerId] ?? 0);
+            $totalSelections += $selectedCount;
+            $rows[] = [
+                'id' => $answerId,
+                'answerId' => $answerId,
+                'answer' => (string) ($answer['answer'] ?? ''),
+                'correct' => false,
+                'correctValue' => (int) ($answer['correctValue'] ?? 0),
+                'score' => (float) ($answer['score'] ?? 0.0),
+                'position' => (int) ($answer['position'] ?? 0),
+                'selectedCount' => $selectedCount,
+                'selectedPercentage' => 0.0,
+            ];
+        }
+
+        return $this->withPercentages($rows, $totalSelections);
+    }
+
+    /**
+     * @return array<int, array{answer: string, userId: int, attemptId: int}>
+     */
+    private function getCompletedAttemptAnswerRows(CQuiz $quiz, Course $course, ?Session $session, int $questionId): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt.answer AS answer')
+            ->addSelect('IDENTITY(trackedExercise.user) AS userId')
+            ->addSelect('trackedExercise.exeId AS attemptId')
+            ->from(TrackEAttempt::class, 'attempt')
+            ->innerJoin('attempt.trackExercise', 'trackedExercise')
+            ->andWhere('IDENTITY(trackedExercise.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(trackedExercise.course) = :courseId')
+            ->andWhere('trackedExercise.status = :completedStatus')
+            ->andWhere('attempt.questionId = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('completedStatus', '', Types::STRING)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('userId', 'ASC')
+            ->addOrderBy('attemptId', 'ASC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(trackedExercise.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('trackedExercise.session IS NULL');
+        }
+
+        return $queryBuilder->getQuery()->getArrayResult();
+    }
+
+    /**
+     * @return array<string, int>
+     */
+    private function getAnswerValueCounts(CQuiz $quiz, Course $course, ?Session $session, int $questionId): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt.answer AS answerValue')
+            ->addSelect('COUNT(attempt.id) AS selectedCount')
+            ->from(TrackEAttempt::class, 'attempt')
+            ->innerJoin('attempt.trackExercise', 'trackedExercise')
+            ->andWhere('IDENTITY(trackedExercise.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(trackedExercise.course) = :courseId')
+            ->andWhere('trackedExercise.status = :completedStatus')
+            ->andWhere('attempt.questionId = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('completedStatus', '', Types::STRING)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->groupBy('attempt.answer')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(trackedExercise.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('trackedExercise.session IS NULL');
+        }
+
+        $counts = [];
+        foreach ($queryBuilder->getQuery()->getArrayResult() as $row) {
+            $answerValue = trim((string) ($row['answerValue'] ?? ''));
+            if ('' === $answerValue) {
+                continue;
+            }
+
+            $counts[$answerValue] = (int) ($row['selectedCount'] ?? 0);
+        }
+
+        return $counts;
+    }
+
+    /**
+     * @param array<int, int> $answerIds
+     *
+     * @return array<int, int>|null
+     */
+    private function getHotspotCorrectAnswerCounts(CQuiz $quiz, Course $course, ?Session $session, int $questionId, array $answerIds): ?array
+    {
+        $tableName = $this->getHotspotTableName();
+        if (null === $tableName) {
+            return null;
+        }
+
+        $connection = $this->entityManager->getConnection();
+        $queryBuilder = $connection->createQueryBuilder()
+            ->select('hotspot.hotspot_answer_id AS answer_id')
+            ->addSelect('COUNT(DISTINCT tracked_exercise.exe_user_id) AS selected_count')
+            ->from($tableName, 'hotspot')
+            ->innerJoin('hotspot', 'track_e_exercises', 'tracked_exercise', 'tracked_exercise.exe_id = hotspot.hotspot_exe_id')
+            ->andWhere('tracked_exercise.exe_exo_id = :exerciseId')
+            ->andWhere('tracked_exercise.c_id = :courseId')
+            ->andWhere('tracked_exercise.status = :completedStatus')
+            ->andWhere('hotspot.hotspot_question_id = :questionId')
+            ->andWhere('hotspot.hotspot_answer_id IN (:answerIds)')
+            ->andWhere('hotspot.hotspot_correct = 1')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('completedStatus', '', Types::STRING)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setParameter('answerIds', array_values(array_unique($answerIds)), ArrayParameterType::INTEGER)
+            ->groupBy('hotspot.hotspot_answer_id')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('tracked_exercise.session_id = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('tracked_exercise.session_id IS NULL');
+        }
+
+        $counts = [];
+        foreach ($queryBuilder->executeQuery()->fetchAllAssociative() as $row) {
+            $counts[(int) ($row['answer_id'] ?? 0)] = (int) ($row['selected_count'] ?? 0);
+        }
+
+        return $counts;
+    }
+
+    private function getHotspotTableName(): ?string
+    {
+        $schemaManager = $this->entityManager->getConnection()->createSchemaManager();
+        foreach (['track_e_hotspot', 'track_e_hotspots'] as $tableName) {
+            if ($schemaManager->tablesExist([$tableName])) {
+                return $tableName;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $rows
+     *
+     * @return array{answers: array<int, array<string, mixed>>, totalSelections: int, countingAvailable: bool}
+     */
+    private function withPercentages(array $rows, int $totalSelections): array
+    {
+        if (0 < $totalSelections) {
+            foreach ($rows as &$row) {
+                $row['selectedPercentage'] = round(((int) ($row['selectedCount'] ?? 0) * 100) / $totalSelections, 2);
+            }
+            unset($row);
+        }
+
+        return [
+            'answers' => $rows,
+            'totalSelections' => $totalSelections,
+            'countingAvailable' => true,
+        ];
+    }
+
+    /**
+     * @return array{
+     *     words: array<int, string>,
+     *     words_with_bracket: array<int, string>,
+     *     weighting: array<int, string>,
+     *     student_answer: array<int, string>,
+     *     student_score: array<int, string>,
+     *     blank_separator_start: string,
+     *     blank_separator_end: string
+     * }
+     */
+    private function parseFillBlankAnswer(string $answer, bool $isStudentAnswer): array
+    {
+        $parts = ['', ''];
+        if (1 === preg_match('/(.*)::(.*)$/s', $answer, $matches)) {
+            $parts = [(string) ($matches[1] ?? ''), (string) ($matches[2] ?? '')];
+        }
+
+        $systemString = $parts[1];
+        $systemParts = explode('@', $systemString, 2);
+        $details = explode(':', (string) ($systemParts[0] ?? ''));
+        $weighting = '' !== (string) ($details[0] ?? '') ? explode(',', (string) $details[0]) : [];
+        $separatorNumber = \count($details) >= 3 ? (int) ($details[2] ?? 0) : 0;
+        [$start, $end] = $this->getFillBlankSeparators($separatorNumber);
+        $startPattern = preg_quote($start, '/');
+        $endPattern = preg_quote($end, '/');
+        $wordMatches = [];
+        preg_match_all('/'.$startPattern.'[^'.$endPattern.']*'.$endPattern.'/', $parts[0], $wordMatches);
+        $wordsWithBracket = \is_array($wordMatches[0] ?? null) ? $wordMatches[0] : [];
+        $words = [];
+        foreach ($wordsWithBracket as $word) {
+            $words[] = trim((string) $word, $start.$end);
+        }
+
+        $studentAnswer = [];
+        $studentScore = [];
+        if ($isStudentAnswer) {
+            $baseWords = [];
+            $baseWordsWithBracket = [];
+            $count = \count($words);
+            for ($index = 0; $index < $count; ++$index) {
+                $baseWordsWithBracket[] = $wordsWithBracket[$index] ?? '';
+                $baseWords[] = $words[$index] ?? '';
+                ++$index;
+                $studentAnswer[] = $words[$index] ?? '';
+                ++$index;
+                $studentScore[] = $words[$index] ?? '';
+            }
+            $words = $baseWords;
+            $wordsWithBracket = $baseWordsWithBracket;
+        }
+
+        return [
+            'words' => $words,
+            'words_with_bracket' => $wordsWithBracket,
+            'weighting' => $weighting,
+            'student_answer' => $studentAnswer,
+            'student_score' => $studentScore,
+            'blank_separator_start' => $start,
+            'blank_separator_end' => $end,
+        ];
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getFillBlankSeparators(int $separator): array
+    {
+        return match ($separator) {
+            1 => ['{', '}'],
+            2 => ['(', ')'],
+            3 => ['*', '*'],
+            4 => ['#', '#'],
+            5 => ['%', '%'],
+            6 => ['$', '$'],
+            default => ['[', ']'],
+        };
+    }
+
+    private function stripFillBlankBrackets(string $value, string $start, string $end): string
+    {
+        return trim((string) preg_replace('/^'.preg_quote($start, '/').'(.*)'.preg_quote($end, '/').'$/s', '$1', $value));
+    }
+
+    private function isFillBlankStudentAnswerGood(string $studentAnswer, string $correctAnswer, bool $caseInsensitive): bool
+    {
+        $normalizedStudentAnswer = $caseInsensitive ? mb_strtolower($studentAnswer) : $studentAnswer;
+
+        if (false !== strpos($correctAnswer, '|') && false === strpos($correctAnswer, '||')) {
+            $menuAnswers = array_map([$this, 'trimFillBlankOption'], explode('|', $correctAnswer));
+            $firstAnswer = (string) ($menuAnswers[0] ?? '');
+            $normalizedFirstAnswer = $caseInsensitive ? mb_strtolower($firstAnswer) : $firstAnswer;
+
+            return $normalizedStudentAnswer === $normalizedFirstAnswer || $normalizedStudentAnswer === sha1($normalizedFirstAnswer);
+        }
+
+        if (false !== strpos($correctAnswer, '||')) {
+            $answers = array_map([$this, 'trimFillBlankOption'], preg_split('/\|\|/', $correctAnswer) ?: []);
+            foreach ($answers as $answer) {
+                $candidate = $caseInsensitive ? mb_strtolower($answer) : $answer;
+                if ($normalizedStudentAnswer === $candidate) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        $normalizedCorrectAnswer = $caseInsensitive ? mb_strtolower($this->trimFillBlankOption($correctAnswer)) : $this->trimFillBlankOption($correctAnswer);
+
+        return $normalizedStudentAnswer === $normalizedCorrectAnswer;
+    }
+
+    private function trimFillBlankOption(string $value): string
+    {
+        return trim(html_entity_decode($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php
new file mode 100644
index 00000000000..d16d827ea82
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php
@@ -0,0 +1,496 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseCategoryManagement;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuizCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Repository\CQuizQuestionCategoryRepository;
+use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProcessorInterface<ExerciseCategoryManagement, ExerciseCategoryManagement>
+ */
+final readonly class ExerciseCategoryManagementProcessor implements ProcessorInterface
+{
+    private const ACTION_CREATE = 'create';
+    private const ACTION_UPDATE = 'update';
+    private const ACTION_DELETE = 'delete';
+    private const ACTION_IMPORT_CSV = 'import_csv';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+        private CQuizQuestionCategoryRepository $questionCategoryRepository,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseCategoryManagement
+    {
+        if (!$data instanceof ExerciseCategoryManagement) {
+            throw new BadRequestHttpException('Invalid exercise category action payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercise categories in this context.');
+        }
+
+        $this->validateCsrfToken($data->submittedCsrfToken);
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $categoryType = $this->getCategoryType($uriVariables);
+
+        if (ExerciseCategoryManagementProvider::TYPE_EXERCISE === $categoryType && !$this->isSettingEnabled('exercise.allow_exercise_categories')) {
+            throw new AccessDeniedHttpException('Exercise categories are disabled on this platform.');
+        }
+
+        $action = strtolower(trim($data->action));
+        $message = match ($action) {
+            self::ACTION_CREATE => $this->createCategory($categoryType, $data, $course, $session),
+            self::ACTION_UPDATE => $this->updateCategory($categoryType, $data, $course, $session),
+            self::ACTION_DELETE => $this->deleteCategory($categoryType, $data, $course, $session),
+            self::ACTION_IMPORT_CSV => $this->importQuestionCategoriesFromCsv($categoryType, $data, $course, $session),
+            default => throw new BadRequestHttpException('Unsupported exercise category action.'),
+        };
+
+        $this->entityManager->flush();
+
+        $response = new ExerciseCategoryManagement();
+        $response->id = 'exercise_categories_'.$categoryType;
+        $response->categoryType = $categoryType;
+        $response->action = $action;
+        $response->categoryId = $data->categoryId;
+        $response->categoryTitle = $data->categoryTitle;
+        $response->importedCount = $data->importedCount;
+        $response->skippedCount = $data->skippedCount;
+        $response->success = true;
+        $response->message = $message;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     */
+    private function getCategoryType(array $uriVariables): string
+    {
+        $categoryType = (string) ($uriVariables['categoryType'] ?? '');
+        if (!\in_array($categoryType, [ExerciseCategoryManagementProvider::TYPE_EXERCISE, ExerciseCategoryManagementProvider::TYPE_QUESTION], true)) {
+            throw new BadRequestHttpException('Unsupported category type.');
+        }
+
+        return $categoryType;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function validateCsrfToken(string $submittedCsrfToken): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(ExerciseCategoryManagementProvider::CSRF_TOKEN_ID, $submittedCsrfToken))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+
+    private function createCategory(string $categoryType, ExerciseCategoryManagement $data, Course $course, ?Session $session): string
+    {
+        $title = trim($data->categoryTitle);
+        if ('' === $title) {
+            throw new BadRequestHttpException('A category title is required.');
+        }
+
+        if (ExerciseCategoryManagementProvider::TYPE_EXERCISE === $categoryType) {
+            $this->assertExerciseCategoryTitleIsUnique($title, $course);
+            $category = new CQuizCategory();
+            $category
+                ->setCourse($course)
+                ->setTitle($title)
+                ->setDescription($data->description)
+                ->setPosition($this->getNextExerciseCategoryPosition($course))
+                ->setParent($course)
+                ->addCourseLink($course);
+            $this->entityManager->persist($category);
+
+            return 'Category added';
+        }
+
+        $existingCategory = $this->questionCategoryRepository->findCourseResourceByTitle($title, $course->getResourceNode(), $course);
+        if (null !== $existingCategory) {
+            throw new BadRequestHttpException('A category with this title already exists.');
+        }
+
+        $category = new CQuizQuestionCategory();
+        $category
+            ->setTitle($title)
+            ->setDescription($data->description)
+            ->setParent($course)
+            ->addCourseLink($course, $session);
+        $this->questionCategoryRepository->create($category);
+
+        return 'Category added';
+    }
+
+    private function updateCategory(string $categoryType, ExerciseCategoryManagement $data, Course $course, ?Session $session): string
+    {
+        $categoryId = (int) ($data->categoryId ?? 0);
+        $title = trim($data->categoryTitle);
+        if (0 >= $categoryId || '' === $title) {
+            throw new BadRequestHttpException('A valid category id and title are required.');
+        }
+
+        if (ExerciseCategoryManagementProvider::TYPE_EXERCISE === $categoryType) {
+            $category = $this->getExerciseCategory($categoryId, $course);
+            $this->assertExerciseCategoryTitleIsUnique($title, $course, $categoryId);
+            $category
+                ->setTitle($title)
+                ->setDescription($data->description);
+
+            return 'Category updated';
+        }
+
+        $category = $this->getQuestionCategory($categoryId, $course, $session);
+        $category
+            ->setTitle($title)
+            ->setDescription($data->description);
+        $this->questionCategoryRepository->update($category);
+
+        return 'Category updated';
+    }
+
+    private function deleteCategory(string $categoryType, ExerciseCategoryManagement $data, Course $course, ?Session $session): string
+    {
+        $categoryId = (int) ($data->categoryId ?? 0);
+        if (0 >= $categoryId) {
+            throw new BadRequestHttpException('A valid category id is required.');
+        }
+
+        if (ExerciseCategoryManagementProvider::TYPE_EXERCISE === $categoryType) {
+            $category = $this->getExerciseCategory($categoryId, $course);
+            $this->entityManager->getConnection()->executeStatement(
+                'UPDATE c_quiz SET quiz_category_id = NULL WHERE quiz_category_id = :categoryId',
+                ['categoryId' => $categoryId],
+                ['categoryId' => ParameterType::INTEGER],
+            );
+            $this->entityManager->remove($category);
+
+            return 'Category deleted';
+        }
+
+        $category = $this->getQuestionCategory($categoryId, $course, $session);
+        $this->entityManager->getConnection()->executeStatement(
+            'DELETE FROM c_quiz_question_rel_category WHERE category_id = :categoryId',
+            ['categoryId' => $categoryId],
+            ['categoryId' => ParameterType::INTEGER],
+        );
+        $this->questionCategoryRepository->hardDelete($category);
+
+        return 'Category deleted';
+    }
+
+    private function importQuestionCategoriesFromCsv(string $categoryType, ExerciseCategoryManagement $data, Course $course, ?Session $session): string
+    {
+        if (ExerciseCategoryManagementProvider::TYPE_QUESTION !== $categoryType) {
+            throw new BadRequestHttpException('CSV import is only available for question categories.');
+        }
+
+        $csvContent = trim($data->csvContent);
+        if ('' === $csvContent) {
+            throw new BadRequestHttpException('A CSV file is required.');
+        }
+
+        $rows = $this->parseCsvRows($csvContent);
+        if ([] === $rows) {
+            throw new BadRequestHttpException('The CSV file is empty.');
+        }
+
+        $headerMap = $this->getCsvHeaderMap($rows[0]);
+        $startsWithHeader = [] !== $headerMap;
+        $importedCount = 0;
+        $skippedCount = 0;
+
+        foreach ($rows as $index => $row) {
+            if ($startsWithHeader && 0 === $index) {
+                continue;
+            }
+
+            [$title, $description] = $this->getCsvCategoryValues($row, $headerMap);
+            if ('' === $title) {
+                $skippedCount++;
+
+                continue;
+            }
+
+            if (null !== $this->questionCategoryRepository->findCourseResourceByTitle($title, $course->getResourceNode(), $course)) {
+                $skippedCount++;
+
+                continue;
+            }
+
+            $category = new CQuizQuestionCategory();
+            $category
+                ->setTitle($title)
+                ->setDescription($description)
+                ->setParent($course)
+                ->addCourseLink($course, $session);
+            $this->questionCategoryRepository->create($category);
+            $importedCount++;
+        }
+
+        if (0 === $importedCount && 0 === $skippedCount) {
+            throw new BadRequestHttpException('No categories could be imported from this CSV file.');
+        }
+
+        $data->importedCount = $importedCount;
+        $data->skippedCount = $skippedCount;
+
+        return 'Categories imported';
+    }
+
+    /**
+     * @return array<int, array<int, string>>
+     */
+    private function parseCsvRows(string $csvContent): array
+    {
+        $delimiter = $this->detectCsvDelimiter($csvContent);
+        $stream = fopen('php://temp', 'r+');
+        if (false === $stream) {
+            throw new BadRequestHttpException('The CSV file could not be read.');
+        }
+
+        fwrite($stream, $csvContent);
+        rewind($stream);
+
+        $rows = [];
+        while (false !== ($row = fgetcsv($stream, 0, $delimiter))) {
+            if ([null] === $row || [] === $row) {
+                continue;
+            }
+
+            $cleanRow = [];
+            foreach ($row as $value) {
+                $cleanRow[] = trim((string) $value);
+            }
+
+            if ('' === implode('', $cleanRow)) {
+                continue;
+            }
+
+            $rows[] = $cleanRow;
+        }
+
+        fclose($stream);
+
+        return $rows;
+    }
+
+    private function detectCsvDelimiter(string $csvContent): string
+    {
+        $lines = preg_split('/\r\n|\r|\n/', $csvContent);
+        $firstLine = '';
+        if (false !== $lines) {
+            foreach ($lines as $line) {
+                if ('' !== trim($line)) {
+                    $firstLine = $line;
+
+                    break;
+                }
+            }
+        }
+
+        $delimiters = [',' => substr_count($firstLine, ','), ';' => substr_count($firstLine, ';'), "\t" => substr_count($firstLine, "\t")];
+        arsort($delimiters);
+        $delimiter = (string) array_key_first($delimiters);
+
+        return '' !== $delimiter ? $delimiter : ',';
+    }
+
+    /**
+     * @param array<int, string> $row
+     *
+     * @return array<string, int>
+     */
+    private function getCsvHeaderMap(array $row): array
+    {
+        $headerMap = [];
+        foreach ($row as $index => $value) {
+            $header = mb_strtolower(trim($value));
+            $header = preg_replace('/^\xEF\xBB\xBF/', '', $header) ?? $header;
+            if (\in_array($header, ['title', 'category', 'category_name', 'name'], true)) {
+                $headerMap['title'] = $index;
+            }
+            if (\in_array($header, ['description', 'category_description'], true)) {
+                $headerMap['description'] = $index;
+            }
+        }
+
+        return isset($headerMap['title']) ? $headerMap : [];
+    }
+
+    /**
+     * @param array<int, string> $row
+     * @param array<string, int> $headerMap
+     *
+     * @return array{0: string, 1: string}
+     */
+    private function getCsvCategoryValues(array $row, array $headerMap): array
+    {
+        if ([] !== $headerMap) {
+            $title = trim((string) ($row[$headerMap['title']] ?? ''));
+            $descriptionIndex = $headerMap['description'] ?? null;
+            $description = null !== $descriptionIndex ? trim((string) ($row[$descriptionIndex] ?? '')) : '';
+
+            return [$title, $description];
+        }
+
+        return [trim((string) ($row[0] ?? '')), trim((string) ($row[1] ?? ''))];
+    }
+
+    private function getExerciseCategory(int $categoryId, Course $course): CQuizCategory
+    {
+        $category = $this->entityManager->getRepository(CQuizCategory::class)->find($categoryId);
+        if (!$category instanceof CQuizCategory || (int) $category->getCourse()->getId() !== (int) $course->getId()) {
+            throw new NotFoundHttpException('The requested exercise category was not found.');
+        }
+
+        return $category;
+    }
+
+    private function getQuestionCategory(int $categoryId, Course $course, ?Session $session): CQuizQuestionCategory
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizQuestionCategory::class, 'category')
+            ->innerJoin('category.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('category.iid = :categoryId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('categoryId', $categoryId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $category = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$category instanceof CQuizQuestionCategory) {
+            throw new NotFoundHttpException('The requested question category was not found.');
+        }
+
+        return $category;
+    }
+
+    private function assertExerciseCategoryTitleIsUnique(string $title, Course $course, ?int $exceptCategoryId = null): void
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('category.id')
+            ->from(CQuizCategory::class, 'category')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->andWhere('LOWER(category.title) = :title')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('title', mb_strtolower($title), Types::STRING)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $exceptCategoryId) {
+            $queryBuilder
+                ->andWhere('category.id <> :categoryId')
+                ->setParameter('categoryId', $exceptCategoryId, Types::INTEGER)
+            ;
+        }
+
+        if (null !== $queryBuilder->getQuery()->getOneOrNullResult()) {
+            throw new BadRequestHttpException('A category with this title already exists.');
+        }
+    }
+
+    private function getNextExerciseCategoryPosition(Course $course): int
+    {
+        $position = $this->entityManager->createQueryBuilder()
+            ->select('COALESCE(MAX(category.position), 0)')
+            ->from(CQuizCategory::class, 'category')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return (int) $position + 1;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php
new file mode 100644
index 00000000000..4eabc46649e
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php
@@ -0,0 +1,274 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseCategoryManagement;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProviderInterface<ExerciseCategoryManagement>
+ */
+final readonly class ExerciseCategoryManagementProvider implements ProviderInterface
+{
+    public const TYPE_EXERCISE = 'exercise';
+    public const TYPE_QUESTION = 'question';
+    public const CSRF_TOKEN_ID = 'exercise_category_management';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseCategoryManagement
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercise categories in this context.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $categoryType = $this->getCategoryType($uriVariables);
+
+        if (self::TYPE_EXERCISE === $categoryType && !$this->isSettingEnabled('exercise.allow_exercise_categories')) {
+            throw new AccessDeniedHttpException('Exercise categories are disabled on this platform.');
+        }
+
+        $response = new ExerciseCategoryManagement();
+        $response->id = 'exercise_categories_'.$categoryType;
+        $response->categoryType = $categoryType;
+        $response->title = self::TYPE_EXERCISE === $categoryType ? 'Exercise categories' : 'Question categories';
+        $response->items = self::TYPE_EXERCISE === $categoryType
+            ? $this->getExerciseCategories($course)
+            : $this->getQuestionCategories($course, $session);
+        $response->legacyUrls = $this->getLegacyUrls($categoryType, $request);
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+        $response->canManage = true;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     */
+    private function getCategoryType(array $uriVariables): string
+    {
+        $categoryType = (string) ($uriVariables['categoryType'] ?? '');
+        if (!\in_array($categoryType, [self::TYPE_EXERCISE, self::TYPE_QUESTION], true)) {
+            throw new BadRequestHttpException('Unsupported category type.');
+        }
+
+        return $categoryType;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getExerciseCategories(Course $course): array
+    {
+        $categories = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizCategory::class, 'category')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.position', 'ASC')
+            ->addOrderBy('category.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $categoryIds = [];
+        foreach ($categories as $category) {
+            if ($category instanceof CQuizCategory && null !== $category->getId()) {
+                $categoryIds[] = (int) $category->getId();
+            }
+        }
+
+        $usageCounts = $this->getExerciseCategoryUsageCounts($categoryIds);
+        $items = [];
+        foreach ($categories as $category) {
+            if (!$category instanceof CQuizCategory || null === $category->getId()) {
+                continue;
+            }
+
+            $categoryId = (int) $category->getId();
+            $items[] = [
+                'id' => $categoryId,
+                'title' => $category->getTitle(),
+                'description' => $category->getDescription(),
+                'usageCount' => $usageCounts[$categoryId] ?? 0,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @param array<int, int> $categoryIds
+     *
+     * @return array<int, int>
+     */
+    private function getExerciseCategoryUsageCounts(array $categoryIds): array
+    {
+        if ([] === $categoryIds) {
+            return [];
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('IDENTITY(quiz.quizCategory) AS categoryId')
+            ->addSelect('COUNT(quiz.iid) AS usageCount')
+            ->from(CQuiz::class, 'quiz')
+            ->andWhere('IDENTITY(quiz.quizCategory) IN (:categoryIds)')
+            ->setParameter('categoryIds', $categoryIds, ArrayParameterType::INTEGER)
+            ->groupBy('quiz.quizCategory')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $counts = [];
+        foreach ($rows as $row) {
+            $counts[(int) $row['categoryId']] = (int) $row['usageCount'];
+        }
+
+        return $counts;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestionCategories(Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizQuestionCategory::class, 'category')
+            ->innerJoin('category.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.title', 'ASC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $items = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $category) {
+            if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $category->getIid(),
+                'title' => $category->getTitle(),
+                'description' => (string) $category->getDescription(),
+                'usageCount' => $category->getQuestions()->count(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getLegacyUrls(string $categoryType, Request $request): array
+    {
+        $baseParams = [
+            'cid' => $request->query->getInt('cid'),
+            'sid' => $request->query->getInt('sid'),
+            'gid' => $request->query->getInt('gid'),
+        ];
+        $queryString = http_build_query(array_filter($baseParams, static fn (int $value): bool => 0 < $value));
+
+        if (self::TYPE_QUESTION === $categoryType) {
+            return [
+                'export' => '/main/exercise/tests_category.php?action=export_category&'.$queryString,
+                'import' => '/main/exercise/tests_category.php?action=import_category&'.$queryString,
+            ];
+        }
+
+        return [
+            'legacy' => '/main/exercise/category.php?'.$queryString,
+        ];
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
index 329d48c1133..9301edef9f6 100644
--- a/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
@@ -10,14 +10,25 @@
 use ApiPlatform\State\ProcessorInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseConfiguration;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Entity\ExtraFieldOptions;
+use Chamilo\CoreBundle\Entity\ExtraFieldValues;
+use Chamilo\CoreBundle\Entity\Language;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\Skill;
+use Chamilo\CoreBundle\Entity\SkillRelItem;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTime;
 use DateTimeInterface;
 use DateTimeZone;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -35,6 +46,10 @@
 final readonly class ExerciseConfigurationProcessor implements ProcessorInterface
 {
     private const CSRF_TOKEN_ID = 'exercise_configuration';
+    private const MEDIA_QUESTION = 15;
+    private const PAGE_BREAK = 31;
+    private const SKILL_ITEM_TYPE_EXERCISE = 1;
+
 
     public function __construct(
         private RequestStack $requestStack,
@@ -67,6 +82,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         if (!$this->canManageExercises()) {
             throw new AccessDeniedHttpException('You are not allowed to manage exercises in this context.');
         }
+        $this->getLanguageFromCode($data->language);
 
         $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
         if (0 < $exerciseId) {
@@ -75,6 +91,12 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $quiz = $this->createExercise($data, $course, $session);
         }
 
+        $this->entityManager->flush();
+        $this->applyResourceLanguage($quiz, $data->language);
+        $this->updateLearningPathTitles($quiz, $data);
+        $this->saveCategoryMatrix($quiz, $data);
+        $this->saveExerciseSkills($quiz, $data, $course, $session);
+        $this->saveExerciseExtraFields($quiz, $data);
         $this->entityManager->flush();
 
         return $this->buildResponse($quiz, $course, $session);
@@ -116,6 +138,10 @@ private function applyCommonFields(CQuiz $quiz, ExerciseConfiguration $data, Cou
         }
 
         $feedbackType = $this->normalizeFeedbackType($data->feedbackType);
+        if (!$this->isSettingEnabled('enable_quiz_scenario') && \in_array($feedbackType, [1, 3], true)) {
+            $feedbackType = \in_array($quiz->getFeedbackType(), [1, 3], true) ? $quiz->getFeedbackType() : 0;
+        }
+
         $resultsDisabled = $this->normalizeResultsDisabled($data->resultsDisabled);
         if (\in_array($feedbackType, [1, 3], true)) {
             $resultsDisabled = 0;
@@ -126,10 +152,17 @@ private function applyCommonFields(CQuiz $quiz, ExerciseConfiguration $data, Cou
             $type = CQuiz::ONE_PER_PAGE;
         }
 
-        if (1 === $feedbackType) {
+        if (\in_array($feedbackType, [1, 3], true)) {
             $type = CQuiz::ONE_PER_PAGE;
         }
 
+        $isExistingExercise = null !== $quiz->getIid();
+        $random = $isExistingExercise ? (int) $quiz->getRandom() : $this->normalizeRandomQuestionCount($data->random);
+        $maxAttempt = $isExistingExercise ? $quiz->getMaxAttempt() : max(0, $data->maxAttempt);
+        $propagateNeg = $isExistingExercise ? $quiz->getPropagateNeg() : ($data->propagateNeg ? 1 : 0);
+        $reviewAnswers = $isExistingExercise ? $quiz->getReviewAnswers() : ($data->reviewAnswers ? 1 : 0);
+        $expiredTime = $isExistingExercise ? $quiz->getExpiredTime() : max(0, $data->expiredTime);
+
         $quiz
             ->setTitle(trim($data->title))
             ->setDescription((string) $data->description)
@@ -137,9 +170,9 @@ private function applyCommonFields(CQuiz $quiz, ExerciseConfiguration $data, Cou
             ->setStartTime($startTime)
             ->setEndTime($endTime)
             ->setDuration($this->normalizeNullablePositiveInteger($data->duration))
-            ->setMaxAttempt(max(0, $data->maxAttempt))
+            ->setMaxAttempt($maxAttempt)
             ->setPassPercentage(max(0, min(100, $data->passPercentage)))
-            ->setRandom($this->normalizeRandomQuestionCount($data->random))
+            ->setRandom($random)
             ->setRandomByCategory($this->normalizeRandomByCategory($data->randomByCategory))
             ->setRandomAnswers($data->randomAnswers)
             ->setShowPreviousButton($data->showPreviousButton)
@@ -155,10 +188,10 @@ private function applyCommonFields(CQuiz $quiz, ExerciseConfiguration $data, Cou
             ->setDisplayCategoryName($data->displayCategoryName ? 1 : 0)
             ->setHideQuestionTitle($data->hideQuestionTitle)
             ->setHideQuestionNumber($data->hideQuestionNumber ? 1 : 0)
-            ->setPropagateNeg($data->propagateNeg ? 1 : 0)
+            ->setPropagateNeg($propagateNeg)
             ->setSaveCorrectAnswers(max(0, $data->saveCorrectAnswers))
-            ->setReviewAnswers($data->reviewAnswers ? 1 : 0)
-            ->setExpiredTime(max(0, $data->expiredTime))
+            ->setReviewAnswers($reviewAnswers)
+            ->setExpiredTime($expiredTime)
             ->setDisplayChartDegreeCertainty($this->normalizeBinaryInteger($data->displayChartDegreeCertainty))
             ->setSendEmailChartDegreeCertainty($this->normalizeBinaryInteger($data->sendEmailChartDegreeCertainty))
             ->setNotDisplayBalancePercentageCategorieQuestion($this->normalizeBinaryInteger($data->notDisplayBalancePercentageCategorieQuestion))
@@ -431,7 +464,15 @@ private function buildResponse(CQuiz $quiz, Course $course, ?Session $session):
         $configuration->mode = 'edit';
         $configuration->title = $quiz->getTitle();
         $configuration->description = (string) $quiz->getDescription();
+        $category = $quiz->getQuizCategory();
         $configuration->type = $quiz->getType();
+        $configuration->categoryId = null !== $category && null !== $category->getId() ? (int) $category->getId() : null;
+        $configuration->language = $this->getResourceLanguageIsoCode($quiz);
+        $configuration->updateTitleInLearningPaths = false;
+        $configuration->skillIds = $this->getSelectedSkillIds($quiz);
+        $configuration->extraFieldValues = $this->getExerciseExtraFieldValues($quiz);
+        $configuration->extraNotification = '';
+        $configuration->lockedFields = $this->getLockedFieldsForEdit();
         $configuration->startTime = $this->formatDateForInput($quiz->getStartTime());
         $configuration->endTime = $this->formatDateForInput($quiz->getEndTime());
         $configuration->duration = $quiz->getDuration();
@@ -439,6 +480,7 @@ private function buildResponse(CQuiz $quiz, Course $course, ?Session $session):
         $configuration->passPercentage = (int) ($quiz->getPassPercentage() ?? 0);
         $configuration->random = (int) $quiz->getRandom();
         $configuration->randomByCategory = (int) $quiz->getRandomByCategory();
+        $configuration->categoryMatrix = $this->getCategoryMatrix($quiz);
         $configuration->randomAnswers = $quiz->getRandomAnswers();
         $configuration->showPreviousButton = $quiz->isShowPreviousButton();
         $configuration->preventBackwards = 1 === $quiz->getPreventBackwards();
@@ -467,11 +509,987 @@ private function buildResponse(CQuiz $quiz, Course $course, ?Session $session):
         $configuration->textWhenFinishedFailure = (string) $quiz->getTextWhenFinishedFailure();
         $configuration->questionsUrl = $this->buildLegacyQuestionsUrl($quiz, $course, $session);
         $configuration->csrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
+        $configuration->settings = $this->getSettings();
+        $configuration->options = $this->getOptions($course, $quiz);
+        $configuration->canCreate = true;
+        $configuration->canEdit = true;
 
         return $configuration;
     }
 
 
+
+    private function applyResourceLanguage(CQuiz $quiz, string $rawLanguage): void
+    {
+        $resourceNode = $quiz->getResourceNode();
+        if (null === $resourceNode) {
+            return;
+        }
+
+        $language = $this->getLanguageFromCode($rawLanguage);
+
+        $resourceNode->setLanguage($language);
+        $this->entityManager->persist($resourceNode);
+    }
+
+
+    private function getLanguageFromCode(string $rawLanguage): ?Language
+    {
+        $languageCode = trim($rawLanguage);
+        if ('' === $languageCode) {
+            return null;
+        }
+
+        $language = $this->entityManager->getRepository(Language::class)->findOneBy([
+            'isocode' => $languageCode,
+            'available' => true,
+        ]);
+
+        if (!$language instanceof Language) {
+            throw new BadRequestHttpException('The selected resource language is invalid.');
+        }
+
+        return $language;
+    }
+
+    private function updateLearningPathTitles(CQuiz $quiz, ExerciseConfiguration $data): void
+    {
+        if (!$data->updateTitleInLearningPaths || null === $quiz->getIid()) {
+            return;
+        }
+
+        $items = $this->entityManager->createQueryBuilder()
+            ->select('item')
+            ->from(CLpItem::class, 'item')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('item.path = :path')
+            ->setParameter('itemType', 'quiz', Types::STRING)
+            ->setParameter('path', (string) $quiz->getIid(), Types::STRING)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        foreach ($items as $item) {
+            if (!$item instanceof CLpItem) {
+                continue;
+            }
+
+            $item->setTitle($quiz->getTitle());
+            $this->entityManager->persist($item);
+        }
+    }
+
+    /**
+     * Legacy freezes these fields after an exercise has been created.
+     *
+     * @return array<int, string>
+     */
+    private function getLockedFieldsForEdit(): array
+    {
+        return [
+            'random',
+            'maxAttempt',
+            'propagateNeg',
+            'enableTimeControl',
+            'expiredTime',
+            'reviewAnswers',
+        ];
+    }
+
+    private function saveCategoryMatrix(CQuiz $quiz, ExerciseConfiguration $data): void
+    {
+        if ([] === $data->categoryMatrix) {
+            return;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return;
+        }
+
+        $matrix = $this->normalizeCategoryMatrix($quiz, $data->categoryMatrix);
+        if ([] === $matrix) {
+            return;
+        }
+
+        $connection = $this->entityManager->getConnection();
+        $connection->executeStatement(
+            'DELETE FROM c_quiz_rel_category WHERE exercise_id = :exerciseId',
+            ['exerciseId' => $exerciseId],
+            ['exerciseId' => Types::INTEGER]
+        );
+
+        foreach ($matrix as $categoryId => $countQuestions) {
+            if (0 === (int) $categoryId) {
+                continue;
+            }
+
+            $connection->insert('c_quiz_rel_category', [
+                'exercise_id' => $exerciseId,
+                'category_id' => $categoryId,
+                'count_questions' => $countQuestions,
+            ], [
+                'exercise_id' => Types::INTEGER,
+                'category_id' => Types::INTEGER,
+                'count_questions' => Types::INTEGER,
+            ]);
+        }
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $matrix
+     *
+     * @return array<int, int>
+     */
+    private function normalizeCategoryMatrix(CQuiz $quiz, array $matrix): array
+    {
+        $allowedCategoryIds = $this->getAllowedCategoryMatrixIds($quiz);
+        if ([] === $allowedCategoryIds) {
+            return [];
+        }
+
+        $normalized = [];
+        foreach ($matrix as $row) {
+            if (!\is_array($row)) {
+                continue;
+            }
+
+            $categoryId = (int) ($row['categoryId'] ?? 0);
+            if (!\in_array($categoryId, $allowedCategoryIds, true)) {
+                continue;
+            }
+
+            $countQuestions = (int) ($row['countQuestions'] ?? -1);
+            $normalized[$categoryId] = max(-1, $countQuestions);
+        }
+
+        return $normalized;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getAllowedCategoryMatrixIds(CQuiz $quiz): array
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return [];
+        }
+
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $categoryIds = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $questionType = (int) $question->getType();
+            if (self::MEDIA_QUESTION === $questionType || self::PAGE_BREAK === $questionType) {
+                continue;
+            }
+
+            foreach ($question->getCategories() as $category) {
+                if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+                    continue;
+                }
+
+                $categoryIds[(int) $category->getIid()] = (int) $category->getIid();
+            }
+        }
+
+        if ([] === $categoryIds) {
+            return [];
+        }
+
+        $categoryIds[0] = 0;
+
+        return array_values($categoryIds);
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCategoryMatrix(CQuiz $quiz): array
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return [];
+        }
+
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $categories = [];
+        $generalQuestionCount = 0;
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $questionType = (int) $question->getType();
+            if (self::MEDIA_QUESTION === $questionType || self::PAGE_BREAK === $questionType) {
+                continue;
+            }
+
+            $questionCategories = $question->getCategories();
+            if (0 === $questionCategories->count()) {
+                $generalQuestionCount++;
+                continue;
+            }
+
+            foreach ($questionCategories as $category) {
+                if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+                    continue;
+                }
+
+                $categoryId = (int) $category->getIid();
+                if (!isset($categories[$categoryId])) {
+                    $categories[$categoryId] = [
+                        'categoryId' => $categoryId,
+                        'title' => $category->getTitle(),
+                        'availableQuestions' => 0,
+                    ];
+                }
+
+                $categories[$categoryId]['availableQuestions']++;
+            }
+        }
+
+        if ([] === $categories) {
+            return [];
+        }
+
+        uasort(
+            $categories,
+            static fn (array $left, array $right): int => strcasecmp((string) $left['title'], (string) $right['title'])
+        );
+
+        $savedCounts = $this->getSavedCategoryQuestionCounts($exerciseId);
+        $matrix = [];
+        foreach ($categories as $category) {
+            $categoryId = (int) $category['categoryId'];
+            $matrix[] = [
+                'categoryId' => $categoryId,
+                'title' => (string) $category['title'],
+                'availableQuestions' => (int) $category['availableQuestions'],
+                'countQuestions' => $savedCounts[$categoryId] ?? -1,
+            ];
+        }
+
+        $matrix[] = [
+            'categoryId' => 0,
+            'title' => 'General',
+            'availableQuestions' => $generalQuestionCount,
+            'countQuestions' => $savedCounts[0] ?? -1,
+        ];
+
+        return $matrix;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getSavedCategoryQuestionCounts(int $exerciseId): array
+    {
+        $rows = $this->entityManager->getConnection()->fetchAllAssociative(
+            'SELECT category_id, count_questions FROM c_quiz_rel_category WHERE exercise_id = :exerciseId',
+            ['exerciseId' => $exerciseId],
+            ['exerciseId' => Types::INTEGER]
+        );
+
+        $counts = [];
+        foreach ($rows as $row) {
+            $counts[(int) $row['category_id']] = (int) $row['count_questions'];
+        }
+
+        return $counts;
+    }
+
+    /**
+     * @return array<string, bool>
+     */
+    private function getSettings(): array
+    {
+        return [
+            'allowExerciseCategories' => $this->isSettingEnabled('exercise.allow_exercise_categories'),
+            'allowQuizResultsPageConfig' => $this->isSettingEnabled('exercise.allow_quiz_results_page_config'),
+            'allowExerciseAutoLaunch' => $this->isSettingEnabled('exercise.allow_exercise_auto_launch'),
+            'enableExerciseAutoLaunch' => $this->isSettingEnabled('exercise.enable_exercise_auto_launch'),
+            'hideAttemptsTableOnStartPage' => $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page'),
+            'limitTeacherAccess' => $this->isSettingEnabled('exercise.limit_exercise_teacher_access'),
+            'allowNotificationSettingPerExercise' => $this->isSettingEnabled('exercise.allow_notification_setting_per_exercise'),
+            'allowHideQuestionNumberSetting' => $this->isSettingEnabled('exercise.quiz_hide_question_number'),
+            'enableQuizScenario' => $this->isSettingEnabled('enable_quiz_scenario'),
+        ];
+    }
+
+    /**
+     * @return array<string, array<int, array<string, mixed>>>
+     */
+    private function getOptions(Course $course, ?CQuiz $quiz): array
+    {
+        return [
+            'typeOptions' => [
+                ['value' => CQuiz::ALL_ON_ONE_PAGE, 'label' => 'All questions on one page'],
+                ['value' => CQuiz::ONE_PER_PAGE, 'label' => 'One question per page'],
+            ],
+            'categoryOptions' => $this->getCategoryOptions($course),
+            'languageOptions' => $this->getResourceLanguageOptions(),
+            'skillOptions' => $this->getSkillOptions(),
+            'extraFieldDefinitions' => $this->getExtraFieldDefinitions(),
+            'extraNotificationOptions' => [],
+            'feedbackOptions' => $this->getFeedbackOptions($quiz),
+            'resultOptions' => [
+                ['value' => 0, 'label' => 'Auto-evaluation mode: show score and expected answers'],
+                ['value' => 1, 'label' => 'Exam mode: Do not show score nor answers'],
+                ['value' => 2, 'label' => 'Practice mode: Show score only, by category if at least one is used'],
+                ['value' => 4, 'label' => 'Show score on every attempt, show correct answers only on last attempt (only works with an attempts limit)'],
+                ['value' => 5, 'label' => 'Do not show the score (only when user finishes all attempts) but show feedback for each attempt.'],
+                ['value' => 6, 'label' => 'Ranking mode: Do not show results details question by question and show a table with the ranking of all other users.'],
+                ['value' => 7, 'label' => 'Show only global score (not question score) and show only the correct answers, do not show incorrect answers at all'],
+                ['value' => 8, 'label' => 'Auto-evaluation mode and ranking'],
+                ['value' => 9, 'label' => 'Show score by category on a radar/spiderweb chart'],
+                ['value' => 10, 'label' => 'Show the result to the learner: Show the score, the learner choice and his feedback on each attempt, add the correct answer and his feedback when the chosen limit of attempts is reached.'],
+            ],
+            'questionSelectionTypeOptions' => [
+                ['value' => 1, 'label' => 'Ordered by user'],
+                ['value' => 2, 'label' => 'Random'],
+                ['value' => 3, 'label' => 'Ordered categories alphabetically with questions ordered'],
+                ['value' => 4, 'label' => 'Random categories with questions ordered'],
+                ['value' => 5, 'label' => 'Ordered categories alphabetically with random questions'],
+                ['value' => 6, 'label' => 'Random categories with random questions'],
+            ],
+            'randomByCategoryOptions' => [
+                ['value' => 0, 'label' => 'No'],
+                ['value' => 1, 'label' => 'Random shuffled categories'],
+                ['value' => 2, 'label' => 'Random ordered categories'],
+            ],
+            'notificationOptions' => [
+                ['value' => 2, 'label' => 'Paranoid: E-mail teacher when a student starts an exercise'],
+                ['value' => 1, 'label' => 'Aware: E-mail teacher when a student ends an exercise'],
+                ['value' => 3, 'label' => 'Relaxed open: E-mail teacher when a student ends an exercise, only if an open question is answered'],
+                ['value' => 4, 'label' => 'Relaxed audio: E-mail teacher when a student ends an exercise, only if an oral question is answered'],
+            ],
+            'saveCorrectAnswerOptions' => [
+                ['value' => 0, 'label' => 'Please select an option'],
+                ['value' => 1, 'label' => 'Save the correct answer for the next attempt'],
+                ['value' => 2, 'label' => 'Pre-fill with answers from previous attempt'],
+            ],
+        ];
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getFeedbackOptions(?CQuiz $quiz): array
+    {
+        $options = [
+            ['value' => 0, 'label' => 'At end of test'],
+            ['value' => 2, 'label' => 'Exam (no feedback)'],
+        ];
+
+        if ($this->isSettingEnabled('enable_quiz_scenario') || \in_array($quiz?->getFeedbackType(), [1, 3], true)) {
+            $options[] = ['value' => 1, 'label' => 'Adaptative test with immediate feedback'];
+            $options[] = ['value' => 3, 'label' => 'Direct pop-up mode'];
+        }
+
+        return $options;
+    }
+
+    /**
+     * @return array<string, bool>
+     */
+    private function getDefaultPageResultConfiguration(): array
+    {
+        return [
+            'hideExpectedAnswers' => false,
+            'hideTotalScore' => false,
+            'hideQuestionScore' => false,
+            'hideCategoryTable' => false,
+            'hideCorrectAnsweredQuestions' => false,
+        ];
+    }
+
+
+    /**
+     * @return array<int, array<string, string>>
+     */
+    private function getResourceLanguageOptions(): array
+    {
+        $languages = $this->entityManager->getRepository(Language::class)->findBy(
+            ['available' => true],
+            ['englishName' => 'ASC']
+        );
+
+        $items = [
+            ['value' => '', 'label' => 'No specific language'],
+        ];
+
+        foreach ($languages as $language) {
+            if (!$language instanceof Language) {
+                continue;
+            }
+
+            $items[] = [
+                'value' => $language->getIsocode(),
+                'label' => $language->getOriginalName() ?: $language->getEnglishName(),
+            ];
+        }
+
+        return $items;
+    }
+
+    private function getResourceLanguageIsoCode(CQuiz $quiz): string
+    {
+        $resourceNode = $quiz->getResourceNode();
+        if (null === $resourceNode) {
+            return '';
+        }
+
+        $language = $resourceNode->getLanguage();
+        if (!$language instanceof Language) {
+            return '';
+        }
+
+        return $language->getIsocode();
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCategoryOptions(Course $course): array
+    {
+        if (!$this->isSettingEnabled('exercise.allow_exercise_categories')) {
+            return [];
+        }
+
+        $categories = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizCategory::class, 'category')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.position', 'ASC')
+            ->addOrderBy('category.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($categories as $category) {
+            if (!$category instanceof CQuizCategory || null === $category->getId()) {
+                continue;
+            }
+
+            $items[] = [
+                'value' => (int) $category->getId(),
+                'label' => $category->getTitle(),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getSkillOptions(): array
+    {
+        $skills = $this->entityManager->createQueryBuilder()
+            ->select('skill')
+            ->from(Skill::class, 'skill')
+            ->andWhere('skill.status = :status')
+            ->setParameter('status', Skill::STATUS_ENABLED, Types::INTEGER)
+            ->orderBy('skill.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($skills as $skill) {
+            if (!$skill instanceof Skill || null === $skill->getId()) {
+                continue;
+            }
+
+            $label = $skill->getTitle();
+            if ('' !== trim($skill->getShortCode())) {
+                $label .= ' ('.$skill->getShortCode().')';
+            }
+
+            $items[] = [
+                'value' => (int) $skill->getId(),
+                'label' => $label,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getSelectedSkillIds(CQuiz $quiz): array
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return [];
+        }
+
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relation', 'skill')
+            ->from(SkillRelItem::class, 'relation')
+            ->innerJoin('relation.skill', 'skill')
+            ->andWhere('relation.itemType = :itemType')
+            ->andWhere('relation.itemId = :itemId')
+            ->andWhere('skill.status = :status')
+            ->setParameter('itemType', self::SKILL_ITEM_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('status', Skill::STATUS_ENABLED, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $ids = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof SkillRelItem || null === $relation->getSkill()->getId()) {
+                continue;
+            }
+
+            $ids[] = (int) $relation->getSkill()->getId();
+        }
+
+        return array_values(array_unique($ids));
+    }
+
+    private function saveExerciseSkills(CQuiz $quiz, ExerciseConfiguration $data, Course $course, ?Session $session): void
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return;
+        }
+
+        $skillIds = array_values(array_unique(array_filter(
+            array_map(static fn (mixed $value): int => (int) $value, $data->skillIds),
+            static fn (int $value): bool => 0 < $value
+        )));
+
+        $this->entityManager->createQueryBuilder()
+            ->delete(SkillRelItem::class, 'relation')
+            ->andWhere('relation.itemType = :itemType')
+            ->andWhere('relation.itemId = :itemId')
+            ->setParameter('itemType', self::SKILL_ITEM_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->getQuery()
+            ->execute()
+        ;
+
+        if ([] === $skillIds) {
+            return;
+        }
+
+        $skills = $this->entityManager->createQueryBuilder()
+            ->select('skill')
+            ->from(Skill::class, 'skill')
+            ->andWhere('skill.id IN (:skillIds)')
+            ->andWhere('skill.status = :status')
+            ->setParameter('skillIds', $skillIds, ArrayParameterType::INTEGER)
+            ->setParameter('status', Skill::STATUS_ENABLED, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $userId = $this->getCurrentUserId();
+        foreach ($skills as $skill) {
+            if (!$skill instanceof Skill) {
+                continue;
+            }
+
+            $relation = new SkillRelItem();
+            $relation
+                ->setSkill($skill)
+                ->setItemType(self::SKILL_ITEM_TYPE_EXERCISE)
+                ->setItemId($exerciseId)
+                ->setIsReal(true)
+                ->setRequiresValidation(false)
+                ->setCreatedBy($userId)
+                ->setUpdatedBy($userId)
+                ->setCourseId((int) $course->getId())
+            ;
+
+            if (null !== $session && null !== $session->getId()) {
+                $relation->setSessionId((int) $session->getId());
+            }
+
+            $this->entityManager->persist($relation);
+        }
+    }
+
+    /**
+     * @return array<int, ExtraField>
+     */
+    private function getExerciseExtraFields(bool $includeNotifications = false): array
+    {
+        $fields = $this->entityManager->createQueryBuilder()
+            ->select('field', 'options')
+            ->from(ExtraField::class, 'field')
+            ->leftJoin('field.options', 'options')
+            ->andWhere('field.itemType = :itemType')
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->orderBy('field.fieldOrder', 'ASC')
+            ->addOrderBy('field.displayText', 'ASC')
+            ->addOrderBy('options.optionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($fields as $field) {
+            if (!$field instanceof ExtraField) {
+                continue;
+            }
+
+            if (!$includeNotifications && 'notifications' === $field->getVariable()) {
+                continue;
+            }
+
+            $items[] = $field;
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getExtraFieldDefinitions(): array
+    {
+        $items = [];
+        foreach ($this->getExerciseExtraFields() as $field) {
+            if (null === $field->getId() || !$this->isSupportedExtraFieldType((int) $field->getValueType())) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $field->getId(),
+                'variable' => $field->getVariable(),
+                'label' => $field->getDisplayText() ?: $field->getVariable(),
+                'type' => (int) $field->getValueType(),
+                'defaultValue' => (string) ($field->getDefaultValue() ?? ''),
+                'changeable' => true === $field->isChangeable(),
+                'options' => $this->getExtraFieldOptionItems($field),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, string>>
+     */
+    private function getExtraFieldOptionItems(ExtraField $field): array
+    {
+        $items = [];
+        foreach ($field->getOptions() as $option) {
+            if (!$option instanceof ExtraFieldOptions) {
+                continue;
+            }
+
+            $value = (string) ($option->getValue() ?? '');
+            if ('' === $value) {
+                continue;
+            }
+
+            $items[] = [
+                'value' => $value,
+                'label' => $option->getDisplayText() ?: $value,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getExerciseExtraFieldValues(CQuiz $quiz): array
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        $values = [];
+        foreach ($this->getExerciseExtraFields() as $field) {
+            if (!$this->isSupportedExtraFieldType((int) $field->getValueType())) {
+                continue;
+            }
+
+            $values[$field->getVariable()] = $this->normalizeExtraFieldValueForFrontend(
+                (int) $field->getValueType(),
+                (string) ($field->getDefaultValue() ?? ''),
+                0 < $field->getOptions()->count()
+            );
+        }
+
+        if (0 >= $exerciseId) {
+            return $values;
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('value', 'field')
+            ->from(ExtraFieldValues::class, 'value')
+            ->innerJoin('value.field', 'field')
+            ->andWhere('value.itemId = :itemId')
+            ->andWhere('field.itemType = :itemType')
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        foreach ($rows as $row) {
+            if (!$row instanceof ExtraFieldValues) {
+                continue;
+            }
+
+            $field = $row->getField();
+            if ('notifications' === $field->getVariable() || !$this->isSupportedExtraFieldType((int) $field->getValueType())) {
+                continue;
+            }
+
+            $values[$field->getVariable()] = $this->normalizeExtraFieldValueForFrontend(
+                (int) $field->getValueType(),
+                (string) ($row->getFieldValue() ?? ''),
+                0 < $field->getOptions()->count()
+            );
+        }
+
+        return $values;
+    }
+
+    private function saveExerciseExtraFields(CQuiz $quiz, ExerciseConfiguration $data): void
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return;
+        }
+
+        foreach ($this->getExerciseExtraFields() as $field) {
+            if (null === $field->getId() || !$this->isSupportedExtraFieldType((int) $field->getValueType())) {
+                continue;
+            }
+
+            $rawValue = $data->extraFieldValues[$field->getVariable()] ?? null;
+            $value = $this->normalizeExtraFieldValueForStorage($field, $rawValue);
+            $this->saveExtraFieldValue($field, $exerciseId, $value);
+        }
+    }
+
+    private function getExerciseExtraNotification(CQuiz $quiz): string
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return '';
+        }
+
+        $row = $this->entityManager->createQueryBuilder()
+            ->select('value', 'field')
+            ->from(ExtraFieldValues::class, 'value')
+            ->innerJoin('value.field', 'field')
+            ->andWhere('value.itemId = :itemId')
+            ->andWhere('field.itemType = :itemType')
+            ->andWhere('field.variable = :variable')
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->setParameter('variable', 'notifications', Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $row instanceof ExtraFieldValues ? (string) ($row->getFieldValue() ?? '') : '';
+    }
+
+    private function saveExerciseExtraNotification(CQuiz $quiz, ExerciseConfiguration $data): void
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return;
+        }
+
+        $notification = trim($data->extraNotification);
+        $options = $this->getExtraNotificationOptions();
+        if ('' !== $notification && [] !== $options && !\in_array($notification, array_column($options, 'value'), true)) {
+            throw new BadRequestHttpException('The selected finished notification is invalid.');
+        }
+
+        $field = $this->getExerciseExtraFieldByVariable('notifications');
+        if (!$field instanceof ExtraField) {
+            return;
+        }
+
+        $this->saveExtraFieldValue($field, $exerciseId, $notification);
+    }
+
+    private function getExerciseExtraFieldByVariable(string $variable): ?ExtraField
+    {
+        $field = $this->entityManager->createQueryBuilder()
+            ->select('field')
+            ->from(ExtraField::class, 'field')
+            ->andWhere('field.itemType = :itemType')
+            ->andWhere('field.variable = :variable')
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->setParameter('variable', $variable, Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $field instanceof ExtraField ? $field : null;
+    }
+
+    private function saveExtraFieldValue(ExtraField $field, int $exerciseId, string $value): void
+    {
+        $extraValue = $this->entityManager->createQueryBuilder()
+            ->select('value')
+            ->from(ExtraFieldValues::class, 'value')
+            ->andWhere('value.itemId = :itemId')
+            ->andWhere('IDENTITY(value.field) = :fieldId')
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('fieldId', (int) $field->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$extraValue instanceof ExtraFieldValues) {
+            $extraValue = new ExtraFieldValues();
+            $extraValue->setField($field);
+            $extraValue->setItemId($exerciseId);
+            $extraValue->setComment('');
+        }
+
+        $extraValue->setFieldValue($value);
+        $this->entityManager->persist($extraValue);
+    }
+
+    private function normalizeExtraFieldValueForStorage(ExtraField $field, mixed $rawValue): string
+    {
+        $type = (int) $field->getValueType();
+        $hasOptions = 0 < $field->getOptions()->count();
+
+        if (ExtraField::FIELD_TYPE_SELECT_MULTIPLE === $type || (ExtraField::FIELD_TYPE_CHECKBOX === $type && $hasOptions)) {
+            if (!\is_array($rawValue)) {
+                return '';
+            }
+
+            return implode(';', array_values(array_filter(
+                array_map(static fn (mixed $value): string => trim((string) $value), $rawValue),
+                static fn (string $value): bool => '' !== $value
+            )));
+        }
+
+        if (ExtraField::FIELD_TYPE_CHECKBOX === $type) {
+            return true === $rawValue || '1' === (string) $rawValue || 'on' === strtolower((string) $rawValue) ? '1' : '0';
+        }
+
+        return trim((string) $rawValue);
+    }
+
+    private function normalizeExtraFieldValueForFrontend(int $type, string $value, bool $hasOptions): mixed
+    {
+        if (ExtraField::FIELD_TYPE_SELECT_MULTIPLE === $type || (ExtraField::FIELD_TYPE_CHECKBOX === $type && $hasOptions)) {
+            if ('' === trim($value)) {
+                return [];
+            }
+
+            return array_values(array_filter(explode(';', $value), static fn (string $item): bool => '' !== trim($item)));
+        }
+
+        if (ExtraField::FIELD_TYPE_CHECKBOX === $type) {
+            return true === $value || '1' === $value || 'on' === strtolower($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * @return array<int, array<string, string>>
+     */
+    private function getExtraNotificationOptions(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeExtraNotificationSettings(mixed $rawValue): array
+    {
+        if (\is_array($rawValue)) {
+            return $rawValue;
+        }
+
+        if (!\is_string($rawValue) || '' === trim($rawValue)) {
+            return [];
+        }
+
+        $decoded = json_decode($rawValue, true);
+        if (\is_array($decoded)) {
+            return $decoded;
+        }
+
+        return [];
+    }
+
+    private function isSupportedExtraFieldType(int $type): bool
+    {
+        return \in_array($type, [
+            ExtraField::FIELD_TYPE_TEXT,
+            ExtraField::FIELD_TYPE_TEXTAREA,
+            ExtraField::FIELD_TYPE_RADIO,
+            ExtraField::FIELD_TYPE_SELECT,
+            ExtraField::FIELD_TYPE_SELECT_MULTIPLE,
+            ExtraField::FIELD_TYPE_DATE,
+            ExtraField::FIELD_TYPE_DATETIME,
+            ExtraField::FIELD_TYPE_CHECKBOX,
+            ExtraField::FIELD_TYPE_INTEGER,
+            ExtraField::FIELD_TYPE_FLOAT,
+        ], true);
+    }
+
+    private function getCurrentUserId(): int
+    {
+        $user = $this->security->getUser();
+        if (!\is_object($user) || !method_exists($user, 'getId')) {
+            throw new AccessDeniedHttpException('A valid user is required.');
+        }
+
+        return (int) $user->getId();
+    }
+
     /**
      * @return array<int, int>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
index 9e989c9fcb3..cd3f7554b5e 100644
--- a/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
@@ -10,10 +10,19 @@
 use ApiPlatform\State\ProviderInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseConfiguration;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Entity\ExtraFieldOptions;
+use Chamilo\CoreBundle\Entity\ExtraFieldValues;
+use Chamilo\CoreBundle\Entity\Language;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\Skill;
+use Chamilo\CoreBundle\Entity\SkillRelItem;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTimeInterface;
 use Doctrine\DBAL\Types\Types;
@@ -32,6 +41,10 @@
 final readonly class ExerciseConfigurationProvider implements ProviderInterface
 {
     private const CSRF_TOKEN_ID = 'exercise_configuration';
+    private const MEDIA_QUESTION = 15;
+    private const PAGE_BREAK = 31;
+    private const SKILL_ITEM_TYPE_EXERCISE = 1;
+
 
     public function __construct(
         private RequestStack $requestStack,
@@ -77,7 +90,7 @@ private function buildCreateConfiguration(Course $course, ?Session $session): Ex
         $configuration->canEdit = false;
         $configuration->csrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
         $configuration->settings = $this->getSettings();
-        $configuration->options = $this->getOptions($course);
+        $configuration->options = $this->getOptions($course, null);
         $configuration->listUrl = '';
         $configuration->questionsUrl = '';
         $configuration->maxAttempt = 0;
@@ -87,6 +100,13 @@ private function buildCreateConfiguration(Course $course, ?Session $session): Ex
         $configuration->resultsDisabled = 0;
         $configuration->questionSelectionType = 1;
         $configuration->randomByCategory = 0;
+        $configuration->categoryMatrix = [];
+        $configuration->language = '';
+        $configuration->updateTitleInLearningPaths = false;
+        $configuration->skillIds = [];
+        $configuration->extraFieldValues = $this->getDefaultExtraFieldValues();
+        $configuration->extraNotification = '';
+        $configuration->lockedFields = [];
         $configuration->displayCategoryName = true;
         $configuration->pageResultConfiguration = $this->getDefaultPageResultConfiguration();
         $configuration->notifications = [];
@@ -106,6 +126,12 @@ private function buildEditConfiguration(CQuiz $quiz, Course $course, ?Session $s
         $configuration->description = (string) $quiz->getDescription();
         $configuration->type = $quiz->getType();
         $configuration->categoryId = null !== $category && null !== $category->getId() ? (int) $category->getId() : null;
+        $configuration->language = $this->getResourceLanguageIsoCode($quiz);
+        $configuration->updateTitleInLearningPaths = false;
+        $configuration->skillIds = $this->getSelectedSkillIds($quiz);
+        $configuration->extraFieldValues = $this->getExerciseExtraFieldValues($quiz);
+        $configuration->extraNotification = '';
+        $configuration->lockedFields = $this->getLockedFieldsForEdit();
         $configuration->startTime = $this->formatDateForInput($quiz->getStartTime());
         $configuration->endTime = $this->formatDateForInput($quiz->getEndTime());
         $configuration->duration = $quiz->getDuration();
@@ -113,6 +139,7 @@ private function buildEditConfiguration(CQuiz $quiz, Course $course, ?Session $s
         $configuration->passPercentage = (int) ($quiz->getPassPercentage() ?? 0);
         $configuration->random = (int) $quiz->getRandom();
         $configuration->randomByCategory = (int) $quiz->getRandomByCategory();
+        $configuration->categoryMatrix = $this->getCategoryMatrix($quiz);
         $configuration->randomAnswers = $quiz->getRandomAnswers();
         $configuration->showPreviousButton = $quiz->isShowPreviousButton();
         $configuration->preventBackwards = 1 === $quiz->getPreventBackwards();
@@ -143,7 +170,7 @@ private function buildEditConfiguration(CQuiz $quiz, Course $course, ?Session $s
         $configuration->canEdit = true;
         $configuration->csrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
         $configuration->settings = $this->getSettings();
-        $configuration->options = $this->getOptions($course);
+        $configuration->options = $this->getOptions($course, $quiz);
         $configuration->listUrl = '';
         $configuration->questionsUrl = $this->buildLegacyQuestionsUrl($quiz, $course, $session);
 
@@ -206,13 +233,14 @@ private function getSettings(): array
             'limitTeacherAccess' => $this->isSettingEnabled('exercise.limit_exercise_teacher_access'),
             'allowNotificationSettingPerExercise' => $this->isSettingEnabled('exercise.allow_notification_setting_per_exercise'),
             'allowHideQuestionNumberSetting' => $this->isSettingEnabled('exercise.quiz_hide_question_number'),
+            'enableQuizScenario' => $this->isSettingEnabled('enable_quiz_scenario'),
         ];
     }
 
     /**
      * @return array<string, array<int, array<string, mixed>>>
      */
-    private function getOptions(Course $course): array
+    private function getOptions(Course $course, ?CQuiz $quiz): array
     {
         return [
             'typeOptions' => [
@@ -220,12 +248,11 @@ private function getOptions(Course $course): array
                 ['value' => CQuiz::ONE_PER_PAGE, 'label' => 'One question per page'],
             ],
             'categoryOptions' => $this->getCategoryOptions($course),
-            'feedbackOptions' => [
-                ['value' => 0, 'label' => 'At end of test'],
-                ['value' => 1, 'label' => 'Adaptative test with immediate feedback'],
-                ['value' => 2, 'label' => 'Exam (no feedback)'],
-                ['value' => 3, 'label' => 'Direct pop-up mode'],
-            ],
+            'languageOptions' => $this->getResourceLanguageOptions(),
+            'skillOptions' => $this->getSkillOptions(),
+            'extraFieldDefinitions' => $this->getExtraFieldDefinitions(),
+            'extraNotificationOptions' => [],
+            'feedbackOptions' => $this->getFeedbackOptions($quiz),
             'resultOptions' => [
                 ['value' => 0, 'label' => 'Auto-evaluation mode: show score and expected answers'],
                 ['value' => 1, 'label' => 'Exam mode: Do not show score nor answers'],
@@ -266,6 +293,136 @@ private function getOptions(Course $course): array
     }
 
 
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getFeedbackOptions(?CQuiz $quiz): array
+    {
+        $options = [
+            ['value' => 0, 'label' => 'At end of test'],
+            ['value' => 2, 'label' => 'Exam (no feedback)'],
+        ];
+
+        if ($this->isSettingEnabled('enable_quiz_scenario') || \in_array($quiz?->getFeedbackType(), [1, 3], true)) {
+            $options[] = ['value' => 1, 'label' => 'Adaptative test with immediate feedback'];
+            $options[] = ['value' => 3, 'label' => 'Direct pop-up mode'];
+        }
+
+        return $options;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCategoryMatrix(CQuiz $quiz): array
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return [];
+        }
+
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $categories = [];
+        $generalQuestionCount = 0;
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $questionType = (int) $question->getType();
+            if (self::MEDIA_QUESTION === $questionType || self::PAGE_BREAK === $questionType) {
+                continue;
+            }
+
+            $questionCategories = $question->getCategories();
+            if (0 === $questionCategories->count()) {
+                $generalQuestionCount++;
+                continue;
+            }
+
+            foreach ($questionCategories as $category) {
+                if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+                    continue;
+                }
+
+                $categoryId = (int) $category->getIid();
+                if (!isset($categories[$categoryId])) {
+                    $categories[$categoryId] = [
+                        'categoryId' => $categoryId,
+                        'title' => $category->getTitle(),
+                        'availableQuestions' => 0,
+                    ];
+                }
+
+                $categories[$categoryId]['availableQuestions']++;
+            }
+        }
+
+        if ([] === $categories) {
+            return [];
+        }
+
+        uasort(
+            $categories,
+            static fn (array $left, array $right): int => strcasecmp((string) $left['title'], (string) $right['title'])
+        );
+
+        $savedCounts = $this->getSavedCategoryQuestionCounts($exerciseId);
+        $matrix = [];
+        foreach ($categories as $category) {
+            $categoryId = (int) $category['categoryId'];
+            $matrix[] = [
+                'categoryId' => $categoryId,
+                'title' => (string) $category['title'],
+                'availableQuestions' => (int) $category['availableQuestions'],
+                'countQuestions' => $savedCounts[$categoryId] ?? -1,
+            ];
+        }
+
+        $matrix[] = [
+            'categoryId' => 0,
+            'title' => 'General',
+            'availableQuestions' => $generalQuestionCount,
+            'countQuestions' => $savedCounts[0] ?? -1,
+        ];
+
+        return $matrix;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getSavedCategoryQuestionCounts(int $exerciseId): array
+    {
+        $rows = $this->entityManager->getConnection()->fetchAllAssociative(
+            'SELECT category_id, count_questions FROM c_quiz_rel_category WHERE exercise_id = :exerciseId',
+            ['exerciseId' => $exerciseId],
+            ['exerciseId' => Types::INTEGER]
+        );
+
+        $counts = [];
+        foreach ($rows as $row) {
+            $counts[(int) $row['category_id']] = (int) $row['count_questions'];
+        }
+
+        return $counts;
+    }
+
     /**
      * @return array<string, bool>
      */
@@ -306,6 +463,375 @@ private function isEnabledPageResultFlag(array $configuration, string $camelKey,
         return true === $value || 1 === $value || '1' === (string) $value || 'on' === strtolower((string) $value);
     }
 
+
+    /**
+     * Legacy freezes these fields after an exercise has been created.
+     *
+     * @return array<int, string>
+     */
+    private function getLockedFieldsForEdit(): array
+    {
+        return [
+            'random',
+            'maxAttempt',
+            'propagateNeg',
+            'enableTimeControl',
+            'expiredTime',
+            'reviewAnswers',
+        ];
+    }
+
+    /**
+     * @return array<int, array<string, string>>
+     */
+    private function getResourceLanguageOptions(): array
+    {
+        $languages = $this->entityManager->getRepository(Language::class)->findBy(
+            ['available' => true],
+            ['englishName' => 'ASC']
+        );
+
+        $items = [
+            ['value' => '', 'label' => 'No specific language'],
+        ];
+
+        foreach ($languages as $language) {
+            if (!$language instanceof Language) {
+                continue;
+            }
+
+            $items[] = [
+                'value' => $language->getIsocode(),
+                'label' => $language->getOriginalName() ?: $language->getEnglishName(),
+            ];
+        }
+
+        return $items;
+    }
+
+    private function getResourceLanguageIsoCode(CQuiz $quiz): string
+    {
+        $resourceNode = $quiz->getResourceNode();
+        if (null === $resourceNode) {
+            return '';
+        }
+
+        $language = $resourceNode->getLanguage();
+        if (!$language instanceof Language) {
+            return '';
+        }
+
+        return $language->getIsocode();
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getSkillOptions(): array
+    {
+        $skills = $this->entityManager->createQueryBuilder()
+            ->select('skill')
+            ->from(Skill::class, 'skill')
+            ->andWhere('skill.status = :status')
+            ->setParameter('status', Skill::STATUS_ENABLED, Types::INTEGER)
+            ->orderBy('skill.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($skills as $skill) {
+            if (!$skill instanceof Skill || null === $skill->getId()) {
+                continue;
+            }
+
+            $label = $skill->getTitle();
+            if ('' !== trim($skill->getShortCode())) {
+                $label .= ' ('.$skill->getShortCode().')';
+            }
+
+            $items[] = [
+                'value' => (int) $skill->getId(),
+                'label' => $label,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getSelectedSkillIds(CQuiz $quiz): array
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return [];
+        }
+
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relation', 'skill')
+            ->from(SkillRelItem::class, 'relation')
+            ->innerJoin('relation.skill', 'skill')
+            ->andWhere('relation.itemType = :itemType')
+            ->andWhere('relation.itemId = :itemId')
+            ->andWhere('skill.status = :status')
+            ->setParameter('itemType', self::SKILL_ITEM_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('status', Skill::STATUS_ENABLED, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $ids = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof SkillRelItem || null === $relation->getSkill()->getId()) {
+                continue;
+            }
+
+            $ids[] = (int) $relation->getSkill()->getId();
+        }
+
+        return array_values(array_unique($ids));
+    }
+
+    /**
+     * @return array<int, ExtraField>
+     */
+    private function getExerciseExtraFields(bool $includeNotifications = false): array
+    {
+        $fields = $this->entityManager->createQueryBuilder()
+            ->select('field', 'options')
+            ->from(ExtraField::class, 'field')
+            ->leftJoin('field.options', 'options')
+            ->andWhere('field.itemType = :itemType')
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->orderBy('field.fieldOrder', 'ASC')
+            ->addOrderBy('field.displayText', 'ASC')
+            ->addOrderBy('options.optionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($fields as $field) {
+            if (!$field instanceof ExtraField) {
+                continue;
+            }
+
+            if (!$includeNotifications && 'notifications' === $field->getVariable()) {
+                continue;
+            }
+
+            $items[] = $field;
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getExtraFieldDefinitions(): array
+    {
+        $items = [];
+        foreach ($this->getExerciseExtraFields() as $field) {
+            if (null === $field->getId() || !$this->isSupportedExtraFieldType((int) $field->getValueType())) {
+                continue;
+            }
+
+            $items[] = [
+                'id' => (int) $field->getId(),
+                'variable' => $field->getVariable(),
+                'label' => $field->getDisplayText() ?: $field->getVariable(),
+                'type' => (int) $field->getValueType(),
+                'defaultValue' => (string) ($field->getDefaultValue() ?? ''),
+                'changeable' => true === $field->isChangeable(),
+                'options' => $this->getExtraFieldOptionItems($field),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, string>>
+     */
+    private function getExtraFieldOptionItems(ExtraField $field): array
+    {
+        $items = [];
+        foreach ($field->getOptions() as $option) {
+            if (!$option instanceof ExtraFieldOptions) {
+                continue;
+            }
+
+            $value = (string) ($option->getValue() ?? '');
+            if ('' === $value) {
+                continue;
+            }
+
+            $items[] = [
+                'value' => $value,
+                'label' => $option->getDisplayText() ?: $value,
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getDefaultExtraFieldValues(): array
+    {
+        $values = [];
+        foreach ($this->getExerciseExtraFields() as $field) {
+            if (!$this->isSupportedExtraFieldType((int) $field->getValueType())) {
+                continue;
+            }
+
+            $values[$field->getVariable()] = $this->normalizeExtraFieldValueForFrontend(
+                (int) $field->getValueType(),
+                (string) ($field->getDefaultValue() ?? ''),
+                0 < $field->getOptions()->count()
+            );
+        }
+
+        return $values;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getExerciseExtraFieldValues(CQuiz $quiz): array
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        $values = $this->getDefaultExtraFieldValues();
+        if (0 >= $exerciseId) {
+            return $values;
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('value', 'field')
+            ->from(ExtraFieldValues::class, 'value')
+            ->innerJoin('value.field', 'field')
+            ->andWhere('value.itemId = :itemId')
+            ->andWhere('field.itemType = :itemType')
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        foreach ($rows as $row) {
+            if (!$row instanceof ExtraFieldValues) {
+                continue;
+            }
+
+            $field = $row->getField();
+            if ('notifications' === $field->getVariable() || !$this->isSupportedExtraFieldType((int) $field->getValueType())) {
+                continue;
+            }
+
+            $values[$field->getVariable()] = $this->normalizeExtraFieldValueForFrontend(
+                (int) $field->getValueType(),
+                (string) ($row->getFieldValue() ?? ''),
+                0 < $field->getOptions()->count()
+            );
+        }
+
+        return $values;
+    }
+
+    private function getExerciseExtraNotification(CQuiz $quiz): string
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return '';
+        }
+
+        $row = $this->entityManager->createQueryBuilder()
+            ->select('value', 'field')
+            ->from(ExtraFieldValues::class, 'value')
+            ->innerJoin('value.field', 'field')
+            ->andWhere('value.itemId = :itemId')
+            ->andWhere('field.itemType = :itemType')
+            ->andWhere('field.variable = :variable')
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->setParameter('variable', 'notifications', Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $row instanceof ExtraFieldValues ? (string) ($row->getFieldValue() ?? '') : '';
+    }
+
+    /**
+     * @return array<int, array<string, string>>
+     */
+    private function getExtraNotificationOptions(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeExtraNotificationSettings(mixed $rawValue): array
+    {
+        if (
+            \is_array($rawValue)
+        ) {
+            return $rawValue;
+        }
+
+        if (!\is_string($rawValue) || '' === trim($rawValue)) {
+            return [];
+        }
+
+        $decoded = json_decode($rawValue, true);
+        if (\is_array($decoded)) {
+            return $decoded;
+        }
+
+        return [];
+    }
+
+    private function normalizeExtraFieldValueForFrontend(int $type, string $value, bool $hasOptions): mixed
+    {
+        if (ExtraField::FIELD_TYPE_SELECT_MULTIPLE === $type || (ExtraField::FIELD_TYPE_CHECKBOX === $type && $hasOptions)) {
+            if ('' === trim($value)) {
+                return [];
+            }
+
+            return array_values(array_filter(explode(';', $value), static fn (string $item): bool => '' !== trim($item)));
+        }
+
+        if (ExtraField::FIELD_TYPE_CHECKBOX === $type) {
+            return true === $value || '1' === $value || 'on' === strtolower($value);
+        }
+
+        return $value;
+    }
+
+    private function isSupportedExtraFieldType(int $type): bool
+    {
+        return \in_array($type, [
+            ExtraField::FIELD_TYPE_TEXT,
+            ExtraField::FIELD_TYPE_TEXTAREA,
+            ExtraField::FIELD_TYPE_RADIO,
+            ExtraField::FIELD_TYPE_SELECT,
+            ExtraField::FIELD_TYPE_SELECT_MULTIPLE,
+            ExtraField::FIELD_TYPE_DATE,
+            ExtraField::FIELD_TYPE_DATETIME,
+            ExtraField::FIELD_TYPE_CHECKBOX,
+            ExtraField::FIELD_TYPE_INTEGER,
+            ExtraField::FIELD_TYPE_FLOAT,
+        ], true);
+    }
+
     /**
      * @return array<int, array<string, mixed>>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php
new file mode 100644
index 00000000000..f2181675194
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php
@@ -0,0 +1,510 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseList;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Repository\ResourceLinkRepository;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProcessorInterface<ExerciseList, ExerciseList>
+ */
+final readonly class ExerciseListActionProcessor implements ProcessorInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_list_action';
+    private const ACTION_COPY = 'copy';
+    private const ACTION_DELETE = 'delete';
+    private const ACTION_TOGGLE_VISIBILITY = 'toggle_visibility';
+    private const VISIBILITY_PUBLISHED = 2;
+    private const MATCHING = 4;
+    private const MATCHING_DRAGGABLE = 19;
+    private const MATCHING_DRAGGABLE_COMBINATION = 25;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private CQuizQuestionRepository $questionRepository,
+        private ResourceLinkRepository $resourceLinkRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseList
+    {
+        if (!$data instanceof ExerciseList) {
+            throw new BadRequestHttpException('Invalid exercise action payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $this->validateCsrfToken($data->submittedCsrfToken);
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercises in this context.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = (int) $data->exerciseId;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $action = strtolower(trim($data->action));
+
+        $message = match ($action) {
+            self::ACTION_COPY => $this->copyExercise($quiz, $course, $session),
+            self::ACTION_DELETE => $this->deleteExercise($quiz, $course, $session),
+            self::ACTION_TOGGLE_VISIBILITY => $this->toggleVisibility($quiz, $course, $session),
+            default => throw new BadRequestHttpException('Unsupported exercise action.'),
+        };
+
+        $this->entityManager->flush();
+
+        $response = new ExerciseList();
+        $response->exerciseId = $exerciseId;
+        $response->action = $action;
+        $response->success = true;
+        $response->message = $message;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function canRunRestrictedAction(): bool
+    {
+        if (!$this->isSettingEnabled('exercise.limit_exercise_teacher_access')) {
+            return true;
+        }
+
+        return $this->security->isGranted('ROLE_ADMIN');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function copyExercise(CQuiz $sourceQuiz, Course $course, ?Session $session): string
+    {
+        $newQuiz = new CQuiz();
+        $this->copyExerciseFields($sourceQuiz, $newQuiz);
+        $newQuiz
+            ->setTitle(trim($sourceQuiz->getTitle()).' - Copy')
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        $this->quizRepository->create($newQuiz);
+        $this->entityManager->flush();
+
+        $order = 1;
+        foreach ($this->getQuestionRelations($sourceQuiz) as $relation) {
+            $newQuestion = $this->duplicateQuestion($relation->getQuestion(), $course, $session, $order);
+            $newRelation = new CQuizRelQuestion();
+            $newRelation
+                ->setQuiz($newQuiz)
+                ->setQuestion($newQuestion)
+                ->setQuestionOrder($order)
+                ->setDestination($relation->getDestination())
+            ;
+            $this->entityManager->persist($newRelation);
+            ++$order;
+        }
+
+        return 'Exercise copied';
+    }
+
+    private function copyExerciseFields(CQuiz $sourceQuiz, CQuiz $newQuiz): void
+    {
+        $newQuiz
+            ->setDescription((string) $sourceQuiz->getDescription())
+            ->setSound((string) $sourceQuiz->getSound())
+            ->setType((int) $sourceQuiz->getType())
+            ->setRandom((int) $sourceQuiz->getRandom())
+            ->setRandomAnswers($sourceQuiz->getRandomAnswers())
+            ->setResultsDisabled((int) $sourceQuiz->getResultsDisabled())
+            ->setAccessCondition((string) $sourceQuiz->getAccessCondition())
+            ->setMaxAttempt((int) $sourceQuiz->getMaxAttempt())
+            ->setFeedbackType((int) $sourceQuiz->getFeedbackType())
+            ->setExpiredTime((int) $sourceQuiz->getExpiredTime())
+            ->setPropagateNeg((int) $sourceQuiz->getPropagateNeg())
+            ->setSaveCorrectAnswers((int) ($sourceQuiz->getSaveCorrectAnswers() ?? 0))
+            ->setReviewAnswers((int) $sourceQuiz->getReviewAnswers())
+            ->setRandomByCategory((int) $sourceQuiz->getRandomByCategory())
+            ->setTextWhenFinished((string) $sourceQuiz->getTextWhenFinished())
+            ->setTextWhenFinishedFailure((string) $sourceQuiz->getTextWhenFinishedFailure())
+            ->setDisplayCategoryName((int) $sourceQuiz->getDisplayCategoryName())
+            ->setPassPercentage((int) ($sourceQuiz->getPassPercentage() ?? 0))
+            ->setPreventBackwards((int) $sourceQuiz->getPreventBackwards())
+            ->setQuestionSelectionType((int) ($sourceQuiz->getQuestionSelectionType() ?? 0))
+            ->setHideQuestionNumber((int) ($sourceQuiz->getHideQuestionNumber() ?? 0))
+            ->setHideQuestionTitle($sourceQuiz->isHideQuestionTitle())
+            ->setShowPreviousButton($sourceQuiz->isShowPreviousButton())
+            ->setNotifications($sourceQuiz->getNotifications())
+            ->setAutoLaunch($sourceQuiz->isAutoLaunch())
+            ->setHideAttemptsTable($sourceQuiz->isHideAttemptsTable())
+            ->setPageResultConfiguration($sourceQuiz->getPageResultConfiguration())
+            ->setDisplayChartDegreeCertainty($sourceQuiz->getDisplayChartDegreeCertainty())
+            ->setSendEmailChartDegreeCertainty($sourceQuiz->getSendEmailChartDegreeCertainty())
+            ->setNotDisplayBalancePercentageCategorieQuestion($sourceQuiz->getNotDisplayBalancePercentageCategorieQuestion())
+            ->setDisplayChartDegreeCertaintyCategory($sourceQuiz->getDisplayChartDegreeCertaintyCategory())
+            ->setGatherQuestionsCategories($sourceQuiz->getGatherQuestionsCategories())
+            ->setDuration($sourceQuiz->getDuration())
+        ;
+
+        if (null !== $sourceQuiz->getStartTime()) {
+            $newQuiz->setStartTime(clone $sourceQuiz->getStartTime());
+        }
+
+        if (null !== $sourceQuiz->getEndTime()) {
+            $newQuiz->setEndTime(clone $sourceQuiz->getEndTime());
+        }
+
+        if (null !== $sourceQuiz->getQuizCategory()) {
+            $newQuiz->setQuizCategory($sourceQuiz->getQuizCategory());
+        }
+    }
+
+    private function deleteExercise(CQuiz $quiz, Course $course, ?Session $session): string
+    {
+        if (!$this->canRunRestrictedAction()) {
+            throw new AccessDeniedHttpException('You are not allowed to delete this exercise.');
+        }
+
+        $this->resourceLinkRepository->removeByResourceInContext($quiz, $course, $session);
+
+        return 'Exercise deleted';
+    }
+
+    private function toggleVisibility(CQuiz $quiz, Course $course, ?Session $session): string
+    {
+        if (!$this->canRunRestrictedAction()) {
+            throw new AccessDeniedHttpException('You are not allowed to change this exercise visibility.');
+        }
+
+        if ($this->isExerciseVisible($quiz, $course, $session)) {
+            $this->quizRepository->setVisibilityDraft($quiz, $course, $session);
+
+            return 'Exercise hidden';
+        }
+
+        $this->quizRepository->setVisibilityPublished($quiz, $course, $session);
+
+        return 'Exercise visible';
+    }
+
+    private function isExerciseVisible(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('links.visibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return self::VISIBILITY_PUBLISHED === (int) $queryBuilder->getQuery()->getSingleScalarResult();
+    }
+
+    private function duplicateQuestion(CQuizQuestion $sourceQuestion, Course $course, ?Session $session, int $position): CQuizQuestion
+    {
+        $newQuestion = new CQuizQuestion();
+        $newQuestion
+            ->setQuestion(trim($sourceQuestion->getQuestion()).' - Copy')
+            ->setDescription($sourceQuestion->getDescription())
+            ->setFeedback($sourceQuestion->getFeedback())
+            ->setType((int) $sourceQuestion->getType())
+            ->setLevel(max(1, (int) $sourceQuestion->getLevel()))
+            ->setPosition($position)
+            ->setPonderation((float) $sourceQuestion->getPonderation())
+            ->setMandatory((int) $sourceQuestion->getMandatory())
+            ->setDuration($sourceQuestion->getDuration())
+            ->setParentMediaId($sourceQuestion->getParentMediaId())
+            ->setExtra($sourceQuestion->getExtra())
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        foreach ($sourceQuestion->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                $newQuestion->addCategory($category);
+            }
+        }
+
+        $this->questionRepository->create($newQuestion);
+
+        if ($this->isMatchingQuestion((int) $sourceQuestion->getType())) {
+            $this->copyMatchingAnswers($sourceQuestion, $newQuestion);
+
+            return $newQuestion;
+        }
+
+        $optionIidMap = $this->copyQuestionOptions($sourceQuestion, $newQuestion);
+        foreach ($this->getAnswers($sourceQuestion) as $sourceAnswer) {
+            $sourceCorrect = (int) $sourceAnswer->getCorrect();
+            $answer = $this->cloneAnswer($sourceAnswer, $newQuestion, (int) ($optionIidMap[$sourceCorrect] ?? $sourceCorrect));
+            $this->entityManager->persist($answer);
+        }
+
+        return $newQuestion;
+    }
+
+    private function isMatchingQuestion(int $type): bool
+    {
+        return \in_array($type, [self::MATCHING, self::MATCHING_DRAGGABLE, self::MATCHING_DRAGGABLE_COMBINATION], true);
+    }
+
+    private function copyMatchingAnswers(CQuizQuestion $sourceQuestion, CQuizQuestion $newQuestion): void
+    {
+        $sourceAnswers = $this->getAnswers($sourceQuestion);
+        $optionIidMap = [];
+
+        foreach ($sourceAnswers as $sourceAnswer) {
+            if (0 < (int) $sourceAnswer->getCorrect()) {
+                continue;
+            }
+
+            $newOption = $this->cloneAnswer($sourceAnswer, $newQuestion, 0);
+            $this->entityManager->persist($newOption);
+            $this->entityManager->flush();
+
+            if (null !== $sourceAnswer->getIid() && null !== $newOption->getIid()) {
+                $optionIidMap[(int) $sourceAnswer->getIid()] = (int) $newOption->getIid();
+            }
+        }
+
+        foreach ($sourceAnswers as $sourceAnswer) {
+            $sourceCorrect = (int) $sourceAnswer->getCorrect();
+            if (0 >= $sourceCorrect) {
+                continue;
+            }
+
+            $newPair = $this->cloneAnswer($sourceAnswer, $newQuestion, (int) ($optionIidMap[$sourceCorrect] ?? 0));
+            $this->entityManager->persist($newPair);
+        }
+    }
+
+    private function cloneAnswer(CQuizAnswer $sourceAnswer, CQuizQuestion $newQuestion, int $correct): CQuizAnswer
+    {
+        $answer = new CQuizAnswer();
+        $answer
+            ->setQuestion($newQuestion)
+            ->setAnswer($sourceAnswer->getAnswer())
+            ->setCorrect($correct)
+            ->setComment((string) $sourceAnswer->getComment())
+            ->setPonderation((float) $sourceAnswer->getPonderation())
+            ->setPosition((int) $sourceAnswer->getPosition())
+        ;
+
+        if (null !== $sourceAnswer->getHotspotCoordinates()) {
+            $answer->setHotspotCoordinates($sourceAnswer->getHotspotCoordinates());
+        }
+
+        if (null !== $sourceAnswer->getHotspotType()) {
+            $answer->setHotspotType($sourceAnswer->getHotspotType());
+        }
+
+        if (null !== $sourceAnswer->getAnswerCode()) {
+            $answer->setAnswerCode($sourceAnswer->getAnswerCode());
+        }
+
+        return $answer;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function copyQuestionOptions(CQuizQuestion $sourceQuestion, CQuizQuestion $newQuestion): array
+    {
+        $optionIidMap = [];
+        foreach ($sourceQuestion->getOptions() as $sourceOption) {
+            if (!$sourceOption instanceof CQuizQuestionOption) {
+                continue;
+            }
+
+            $newOption = new CQuizQuestionOption();
+            $newOption
+                ->setQuestion($newQuestion)
+                ->setTitle((string) $sourceOption->getTitle())
+                ->setPosition((int) $sourceOption->getPosition())
+            ;
+            $this->entityManager->persist($newOption);
+            $this->entityManager->flush();
+
+            if (null !== $sourceOption->getIid() && null !== $newOption->getIid()) {
+                $optionIidMap[(int) $sourceOption->getIid()] = (int) $newOption->getIid();
+            }
+        }
+
+        return $optionIidMap;
+    }
+
+    /**
+     * @return array<int, CQuizRelQuestion>
+     */
+    private function getQuestionRelations(CQuiz $quiz): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getAnswers(CQuizQuestion $question): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
+    private function validateCsrfToken(string $token): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(self::CSRF_TOKEN_ID, $token))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseListProvider.php b/src/CoreBundle/State/Exercise/ExerciseListProvider.php
index 7e9b37b238e..5bd725ca3ff 100644
--- a/src/CoreBundle/State/Exercise/ExerciseListProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseListProvider.php
@@ -26,6 +26,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
 /**
  * @implements ProviderInterface<ExerciseList>
@@ -33,12 +34,14 @@
 final readonly class ExerciseListProvider implements ProviderInterface
 {
     private const VISIBILITY_PUBLISHED = 2;
+    private const CSRF_TOKEN_ID = 'exercise_list_action';
 
     public function __construct(
         private RequestStack $requestStack,
         private EntityManagerInterface $entityManager,
         private Security $security,
         private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
     ) {}
 
     /**
@@ -67,9 +70,11 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->items = $items;
         $response->categories = $this->getCategories($course);
         $response->settings = $this->getSettings();
+        $response->submittedCsrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
         $response->totalItems = \count($items);
         $response->canManage = $canManage;
         $response->canCreate = $canCreate;
+        $response->usesLegacyActions = false;
 
         return $response;
     }
@@ -338,6 +343,8 @@ private function getSettings(): array
             'disableNewAttempts' => $this->isSettingEnabled('exercise.exercises_disable_new_attempts'),
             'hideAttemptsTableOnStartPage' => $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page'),
             'limitTeacherAccess' => $this->isSettingEnabled('exercise.limit_exercise_teacher_access'),
+            'exerciseGeneratorEnabled' => $this->isSettingEnabled('ai_helpers.enable_ai_helpers')
+                && $this->isSettingEnabled('ai_helpers.exercise_generator'),
         ];
     }
 
@@ -355,6 +362,7 @@ private function normalizeQuiz(
         $startTime = $quiz->getStartTime();
         $endTime = $quiz->getEndTime();
         $availabilityStatus = $this->getAvailabilityStatus($startTime, $endTime);
+        $canRunRestrictedActions = $this->canRunRestrictedActions();
 
         return [
             'iid' => (int) $quiz->getIid(),
@@ -372,10 +380,14 @@ private function normalizeQuiz(
             'questionCount' => $questionCount,
             'attemptCount' => $attemptCount,
             'canOpen' => $visible || $canManage,
+            'canOverview' => $visible || $canManage,
             'canEdit' => $canManage,
             'canConfigure' => $canManage,
             'canReport' => $canManage,
             'canExport' => $canManage,
+            'canCopy' => $canManage,
+            'canDelete' => $canManage && $canRunRestrictedActions,
+            'canToggleVisibility' => $canManage && $canRunRestrictedActions,
         ];
     }
 
@@ -394,6 +406,16 @@ private function getAvailabilityStatus(?DateTimeInterface $startTime, ?DateTimeI
         return 'open';
     }
 
+
+    private function canRunRestrictedActions(): bool
+    {
+        if (!$this->isSettingEnabled('exercise.limit_exercise_teacher_access')) {
+            return true;
+        }
+
+        return $this->security->isGranted('ROLE_ADMIN');
+    }
+
     private function formatDate(?DateTimeInterface $date): ?string
     {
         if (null === $date) {
@@ -405,6 +427,6 @@ private function formatDate(?DateTimeInterface $date): ?string
 
     private function isSettingEnabled(string $name): bool
     {
-        return 'true' === $this->settingsManager->getSetting($name);
+        return 'true' === $this->settingsManager->getSetting($name, true);
     }
 }
diff --git a/src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php b/src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php
new file mode 100644
index 00000000000..4ffcf4cbf51
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php
@@ -0,0 +1,403 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseLiveResults;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateInterval;
+use DateTime;
+use DateTimeInterface;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Read-only provider for the migrated exercise live results page.
+ *
+ * Legacy live_stats.php refreshes jqGrid every 10 seconds and asks for the
+ * learners taking the exercise in the last minutes. This provider keeps the
+ * same read-only scope using track_e_exercises and track_e_attempt, without
+ * touching tracking, grades, gradebook or attempt status.
+ *
+ * @implements ProviderInterface<ExerciseLiveResults>
+ */
+final readonly class ExerciseLiveResultsProvider implements ProviderInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const STATUS_COMPLETED = 'completed';
+    private const STATUS_ALL = 'all';
+    private const DEFAULT_MINUTES = 60;
+    private const MIN_MINUTES = 1;
+    private const MAX_MINUTES = 1440;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseLiveResults
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to view live exercise results.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $minutes = $this->getMinutes($request);
+        $status = $this->getStatusFilter($request);
+        $attempts = $this->getLiveAttempts($quiz, $course, $session, $minutes, $status);
+
+        $response = new ExerciseLiveResults();
+        $response->exerciseId = $exerciseId;
+        $response->title = $quiz->getTitle();
+        $response->description = (string) $quiz->getDescription();
+        $response->attempts = $attempts;
+        $response->summary = $this->buildSummary($attempts, $minutes);
+        $response->filters = [
+            'minutes' => $minutes,
+            'status' => $status,
+        ];
+        $response->legacyUrls = [];
+        $response->totalItems = \count($attempts);
+        $response->canManage = true;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    private function getMinutes(Request $request): int
+    {
+        $minutes = $request->query->getInt('minutes', self::DEFAULT_MINUTES);
+
+        return max(self::MIN_MINUTES, min(self::MAX_MINUTES, $minutes));
+    }
+
+    private function getStatusFilter(Request $request): string
+    {
+        $status = trim((string) $request->query->get('status', self::STATUS_ALL));
+
+        return \in_array($status, [self::STATUS_ALL, self::STATUS_INCOMPLETE, self::STATUS_COMPLETED], true)
+            ? $status
+            : self::STATUS_ALL;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getLiveAttempts(CQuiz $quiz, Course $course, ?Session $session, int $minutes, string $status): array
+    {
+        $since = (new DateTime())->sub(new DateInterval(sprintf('PT%dM', $minutes)));
+
+        $idQueryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('DISTINCT attempt.exeId AS attemptId')
+            ->from(TrackEExercise::class, 'attempt')
+            ->leftJoin('attempt.attempts', 'answer')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('(attempt.status = :incompleteStatus OR attempt.startDate >= :since OR attempt.exeDate >= :since OR answer.tms >= :since)')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('incompleteStatus', self::STATUS_INCOMPLETE, Types::STRING)
+            ->setParameter('since', $since, Types::DATETIME_MUTABLE)
+            ->orderBy('attempt.status', 'DESC')
+            ->addOrderBy('attempt.exeDate', 'DESC')
+            ->addOrderBy('attempt.exeId', 'DESC')
+            ->setMaxResults(200)
+        ;
+
+        if (null !== $session) {
+            $idQueryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $idQueryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        if (self::STATUS_INCOMPLETE === $status) {
+            $idQueryBuilder
+                ->andWhere('attempt.status = :status')
+                ->setParameter('status', self::STATUS_INCOMPLETE, Types::STRING)
+            ;
+        } elseif (self::STATUS_COMPLETED === $status) {
+            $idQueryBuilder
+                ->andWhere('attempt.status <> :statusIncomplete')
+                ->setParameter('statusIncomplete', self::STATUS_INCOMPLETE, Types::STRING)
+            ;
+        }
+
+        $attemptIds = [];
+        foreach ($idQueryBuilder->getQuery()->getArrayResult() as $row) {
+            $attemptId = (int) ($row['attemptId'] ?? 0);
+            if (0 < $attemptId) {
+                $attemptIds[] = $attemptId;
+            }
+        }
+
+        if ([] === $attemptIds) {
+            return [];
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt', 'user', 'answer')
+            ->from(TrackEExercise::class, 'attempt')
+            ->innerJoin('attempt.user', 'user')
+            ->leftJoin('attempt.attempts', 'answer')
+            ->andWhere('attempt.exeId IN (:attemptIds)')
+            ->setParameter('attemptIds', $attemptIds)
+            ->orderBy('attempt.status', 'DESC')
+            ->addOrderBy('attempt.exeDate', 'DESC')
+            ->addOrderBy('attempt.exeId', 'DESC')
+        ;
+
+        $attempts = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
+            if (!$attempt instanceof TrackEExercise) {
+                continue;
+            }
+
+            $attempts[] = $this->normalizeAttempt($attempt);
+        }
+
+        return $attempts;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function normalizeAttempt(TrackEExercise $attempt): array
+    {
+        $user = $attempt->getUser();
+        $answeredQuestions = $this->countAnsweredQuestions($attempt);
+        $lastActivity = $this->getLastActivity($attempt);
+        $status = self::STATUS_INCOMPLETE === (string) $attempt->getStatus()
+            ? self::STATUS_INCOMPLETE
+            : self::STATUS_COMPLETED;
+        $statusLabel = self::STATUS_INCOMPLETE === $status ? 'Ongoing' : 'Completed';
+        $score = $attempt->getScore();
+        $maxScore = $attempt->getMaxScore();
+        $percentage = 0.0 < $maxScore ? round(($score * 100) / $maxScore, 2) : 0.0;
+
+        return [
+            'id' => (int) $attempt->getExeId(),
+            'attemptId' => (int) $attempt->getExeId(),
+            'userId' => (int) $user->getId(),
+            'username' => $user->getUsername(),
+            'firstName' => (string) $user->getFirstname(),
+            'lastName' => (string) $user->getLastname(),
+            'fullName' => $user->getFullName(),
+            'startedAt' => $this->formatDate($attempt->getStartDate()),
+            'completedAt' => self::STATUS_INCOMPLETE === $status ? null : $this->formatDate($attempt->getExeDate()),
+            'lastActivityAt' => $this->formatDate($lastActivity),
+            'duration' => $attempt->getExeDuration(),
+            'answeredQuestions' => $answeredQuestions,
+            'score' => $score,
+            'maxScore' => $maxScore,
+            'percentage' => $percentage,
+            'ip' => $attempt->getUserIp(),
+            'status' => $status,
+            'statusLabel' => $statusLabel,
+        ];
+    }
+
+    private function countAnsweredQuestions(TrackEExercise $attempt): int
+    {
+        $questionIds = [];
+        foreach ($attempt->getAttempts() as $answer) {
+            if (!$answer instanceof TrackEAttempt) {
+                continue;
+            }
+
+            $questionId = (int) $answer->getQuestionId();
+            if (0 < $questionId) {
+                $questionIds[$questionId] = true;
+            }
+        }
+
+        return \count($questionIds);
+    }
+
+    private function getLastActivity(TrackEExercise $attempt): DateTimeInterface
+    {
+        $lastActivity = $attempt->getStartDate();
+        foreach ($attempt->getAttempts() as $answer) {
+            if (!$answer instanceof TrackEAttempt) {
+                continue;
+            }
+
+            if ($answer->getTms() > $lastActivity) {
+                $lastActivity = $answer->getTms();
+            }
+        }
+
+        if ($attempt->getExeDate() > $lastActivity) {
+            $lastActivity = $attempt->getExeDate();
+        }
+
+        return $lastActivity;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $attempts
+     *
+     * @return array<string, int|float|string>
+     */
+    private function buildSummary(array $attempts, int $minutes): array
+    {
+        $ongoing = 0;
+        $completed = 0;
+        $answered = 0;
+        foreach ($attempts as $attempt) {
+            if (self::STATUS_INCOMPLETE === ($attempt['status'] ?? '')) {
+                ++$ongoing;
+            } else {
+                ++$completed;
+            }
+            $answered += (int) ($attempt['answeredQuestions'] ?? 0);
+        }
+
+        return [
+            'totalAttempts' => \count($attempts),
+            'ongoingAttempts' => $ongoing,
+            'completedAttempts' => $completed,
+            'answeredQuestions' => $answered,
+            'minutes' => $minutes,
+        ];
+    }
+
+    private function formatDate(DateTimeInterface $date): string
+    {
+        return $date->format(DateTimeInterface::ATOM);
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getContextParams(Request $request): array
+    {
+        $params = [
+            'cid' => $request->query->getInt('cid'),
+            'gid' => $request->query->getInt('gid'),
+        ];
+
+        $sessionId = $request->query->getInt('sid');
+        if (0 < $sessionId) {
+            $params['sid'] = $sessionId;
+        }
+
+        return $params;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
new file mode 100644
index 00000000000..0f79c383656
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
@@ -0,0 +1,458 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseOverview;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttemptQualify;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Legacy-compatible start page data for one exercise.
+ *
+ * @implements ProviderInterface<ExerciseOverview>
+ */
+final readonly class ExerciseOverviewProvider implements ProviderInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS = 0;
+    private const RESULT_DISABLE_NO_SCORE_AND_EXPECTED_ANSWERS = 1;
+    private const RESULT_DISABLE_SHOW_SCORE_ONLY = 2;
+    private const RESULT_DISABLE_SHOW_FINAL_SCORE_ONLY_WITH_CATEGORIES = 3;
+    private const RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT = 4;
+    private const RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK = 5;
+    private const RESULT_DISABLE_RANKING = 6;
+    private const RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER = 7;
+    private const RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING = 8;
+    private const RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK = 10;
+    private const EXERCISE_FEEDBACK_TYPE_END = 0;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+        private SettingsManager $settingsManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseOverview
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $user = $this->getCurrentUser();
+        $canManage = $this->canManageExercises();
+
+        if (!$canManage && !$this->canViewExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to view exercises in this context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        [$quiz, $linkVisibility] = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $visible = self::VISIBILITY_PUBLISHED === $linkVisibility;
+        if (!$canManage && !$visible) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        $learnpathId = max(0, $request->query->getInt('learnpath_id'));
+        $learnpathItemId = max(0, $request->query->getInt('learnpath_item_id'));
+        $currentUserAttempts = $this->getCurrentUserAttempts($quiz, $course, $session, $user, $learnpathId, $learnpathItemId);
+        $currentUserAttemptCount = \count($currentUserAttempts);
+        $maxAttempt = (int) $quiz->getMaxAttempt();
+        $attemptLimitReached = 0 < $maxAttempt && $currentUserAttemptCount >= $maxAttempt;
+        $hideAttemptsTable = $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page');
+
+        $availabilityStatus = $this->getAvailabilityStatus($quiz->getStartTime(), $quiz->getEndTime());
+        $canOpen = $canManage || ($visible && 'open' === $availabilityStatus);
+
+        $overview = new ExerciseOverview();
+        $overview->exerciseId = (int) $quiz->getIid();
+        $overview->title = $quiz->getTitle();
+        $overview->description = (string) $quiz->getDescription();
+        $overview->visible = $visible;
+        $overview->categoryTitle = null !== $quiz->getQuizCategory() ? $quiz->getQuizCategory()->getTitle() : '';
+        $overview->questionCount = $this->getQuestionCount($quiz);
+        $overview->attemptCount = $currentUserAttemptCount;
+        $overview->currentUserAttemptCount = $currentUserAttemptCount;
+        $overview->averageScore = $this->getAverageScore($quiz, $course, $session);
+        $overview->maxScore = $this->getExerciseMaxScore($quiz);
+        $overview->passPercentage = (int) ($quiz->getPassPercentage() ?? 0);
+        $overview->startTime = $this->formatDate($quiz->getStartTime());
+        $overview->endTime = $this->formatDate($quiz->getEndTime());
+        $overview->duration = $quiz->getDuration();
+        $overview->maxAttempt = $maxAttempt;
+        $overview->feedbackType = $quiz->getFeedbackType();
+        $overview->resultsDisabled = $quiz->getResultsDisabled();
+        $overview->randomAnswers = $quiz->getRandomAnswers();
+        $overview->random = (int) $quiz->getRandom();
+        $overview->randomByCategory = (int) $quiz->getRandomByCategory();
+        $overview->canManage = $canManage;
+        $overview->canOpen = $canOpen;
+        $overview->canStart = $canOpen && !$attemptLimitReached;
+        $overview->canReport = $canManage;
+        $overview->availabilityStatus = $availabilityStatus;
+        $overview->currentUserAttempts = $currentUserAttempts;
+        $overview->showAttemptsTable = !$hideAttemptsTable && [] !== $currentUserAttempts;
+        $overview->showScoreColumn = $this->shouldShowScoreColumn($quiz, $currentUserAttemptCount);
+        $overview->showDetailsColumn = $this->shouldShowDetailsColumn($quiz, $currentUserAttemptCount);
+        $overview->attemptLimitReached = $attemptLimitReached;
+        $overview->startButtonLabel = 0 < $currentUserAttemptCount ? 'Proceed with the test' : 'Start test';
+        $overview->notice = 0 < $currentUserAttemptCount ? 'You have tried to resolve this exercise earlier' : '';
+
+        return $overview;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getCurrentUser(): User
+    {
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException('A valid user is required.');
+        }
+
+        return $user;
+    }
+
+    private function canViewExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    /**
+     * @return array{0: CQuiz, 1: int}
+     */
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!\is_array($row)) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $quiz = $row[0] ?? $row['quiz'] ?? null;
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        return [$quiz, (int) ($row['linkVisibility'] ?? self::VISIBILITY_PUBLISHED)];
+    }
+
+    private function getQuestionCount(CQuiz $quiz): int
+    {
+        return (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(relQuestion.iid)')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+    }
+
+    private function getExerciseMaxScore(CQuiz $quiz): float
+    {
+        $score = $this->entityManager->createQueryBuilder()
+            ->select('COALESCE(SUM(question.ponderation), 0)')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return round((float) $score, 2);
+    }
+
+    private function getAverageScore(CQuiz $quiz, Course $course, ?Session $session): float
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('AVG(attempt.score)')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere("attempt.status = ''")
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        return round((float) ($queryBuilder->getQuery()->getSingleScalarResult() ?? 0), 2);
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCurrentUserAttempts(
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        User $user,
+        int $learnpathId,
+        int $learnpathItemId,
+    ): array {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere("attempt.status = ''")
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('attempt.origLpId = :learnpathId')
+            ->andWhere('attempt.origLpItemId = :learnpathItemId')
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->orderBy('attempt.exeId', 'DESC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempts = $queryBuilder->getQuery()->getResult();
+        $total = \count($attempts);
+        $items = [];
+
+        foreach ($attempts as $index => $attempt) {
+            if (!$attempt instanceof TrackEExercise) {
+                continue;
+            }
+
+            $maxScore = $attempt->getMaxScore();
+            $items[] = [
+                'attemptId' => (int) $attempt->getExeId(),
+                'number' => $total - $index,
+                'startDate' => $this->formatDate($attempt->getStartDate()),
+                'userIp' => $attempt->getUserIp(),
+                'score' => round($attempt->getScore(), 2),
+                'maxScore' => round($maxScore, 2),
+                'percentage' => 0 < $maxScore ? round(($attempt->getScore() / $maxScore) * 100, 2) : 0.0,
+                'revised' => $this->isAttemptRevised((int) $attempt->getExeId()),
+            ];
+        }
+
+        return $items;
+    }
+
+    private function isAttemptRevised(int $attemptId): bool
+    {
+        $total = $this->entityManager->createQueryBuilder()
+            ->select('COUNT(qualify.id)')
+            ->from(TrackEAttemptQualify::class, 'qualify')
+            ->andWhere('IDENTITY(qualify.trackExercise) = :attemptId')
+            ->andWhere('qualify.author > 0')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return 0 < (int) $total;
+    }
+
+    private function shouldShowScoreColumn(CQuiz $quiz, int $attemptCount): bool
+    {
+        $resultMode = (int) $quiz->getResultsDisabled();
+        if (self::RESULT_DISABLE_NO_SCORE_AND_EXPECTED_ANSWERS === $resultMode) {
+            return false;
+        }
+
+        if (
+            self::RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK === $resultMode
+            && !$this->canShowLastAttemptAnswers($quiz, $attemptCount)
+        ) {
+            return false;
+        }
+
+        return \in_array(
+            $resultMode,
+            [
+                self::RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS,
+                self::RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+                self::RESULT_DISABLE_SHOW_SCORE_ONLY,
+                self::RESULT_DISABLE_SHOW_FINAL_SCORE_ONLY_WITH_CATEGORIES,
+                self::RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT,
+                self::RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK,
+                self::RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK,
+                self::RESULT_DISABLE_RANKING,
+                self::RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
+            ],
+            true
+        );
+    }
+
+    private function shouldShowDetailsColumn(CQuiz $quiz, int $attemptCount): bool
+    {
+        $resultMode = (int) $quiz->getResultsDisabled();
+        if (self::RESULT_DISABLE_NO_SCORE_AND_EXPECTED_ANSWERS === $resultMode) {
+            return false;
+        }
+
+        if (self::RESULT_DISABLE_SHOW_SCORE_ONLY === $resultMode) {
+            return self::EXERCISE_FEEDBACK_TYPE_END === (int) $quiz->getFeedbackType();
+        }
+
+        if (\in_array($resultMode, [self::RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT, self::RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK], true)) {
+            return true;
+        }
+
+        if (self::RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK === $resultMode) {
+            return $this->canShowLastAttemptAnswers($quiz, $attemptCount);
+        }
+
+        return \in_array(
+            $resultMode,
+            [
+                self::RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS,
+                self::RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+                self::RESULT_DISABLE_SHOW_FINAL_SCORE_ONLY_WITH_CATEGORIES,
+                self::RESULT_DISABLE_RANKING,
+                self::RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
+            ],
+            true
+        );
+    }
+
+    private function canShowLastAttemptAnswers(CQuiz $quiz, int $attemptCount): bool
+    {
+        $maxAttempt = (int) $quiz->getMaxAttempt();
+
+        return 0 >= $maxAttempt || $attemptCount >= $maxAttempt;
+    }
+
+    private function getAvailabilityStatus(?DateTimeInterface $startTime, ?DateTimeInterface $endTime): string
+    {
+        $now = new DateTimeImmutable();
+
+        if (null !== $startTime && $startTime > $now) {
+            return 'not_started';
+        }
+
+        if (null !== $endTime && $endTime < $now) {
+            return 'closed';
+        }
+
+        return 'open';
+    }
+
+    private function formatDate(?DateTimeInterface $date): ?string
+    {
+        if (null === $date) {
+            return null;
+        }
+
+        return $date->format(DateTimeInterface::ATOM);
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
new file mode 100644
index 00000000000..14ba1175649
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
@@ -0,0 +1,359 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionBank;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceLink;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProcessorInterface<ExerciseQuestionBank, ExerciseQuestionBank>
+ */
+final readonly class ExerciseQuestionBankProcessor implements ProcessorInterface
+{
+    private const ACTION_REUSE = 'reuse';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionBank
+    {
+        if (!$data instanceof ExerciseQuestionBank) {
+            throw new BadRequestHttpException('Invalid exercise question bank action payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage the question bank in this context.');
+        }
+
+        $this->validateCsrfToken($data->submittedCsrfToken);
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $action = strtolower(trim($data->action));
+        if (self::ACTION_REUSE !== $action) {
+            throw new BadRequestHttpException('Unsupported question bank action.');
+        }
+
+        [$addedCount, $skippedCount] = $this->reuseQuestions($quiz, $data, $course, $session);
+        $this->entityManager->flush();
+
+        $response = new ExerciseQuestionBank();
+        $response->exerciseId = $exerciseId;
+        $response->action = $action;
+        $response->questionId = $data->questionId;
+        $response->questionIds = $data->questionIds;
+        $response->success = true;
+        $response->addedCount = $addedCount;
+        $response->skippedCount = $skippedCount;
+        $response->message = 1 === $addedCount ? 'Question added to the test' : 'Questions added to the test';
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function validateCsrfToken(string $submittedCsrfToken): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(ExerciseQuestionBankProvider::CSRF_TOKEN_ID, $submittedCsrfToken))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        $this->applySessionFilter($queryBuilder, 'links', $session);
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @return array{0: int, 1: int}
+     */
+    private function reuseQuestions(CQuiz $quiz, ExerciseQuestionBank $data, Course $course, ?Session $session): array
+    {
+        $questionIds = $this->getSubmittedQuestionIds($data);
+        if ([] === $questionIds) {
+            throw new BadRequestHttpException('Select at least one question.');
+        }
+
+        $addedCount = 0;
+        $skippedCount = 0;
+        $nextOrder = $this->getNextQuestionOrder($quiz);
+        foreach ($questionIds as $questionId) {
+            $question = $this->getQuestionFromCurrentContext($questionId, $course, $session);
+            if (!$this->isQuestionTypeAllowedByFeedback((int) $question->getType(), (int) $quiz->getFeedbackType())) {
+                $skippedCount++;
+                continue;
+            }
+
+            if ($this->hasQuestion($quiz, $questionId)) {
+                $skippedCount++;
+                continue;
+            }
+
+            $relation = new CQuizRelQuestion();
+            $relation
+                ->setQuiz($quiz)
+                ->setQuestion($question)
+                ->setQuestionOrder($nextOrder)
+            ;
+            $this->entityManager->persist($relation);
+            $nextOrder++;
+            $addedCount++;
+        }
+
+        if (0 === $addedCount) {
+            throw new BadRequestHttpException('No question was added.');
+        }
+
+        return [$addedCount, $skippedCount];
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getSubmittedQuestionIds(ExerciseQuestionBank $data): array
+    {
+        $questionIds = array_map('intval', $data->questionIds);
+        if (null !== $data->questionId && 0 < (int) $data->questionId) {
+            $questionIds[] = (int) $data->questionId;
+        }
+
+        return array_values(array_unique(array_filter($questionIds, static fn (int $questionId): bool => 0 < $questionId)));
+    }
+
+    private function getQuestionFromCurrentContext(int $questionId, Course $course, ?Session $session): CQuizQuestion
+    {
+        $question = $this->entityManager->getRepository(CQuizQuestion::class)->find($questionId);
+        if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+            throw new NotFoundHttpException('The requested question was not found.');
+        }
+
+        if ($this->isQuestionInContext($question, $course, $session)) {
+            return $question;
+        }
+
+        throw new AccessDeniedHttpException('The requested question does not belong to the current course context.');
+    }
+
+    private function isQuestionInContext(CQuizQuestion $question, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('question.iid')
+            ->from(CQuizQuestion::class, 'question')
+            ->leftJoin('question.resourceNode', 'questionNode')
+            ->andWhere('question = :question')
+            ->setParameter('question', $question)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        $existsQuestionLink = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(ResourceLink::class, 'questionLink')
+            ->where('questionLink.resourceNode = questionNode')
+            ->andWhere('IDENTITY(questionLink.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsQuestionLink, 'questionLink', $session, true);
+
+        $existsViaQuiz = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(CQuizRelQuestion::class, 'scopeRelation')
+            ->innerJoin('scopeRelation.quiz', 'scopeQuiz')
+            ->innerJoin('scopeQuiz.resourceNode', 'scopeNode')
+            ->innerJoin('scopeNode.resourceLinks', 'scopeLinks')
+            ->where('scopeRelation.question = question')
+            ->andWhere('IDENTITY(scopeLinks.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsViaQuiz, 'scopeLinks', $session, true);
+
+        $queryBuilder->andWhere(
+            $queryBuilder->expr()->orX(
+                $queryBuilder->expr()->exists($existsQuestionLink->getDQL()),
+                $queryBuilder->expr()->exists($existsViaQuiz->getDQL())
+            )
+        );
+
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function hasQuestion(CQuiz $quiz, int $questionId): bool
+    {
+        $result = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion.iid')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $result;
+    }
+
+    private function getNextQuestionOrder(CQuiz $quiz): int
+    {
+        $maxOrder = $this->entityManager->createQueryBuilder()
+            ->select('MAX(relQuestion.questionOrder)')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return max(1, (int) $maxOrder + 1);
+    }
+
+    private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType): bool
+    {
+        if (1 === $feedbackType) {
+            return !\in_array($type, [5, 13, 20, 22, 23, 31], true);
+        }
+
+        if (3 === $feedbackType) {
+            return \in_array($type, [1, 2, 16, 18], true);
+        }
+
+        return true;
+    }
+
+    private function applyActiveLinkConstraints(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected): void
+    {
+        $queryBuilder
+            ->andWhere($alias.'.deletedAt IS NULL')
+            ->andWhere($alias.'.endVisibilityAt IS NULL')
+            ->andWhere($alias.'.visibility IN (0,2)')
+        ;
+
+        $this->applySessionFilter($queryBuilder, $alias, $session, $includeCourseWhenSessionSelected);
+    }
+
+    private function applySessionFilter(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected = false): void
+    {
+        if (null !== $session) {
+            if ($includeCourseWhenSessionSelected) {
+                $queryBuilder->andWhere('(IDENTITY('.$alias.'.session) = :sessionId OR '.$alias.'.session IS NULL)');
+
+                return;
+            }
+
+            $queryBuilder->andWhere('IDENTITY('.$alias.'.session) = :sessionId');
+
+            return;
+        }
+
+        $queryBuilder->andWhere($alias.'.session IS NULL');
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
new file mode 100644
index 00000000000..6d6961d9fd8
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
@@ -0,0 +1,615 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionBank;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceLink;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProviderInterface<ExerciseQuestionBank>
+ */
+final readonly class ExerciseQuestionBankProvider implements ProviderInterface
+{
+    public const CSRF_TOKEN_ID = 'exercise_question_bank_action';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionBank
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage the question bank in this context.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $filters = $this->getFilters($request);
+        $page = max(1, (int) $filters['page']);
+        $itemsPerPage = min(100, max(5, (int) $filters['itemsPerPage']));
+        $existingQuestionIds = $this->getExistingQuestionIds($quiz);
+        $totalItems = $this->countQuestions($quiz, $course, $session, $filters);
+        $items = $this->getQuestions($quiz, $course, $session, $filters, $existingQuestionIds, $page, $itemsPerPage);
+
+        $response = new ExerciseQuestionBank();
+        $response->exerciseId = $exerciseId;
+        $response->title = $quiz->getTitle();
+        $response->items = $items;
+        $response->categoryOptions = $this->getCategoryOptions($course, $session);
+        $response->exerciseOptions = $this->getExerciseOptions($quiz, $course, $session);
+        $response->difficultyOptions = $this->getDifficultyOptions();
+        $response->questionTypeOptions = $this->getQuestionTypeOptions((int) $quiz->getFeedbackType());
+        $response->filters = $filters;
+        $response->legacyUrls = [];
+        $response->page = $page;
+        $response->itemsPerPage = $itemsPerPage;
+        $response->totalItems = $totalItems;
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+        $response->canManage = true;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        $this->applySessionFilter($queryBuilder, 'links', $session);
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getFilters(Request $request): array
+    {
+        return [
+            'page' => max(1, $request->query->getInt('page', 1)),
+            'itemsPerPage' => max(5, $request->query->getInt('itemsPerPage', 20)),
+            'search' => trim((string) $request->query->get('search', '')),
+            'categoryId' => $request->query->getInt('categoryId'),
+            'sourceExerciseId' => $request->query->getInt('sourceExerciseId'),
+            'difficulty' => $request->query->getInt('difficulty', -1),
+            'questionType' => $request->query->getInt('questionType', -1),
+        ];
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getExistingQuestionIds(CQuiz $quiz): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('IDENTITY(relQuestion.question) AS questionId')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        return array_map(static fn (array $row): int => (int) $row['questionId'], $rows);
+    }
+
+    /**
+     * @param array<string, mixed> $filters
+     */
+    private function countQuestions(CQuiz $quiz, Course $course, ?Session $session, array $filters): int
+    {
+        $queryBuilder = $this->createQuestionQueryBuilder($quiz, $course, $session, $filters);
+        $queryBuilder->select('COUNT(DISTINCT question.iid)');
+
+        return (int) $queryBuilder->getQuery()->getSingleScalarResult();
+    }
+
+    /**
+     * @param array<string, mixed> $filters
+     * @param array<int, int>     $existingQuestionIds
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestions(
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        array $filters,
+        array $existingQuestionIds,
+        int $page,
+        int $itemsPerPage
+    ): array {
+        $queryBuilder = $this->createQuestionQueryBuilder($quiz, $course, $session, $filters);
+        $queryBuilder
+            ->select('DISTINCT question')
+            ->addOrderBy('question.question', 'ASC')
+            ->setFirstResult(($page - 1) * $itemsPerPage)
+            ->setMaxResults($itemsPerPage)
+        ;
+
+        $items = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $question) {
+            if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+                continue;
+            }
+
+            $questionId = (int) $question->getIid();
+            $type = (int) $question->getType();
+            $alreadyInExercise = \in_array($questionId, $existingQuestionIds, true);
+            $allowedByFeedback = $this->isQuestionTypeAllowedByFeedback($type, (int) $quiz->getFeedbackType());
+            $items[] = [
+                'id' => $questionId,
+                'title' => $question->getQuestion(),
+                'description' => (string) $question->getDescription(),
+                'type' => $type,
+                'typeLabel' => $this->getQuestionTypeLabel($type),
+                'typeIcon' => $this->getQuestionTypeIcon($type),
+                'categoryLabel' => $this->getFirstCategoryTitle($question),
+                'difficulty' => max(1, (int) $question->getLevel()),
+                'score' => (float) $question->getPonderation(),
+                'alreadyInExercise' => $alreadyInExercise,
+                'canReuse' => !$alreadyInExercise && $allowedByFeedback,
+                'blockedReason' => $allowedByFeedback ? '' : 'This question type is not compatible with the current feedback mode.',
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @param array<string, mixed> $filters
+     */
+    private function createQuestionQueryBuilder(CQuiz $quiz, Course $course, ?Session $session, array $filters): QueryBuilder
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->from(CQuizQuestion::class, 'question')
+            ->leftJoin('question.resourceNode', 'questionNode')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+        ;
+
+        $existsQuestionLink = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(ResourceLink::class, 'questionLink')
+            ->where('questionLink.resourceNode = questionNode')
+            ->andWhere('IDENTITY(questionLink.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsQuestionLink, 'questionLink', $session, true);
+
+        $existsViaQuiz = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(CQuizRelQuestion::class, 'scopeRelation')
+            ->innerJoin('scopeRelation.quiz', 'scopeQuiz')
+            ->innerJoin('scopeQuiz.resourceNode', 'scopeNode')
+            ->innerJoin('scopeNode.resourceLinks', 'scopeLinks')
+            ->where('scopeRelation.question = question')
+            ->andWhere('IDENTITY(scopeLinks.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsViaQuiz, 'scopeLinks', $session, true);
+
+        $queryBuilder->andWhere(
+            $queryBuilder->expr()->orX(
+                $queryBuilder->expr()->exists($existsQuestionLink->getDQL()),
+                $queryBuilder->expr()->exists($existsViaQuiz->getDQL())
+            )
+        );
+
+        $this->applyQuestionFilters($queryBuilder, $quiz, $course, $session, $filters);
+
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        return $queryBuilder;
+    }
+
+    /**
+     * @param array<string, mixed> $filters
+     */
+    private function applyQuestionFilters(QueryBuilder $queryBuilder, CQuiz $quiz, Course $course, ?Session $session, array $filters): void
+    {
+        $categoryId = (int) ($filters['categoryId'] ?? 0);
+        if (0 < $categoryId) {
+            $queryBuilder
+                ->innerJoin('question.categories', 'category')
+                ->andWhere('category.iid = :categoryId')
+                ->setParameter('categoryId', $categoryId, Types::INTEGER)
+            ;
+        }
+
+        $difficulty = (int) ($filters['difficulty'] ?? -1);
+        if (-1 !== $difficulty) {
+            $queryBuilder
+                ->andWhere('question.level = :difficulty')
+                ->setParameter('difficulty', $difficulty, Types::INTEGER)
+            ;
+        }
+
+        $questionType = (int) ($filters['questionType'] ?? -1);
+        if (0 < $questionType) {
+            $queryBuilder
+                ->andWhere('question.type = :questionType')
+                ->setParameter('questionType', $questionType, Types::INTEGER)
+            ;
+        }
+
+        $search = trim((string) ($filters['search'] ?? ''));
+        if ('' !== $search) {
+            if (ctype_digit($search)) {
+                $queryBuilder
+                    ->andWhere('(question.iid = :searchId OR question.question LIKE :searchText OR question.description LIKE :searchText)')
+                    ->setParameter('searchId', (int) $search, Types::INTEGER)
+                    ->setParameter('searchText', '%'.$search.'%', Types::STRING)
+                ;
+            } else {
+                $queryBuilder
+                    ->andWhere('(question.question LIKE :searchText OR question.description LIKE :searchText)')
+                    ->setParameter('searchText', '%'.$search.'%', Types::STRING)
+                ;
+            }
+        }
+
+        $sourceExerciseId = (int) ($filters['sourceExerciseId'] ?? 0);
+        if (0 < $sourceExerciseId) {
+            $this->applySourceExerciseFilter($queryBuilder, $sourceExerciseId, $course, $session);
+        } elseif (-1 === $sourceExerciseId) {
+            $this->applyOrphanQuestionFilter($queryBuilder, $course, $session);
+        }
+    }
+
+    private function applySourceExerciseFilter(QueryBuilder $queryBuilder, int $sourceExerciseId, Course $course, ?Session $session): void
+    {
+        $sourceFilter = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(CQuizRelQuestion::class, 'sourceRelation')
+            ->innerJoin('sourceRelation.quiz', 'sourceQuiz')
+            ->innerJoin('sourceQuiz.resourceNode', 'sourceNode')
+            ->innerJoin('sourceNode.resourceLinks', 'sourceLinks')
+            ->where('sourceRelation.question = question')
+            ->andWhere('sourceQuiz.iid = :sourceExerciseId')
+            ->andWhere('IDENTITY(sourceLinks.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($sourceFilter, 'sourceLinks', $session, true);
+
+        $queryBuilder
+            ->andWhere($queryBuilder->expr()->exists($sourceFilter->getDQL()))
+            ->setParameter('sourceExerciseId', $sourceExerciseId, Types::INTEGER)
+        ;
+    }
+
+    private function applyOrphanQuestionFilter(QueryBuilder $queryBuilder, Course $course, ?Session $session): void
+    {
+        $activeQuizQuestion = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(CQuizRelQuestion::class, 'orphanRelation')
+            ->innerJoin('orphanRelation.quiz', 'orphanQuiz')
+            ->innerJoin('orphanQuiz.resourceNode', 'orphanNode')
+            ->innerJoin('orphanNode.resourceLinks', 'orphanLinks')
+            ->where('orphanRelation.question = question')
+            ->andWhere('IDENTITY(orphanLinks.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($activeQuizQuestion, 'orphanLinks', $session, true);
+
+        $queryBuilder->andWhere($queryBuilder->expr()->not($queryBuilder->expr()->exists($activeQuizQuestion->getDQL())));
+    }
+
+    private function applyActiveLinkConstraints(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected): void
+    {
+        $queryBuilder
+            ->andWhere($alias.'.deletedAt IS NULL')
+            ->andWhere($alias.'.endVisibilityAt IS NULL')
+            ->andWhere($alias.'.visibility IN (0,2)')
+        ;
+
+        $this->applySessionFilter($queryBuilder, $alias, $session, $includeCourseWhenSessionSelected);
+    }
+
+    private function applySessionFilter(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected = false): void
+    {
+        if (null !== $session) {
+            if ($includeCourseWhenSessionSelected) {
+                $queryBuilder->andWhere('(IDENTITY('.$alias.'.session) = :sessionId OR '.$alias.'.session IS NULL)');
+
+                return;
+            }
+
+            $queryBuilder->andWhere('IDENTITY('.$alias.'.session) = :sessionId');
+
+            return;
+        }
+
+        $queryBuilder->andWhere($alias.'.session IS NULL');
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCategoryOptions(Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(CQuizQuestionCategory::class, 'category')
+            ->innerJoin('category.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.title', 'ASC')
+        ;
+
+        $this->applySessionFilter($queryBuilder, 'links', $session);
+
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        $items = [['value' => 0, 'label' => 'All']];
+        foreach ($queryBuilder->getQuery()->getResult() as $category) {
+            if ($category instanceof CQuizQuestionCategory && null !== $category->getIid()) {
+                $items[] = ['value' => (int) $category->getIid(), 'label' => $category->getTitle()];
+            }
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getExerciseOptions(CQuiz $currentQuiz, Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('quiz.title', 'ASC')
+        ;
+
+        $this->applySessionFilter($queryBuilder, 'links', $session);
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        $items = [
+            ['value' => 0, 'label' => 'All tests'],
+            ['value' => -1, 'label' => 'Orphan questions'],
+        ];
+        foreach ($queryBuilder->getQuery()->getResult() as $quiz) {
+            if ($quiz instanceof CQuiz && null !== $quiz->getIid()) {
+                $label = $quiz->getTitle();
+                if ((int) $quiz->getIid() === (int) $currentQuiz->getIid()) {
+                    $label = '> '.$label;
+                }
+                $items[] = ['value' => (int) $quiz->getIid(), 'label' => $label];
+            }
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDifficultyOptions(): array
+    {
+        $items = [['value' => -1, 'label' => 'All']];
+        for ($level = 0; $level <= 5; $level++) {
+            $items[] = ['value' => $level, 'label' => (string) $level];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestionTypeOptions(int $feedbackType): array
+    {
+        $items = [['value' => -1, 'label' => 'All']];
+        foreach ($this->getQuestionTypeDefinitions() as $definition) {
+            $type = (int) $definition['type'];
+            if (8 === $type || !$this->isQuestionTypeAllowedByFeedback($type, $feedbackType)) {
+                continue;
+            }
+
+            $items[] = ['value' => $type, 'label' => $definition['label']];
+        }
+
+        return $items;
+    }
+
+    private function getFirstCategoryTitle(CQuizQuestion $question): string
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                return $category->getTitle();
+            }
+        }
+
+        return '';
+    }
+
+    private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType): bool
+    {
+        if (1 === $feedbackType) {
+            return !\in_array($type, [5, 13, 20, 22, 23, 31], true);
+        }
+
+        if (3 === $feedbackType) {
+            return \in_array($type, [1, 2, 16, 18], true);
+        }
+
+        return true;
+    }
+
+    private function getQuestionTypeLabel(int $type): string
+    {
+        foreach ($this->getQuestionTypeDefinitions() as $definition) {
+            if ($type === (int) $definition['type']) {
+                return $definition['label'];
+            }
+        }
+
+        return 'Question';
+    }
+
+    private function getQuestionTypeIcon(int $type): string
+    {
+        foreach ($this->getQuestionTypeDefinitions() as $definition) {
+            if ($type === (int) $definition['type']) {
+                return $definition['icon'];
+            }
+        }
+
+        return 'quiz.png';
+    }
+
+    /**
+     * @return array<int, array{type: int, label: string, icon: string}>
+     */
+    private function getQuestionTypeDefinitions(): array
+    {
+        return [
+            ['type' => 1, 'label' => 'Multiple choice', 'icon' => 'mcua.png'],
+            ['type' => 2, 'label' => 'Multiple answer', 'icon' => 'mcma.png'],
+            ['type' => 3, 'label' => 'Fill blanks or form', 'icon' => 'fill_in_blanks.png'],
+            ['type' => 4, 'label' => 'Matching', 'icon' => 'matching.png'],
+            ['type' => 5, 'label' => 'Open question', 'icon' => 'open_answer.png'],
+            ['type' => 6, 'label' => 'Image zones', 'icon' => 'hotspot.png'],
+            ['type' => 8, 'label' => 'Hotspot delineation', 'icon' => 'hotspot_delineation.png'],
+            ['type' => 9, 'label' => 'Exact Selection', 'icon' => 'mcmac.png'],
+            ['type' => 10, 'label' => 'Unique answer with unknown', 'icon' => 'mcuao.png'],
+            ['type' => 11, 'label' => "Multiple answer true/false/don't know", 'icon' => 'mcmao.png'],
+            ['type' => 12, 'label' => "Combination true/false/don't-know", 'icon' => 'mcmaco.png'],
+            ['type' => 13, 'label' => 'Oral expression', 'icon' => 'audio_question.png'],
+            ['type' => 14, 'label' => 'Global multiple answer', 'icon' => 'mcmagl.png'],
+            ['type' => 15, 'label' => 'Media question', 'icon' => 'media.png'],
+            ['type' => 16, 'label' => 'Calculated answer', 'icon' => 'calculated_answer.png'],
+            ['type' => 17, 'label' => 'Unique answer with images', 'icon' => 'uaimg.png'],
+            ['type' => 18, 'label' => 'Sequence ordering', 'icon' => 'ordering.png'],
+            ['type' => 19, 'label' => 'Match by dragging', 'icon' => 'matchingdrag.png'],
+            ['type' => 20, 'label' => 'Annotation', 'icon' => 'annotation.png'],
+            ['type' => 21, 'label' => 'Reading comprehension', 'icon' => 'reading_comprehension.png'],
+            ['type' => 22, 'label' => 'Multiple answer true/false with degree of certainty', 'icon' => 'mccert.png'],
+            ['type' => 23, 'label' => 'Upload Answer', 'icon' => 'file_upload_question.png'],
+            ['type' => 24, 'label' => 'Matching combination', 'icon' => 'matching_co.png'],
+            ['type' => 25, 'label' => 'Matching draggable combination', 'icon' => 'matchingdrag_co.png'],
+            ['type' => 26, 'label' => 'Hotspot combination', 'icon' => 'hotspot_co.png'],
+            ['type' => 27, 'label' => 'Fill in blanks combination', 'icon' => 'fill_in_blanks_co.png'],
+            ['type' => 28, 'label' => 'Multiple Answer Dropdown Combination', 'icon' => 'mcma_dropdown_co.png'],
+            ['type' => 29, 'label' => 'Multiple Answer Dropdown', 'icon' => 'mcma_dropdown.png'],
+            ['type' => 31, 'label' => 'Page break', 'icon' => 'page_end.png'],
+        ];
+    }
+
+
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
index 252b0d151df..d7ffae8a8ba 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
@@ -121,6 +121,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $this->entityManager->flush();
+        $this->syncQuestionCategoryMandatory($quiz, $question, $data);
 
         return $this->buildResponse($quiz, $question, $course, $session);
     }
@@ -184,7 +185,7 @@ private function applyQuestionFields(CQuiz $quiz, CQuizQuestion $question, Exerc
             ->setLevel($this->normalizeDifficulty($data->difficulty))
             ->setPosition($position)
             ->setPonderation($score)
-            ->setMandatory($this->isStructuralQuestionType($type) ? 0 : ($data->mandatory ? 1 : 0))
+            ->setMandatory($this->isStructuralQuestionType($type) ? 0 : ($this->isMandatoryQuestionInCategoryEnabled($quiz) && $data->mandatory ? 1 : 0))
             ->setDuration($this->isStructuralQuestionType($type) ? null : $this->normalizeNullablePositiveInteger($data->duration))
             ->setParentMediaId($this->isStructuralQuestionType($type) ? null : $this->normalizeParentMediaId($quiz, $data, $question))
         ;
@@ -685,6 +686,47 @@ private function updateQuestionCategory(
         $question->addCategory($category);
     }
 
+    private function syncQuestionCategoryMandatory(CQuiz $quiz, CQuizQuestion $question, ExerciseQuestionEditor $data): void
+    {
+        $questionId = (int) ($question->getIid() ?? 0);
+        if (0 >= $questionId || !$this->hasMandatoryQuestionCategoryColumn()) {
+            return;
+        }
+
+        $mandatory = $this->isMandatoryQuestionInCategoryEnabled($quiz) && $data->mandatory ? 1 : 0;
+        $this->entityManager->getConnection()->executeStatement(
+            'UPDATE c_quiz_question_rel_category SET mandatory = :mandatory WHERE question_id = :questionId',
+            [
+                'mandatory' => $mandatory,
+                'questionId' => $questionId,
+            ],
+            [
+                'mandatory' => Types::INTEGER,
+                'questionId' => Types::INTEGER,
+            ]
+        );
+    }
+
+    private function isMandatoryQuestionInCategoryEnabled(CQuiz $quiz): bool
+    {
+        return 5 === (int) ($quiz->getQuestionSelectionType() ?? 0)
+            && 'true' === $this->settingsManager->getSetting('exercise.allow_mandatory_question_in_category', true)
+            && $this->hasMandatoryQuestionCategoryColumn();
+    }
+
+    private function hasMandatoryQuestionCategoryColumn(): bool
+    {
+        try {
+            return $this->entityManager
+                ->getConnection()
+                ->createSchemaManager()
+                ->introspectTable('c_quiz_question_rel_category')
+                ->hasColumn('mandatory');
+        } catch (\Throwable) {
+            return false;
+        }
+    }
+
     private function getQuestionCategory(int $categoryId, ?Course $course, ?Session $session): CQuizQuestionCategory
     {
         $category = $this->entityManager->getRepository(CQuizQuestionCategory::class)->find($categoryId);
@@ -757,7 +799,7 @@ private function normalizeParentMediaId(CQuiz $quiz, ExerciseQuestionEditor $dat
 
         $mediaQuestion = $this->questionRepository->find($mediaId);
         if (!$mediaQuestion instanceof CQuizQuestion || self::MEDIA_QUESTION !== (int) $mediaQuestion->getType()) {
-            throw new BadRequestHttpException('The selected media question is not valid.');
+            return null;
         }
 
         if (!$this->isQuestionInExercise($quiz, $mediaId)) {
@@ -2520,7 +2562,7 @@ private function buildResponse(CQuiz $quiz, CQuizQuestion $question, Course $cou
         [$response->correctScore, $response->wrongScore, $response->unknownScore] = $this->getTrueFalseScores($question);
         $response->usesGlobalScore = $this->usesGlobalScore((int) $question->getType());
         $response->hasFixedUnknownAnswer = self::UNIQUE_ANSWER_NO_OPTION === (int) $question->getType();
-        $response->mandatory = 1 === (int) $question->getMandatory();
+        $response->mandatory = $this->isQuestionMandatoryInCategory($question);
         $response->duration = $question->getDuration();
         $response->difficulty = max(1, (int) $question->getLevel());
         $response->categoryId = $this->getFirstCategoryId($question);
@@ -2545,7 +2587,28 @@ private function buildResponse(CQuiz $quiz, CQuizQuestion $question, Course $cou
         ];
         $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
         $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
+        $response->allowMandatoryQuestion = $this->isMandatoryQuestionInCategoryEnabled($quiz);
 
         return $response;
     }
+
+    private function isQuestionMandatoryInCategory(CQuizQuestion $question): bool
+    {
+        $questionId = (int) ($question->getIid() ?? 0);
+        if (0 >= $questionId || !$this->hasMandatoryQuestionCategoryColumn()) {
+            return 1 === (int) $question->getMandatory();
+        }
+
+        $value = $this->entityManager->getConnection()->fetchOne(
+            'SELECT mandatory FROM c_quiz_question_rel_category WHERE question_id = :questionId ORDER BY iid ASC LIMIT 1',
+            ['questionId' => $questionId],
+            ['questionId' => Types::INTEGER]
+        );
+
+        if (false === $value) {
+            return 1 === (int) $question->getMandatory();
+        }
+
+        return 1 === (int) $value;
+    }
 }
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
index 2897b7c66ca..012abe5d83d 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
@@ -253,6 +253,27 @@ private function addSharedEditorData(
         $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
         $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
         $response->imageZoomEnabled = $this->isImageZoomEnabled();
+        $response->allowMandatoryQuestion = $this->isMandatoryQuestionInCategoryEnabled($quiz);
+    }
+
+    private function isMandatoryQuestionInCategoryEnabled(CQuiz $quiz): bool
+    {
+        return 5 === (int) ($quiz->getQuestionSelectionType() ?? 0)
+            && 'true' === $this->settingsManager->getSetting('exercise.allow_mandatory_question_in_category', true)
+            && $this->hasMandatoryQuestionCategoryColumn();
+    }
+
+    private function hasMandatoryQuestionCategoryColumn(): bool
+    {
+        try {
+            return $this->entityManager
+                ->getConnection()
+                ->createSchemaManager()
+                ->introspectTable('c_quiz_question_rel_category')
+                ->hasColumn('mandatory');
+        } catch (\Throwable) {
+            return false;
+        }
     }
 
     private function getCourse(Request $request): Course
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php
new file mode 100644
index 00000000000..a08be31c0e0
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php
@@ -0,0 +1,1027 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionImport;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Service\Exercise\ExerciseQti2ImportService;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizQuestionCategoryRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+use Throwable;
+use ZipArchive;
+
+/**
+ * @implements ProcessorInterface<ExerciseQuestionImport, ExerciseQuestionImport>
+ */
+final readonly class ExerciseQuestionImportProcessor implements ProcessorInterface
+{
+    private const UNIQUE_ANSWER = 1;
+    private const MULTIPLE_ANSWER = 2;
+    private const FILL_IN_BLANKS = 3;
+    private const MATCHING = 4;
+    private const FREE_ANSWER = 5;
+    private const GLOBAL_MULTIPLE_ANSWER = 14;
+    private const DEFAULT_TOTAL_WEIGHT = 20.0;
+    private const CSRF_TOKEN_ID = ExerciseQuestionImportProvider::CSRF_TOKEN_ID;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+        private CQuizQuestionCategoryRepository $questionCategoryRepository,
+        private ExerciseQti2ImportService $qti2ImportService,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionImport
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to import exercises in this context.');
+        }
+
+        $importType = $this->normalizeImportType((string) ($uriVariables['importType'] ?? 'aiken'));
+        $this->validateCsrfToken((string) $request->request->get('submittedCsrfToken', ''));
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $uploadedFile = $request->files->get('file');
+        if (!$uploadedFile instanceof UploadedFile) {
+            throw new BadRequestHttpException('A file is required.');
+        }
+
+        if ('excel' === $importType) {
+            return $this->processExcelImport($uploadedFile, $request, $course, $session);
+        }
+
+        if ('qti2' === $importType) {
+            return $this->processQti2Import($uploadedFile, $course, $session);
+        }
+
+        return $this->processAikenImport($uploadedFile, $request, $course, $session);
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function validateCsrfToken(string $submittedToken): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(self::CSRF_TOKEN_ID, $submittedToken))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function normalizeImportType(string $importType): string
+    {
+        $importType = strtolower(trim($importType));
+        if (\in_array($importType, ['aiken', 'excel', 'qti2'], true)) {
+            return $importType;
+        }
+
+        throw new BadRequestHttpException('Unsupported import type.');
+    }
+
+    private function normalizeTotalWeight(string $value): float
+    {
+        $value = str_replace(',', '.', trim($value));
+        if ('' === $value || !is_numeric($value)) {
+            return self::DEFAULT_TOTAL_WEIGHT;
+        }
+
+        $weight = (float) $value;
+
+        return 0 < $weight ? $weight : self::DEFAULT_TOTAL_WEIGHT;
+    }
+
+    private function normalizeScoreValue(string $value): ?float
+    {
+        $value = str_replace(',', '.', trim($value));
+        if ('' === $value || !is_numeric($value)) {
+            return null;
+        }
+
+        return (float) $value;
+    }
+
+    private function processAikenImport(UploadedFile $uploadedFile, Request $request, Course $course, ?Session $session): ExerciseQuestionImport
+    {
+        $totalWeight = $this->normalizeTotalWeight((string) $request->request->get('totalWeight', ''));
+        $source = $this->readAikenSource($uploadedFile);
+        $parsedQuestions = $this->parseAikenText($source['content'], $totalWeight);
+        if ([] === $parsedQuestions['questions']) {
+            throw new BadRequestHttpException('No valid Aiken questions were found in the uploaded file.');
+        }
+
+        $exerciseTitle = $this->buildAikenExerciseTitle($uploadedFile);
+        $quiz = $this->createExercise($exerciseTitle, $course, $session);
+        $importedQuestionCount = $this->createAikenQuestions($quiz, $parsedQuestions['questions'], $course, $session);
+
+        if (0 === $importedQuestionCount) {
+            throw new BadRequestHttpException('No valid Aiken questions were imported.');
+        }
+
+        $this->entityManager->flush();
+
+        return $this->buildSuccessResponse(
+            'aiken',
+            'Import Aiken quiz',
+            'Aiken quiz imported',
+            $quiz,
+            $importedQuestionCount,
+            (int) $parsedQuestions['skippedCount'],
+            $parsedQuestions['errors'],
+        );
+    }
+
+    private function processExcelImport(UploadedFile $uploadedFile, Request $request, Course $course, ?Session $session): ExerciseQuestionImport
+    {
+        $worksheet = $this->readExcelWorksheet($uploadedFile);
+        $excelData = $this->parseExcelWorksheet($worksheet);
+        if ('' === trim($excelData['quizTitle'])) {
+            throw new BadRequestHttpException('ErrorImportingFile');
+        }
+
+        $useCustomScore = $this->normalizeBoolean((string) $request->request->get('useCustomScore', ''));
+        $correctScore = $this->normalizeScoreValue((string) $request->request->get('correctScore', ''));
+        $incorrectScore = $this->normalizeScoreValue((string) $request->request->get('incorrectScore', ''));
+        $propagateNegative = $useCustomScore && null !== $incorrectScore && 0 > $incorrectScore ? 1 : 0;
+
+        $quiz = $this->createExercise($excelData['quizTitle'], $course, $session, $propagateNegative);
+        $importResult = $this->createExcelQuestions($quiz, $excelData['questions'], $course, $session, $useCustomScore, $correctScore, $incorrectScore);
+        if (0 === $importResult['importedCount']) {
+            throw new BadRequestHttpException('No valid Excel questions were imported.');
+        }
+
+        $this->entityManager->flush();
+
+        return $this->buildSuccessResponse(
+            'excel',
+            'Import quiz from Excel',
+            'File imported',
+            $quiz,
+            $importResult['importedCount'],
+            $importResult['skippedCount'],
+            $importResult['errors'],
+        );
+    }
+
+    private function processQti2Import(UploadedFile $uploadedFile, Course $course, ?Session $session): ExerciseQuestionImport
+    {
+        $importResult = $this->qti2ImportService->import($uploadedFile, $course, $session);
+
+        return $this->buildSuccessResponse(
+            'qti2',
+            'Import exercises QTI2',
+            'File imported',
+            $importResult['quiz'],
+            $importResult['importedCount'],
+            $importResult['skippedCount'],
+            $importResult['errors'],
+        );
+    }
+
+    /**
+     * @param array<int, string> $errors
+     */
+    private function buildSuccessResponse(
+        string $importType,
+        string $title,
+        string $message,
+        CQuiz $quiz,
+        int $importedQuestionCount,
+        int $skippedQuestionCount,
+        array $errors,
+    ): ExerciseQuestionImport {
+        $response = new ExerciseQuestionImport();
+        $response->importType = $importType;
+        $response->title = $title;
+        $response->canManage = true;
+        $response->success = true;
+        $response->exerciseId = (int) $quiz->getIid();
+        $response->exerciseTitle = $quiz->getTitle();
+        $response->importedQuestionCount = $importedQuestionCount;
+        $response->skippedQuestionCount = $skippedQuestionCount;
+        $response->errors = $errors;
+        $response->message = $message;
+
+        return $response;
+    }
+
+    private function normalizeBoolean(string $value): bool
+    {
+        return \in_array(strtolower(trim($value)), ['1', 'true', 'on', 'yes'], true);
+    }
+
+    /**
+     * @return array{content: string, filename: string}
+     */
+    private function readAikenSource(UploadedFile $uploadedFile): array
+    {
+        if (!$uploadedFile->isValid()) {
+            throw new BadRequestHttpException('The uploaded file is not valid.');
+        }
+
+        $extension = strtolower((string) $uploadedFile->getClientOriginalExtension());
+        if ('txt' === $extension) {
+            $content = (string) file_get_contents($uploadedFile->getPathname());
+
+            return ['content' => $this->normalizeTextContent($content), 'filename' => $uploadedFile->getClientOriginalName()];
+        }
+
+        if ('zip' === $extension) {
+            return ['content' => $this->readAikenZip($uploadedFile), 'filename' => $uploadedFile->getClientOriginalName()];
+        }
+
+        throw new BadRequestHttpException('You must upload a .txt or .zip file.');
+    }
+
+    private function readAikenZip(UploadedFile $uploadedFile): string
+    {
+        if (!class_exists(ZipArchive::class)) {
+            throw new BadRequestHttpException('ZIP support is not available on this platform.');
+        }
+
+        $zip = new ZipArchive();
+        if (true !== $zip->open($uploadedFile->getPathname())) {
+            throw new BadRequestHttpException('The uploaded ZIP file could not be opened.');
+        }
+
+        $contents = [];
+        for ($index = 0; $index < $zip->numFiles; ++$index) {
+            $name = (string) $zip->getNameIndex($index);
+            if ('' === $name || str_ends_with($name, '/') || !str_ends_with(strtolower($name), '.txt')) {
+                continue;
+            }
+
+            $content = $zip->getFromIndex($index);
+            if (false !== $content && '' !== trim($content)) {
+                $contents[] = $this->normalizeTextContent($content);
+            }
+        }
+        $zip->close();
+
+        if ([] === $contents) {
+            throw new BadRequestHttpException('The uploaded ZIP file does not contain Aiken .txt files.');
+        }
+
+        return implode("\n\n", $contents);
+    }
+
+    private function normalizeTextContent(string $content): string
+    {
+        $content = str_replace(["\r\n", "\r"], "\n", $content);
+        $content = preg_replace('/^\xEF\xBB\xBF/', '', $content) ?? $content;
+
+        return $content;
+    }
+
+    /**
+     * @return array{questions: array<int, array<string, mixed>>, skippedCount: int, errors: array<int, string>}
+     */
+    private function parseAikenText(string $content, float $totalWeight): array
+    {
+        $questions = [];
+        $errors = [];
+        $currentQuestion = null;
+        $answersByLetter = [];
+        $lineNumber = 0;
+
+        foreach (explode("\n", $content) as $line) {
+            ++$lineNumber;
+            $line = trim($line);
+
+            if ('' === $line || '```' === $line || str_starts_with($line, '```')) {
+                continue;
+            }
+
+            if ($this->isAikenQuestionTitleLine($line)) {
+                if (null !== $currentQuestion) {
+                    $questions[] = $currentQuestion;
+                }
+
+                $currentQuestion = [
+                    'line' => $lineNumber,
+                    'title' => $this->stripLeadingQuestionNumber($line),
+                    'answers' => [],
+                    'correctIndexes' => [],
+                    'feedback' => '',
+                    'score' => null,
+                ];
+                $answersByLetter = [];
+                continue;
+            }
+
+            if (null === $currentQuestion) {
+                $errors[] = 'Line '.$lineNumber.': ignored content before the first question.';
+                continue;
+            }
+
+            if (preg_match('/^([A-Z])\.\s(.*)/', $line, $matches)) {
+                $answerIndex = \count($currentQuestion['answers']);
+                $currentQuestion['answers'][] = trim((string) $matches[2]);
+                $answersByLetter[(string) $matches[1]] = $answerIndex;
+                continue;
+            }
+
+            if (preg_match('/^ANSWER:\s?([A-Z])/', $line, $matches)) {
+                $letter = (string) $matches[1];
+                if (isset($answersByLetter[$letter])) {
+                    $currentQuestion['correctIndexes'][] = $answersByLetter[$letter];
+                } else {
+                    $errors[] = 'Line '.$lineNumber.': ANSWER references an unknown option.';
+                }
+                continue;
+            }
+
+            if (preg_match('/^ANSWER_EXPLANATION:\s?(.*)/', $line, $matches)) {
+                $currentQuestion['feedback'] = trim((string) $matches[1]);
+                continue;
+            }
+
+            if (preg_match('/^SCORE:\s?(.*)/', $line, $matches)) {
+                $score = str_replace(',', '.', trim((string) $matches[1]));
+                if (is_numeric($score) && 0 < (float) $score) {
+                    $currentQuestion['score'] = (float) $score;
+                }
+                continue;
+            }
+
+            $errors[] = 'Line '.$lineNumber.': ignored unsupported Aiken line.';
+        }
+
+        if (null !== $currentQuestion) {
+            $questions[] = $currentQuestion;
+        }
+
+        $validQuestions = [];
+        $skippedCount = 0;
+        $defaultScore = $totalWeight / max(1, \count($questions));
+        foreach ($questions as $question) {
+            $answers = array_values(array_filter($question['answers'], static fn (string $answer): bool => '' !== trim($answer)));
+            $correctIndexes = array_values(array_unique(array_map('intval', $question['correctIndexes'])));
+            if ('' === trim((string) $question['title']) || 2 > \count($answers) || [] === $correctIndexes) {
+                ++$skippedCount;
+                $errors[] = 'Line '.(int) $question['line'].': skipped invalid Aiken question.';
+                continue;
+            }
+
+            $question['answers'] = $answers;
+            $question['correctIndexes'] = $correctIndexes;
+            $question['score'] = null !== $question['score'] ? (float) $question['score'] : $defaultScore;
+            $validQuestions[] = $question;
+        }
+
+        return [
+            'questions' => $validQuestions,
+            'skippedCount' => $skippedCount,
+            'errors' => $errors,
+        ];
+    }
+
+    private function isAikenQuestionTitleLine(string $line): bool
+    {
+        return !preg_match('/^[A-Z]\.\s/', $line)
+            && !preg_match('/^ANSWER:\s?[A-Z]/', $line)
+            && !preg_match('/^ANSWER_EXPLANATION:\s?(.*)/', $line)
+            && !preg_match('/^SCORE:\s?(.*)/', $line);
+    }
+
+    private function stripLeadingQuestionNumber(string $line): string
+    {
+        $line = trim($line);
+        if ('' === $line) {
+            return $line;
+        }
+
+        $normalized = preg_replace('/^\d+\s*[\.\)\-:]\s+/u', '', $line);
+        if (null === $normalized) {
+            return $line;
+        }
+
+        $normalized = trim($normalized);
+
+        return '' !== $normalized ? $normalized : $line;
+    }
+
+    private function buildAikenExerciseTitle(UploadedFile $uploadedFile): string
+    {
+        $name = $uploadedFile->getClientOriginalName();
+        $title = preg_replace('/\.(zip|txt)$/i', '', $name) ?? $name;
+        $title = trim($title);
+
+        return '' !== $title ? $title : 'Imported Aiken quiz';
+    }
+
+    private function readExcelWorksheet(UploadedFile $uploadedFile): Worksheet
+    {
+        if (!$uploadedFile->isValid()) {
+            throw new BadRequestHttpException('The uploaded file is not valid.');
+        }
+
+        $extension = strtolower((string) $uploadedFile->getClientOriginalExtension());
+        if (!\in_array($extension, ['xls', 'xlsx'], true)) {
+            throw new BadRequestHttpException('The uploaded file must be an Excel document.');
+        }
+
+        try {
+            $spreadsheet = IOFactory::load($uploadedFile->getPathname());
+        } catch (Throwable) {
+            throw new BadRequestHttpException('The uploaded Excel file could not be read.');
+        }
+
+        $spreadsheet->setActiveSheetIndex(0);
+
+        return $spreadsheet->getActiveSheet();
+    }
+
+    /**
+     * @return array{quizTitle: string, questions: array<int, array<string, mixed>>}
+     */
+    private function parseExcelWorksheet(Worksheet $worksheet): array
+    {
+        $quizTitle = '';
+        $questions = [];
+        $currentIndex = null;
+        $highestRow = $worksheet->getHighestRow();
+
+        for ($row = 1; $row <= $highestRow; ++$row) {
+            $label = $this->getWorksheetCellValue($worksheet, 'A'.$row);
+            $data = $this->getWorksheetCellValue($worksheet, 'B'.$row);
+            $extra = $this->getWorksheetCellValue($worksheet, 'C'.$row);
+
+            if ('Quiz' === $label) {
+                $quizTitle = $data;
+                continue;
+            }
+
+            if ('Question' === $label) {
+                $questions[] = $this->createEmptyExcelQuestion($data, $row);
+                $currentIndex = array_key_last($questions);
+                continue;
+            }
+
+            if (null === $currentIndex) {
+                continue;
+            }
+
+            if (str_starts_with($label, 'Answer')) {
+                $questions[$currentIndex]['answers'][] = ['data' => $data, 'extra' => $extra];
+                continue;
+            }
+
+            if ('Score' === $label) {
+                $questions[$currentIndex]['score'] = $extra;
+                continue;
+            }
+
+            if ('NoNegativeScore' === $label) {
+                $questions[$currentIndex]['noNegativeScore'] = $extra;
+                continue;
+            }
+
+            if ('Category' === $label) {
+                $questions[$currentIndex]['category'] = $data;
+                continue;
+            }
+
+            if ('FeedbackTrue' === $label) {
+                $questions[$currentIndex]['feedbackTrue'] = $data;
+                continue;
+            }
+
+            if ('FeedbackFalse' === $label) {
+                $questions[$currentIndex]['feedbackFalse'] = $data;
+                continue;
+            }
+
+            if ('EnrichQuestion' === $label) {
+                $questions[$currentIndex]['description'] = $data;
+                continue;
+            }
+
+            if ('QuestionType' === $label) {
+                $questions[$currentIndex]['type'] = $extra;
+            }
+        }
+
+        return ['quizTitle' => trim($quizTitle), 'questions' => $questions];
+    }
+
+    private function getWorksheetCellValue(Worksheet $worksheet, string $coordinate): string
+    {
+        $value = $worksheet->getCell($coordinate)->getValue();
+        if (null === $value) {
+            return '';
+        }
+
+        return trim((string) $value);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function createEmptyExcelQuestion(string $title, int $row): array
+    {
+        return [
+            'row' => $row,
+            'title' => $title,
+            'answers' => [],
+            'score' => null,
+            'noNegativeScore' => '',
+            'category' => '',
+            'feedbackTrue' => '',
+            'feedbackFalse' => '',
+            'description' => '',
+            'type' => null,
+        ];
+    }
+
+    private function createExercise(string $title, Course $course, ?Session $session, int $propagateNegative = 0): CQuiz
+    {
+        $quiz = new CQuiz();
+        $quiz
+            ->setTitle($title)
+            ->setDescription('')
+            ->setType(CQuiz::ONE_PER_PAGE)
+            ->setRandom(0)
+            ->setRandomAnswers(false)
+            ->setResultsDisabled(0)
+            ->setMaxAttempt(1)
+            ->setFeedbackType(0)
+            ->setExpiredTime(0)
+            ->setPropagateNeg($propagateNegative)
+            ->setSaveCorrectAnswers(0)
+            ->setReviewAnswers(0)
+            ->setRandomByCategory(0)
+            ->setDisplayCategoryName(0)
+            ->setPassPercentage(0)
+            ->setPreventBackwards(0)
+            ->setHideQuestionTitle(false)
+            ->setHideQuestionNumber(0)
+            ->setShowPreviousButton(true)
+            ->setNotifications('')
+            ->setAutoLaunch(false)
+            ->setHideAttemptsTable(false)
+            ->setPageResultConfiguration([])
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        $this->entityManager->persist($quiz);
+
+        return $quiz;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     */
+    private function createAikenQuestions(CQuiz $quiz, array $questions, Course $course, ?Session $session): int
+    {
+        $questionOrder = 1;
+        foreach ($questions as $questionData) {
+            $score = max(0.0, (float) $questionData['score']);
+            $question = $this->createQuestion($quiz, $course, $session, (string) $questionData['title'], '', self::UNIQUE_ANSWER, $score, $questionOrder);
+            $this->createChoiceAnswers($question, $questionData['answers'], $questionData['correctIndexes'], $score, (string) $questionData['feedback']);
+            ++$questionOrder;
+        }
+
+        return \count($questions);
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     *
+     * @return array{importedCount: int, skippedCount: int, errors: array<int, string>}
+     */
+    private function createExcelQuestions(
+        CQuiz $quiz,
+        array $questions,
+        Course $course,
+        ?Session $session,
+        bool $useCustomScore,
+        ?float $correctScore,
+        ?float $incorrectScore,
+    ): array {
+        $importedCount = 0;
+        $skippedCount = 0;
+        $errors = [];
+        $questionOrder = 1;
+
+        foreach ($questions as $questionData) {
+            $title = trim((string) $questionData['title']);
+            if ('' === $title) {
+                ++$skippedCount;
+                $errors[] = 'Row '.(int) $questionData['row'].': skipped question without title.';
+                continue;
+            }
+
+            $answers = \is_array($questionData['answers']) ? $questionData['answers'] : [];
+            $questionType = $this->normalizeExcelQuestionType($questionData['type'], $answers);
+            $description = (string) $questionData['description'];
+            $questionDescription = '' !== $description ? '<p>'.$description.'</p>' : '<p></p>';
+            if (self::FILL_IN_BLANKS === $questionType) {
+                $questionDescription = '';
+            }
+
+            $question = $this->createQuestion($quiz, $course, $session, $title, $questionDescription, $questionType, 0.0, $questionOrder);
+            $category = $this->findOrCreateQuestionCategory((string) $questionData['category'], $course, $session);
+            if ($category instanceof CQuizQuestionCategory) {
+                $question->updateCategory($category);
+            }
+
+            $this->createExcelAnswers($question, $questionType, $answers, $questionData, $useCustomScore, $correctScore, $incorrectScore, $description);
+            ++$importedCount;
+            ++$questionOrder;
+        }
+
+        return [
+            'importedCount' => $importedCount,
+            'skippedCount' => $skippedCount,
+            'errors' => $errors,
+        ];
+    }
+
+    private function createQuestion(
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        string $title,
+        string $description,
+        int $type,
+        float $ponderation,
+        int $questionOrder,
+    ): CQuizQuestion {
+        $question = new CQuizQuestion();
+        $question
+            ->setQuestion($title)
+            ->setDescription($description)
+            ->setFeedback('')
+            ->setExtra(null)
+            ->setType($type)
+            ->setLevel(0)
+            ->setPosition($questionOrder)
+            ->setPonderation($ponderation)
+            ->setMandatory(0)
+            ->setDuration(null)
+            ->setParentMediaId(null)
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+        $this->entityManager->persist($question);
+
+        $relation = new CQuizRelQuestion();
+        $relation
+            ->setQuiz($quiz)
+            ->setQuestion($question)
+            ->setQuestionOrder($questionOrder)
+        ;
+        $this->entityManager->persist($relation);
+
+        return $question;
+    }
+
+    /**
+     * @param array<int, string> $answers
+     * @param array<int, int> $correctIndexes
+     */
+    private function createChoiceAnswers(CQuizQuestion $question, array $answers, array $correctIndexes, float $score, string $feedback): void
+    {
+        foreach ($answers as $position => $answerText) {
+            $isCorrect = \in_array((int) $position, $correctIndexes, true);
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) $answerText)
+                ->setCorrect($isCorrect ? 1 : 0)
+                ->setComment($isCorrect ? $feedback : '')
+                ->setPonderation($isCorrect ? $score : 0.0)
+                ->setPosition((int) $position)
+            ;
+            $this->entityManager->persist($answer);
+        }
+    }
+
+    /**
+     * @param array<int, array<string, string>> $answers
+     * @param array<string, mixed> $questionData
+     */
+    private function createExcelAnswers(
+        CQuizQuestion $question,
+        int $questionType,
+        array $answers,
+        array $questionData,
+        bool $useCustomScore,
+        ?float $correctScore,
+        ?float $incorrectScore,
+        string $description,
+    ): void {
+        match ($questionType) {
+            self::FREE_ANSWER => $this->updateQuestionPonderation($question, $this->scoreFromValue($questionData['score'])),
+            self::FILL_IN_BLANKS => $this->createFillInBlankAnswer($question, $answers, $description),
+            self::MATCHING => $this->createMatchingAnswers($question, $answers, $this->scoreFromValue($questionData['score'])),
+            self::GLOBAL_MULTIPLE_ANSWER => $this->createMultipleChoiceAnswers($question, $answers, $questionData, $useCustomScore, $correctScore, $incorrectScore, true),
+            self::MULTIPLE_ANSWER, self::UNIQUE_ANSWER => $this->createMultipleChoiceAnswers($question, $answers, $questionData, $useCustomScore, $correctScore, $incorrectScore, false),
+            default => $this->createMultipleChoiceAnswers($question, $answers, $questionData, $useCustomScore, $correctScore, $incorrectScore, false),
+        };
+    }
+
+    private function updateQuestionPonderation(CQuizQuestion $question, float $ponderation): void
+    {
+        $question->setPonderation($ponderation);
+    }
+
+    /**
+     * @param array<int, array<string, string>> $answers
+     * @param array<string, mixed> $questionData
+     */
+    private function createMultipleChoiceAnswers(
+        CQuizQuestion $question,
+        array $answers,
+        array $questionData,
+        bool $useCustomScore,
+        ?float $correctScore,
+        ?float $incorrectScore,
+        bool $globalMultiple,
+    ): void {
+        $total = 0.0;
+        $globalScore = $this->scoreFromValue($questionData['score']);
+        $numberRightAnswers = $this->countRightAnswers($answers);
+        $position = 1;
+
+        foreach ($answers as $answerData) {
+            $answerValue = (string) ($answerData['data'] ?? '');
+            $extra = (string) ($answerData['extra'] ?? '');
+            $correct = 'x' === strtolower($extra);
+            $score = 0.0;
+            $comment = $correct ? (string) $questionData['feedbackTrue'] : (string) $questionData['feedbackFalse'];
+
+            if ($correct) {
+                $score = $globalScore;
+            } elseif (is_numeric($extra)) {
+                $score = (float) $extra;
+            }
+
+            if ($useCustomScore) {
+                $score = $correct ? (float) ($correctScore ?? 0.0) : (float) ($incorrectScore ?? 0.0);
+            }
+
+            if ($globalMultiple) {
+                if ($correct) {
+                    $score = abs($globalScore);
+                } else {
+                    $score = 'x' === (string) $questionData['noNegativeScore'] ? 0.0 : -abs($globalScore);
+                }
+                $score /= max(1, $numberRightAnswers);
+            }
+
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer($answerValue)
+                ->setCorrect($correct ? 1 : 0)
+                ->setComment($comment)
+                ->setPonderation($score)
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+
+            if ($correct) {
+                $total += $score;
+            }
+            ++$position;
+        }
+
+        $question->setPonderation($globalMultiple ? $globalScore : $total);
+    }
+
+    /**
+     * @param array<int, array<string, string>> $answers
+     */
+    private function createFillInBlankAnswer(CQuizQuestion $question, array $answers, string $description): void
+    {
+        $scores = [];
+        $sizes = [];
+        $globalScore = 0.0;
+        foreach ($answers as $answerData) {
+            $score = $this->scoreFromValue($answerData['extra'] ?? null);
+            $globalScore += $score;
+            $scores[] = (string) $score;
+            $sizes[] = '200';
+        }
+
+        $answer = new CQuizAnswer();
+        $answer
+            ->setQuestion($question)
+            ->setAnswer($description.'::'.implode(',', $scores).':'.implode(',', $sizes).':0@')
+            ->setCorrect(0)
+            ->setComment('')
+            ->setPonderation($globalScore)
+            ->setPosition(1)
+        ;
+        $this->entityManager->persist($answer);
+        $question->setPonderation($globalScore);
+    }
+
+    /**
+     * @param array<int, array<string, string>> $answers
+     */
+    private function createMatchingAnswers(CQuizQuestion $question, array $answers, float $globalScore): void
+    {
+        $position = 1;
+        foreach ($answers as $answerData) {
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) ($answerData['extra'] ?? ''))
+                ->setCorrect(0)
+                ->setComment('')
+                ->setPonderation(0.0)
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+            ++$position;
+        }
+
+        $counter = 1;
+        foreach ($answers as $answerData) {
+            $answer = new CQuizAnswer();
+            $answer
+                ->setQuestion($question)
+                ->setAnswer((string) ($answerData['data'] ?? ''))
+                ->setCorrect($counter)
+                ->setComment(' ')
+                ->setPonderation($globalScore)
+                ->setPosition($position)
+            ;
+            $this->entityManager->persist($answer);
+            ++$counter;
+            ++$position;
+        }
+
+        $question->setPonderation($globalScore);
+    }
+
+    private function scoreFromValue(mixed $value): float
+    {
+        $value = str_replace(',', '.', trim((string) $value));
+        if ('' === $value || !is_numeric($value)) {
+            return 0.0;
+        }
+
+        return (float) $value;
+    }
+
+    /**
+     * @param array<int, array<string, string>> $answers
+     */
+    private function countRightAnswers(array $answers): int
+    {
+        $count = 0;
+        foreach ($answers as $answerData) {
+            if ('x' === strtolower((string) ($answerData['extra'] ?? ''))) {
+                ++$count;
+            }
+        }
+
+        return $count;
+    }
+
+    /**
+     * @param array<int, array<string, string>> $answers
+     */
+    private function normalizeExcelQuestionType(mixed $questionType, array $answers): int
+    {
+        $questionType = trim((string) $questionType);
+        if ('' !== $questionType) {
+            $type = (int) $questionType;
+
+            return \in_array($type, [self::UNIQUE_ANSWER, self::MULTIPLE_ANSWER, self::FILL_IN_BLANKS, self::MATCHING, self::FREE_ANSWER, self::GLOBAL_MULTIPLE_ANSWER], true)
+                ? $type
+                : self::UNIQUE_ANSWER;
+        }
+
+        return $this->detectExcelQuestionType($answers);
+    }
+
+    /**
+     * @param array<int, array<string, string>> $answers
+     */
+    private function detectExcelQuestionType(array $answers): int
+    {
+        $correct = 0;
+        $isNumeric = false;
+
+        if ([] === $answers) {
+            return self::FREE_ANSWER;
+        }
+
+        foreach ($answers as $answerData) {
+            $extra = (string) ($answerData['extra'] ?? '');
+            if ('x' === strtolower($extra)) {
+                ++$correct;
+                continue;
+            }
+
+            if (is_numeric($extra)) {
+                $isNumeric = true;
+            }
+        }
+
+        if (1 === $correct) {
+            return self::UNIQUE_ANSWER;
+        }
+
+        if (1 < $correct) {
+            return $isNumeric ? self::MULTIPLE_ANSWER : self::GLOBAL_MULTIPLE_ANSWER;
+        }
+
+        return self::FREE_ANSWER;
+    }
+
+    private function findOrCreateQuestionCategory(string $categoryTitle, Course $course, ?Session $session): ?CQuizQuestionCategory
+    {
+        $categoryTitle = trim($categoryTitle);
+        if ('' === $categoryTitle) {
+            return null;
+        }
+
+        $existingCategory = $this->questionCategoryRepository->findCourseResourceByTitle($categoryTitle, $course->getResourceNode(), $course);
+        if ($existingCategory instanceof CQuizQuestionCategory) {
+            return $existingCategory;
+        }
+
+        $category = new CQuizQuestionCategory();
+        $category
+            ->setTitle($categoryTitle)
+            ->setDescription('')
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+        $this->questionCategoryRepository->create($category);
+
+        return $category;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionImportProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionImportProvider.php
new file mode 100644
index 00000000000..f2660b0e741
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionImportProvider.php
@@ -0,0 +1,216 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionImport;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProviderInterface<ExerciseQuestionImport>
+ */
+final readonly class ExerciseQuestionImportProvider implements ProviderInterface
+{
+    public const CSRF_TOKEN_ID = 'exercise_question_import';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionImport
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to import exercises in this context.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $importType = $this->normalizeImportType((string) ($uriVariables['importType'] ?? 'aiken'));
+
+        $response = new ExerciseQuestionImport();
+        $response->importType = $importType;
+        $response->title = $this->getImportTitle($importType);
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+        $response->canManage = true;
+        $response->actionUrls = $this->getActionUrls($course, $session, $request);
+        $response->sample = $this->getImportSample($importType);
+
+        return $response;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function normalizeImportType(string $importType): string
+    {
+        $importType = strtolower(trim($importType));
+        if (\in_array($importType, ['aiken', 'excel', 'qti2'], true)) {
+            return $importType;
+        }
+
+        throw new BadRequestHttpException('Unsupported import type.');
+    }
+
+    private function getImportTitle(string $importType): string
+    {
+        if ('aiken' === $importType) {
+            return 'Import Aiken quiz';
+        }
+
+        if ('excel' === $importType) {
+            return 'Import quiz from Excel';
+        }
+
+        if ('qti2' === $importType) {
+            return 'Import exercises QTI2';
+        }
+
+        return 'Import questions';
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getActionUrls(Course $course, ?Session $session, Request $request): array
+    {
+        $params = [
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+            'gid' => $request->query->getInt('gid'),
+        ];
+        $queryString = http_build_query(array_filter($params, static fn (int $value): bool => 0 < $value));
+
+        return [
+            'excelTemplate' => '/api/exercise/import/excel/template.xlsx'.('' !== $queryString ? '?'.$queryString : ''),
+        ];
+    }
+
+    private function getImportSample(string $importType): string
+    {
+        if ('excel' === $importType) {
+            return $this->getExcelSample();
+        }
+
+        if ('qti2' === $importType) {
+            return $this->getQti2Sample();
+        }
+
+        return $this->getAikenSample();
+    }
+
+    private function getAikenSample(): string
+    {
+        return <<<'TEXT'
+This is the text for question 1
+A. Answer 1
+B. Answer 2
+C. Answer 3
+ANSWER: B
+
+This is the text for question 2
+A. Answer 1
+B. Answer 2
+C. Answer 3
+D. Answer 4
+ANSWER: D
+ANSWER_EXPLANATION: this is an optional feedback comment that will appear next to the correct answer.
+SCORE: 20
+TEXT;
+    }
+
+    private function getQti2Sample(): string
+    {
+        return <<<'TEXT'
+Upload an IMS/QTI 2 .zip package.
+
+Supported import:
+- IMS/QTI 2 package inside a ZIP file.
+- Unique answer questions.
+- Multiple answer questions.
+- Fill in blanks questions.
+- Free answer questions.
+
+Unsupported QTI entries are skipped, matching the previous importer behavior.
+TEXT;
+    }
+
+    private function getExcelSample(): string
+    {
+        return <<<'TEXT'
+The Excel file must follow the Chamilo quiz template:
+
+Column A: row label
+Column B: text/title/content
+Column C: score, option marker or question type
+
+Example rows:
+Quiz | Imported Excel quiz |
+Question | What is PHP? |
+Answer 1 | A programming language | x
+Answer 2 | A database |
+Score | | 10
+FeedbackTrue | Correct. |
+FeedbackFalse | Incorrect. |
+Category | PHP basics |
+QuestionType | | 1
+TEXT;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
index 38651652c01..859c7ecbcd6 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
@@ -78,7 +78,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->questionTypes = $this->getQuestionTypes($quiz);
         $response->questionCount = \count($questions);
         $response->totalScore = $this->getTotalScore($questions);
-        $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session);
+        $response->legacyUrls = [];
         $response->canManage = true;
         $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
 
@@ -697,17 +697,20 @@ private function usesFillBlanks(int $type): bool
      */
     private function getQuestionTypes(CQuiz $quiz): array
     {
-        $feedbackType = $quiz->getFeedbackType();
+        $feedbackType = (int) $quiz->getFeedbackType();
         $types = [];
 
         foreach ($this->getLegacyQuestionTypeDefinitions() as $definition) {
             $type = (int) $definition['type'];
-            $isVueEditor = $this->isVueQuestionEditorType($type);
+            if (!$this->isQuestionTypeVisibleInSelector($type, $feedbackType)) {
+                continue;
+            }
 
-            if (!$this->isQuestionTypeAllowedByFeedback($type, (int) $feedbackType)) {
+            if (!$this->isQuestionTypeAllowedByFeedback($type, $feedbackType)) {
                 continue;
             }
 
+            $isVueEditor = $this->isVueQuestionEditorType($type);
             $types[] = [
                 'type' => $type,
                 'label' => $definition['label'],
@@ -728,38 +731,44 @@ private function getQuestionTypes(CQuiz $quiz): array
     private function getLegacyQuestionTypeDefinitions(): array
     {
         return [
-            ['type' => 1, 'label' => 'Unique answer', 'icon' => 'mcua.png'],
+            ['type' => 1, 'label' => 'Multiple choice', 'icon' => 'mcua.png'],
             ['type' => 2, 'label' => 'Multiple answer', 'icon' => 'mcma.png'],
-            ['type' => 3, 'label' => 'Fill in blanks', 'icon' => 'fill_in_blanks.png'],
+            ['type' => 3, 'label' => 'Fill blanks or form', 'icon' => 'fill_in_blanks.png'],
             ['type' => 4, 'label' => 'Matching', 'icon' => 'matching.png'],
             ['type' => 5, 'label' => 'Open question', 'icon' => 'open_answer.png'],
-            ['type' => 6, 'label' => 'Hotspot', 'icon' => 'hotspot.png'],
+            ['type' => 6, 'label' => 'Image zones', 'icon' => 'hotspot.png'],
+            ['type' => 8, 'label' => 'Hotspot delineation', 'icon' => 'hotspot_delineation.png'],
             ['type' => 9, 'label' => 'Exact Selection', 'icon' => 'mcmac.png'],
             ['type' => 10, 'label' => 'Unique answer with unknown', 'icon' => 'mcuao.png'],
-            ['type' => 11, 'label' => 'Multiple answer true/false', 'icon' => 'mcmao.png'],
-            ['type' => 12, 'label' => 'Multiple answer combination true/false', 'icon' => 'mcmaco.png'],
+            ['type' => 11, 'label' => "Multiple answer true/false/don't know", 'icon' => 'mcmao.png'],
+            ['type' => 12, 'label' => "Combination true/false/don't-know", 'icon' => 'mcmaco.png'],
             ['type' => 13, 'label' => 'Oral expression', 'icon' => 'audio_question.png'],
             ['type' => 14, 'label' => 'Global multiple answer', 'icon' => 'mcmagl.png'],
             ['type' => 15, 'label' => 'Media question', 'icon' => 'media.png'],
             ['type' => 16, 'label' => 'Calculated answer', 'icon' => 'calculated_answer.png'],
             ['type' => 17, 'label' => 'Unique answer with images', 'icon' => 'uaimg.png'],
             ['type' => 18, 'label' => 'Sequence ordering', 'icon' => 'ordering.png'],
-            ['type' => 19, 'label' => 'Matching draggable', 'icon' => 'matchingdrag.png'],
+            ['type' => 19, 'label' => 'Match by dragging', 'icon' => 'matchingdrag.png'],
             ['type' => 20, 'label' => 'Annotation', 'icon' => 'annotation.png'],
             ['type' => 21, 'label' => 'Reading comprehension', 'icon' => 'reading_comprehension.png'],
             ['type' => 22, 'label' => 'Multiple answer true/false with degree of certainty', 'icon' => 'mccert.png'],
-            ['type' => 23, 'label' => 'Upload answer', 'icon' => 'file_upload_question.png'],
+            ['type' => 23, 'label' => 'Upload Answer', 'icon' => 'file_upload_question.png'],
             ['type' => 24, 'label' => 'Matching combination', 'icon' => 'matching_co.png'],
             ['type' => 25, 'label' => 'Matching draggable combination', 'icon' => 'matchingdrag_co.png'],
             ['type' => 26, 'label' => 'Hotspot combination', 'icon' => 'hotspot_co.png'],
             ['type' => 27, 'label' => 'Fill in blanks combination', 'icon' => 'fill_in_blanks_co.png'],
-            ['type' => 28, 'label' => 'Multiple answer dropdown combination', 'icon' => 'mcma_dropdown_co.png'],
-            ['type' => 29, 'label' => 'Multiple answer dropdown', 'icon' => 'mcma_dropdown.png'],
+            ['type' => 28, 'label' => 'Multiple Answer Dropdown Combination', 'icon' => 'mcma_dropdown_co.png'],
+            ['type' => 29, 'label' => 'Multiple Answer Dropdown', 'icon' => 'mcma_dropdown.png'],
             ['type' => 31, 'label' => 'Page break', 'icon' => 'page_end.png'],
         ];
     }
 
 
+    private function isQuestionTypeVisibleInSelector(int $type, int $feedbackType): bool
+    {
+        return 8 !== $type;
+    }
+
     private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType): bool
     {
         if (1 === $feedbackType) {
@@ -799,40 +808,4 @@ private function getQuestionTypeIcon(int $type): string
 
         return 'quiz.png';
     }
-
-
-    /**
-     * @param array<string, int> $baseParams
-     *
-     * @return array<string, int>
-     */
-    private function getQuestionPoolParams(CQuiz $quiz, array $baseParams): array
-    {
-        $feedbackType = (int) $quiz->getFeedbackType();
-        if (\in_array($feedbackType, [1, 3], true)) {
-            $baseParams['type'] = 1;
-        }
-
-        return $baseParams;
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session): array
-    {
-        $baseParams = [
-            'exerciseId' => (int) $quiz->getIid(),
-            'cid' => (int) $course->getId(),
-            'sid' => (int) ($session?->getId() ?? 0),
-        ];
-
-        return [
-            'list' => '/main/exercise/exercise.php?'.http_build_query($baseParams),
-            'configure' => '/main/exercise/exercise_admin.php?'.http_build_query($baseParams + ['modifyExercise' => 'yes']),
-            'preview' => '/main/exercise/overview.php?'.http_build_query($baseParams),
-            'results' => '/main/exercise/exercise_report.php?'.http_build_query($baseParams),
-            'questionPool' => '/main/exercise/question_pool.php?'.http_build_query($this->getQuestionPoolParams($quiz, $baseParams)),
-        ];
-    }
 }
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php
new file mode 100644
index 00000000000..f004d3e765a
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php
@@ -0,0 +1,396 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionStats;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Read-only question statistics for the migrated exercise report.
+ *
+ * This provider exposes teacher-side stats through modern API/PDF endpoints:
+ * attempts per question, lowest/average/highest score and wrong/total counts.
+ *
+ * @implements ProviderInterface<ExerciseQuestionStats>
+ */
+final readonly class ExerciseQuestionStatsProvider implements ProviderInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_COMPLETED = '';
+
+    private const TYPE_NAMES = [
+        1 => 'Unique answer',
+        2 => 'Multiple answer',
+        3 => 'Fill in blanks',
+        4 => 'Matching',
+        5 => 'Free answer',
+        6 => 'Hotspot',
+        9 => 'Multiple answer combination',
+        10 => 'Unique answer with unknown',
+        11 => 'Multiple answer true/false',
+        12 => 'Multiple answer combination true/false',
+        13 => 'Oral expression',
+        14 => 'Global multiple answer',
+        15 => 'Media question',
+        16 => 'Calculated answer',
+        17 => 'Unique answer with images',
+        18 => 'Sequence ordering',
+        19 => 'Matching draggable',
+        20 => 'Annotation',
+        21 => 'Reading comprehension',
+        22 => 'Multiple answer true/false with degree of certainty',
+        23 => 'Upload answer',
+        24 => 'Matching combination',
+        25 => 'Matching draggable combination',
+        26 => 'Hotspot combination',
+        27 => 'Fill in blanks combination',
+        28 => 'Multiple answer dropdown combination',
+        29 => 'Multiple answer dropdown',
+        31 => 'Page break',
+    ];
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseQuestionStats
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to view these exercise statistics.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $questions = $this->getExerciseQuestions($quiz);
+        $attemptMarks = $this->getQuestionAttemptMarks($quiz, $course, $session, array_keys($questions));
+        $rows = $this->buildRows($questions, $attemptMarks);
+
+        $response = new ExerciseQuestionStats();
+        $response->exerciseId = $exerciseId;
+        $response->title = $quiz->getTitle();
+        $response->description = (string) $quiz->getDescription();
+        $response->questions = $rows;
+        $response->summary = $this->buildSummary($rows);
+        $response->actionUrls = $this->getActionUrls($quiz, $request);
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>> keyed by question id
+     */
+    private function getExerciseQuestions(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relation', 'question')
+            ->from(CQuizRelQuestion::class, 'relation')
+            ->innerJoin('relation.question', 'question')
+            ->andWhere('IDENTITY(relation.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relation.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questions = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            $questionId = (int) $question->getIid();
+            if (isset($questions[$questionId])) {
+                continue;
+            }
+
+            $type = (int) $question->getType();
+            $questions[$questionId] = [
+                'id' => $questionId,
+                'title' => $question->getQuestion(),
+                'type' => $type,
+                'typeLabel' => self::TYPE_NAMES[$type] ?? sprintf('Type %d', $type),
+                'maxScore' => (float) $question->getPonderation(),
+                'position' => (int) $relation->getQuestionOrder(),
+            ];
+        }
+
+        return $questions;
+    }
+
+    /**
+     * @param array<int, int> $questionIds
+     *
+     * @return array<int, array<int, float>> question id => attempt id => marks
+     */
+    private function getQuestionAttemptMarks(CQuiz $quiz, Course $course, ?Session $session, array $questionIds): array
+    {
+        if ([] === $questionIds) {
+            return [];
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt.questionId AS questionId')
+            ->addSelect('IDENTITY(attempt.trackExercise) AS attemptId')
+            ->addSelect('attempt.marks AS marks')
+            ->from(TrackEAttempt::class, 'attempt')
+            ->innerJoin('attempt.trackExercise', 'trackedExercise')
+            ->andWhere('IDENTITY(trackedExercise.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(trackedExercise.course) = :courseId')
+            ->andWhere('trackedExercise.status = :completedStatus')
+            ->andWhere('attempt.questionId IN (:questionIds)')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('completedStatus', self::STATUS_COMPLETED, Types::STRING)
+            ->setParameter('questionIds', array_values($questionIds))
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(trackedExercise.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('trackedExercise.session IS NULL');
+        }
+
+        $marks = [];
+        foreach ($queryBuilder->getQuery()->getArrayResult() as $row) {
+            $questionId = (int) ($row['questionId'] ?? 0);
+            $attemptId = (int) ($row['attemptId'] ?? 0);
+            if (0 >= $questionId || 0 >= $attemptId) {
+                continue;
+            }
+
+            $marks[$questionId][$attemptId] = ($marks[$questionId][$attemptId] ?? 0.0) + (float) ($row['marks'] ?? 0);
+        }
+
+        return $marks;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     * @param array<int, array<int, float>> $attemptMarks
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function buildRows(array $questions, array $attemptMarks): array
+    {
+        $rows = [];
+        foreach ($questions as $questionId => $question) {
+            $marks = array_values($attemptMarks[$questionId] ?? []);
+            $answeredAttempts = \count($marks);
+            $maxScore = (float) ($question['maxScore'] ?? 0.0);
+            $lowestScore = $answeredAttempts > 0 ? min($marks) : 0.0;
+            $highestScore = $answeredAttempts > 0 ? max($marks) : 0.0;
+            $averageScore = $answeredAttempts > 0 ? array_sum($marks) / $answeredAttempts : 0.0;
+            $wrongAttempts = 0;
+
+            foreach ($marks as $mark) {
+                if ($mark < $maxScore) {
+                    $wrongAttempts++;
+                }
+            }
+
+            $wrongPercentage = $answeredAttempts > 0 ? round(($wrongAttempts * 100) / $answeredAttempts, 2) : 0.0;
+
+            $rows[] = [
+                'id' => $questionId,
+                'questionId' => $questionId,
+                'title' => (string) ($question['title'] ?? ''),
+                'type' => (int) ($question['type'] ?? 0),
+                'typeLabel' => (string) ($question['typeLabel'] ?? ''),
+                'position' => (int) ($question['position'] ?? 0),
+                'answeredAttempts' => $answeredAttempts,
+                'wrongAttempts' => $wrongAttempts,
+                'wrongPercentage' => $wrongPercentage,
+                'lowestScore' => round($lowestScore, 2),
+                'averageScore' => round($averageScore, 2),
+                'highestScore' => round($highestScore, 2),
+                'maxScore' => round($maxScore, 2),
+            ];
+        }
+
+        return $rows;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $rows
+     *
+     * @return array<string, int|float>
+     */
+    private function buildSummary(array $rows): array
+    {
+        $totalAnswered = 0;
+        $totalWrong = 0;
+        foreach ($rows as $row) {
+            $totalAnswered += (int) ($row['answeredAttempts'] ?? 0);
+            $totalWrong += (int) ($row['wrongAttempts'] ?? 0);
+        }
+
+        return [
+            'totalQuestions' => \count($rows),
+            'totalAnswered' => $totalAnswered,
+            'totalWrong' => $totalWrong,
+            'wrongPercentage' => $totalAnswered > 0 ? round(($totalWrong * 100) / $totalAnswered, 2) : 0.0,
+        ];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getActionUrls(CQuiz $quiz, Request $request): array
+    {
+        $exerciseId = (int) $quiz->getIid();
+        $params = $this->getBaseParams($exerciseId, $request);
+
+        return [
+            'questionStatsPdf' => '/api/exercise/runtime/'.$exerciseId.'/question-stats.pdf?'.http_build_query($params),
+        ];
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getBaseParams(int $exerciseId, Request $request): array
+    {
+        return ['exerciseId' => $exerciseId] + $this->getContextParams($request);
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getContextParams(Request $request): array
+    {
+        $params = [
+            'cid' => $request->query->getInt('cid'),
+            'gid' => $request->query->getInt('gid'),
+        ];
+
+        $sessionId = $request->query->getInt('sid');
+        if (0 < $sessionId) {
+            $params['sid'] = $sessionId;
+        }
+
+        return $params;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php
new file mode 100644
index 00000000000..eb78bc9b5f3
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php
@@ -0,0 +1,500 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseReportByQuestion;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CoreBundle\Service\Exercise\ExerciseSpecialQuestionReportCounterService;
+use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Read-only report by question.
+ *
+ * The migrated report exposes configured answer distributions for answer-id based
+ * question types and uses modern PDF export endpoints. Complex answer counters
+ * remain explicit in the response instead of being proxied through old PHP pages.
+ *
+ * @implements ProviderInterface<ExerciseReportByQuestion>
+ */
+final readonly class ExerciseReportByQuestionProvider implements ProviderInterface
+{
+    private const VISIBILITY_PUBLISHED = 2;
+    private const STATUS_COMPLETED = '';
+
+    /**
+     * Question types that require dedicated counters/parsers instead of
+     * a simple track_e_attempt.answer = c_quiz_answer.iid count.
+     */
+    private const SPECIAL_COUNTING_TYPES = [
+        3,  // Fill in blanks
+        4,  // Matching
+        6,  // Hotspot
+        19, // Matching draggable
+        24, // Matching combination
+        25, // Matching draggable combination
+        26, // Hotspot combination
+        27, // Fill in blanks combination
+        28, // Multiple answer dropdown combination
+    ];
+
+    private const TYPE_NAMES = [
+        1 => 'Unique answer',
+        2 => 'Multiple answer',
+        3 => 'Fill in blanks',
+        4 => 'Matching',
+        5 => 'Free answer',
+        6 => 'Hotspot',
+        9 => 'Multiple answer combination',
+        10 => 'Unique answer with unknown',
+        11 => 'Multiple answer true/false',
+        12 => 'Multiple answer combination true/false',
+        13 => 'Oral expression',
+        14 => 'Global multiple answer',
+        15 => 'Media question',
+        16 => 'Calculated answer',
+        17 => 'Unique answer with images',
+        18 => 'Sequence ordering',
+        19 => 'Matching draggable',
+        20 => 'Annotation',
+        21 => 'Reading comprehension',
+        22 => 'Multiple answer true/false with degree of certainty',
+        23 => 'Upload answer',
+        24 => 'Matching combination',
+        25 => 'Matching draggable combination',
+        26 => 'Hotspot combination',
+        27 => 'Fill in blanks combination',
+        28 => 'Multiple answer dropdown combination',
+        29 => 'Multiple answer dropdown',
+        31 => 'Page break',
+    ];
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private ExerciseSpecialQuestionReportCounterService $specialQuestionReportCounterService,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseReportByQuestion
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to view this report.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $questions = $this->getExerciseQuestions($quiz);
+        $answerCounts = $this->getAnswerCounts($quiz, $course, $session, $this->getAnswerIds($questions));
+        $specialAnswerDistributions = $this->specialQuestionReportCounterService->buildDistributions($quiz, $course, $session, $questions);
+        $rows = $this->buildQuestionRows($questions, $answerCounts, $specialAnswerDistributions);
+
+        $response = new ExerciseReportByQuestion();
+        $response->exerciseId = $exerciseId;
+        $response->title = $quiz->getTitle();
+        $response->description = (string) $quiz->getDescription();
+        $response->questions = $rows;
+        $response->summary = $this->buildSummary($rows);
+        $response->actionUrls = $this->getActionUrls($quiz, $request);
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->addSelect('links.visibility AS linkVisibility')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $row = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (null === $row) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+        if (0 !== $visibility && self::VISIBILITY_PUBLISHED !== $visibility && !$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('The requested exercise is not visible.');
+        }
+
+        return $quiz;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>> keyed by question id
+     */
+    private function getExerciseQuestions(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relation', 'question', 'answer')
+            ->from(CQuizRelQuestion::class, 'relation')
+            ->innerJoin('relation.question', 'question')
+            ->leftJoin('question.answers', 'answer')
+            ->andWhere('IDENTITY(relation.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relation.questionOrder', 'ASC')
+            ->addOrderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questions = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            $questionId = (int) $question->getIid();
+            if (isset($questions[$questionId])) {
+                continue;
+            }
+
+            $type = (int) $question->getType();
+            if (31 === $type) {
+                continue;
+            }
+
+            $answers = [];
+            foreach ($question->getAnswers() as $answer) {
+                if (!$answer instanceof CQuizAnswer) {
+                    continue;
+                }
+
+                $answerId = (int) $answer->getIid();
+                $answers[$answerId] = [
+                    'id' => $answerId,
+                    'answerId' => $answerId,
+                    'answer' => (string) $answer->getAnswer(),
+                    'correct' => 1 === (int) $answer->getCorrect(),
+                    'correctValue' => (int) $answer->getCorrect(),
+                    'score' => round((float) $answer->getPonderation(), 2),
+                    'position' => (int) $answer->getPosition(),
+                ];
+            }
+
+            uasort($answers, static fn (array $left, array $right): int => ($left['position'] <=> $right['position']) ?: ($left['id'] <=> $right['id']));
+
+            $questions[$questionId] = [
+                'id' => $questionId,
+                'questionId' => $questionId,
+                'title' => (string) $question->getQuestion(),
+                'type' => $type,
+                'typeLabel' => self::TYPE_NAMES[$type] ?? sprintf('Type %d', $type),
+                'maxScore' => round((float) $question->getPonderation(), 2),
+                'position' => (int) $relation->getQuestionOrder(),
+                'extra' => (string) $question->getExtra(),
+                'usesSpecialCounting' => \in_array($type, self::SPECIAL_COUNTING_TYPES, true),
+                'answers' => array_values($answers),
+            ];
+        }
+
+        return $questions;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     *
+     * @return array<int, string>
+     */
+    private function getAnswerIds(array $questions): array
+    {
+        $answerIds = [];
+        foreach ($questions as $question) {
+            if (!empty($question['usesSpecialCounting'])) {
+                continue;
+            }
+
+            foreach (($question['answers'] ?? []) as $answer) {
+                $answerId = (int) ($answer['answerId'] ?? 0);
+                if (0 < $answerId) {
+                    $answerIds[$answerId] = (string) $answerId;
+                }
+            }
+        }
+
+        return $answerIds;
+    }
+
+    /**
+     * @param array<int, string> $answerIds
+     *
+     * @return array<int, array<int, int>> question id => answer id => count
+     */
+    private function getAnswerCounts(CQuiz $quiz, Course $course, ?Session $session, array $answerIds): array
+    {
+        if ([] === $answerIds) {
+            return [];
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt.questionId AS questionId')
+            ->addSelect('attempt.answer AS answerValue')
+            ->addSelect('COUNT(attempt.id) AS selectedCount')
+            ->from(TrackEAttempt::class, 'attempt')
+            ->innerJoin('attempt.trackExercise', 'trackedExercise')
+            ->andWhere('IDENTITY(trackedExercise.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(trackedExercise.course) = :courseId')
+            ->andWhere('trackedExercise.status = :completedStatus')
+            ->andWhere('attempt.answer IN (:answerIds)')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('completedStatus', self::STATUS_COMPLETED, Types::STRING)
+            ->setParameter('answerIds', array_values($answerIds))
+            ->groupBy('attempt.questionId')
+            ->addGroupBy('attempt.answer')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(trackedExercise.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('trackedExercise.session IS NULL');
+        }
+
+        $counts = [];
+        foreach ($queryBuilder->getQuery()->getArrayResult() as $row) {
+            $questionId = (int) ($row['questionId'] ?? 0);
+            $answerId = (int) ($row['answerValue'] ?? 0);
+            if (0 >= $questionId || 0 >= $answerId) {
+                continue;
+            }
+
+            $counts[$questionId][$answerId] = (int) ($row['selectedCount'] ?? 0);
+        }
+
+        return $counts;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $questions
+     * @param array<int, array<int, int>> $answerCounts
+     * @param array<int, array{answers: array<int, array<string, mixed>>, totalSelections: int, countingAvailable: bool}> $specialAnswerDistributions
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function buildQuestionRows(array $questions, array $answerCounts, array $specialAnswerDistributions): array
+    {
+        $rows = [];
+        foreach ($questions as $questionId => $question) {
+            $answers = [];
+            $totalSelections = 0;
+            $usesSpecialCounting = !empty($question['usesSpecialCounting']);
+
+            $countingAvailable = false;
+            $specialDistribution = $specialAnswerDistributions[$questionId] ?? null;
+            if ($usesSpecialCounting && \is_array($specialDistribution)) {
+                $answers = $specialDistribution['answers'];
+                $totalSelections = (int) $specialDistribution['totalSelections'];
+                $countingAvailable = (bool) $specialDistribution['countingAvailable'];
+            } else {
+                foreach (($question['answers'] ?? []) as $answer) {
+                    $answerId = (int) ($answer['answerId'] ?? 0);
+                    $selectedCount = $usesSpecialCounting ? null : (int) ($answerCounts[$questionId][$answerId] ?? 0);
+                    if (null !== $selectedCount) {
+                        $totalSelections += $selectedCount;
+                    }
+
+                    $answers[] = [
+                        'id' => $answerId,
+                        'answerId' => $answerId,
+                        'answer' => (string) ($answer['answer'] ?? ''),
+                        'correct' => (bool) ($answer['correct'] ?? false),
+                        'correctValue' => (int) ($answer['correctValue'] ?? 0),
+                        'score' => (float) ($answer['score'] ?? 0.0),
+                        'position' => (int) ($answer['position'] ?? 0),
+                        'selectedCount' => $selectedCount,
+                        'selectedPercentage' => 0.0,
+                    ];
+                }
+
+                if (0 < $totalSelections) {
+                    foreach ($answers as &$answerRow) {
+                        if (null !== $answerRow['selectedCount']) {
+                            $answerRow['selectedPercentage'] = round(((int) $answerRow['selectedCount'] * 100) / $totalSelections, 2);
+                        }
+                    }
+                    unset($answerRow);
+                }
+            }
+
+            $rows[] = [
+                'id' => $questionId,
+                'questionId' => $questionId,
+                'title' => (string) ($question['title'] ?? ''),
+                'type' => (int) ($question['type'] ?? 0),
+                'typeLabel' => (string) ($question['typeLabel'] ?? ''),
+                'position' => (int) ($question['position'] ?? 0),
+                'maxScore' => (float) ($question['maxScore'] ?? 0.0),
+                'answers' => $answers,
+                'totalSelections' => $totalSelections,
+                'usesSpecialCounting' => $usesSpecialCounting,
+                'countingAvailable' => $countingAvailable,
+            ];
+        }
+
+        return $rows;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $rows
+     *
+     * @return array<string, int|float>
+     */
+    private function buildSummary(array $rows): array
+    {
+        $totalAnswers = 0;
+        $totalSelections = 0;
+        $specialCountingQuestions = 0;
+
+        foreach ($rows as $row) {
+            $totalAnswers += \count($row['answers'] ?? []);
+            $totalSelections += (int) ($row['totalSelections'] ?? 0);
+            if (!empty($row['usesSpecialCounting']) && empty($row['countingAvailable'])) {
+                $specialCountingQuestions++;
+            }
+        }
+
+        return [
+            'totalQuestions' => \count($rows),
+            'totalAnswers' => $totalAnswers,
+            'totalSelections' => $totalSelections,
+            'specialCountingQuestions' => $specialCountingQuestions,
+        ];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getActionUrls(CQuiz $quiz, Request $request): array
+    {
+        $exerciseId = (int) $quiz->getIid();
+        $params = $this->getBaseParams($exerciseId, $request);
+
+        return [
+            'reportByQuestionPdf' => '/api/exercise/runtime/'.$exerciseId.'/report-by-question.pdf?'.http_build_query($params),
+        ];
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getBaseParams(int $exerciseId, Request $request): array
+    {
+        return ['exerciseId' => $exerciseId] + $this->getContextParams($request);
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getContextParams(Request $request): array
+    {
+        $params = [
+            'cid' => $request->query->getInt('cid'),
+            'gid' => $request->query->getInt('gid'),
+        ];
+
+        $sessionId = $request->query->getInt('sid');
+        if (0 < $sessionId) {
+            $params['sid'] = $sessionId;
+        }
+
+        return $params;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index 83ab0d645c1..7ca8c64fb40 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -17,6 +17,7 @@
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTime;
@@ -42,12 +43,15 @@
 {
     private const VISIBILITY_PUBLISHED = 2;
     private const STATUS_INCOMPLETE = 'incomplete';
+    private const FEEDBACK_TYPE_DIRECT = 1;
+    private const FEEDBACK_TYPE_POPUP = 3;
     private const UNIQUE_TYPES = [1, 10, 17, 21];
     private const MULTIPLE_TYPES = [2, 9, 14];
     private const TRUE_FALSE_TYPES = [11, 12];
     private const TRUE_FALSE_DEGREE_CERTAINTY_TYPES = [22];
     private const FILL_BLANK_TYPES = [3, 27];
     private const MATCHING_TYPES = [4, 19, 24, 25];
+    private const DRAGGABLE_TYPES = [18];
     private const DROPDOWN_TYPES = [28, 29];
     private const CALCULATED_TYPES = [16];
     private const FREE_ANSWER_TYPES = [5];
@@ -108,6 +112,8 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $rows = $this->buildDraftRows($question, $data->answer, max(0, (int) $data->secondsSpent));
+        $feedback = $this->buildFeedback($quiz, $question, $rows);
+        $marks = [] !== $feedback ? (float) ($feedback['score'] ?? 0.0) : 0.0;
         $this->deletePreviousDraftRows($attempt, $questionId);
 
         foreach ($rows as $row) {
@@ -117,7 +123,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                 ->setQuestionId($questionId)
                 ->setAnswer($row['answer'])
                 ->setTeacherComment('')
-                ->setMarks(0.0)
+                ->setMarks($marks)
                 ->setPosition($row['position'])
                 ->setTms(new DateTime())
                 ->setSecondsSpent($row['secondsSpent'])
@@ -137,6 +143,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $response->answeredQuestionIds = $this->getAnsweredQuestionIds($attemptId);
         $response->answeredCount = \count($response->answeredQuestionIds);
         $response->canFinish = false;
+        $response->feedback = $feedback;
 
         return $response;
     }
@@ -342,6 +349,10 @@ private function buildDraftRows(CQuizQuestion $question, mixed $answer, int $sec
             return $this->buildMatchingRows($payload, $secondsSpent);
         }
 
+        if (\in_array($type, self::DRAGGABLE_TYPES, true)) {
+            return $this->buildDraggableRows($question, $payload, $secondsSpent);
+        }
+
         if (\in_array($type, self::DROPDOWN_TYPES, true)) {
             return $this->buildDropdownRows($payload, $secondsSpent);
         }
@@ -594,6 +605,46 @@ private function buildMatchingRows(array $payload, int $secondsSpent): array
         return $rows;
     }
 
+    /**
+     * @param array<string, mixed> $payload
+     *
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function buildDraggableRows(CQuizQuestion $question, array $payload, int $secondsSpent): array
+    {
+        $order = $payload['order'] ?? $payload['value'] ?? [];
+        if (!\is_array($order)) {
+            return [];
+        }
+
+        $validAnswerIds = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            if (0 < (int) ($answer->getCorrect() ?? 0)) {
+                $validAnswerIds[(int) $answer->getIid()] = true;
+            }
+        }
+
+        $rows = [];
+        $position = 1;
+        $usedAnswerIds = [];
+        foreach ($order as $answerId) {
+            $safeAnswerId = $this->toPositiveInt($answerId);
+            if (0 >= $safeAnswerId || !isset($validAnswerIds[$safeAnswerId]) || isset($usedAnswerIds[$safeAnswerId])) {
+                continue;
+            }
+
+            $rows[] = [
+                'answer' => (string) $position,
+                'position' => $safeAnswerId,
+                'secondsSpent' => $secondsSpent,
+            ];
+            $usedAnswerIds[$safeAnswerId] = true;
+            ++$position;
+        }
+
+        return $rows;
+    }
+
     /**
      * @param array<string, mixed> $payload
      *
@@ -826,6 +877,617 @@ private function getFirstAnswer(CQuizQuestion $question): ?CQuizAnswer
         return $answer instanceof CQuizAnswer ? $answer : null;
     }
 
+    /**
+     * @return list<CQuizAnswer>
+     */
+    private function getOrderedAnswers(CQuizQuestion $question): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->orderBy('answer.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+
+    /**
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     *
+     * @return array<string, mixed>
+     */
+    private function buildFeedback(CQuiz $quiz, CQuizQuestion $question, array $rows): array
+    {
+        $feedbackType = (int) $quiz->getFeedbackType();
+        if (!\in_array($feedbackType, [self::FEEDBACK_TYPE_DIRECT, self::FEEDBACK_TYPE_POPUP], true)) {
+            return [];
+        }
+
+        $answers = $this->getQuestionAnswerMap($question);
+        $options = $this->getQuestionOptionMap($question);
+        $score = $this->scoreFeedbackQuestion($quiz, $question, $answers, $options, $rows);
+        if (0 === (int) $quiz->getPropagateNeg() && 0 > $score) {
+            $score = 0.0;
+        }
+
+        $maxScore = $this->getQuestionWeight($question, $answers);
+        $status = $this->getFeedbackStatus($question, $score, $maxScore, $rows);
+
+        return [
+            'enabled' => true,
+            'mode' => self::FEEDBACK_TYPE_POPUP === $feedbackType ? 'popup' : 'direct',
+            'questionId' => (int) $question->getIid(),
+            'status' => $status,
+            'title' => $this->getFeedbackTitle($status),
+            'score' => $score,
+            'maxScore' => $maxScore,
+            'entries' => $this->buildFeedbackEntries($question, $answers, $rows),
+        ];
+    }
+
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getQuestionAnswerMap(CQuizQuestion $question): array
+    {
+        $answers = [];
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            if (null !== $answer->getIid()) {
+                $answers[(int) $answer->getIid()] = $answer;
+            }
+        }
+
+        return $answers;
+    }
+
+    /**
+     * @return array<int, CQuizQuestionOption>
+     */
+    private function getQuestionOptionMap(CQuizQuestion $question): array
+    {
+        $options = [];
+        foreach ($question->getOptions() as $option) {
+            if ($option instanceof CQuizQuestionOption && null !== $option->getIid()) {
+                $options[(int) $option->getIid()] = $option;
+            }
+        }
+
+        return $options;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreFeedbackQuestion(CQuiz $quiz, CQuizQuestion $question, array $answers, array $options, array $rows): float
+    {
+        $type = (int) $question->getType();
+
+        if (\in_array($type, self::UNIQUE_TYPES, true) || \in_array($type, self::DROPDOWN_TYPES, true)) {
+            return $this->scoreSelectedAnswerRows($answers, $rows);
+        }
+
+        if (\in_array($type, self::MULTIPLE_TYPES, true)) {
+            if (\in_array($type, [9, 28], true)) {
+                return $this->scoreCombinationRows($question, $answers, $rows);
+            }
+
+            return $this->scoreSelectedAnswerRows($answers, $rows);
+        }
+
+        if (\in_array($type, self::TRUE_FALSE_TYPES, true)) {
+            return $this->scoreTrueFalseRows($question, $answers, $options, $rows, false);
+        }
+
+        if (\in_array($type, self::TRUE_FALSE_DEGREE_CERTAINTY_TYPES, true)) {
+            return $this->scoreTrueFalseRows($question, $answers, $options, $rows, true);
+        }
+
+        if (\in_array($type, self::FILL_BLANK_TYPES, true)) {
+            return $this->scoreFillBlankRowsForFeedback($quiz, $question, $rows);
+        }
+
+        if (\in_array($type, self::MATCHING_TYPES, true)) {
+            if (\in_array($type, [24, 25], true)) {
+                return $this->scoreMatchingCombinationRows($question, $answers, $rows);
+            }
+
+            return $this->scoreMatchingRowsForFeedback($answers, $rows);
+        }
+
+        if (\in_array($type, self::DRAGGABLE_TYPES, true)) {
+            return $this->scoreDraggableRowsForFeedback($answers, $rows);
+        }
+
+        if (\in_array($type, self::CALCULATED_TYPES, true)) {
+            return $this->scoreCalculatedRowsForFeedback($question, $answers, $rows);
+        }
+
+        return 0.0;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreSelectedAnswerRows(array $answers, array $rows): float
+    {
+        $score = 0.0;
+        foreach ($rows as $row) {
+            $answerId = (int) $row['answer'];
+            if (isset($answers[$answerId])) {
+                $score += (float) $answers[$answerId]->getPonderation();
+            }
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreCombinationRows(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $selected = array_flip($this->getRowAnswerIds($rows));
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $isCorrect = 1 === (int) $answer->getCorrect();
+            $isSelected = isset($selected[$answerId]);
+            if ($isCorrect !== $isSelected) {
+                return 0.0;
+            }
+        }
+
+        $firstAnswer = reset($answers);
+        if ($firstAnswer instanceof CQuizAnswer && 0.0 !== (float) $firstAnswer->getPonderation()) {
+            return (float) $firstAnswer->getPonderation();
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, CQuizAnswer>         $answers
+     * @param array<int, CQuizQuestionOption> $options
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreTrueFalseRows(CQuizQuestion $question, array $answers, array $options, array $rows, bool $withDegreeCertainty): float
+    {
+        [$trueScore, $falseScore, $doubtScore] = $this->getTrueFalseScores((string) $question->getExtra());
+        $choices = [];
+        foreach ($rows as $row) {
+            $parts = explode(':', (string) $row['answer']);
+            $answerId = (int) ($parts[0] ?? 0);
+            $optionId = (int) ($parts[1] ?? 0);
+            $degreeId = (int) ($parts[2] ?? 0);
+            if (0 < $answerId && 0 < $optionId) {
+                $choices[$answerId] = ['choice' => $optionId, 'degree' => $degreeId];
+            }
+        }
+
+        $score = 0.0;
+        foreach ($answers as $answer) {
+            $answerId = (int) $answer->getIid();
+            $studentChoice = (int) ($choices[$answerId]['choice'] ?? 0);
+            if (0 >= $studentChoice) {
+                $score += $withDegreeCertainty ? 0.0 : $doubtScore;
+                continue;
+            }
+
+            if ($this->isTrueFalseChoiceCorrect($studentChoice, (int) $answer->getCorrect(), $options)) {
+                if (!$withDegreeCertainty) {
+                    $score += $trueScore;
+                    continue;
+                }
+
+                $degreePosition = $this->getTrueFalseOptionPosition((int) ($choices[$answerId]['degree'] ?? 0), $options);
+                $score += 3 <= $degreePosition && 9 > $degreePosition ? $trueScore : $doubtScore;
+                continue;
+            }
+
+            if ($withDegreeCertainty) {
+                $degreePosition = $this->getTrueFalseOptionPosition((int) ($choices[$answerId]['degree'] ?? 0), $options);
+                $score += 3 <= $degreePosition && 9 > $degreePosition ? $falseScore : $doubtScore;
+                continue;
+            }
+
+            $optionTitle = $this->getTrueFalseOptionTitle($studentChoice, $options);
+            $score += \in_array($optionTitle, ["Don't know", 'DoubtScore'], true) ? $doubtScore : $falseScore;
+        }
+
+        return $score;
+    }
+
+    /**
+     * @return array{0: float, 1: float, 2: float}
+     */
+    private function getTrueFalseScores(string $extra): array
+    {
+        if ('' === trim($extra)) {
+            return [1.0, -0.5, 0.0];
+        }
+
+        $parts = explode(':', $extra);
+
+        return [
+            isset($parts[0]) ? (float) trim($parts[0]) : 1.0,
+            isset($parts[1]) ? (float) trim($parts[1]) : -0.5,
+            isset($parts[2]) ? (float) trim($parts[2]) : 0.0,
+        ];
+    }
+
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function isTrueFalseChoiceCorrect(int $studentChoice, int $correctChoice, array $options): bool
+    {
+        if (0 >= $studentChoice || 0 >= $correctChoice) {
+            return false;
+        }
+
+        if ($studentChoice === $correctChoice) {
+            return true;
+        }
+
+        $studentPosition = $this->getTrueFalseOptionPosition($studentChoice, $options);
+        $correctPosition = $this->getTrueFalseOptionPosition($correctChoice, $options);
+
+        return 0 < $studentPosition && $studentPosition === $correctPosition;
+    }
+
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function getTrueFalseOptionPosition(int $choice, array $options): int
+    {
+        $option = $options[$choice] ?? null;
+        if ($option instanceof CQuizQuestionOption) {
+            return (int) $option->getPosition();
+        }
+
+        foreach ($options as $candidate) {
+            if ($candidate instanceof CQuizQuestionOption && (int) $candidate->getPosition() === $choice) {
+                return (int) $candidate->getPosition();
+            }
+        }
+
+        return $choice;
+    }
+
+    /**
+     * @param array<int, CQuizQuestionOption> $options
+     */
+    private function getTrueFalseOptionTitle(int $choice, array $options): string
+    {
+        $option = $options[$choice] ?? null;
+        if ($option instanceof CQuizQuestionOption) {
+            return (string) $option->getTitle();
+        }
+
+        foreach ($options as $candidate) {
+            if ($candidate instanceof CQuizQuestionOption && (int) $candidate->getPosition() === $choice) {
+                return (string) $candidate->getTitle();
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreFillBlankRowsForFeedback(CQuiz $quiz, CQuizQuestion $question, array $rows): float
+    {
+        $row = $rows[0] ?? null;
+        if (!\is_array($row)) {
+            return 0.0;
+        }
+
+        $parsed = $this->parseFillBlankStudentRows((string) $row['answer']);
+        $caseInsensitive = 'case:false' === (string) $question->getExtra();
+        $score = 0.0;
+        $allCorrect = [] !== $parsed['items'];
+
+        foreach ($parsed['items'] as $index => $item) {
+            $expected = (string) ($item['expected'] ?? '');
+            $student = (string) ($item['student'] ?? '');
+            $isCorrect = $caseInsensitive ? 0 === strcasecmp($expected, $student) : $expected === $student;
+            if ($isCorrect) {
+                $score += (float) ($parsed['weights'][$index] ?? 0.0);
+                continue;
+            }
+
+            $allCorrect = false;
+        }
+
+        if (27 === (int) $question->getType()) {
+            return $allCorrect ? (float) $question->getPonderation() : 0.0;
+        }
+
+        return $score;
+    }
+
+    /**
+     * @return array{items: array<int, array{expected: string, student: string}>, weights: array<int, float>}
+     */
+    private function parseFillBlankStudentRows(string $encodedAnswer): array
+    {
+        $parts = explode('::', $encodedAnswer, 2);
+        $text = (string) ($parts[0] ?? '');
+        $system = (string) ($parts[1] ?? '');
+        $separator = $this->getFillBlankSeparator($system);
+        [$start, $end] = $this->getFillBlankSeparators($separator);
+        $pattern = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
+        preg_match_all($pattern, $text, $matches);
+        $values = $matches[1] ?? [];
+        $items = [];
+        for ($index = 0; $index < \count($values); $index += 3) {
+            $items[] = [
+                'expected' => htmlspecialchars_decode((string) ($values[$index] ?? ''), ENT_QUOTES),
+                'student' => htmlspecialchars_decode((string) ($values[$index + 1] ?? ''), ENT_QUOTES),
+            ];
+        }
+
+        $systemParts = explode('@', $system, 2);
+        $details = explode(':', (string) ($systemParts[0] ?? ''));
+        $weights = [];
+        foreach (explode(',', (string) ($details[0] ?? '')) as $weight) {
+            if ('' !== trim($weight)) {
+                $weights[] = (float) trim($weight);
+            }
+        }
+
+        return ['items' => $items, 'weights' => $weights];
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreMatchingRowsForFeedback(array $answers, array $rows): float
+    {
+        $score = 0.0;
+        foreach ($rows as $row) {
+            $promptId = (int) $row['position'];
+            $optionId = (int) $row['answer'];
+            $answer = $answers[$promptId] ?? null;
+            if ($answer instanceof CQuizAnswer && $optionId === (int) $answer->getCorrect()) {
+                $score += (float) $answer->getPonderation();
+            }
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreMatchingCombinationRows(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $choices = [];
+        foreach ($rows as $row) {
+            $choices[(int) $row['position']] = (int) $row['answer'];
+        }
+
+        $optionCount = 0;
+        $correctCount = 0;
+        foreach ($answers as $answer) {
+            if (0 === (int) $answer->getCorrect()) {
+                ++$optionCount;
+                continue;
+            }
+
+            if (($choices[(int) $answer->getIid()] ?? 0) === (int) $answer->getCorrect()) {
+                ++$correctCount;
+            }
+        }
+
+        return 0 < $optionCount && $correctCount >= $optionCount ? (float) $question->getPonderation() : 0.0;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreDraggableRowsForFeedback(array $answers, array $rows): float
+    {
+        $score = 0.0;
+        foreach ($rows as $row) {
+            $answerId = (int) $row['position'];
+            $selectedPosition = (int) $row['answer'];
+            $answer = $answers[$answerId] ?? null;
+            if ($answer instanceof CQuizAnswer && $selectedPosition === (int) $answer->getCorrect()) {
+                $score += (float) $answer->getPonderation();
+            }
+        }
+
+        return $score;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreCalculatedRowsForFeedback(CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $row = $rows[0] ?? null;
+        if (!\is_array($row)) {
+            return 0.0;
+        }
+
+        [$answerId, $studentAnswer] = $this->parseCalculatedStudentAnswer((string) $row['answer']);
+        $teacherAnswer = 0 < $answerId && isset($answers[$answerId]) ? $answers[$answerId] : reset($answers);
+        if (!$teacherAnswer instanceof CQuizAnswer) {
+            return 0.0;
+        }
+
+        $expectedAnswer = $this->extractCalculatedExpectedAnswer((string) $teacherAnswer->getAnswer());
+        if ('' === $expectedAnswer || '' === $studentAnswer) {
+            return 0.0;
+        }
+
+        return trim($studentAnswer) === trim($expectedAnswer) ? (float) $question->getPonderation() : 0.0;
+    }
+
+    /**
+     * @return array{0: int, 1: string}
+     */
+    private function parseCalculatedStudentAnswer(string $value): array
+    {
+        $parts = explode(':', $value, 2);
+        if (2 === \count($parts)) {
+            return [(int) $parts[0], trim((string) $parts[1])];
+        }
+
+        return [0, trim($value)];
+    }
+
+    private function extractCalculatedExpectedAnswer(string $answer): string
+    {
+        $parts = explode('@@', $answer, 2);
+        $text = (string) ($parts[0] ?? $answer);
+        if (1 === preg_match('/\[([^\[\]]*)\]\s*$/', $text, $matches)) {
+            return trim((string) ($matches[1] ?? ''));
+        }
+
+        return '';
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     */
+    private function getQuestionWeight(CQuizQuestion $question, array $answers): float
+    {
+        if (\in_array((int) $question->getType(), [9, 12, 24, 25, 27, 28], true)) {
+            $firstAnswer = reset($answers);
+            if ($firstAnswer instanceof CQuizAnswer && 0.0 !== (float) $firstAnswer->getPonderation()) {
+                return (float) $firstAnswer->getPonderation();
+            }
+        }
+
+        return (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getRowAnswerIds(array $rows): array
+    {
+        $answerIds = [];
+        foreach ($rows as $row) {
+            $answerId = (int) $row['answer'];
+            if (0 < $answerId && !\in_array($answerId, $answerIds, true)) {
+                $answerIds[] = $answerId;
+            }
+        }
+
+        return $answerIds;
+    }
+
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function buildFeedbackEntries(CQuizQuestion $question, array $answers, array $rows): array
+    {
+        $entries = [];
+        $type = (int) $question->getType();
+        $answerIds = $this->getFeedbackAnswerIds($type, $rows);
+
+        foreach ($answerIds as $answerId) {
+            $answer = $answers[$answerId] ?? null;
+            if (!$answer instanceof CQuizAnswer) {
+                continue;
+            }
+
+            $entries[] = [
+                'answer' => $answer->getAnswer(),
+                'comment' => (string) $answer->getComment(),
+                'correct' => 0 < (float) $answer->getPonderation() || 1 === (int) $answer->getCorrect(),
+            ];
+        }
+
+        if ([] === $entries) {
+            $firstAnswer = reset($answers);
+            if ($firstAnswer instanceof CQuizAnswer && '' !== trim((string) $firstAnswer->getComment())) {
+                $entries[] = [
+                    'answer' => '',
+                    'comment' => (string) $firstAnswer->getComment(),
+                    'correct' => false,
+                ];
+            }
+        }
+
+        return $entries;
+    }
+
+    /**
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getFeedbackAnswerIds(int $type, array $rows): array
+    {
+        if (\in_array($type, self::MATCHING_TYPES, true)) {
+            return array_values(array_filter(array_map(static fn (array $row): int => (int) $row['answer'], $rows)));
+        }
+
+        if (\in_array($type, self::TRUE_FALSE_TYPES, true) || \in_array($type, self::TRUE_FALSE_DEGREE_CERTAINTY_TYPES, true)) {
+            return array_values(array_filter(array_map(static function (array $row): int {
+                $parts = explode(':', (string) $row['answer']);
+
+                return (int) ($parts[0] ?? 0);
+            }, $rows)));
+        }
+
+        return $this->getRowAnswerIds($rows);
+    }
+
+    /**
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function getFeedbackStatus(CQuizQuestion $question, float $score, float $maxScore, array $rows): string
+    {
+        if ([] === $rows) {
+            return 'empty';
+        }
+
+        if (\in_array((int) $question->getType(), self::FREE_ANSWER_TYPES, true)) {
+            return 'pending';
+        }
+
+        if (0.0 < $maxScore && $score >= $maxScore) {
+            return 'correct';
+        }
+
+        if (0.0 < $score) {
+            return 'partial';
+        }
+
+        return 'incorrect';
+    }
+
+    private function getFeedbackTitle(string $status): string
+    {
+        return match ($status) {
+            'correct' => 'Correct',
+            'partial' => 'Partially correct',
+            'pending' => 'Pending correction',
+            'empty' => 'No answer selected',
+            default => 'Incorrect',
+        };
+    }
+
     private function deletePreviousDraftRows(TrackEExercise $attempt, int $questionId): void
     {
         $rows = $this->entityManager->createQueryBuilder()
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php
new file mode 100644
index 00000000000..823f9000040
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php
@@ -0,0 +1,230 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAttemptClose;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Closes an incomplete attempt from the migrated exercise report.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeAttemptClose, ExerciseRuntimeAttemptClose>
+ */
+final readonly class ExerciseRuntimeAttemptCloseProcessor implements ProcessorInterface
+{
+    private const STATUS_INCOMPLETE = 'incomplete';
+    private const LINK_TYPE_EXERCISE = 1;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeAttemptClose
+    {
+        if (!$data instanceof ExerciseRuntimeAttemptClose) {
+            throw new BadRequestHttpException('Invalid close request.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to close this exercise attempt.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : (int) ($data->attemptId ?? 0);
+        if (0 >= $exerciseId || 0 >= $attemptId) {
+            throw new BadRequestHttpException('A valid exercise and attempt are required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        if ($this->isGradebookLocked((int) $quiz->getIid(), $course)) {
+            throw new BadRequestHttpException('This exercise is locked by gradebook.');
+        }
+
+        $attempt = $this->getAttempt($attemptId, $quiz, $course, $session);
+        if (self::STATUS_INCOMPLETE === (string) $attempt->getStatus()) {
+            $attempt->setStatus('');
+            $this->entityManager->flush();
+        }
+
+        $response = new ExerciseRuntimeAttemptClose();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->success = true;
+        $response->message = 'Attempt closed';
+
+        return $response;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        return $quiz;
+    }
+
+    private function getAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
index 5172ee5709f..2523465ab21 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
@@ -10,8 +10,10 @@
 use ApiPlatform\State\ProcessorInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAttemptDelete;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use Doctrine\DBAL\Types\Types;
@@ -30,11 +32,14 @@
  */
 final readonly class ExerciseRuntimeAttemptDeleteProcessor implements ProcessorInterface
 {
+    private const LINK_TYPE_EXERCISE = 1;
+
     public function __construct(
         private RequestStack $requestStack,
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     /**
@@ -65,6 +70,13 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        if ($this->isGradebookLocked((int) $quiz->getIid(), $course)) {
+            throw new BadRequestHttpException('This exercise is locked by gradebook.');
+        }
+        if (!$this->canDeleteResults()) {
+            throw new AccessDeniedHttpException('Deleting exercise results is not allowed.');
+        }
+
         $attempt = $this->getAttempt($attemptId, $quiz, $course, $session);
 
         $this->entityManager->remove($attempt);
@@ -152,6 +164,50 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
         return $quiz;
     }
 
+
+    private function canDeleteResults(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access');
+    }
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
     private function getAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session): TrackEExercise
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptEmailProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptEmailProcessor.php
new file mode 100644
index 00000000000..4e2c014232d
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptEmailProcessor.php
@@ -0,0 +1,58 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAttemptEmail;
+use Chamilo\CoreBundle\Service\Exercise\ExerciseRuntimeResultEmailService;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * Sends one migrated exercise attempt result email using Symfony mailer.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeAttemptEmail, ExerciseRuntimeAttemptEmail>
+ */
+final readonly class ExerciseRuntimeAttemptEmailProcessor implements ProcessorInterface
+{
+    public function __construct(
+        private RequestStack $requestStack,
+        private ExerciseRuntimeResultEmailService $emailService,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeAttemptEmail
+    {
+        if (!$data instanceof ExerciseRuntimeAttemptEmail) {
+            throw new BadRequestHttpException('Invalid email request.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : (int) ($data->attemptId ?? 0);
+        $result = $this->emailService->sendAttempt($exerciseId, $attemptId, $request, (string) ($data->node ?? ''));
+
+        $response = new ExerciseRuntimeAttemptEmail();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->success = $result['success'];
+        $response->message = $result['message'];
+        $response->recipientId = $result['recipientId'];
+        $response->recipientName = $result['recipientName'];
+        $response->recipientEmail = $result['recipientEmail'];
+
+        return $response;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index f0d3e674e95..f6ac264fa3a 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -14,10 +14,12 @@
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTime;
 use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\DBAL\ArrayParameterType;
@@ -45,6 +47,10 @@
     private const VISIBILITY_PUBLISHED = 2;
     private const STATUS_INCOMPLETE = 'incomplete';
     private const QUESTION_SELECTION_RANDOM = 2;
+    private const QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_ORDERED = 3;
+    private const QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_ORDERED = 4;
+    private const QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_RANDOM = 5;
+    private const QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM = 6;
     private const PAGE_BREAK = 31;
     private const MEDIA_QUESTION = 15;
 
@@ -53,6 +59,7 @@ public function __construct(
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     /**
@@ -100,7 +107,17 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                 $course,
                 $session,
                 $request,
-                'This exercise uses category-based question selection. Continue in legacy exercise until the Vue selector reaches parity.'
+                'This exercise uses a question selection mode that is not supported by the Vue runtime yet.'
+            );
+        }
+
+        if (0 < (int) $quiz->getRandomByCategory() && 0 >= (int) $quiz->getRandom()) {
+            return $this->createLegacyRequiredResponse(
+                $quiz,
+                $course,
+                $session,
+                $request,
+                'Please select some random question.'
             );
         }
 
@@ -242,8 +259,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
     private function requiresLegacyQuestionSelection(CQuiz $quiz): bool
     {
-        return 0 < (int) $quiz->getRandomByCategory()
-            || (int) ($quiz->getQuestionSelectionType() ?? 0) > self::QUESTION_SELECTION_RANDOM;
+        return (int) ($quiz->getQuestionSelectionType() ?? 0) > self::QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM;
     }
 
     private function findIncompleteAttempt(CQuiz $quiz, Course $course, ?Session $session, User $user, Request $request): ?TrackEExercise
@@ -335,8 +351,39 @@ private function buildQuestionList(CQuiz $quiz): array
             ->getResult()
         ;
 
-        $mustShuffle = self::QUESTION_SELECTION_RANDOM === (int) ($quiz->getQuestionSelectionType() ?? 0);
+        $selectionType = (int) ($quiz->getQuestionSelectionType() ?? 0);
         $randomCount = (int) $quiz->getRandom();
+        if (0 < (int) $quiz->getRandomByCategory() && 0 !== $randomCount) {
+            return $this->buildRandomByCategoryQuestionList($quiz, $relations, $randomCount);
+        }
+
+        if ($selectionType >= self::QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_ORDERED
+            && $selectionType <= self::QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM
+        ) {
+            return $this->buildCategoryMatrixQuestionList($quiz, $relations, $selectionType);
+        }
+
+        $mustShuffle = self::QUESTION_SELECTION_RANDOM === $selectionType;
+        $questionIds = $this->buildOrderedQuestionIds($relations, $mustShuffle || 0 < $randomCount);
+
+        if ($mustShuffle || 0 < $randomCount) {
+            shuffle($questionIds);
+        }
+
+        if (0 < $randomCount && $randomCount < \count($questionIds)) {
+            $questionIds = \array_slice($questionIds, 0, $randomCount);
+        }
+
+        return $questionIds;
+    }
+
+    /**
+     * @param array<int, mixed> $relations
+     *
+     * @return array<int, int>
+     */
+    private function buildOrderedQuestionIds(array $relations, bool $skipStructuralQuestions): array
+    {
         $questionIds = [];
         foreach ($relations as $relation) {
             if (!$relation instanceof CQuizRelQuestion) {
@@ -353,24 +400,321 @@ private function buildQuestionList(CQuiz $quiz): array
                 continue;
             }
 
-            if (self::PAGE_BREAK === $type && ($mustShuffle || 0 < $randomCount)) {
+            if ($skipStructuralQuestions && self::PAGE_BREAK === $type) {
                 continue;
             }
 
             $questionIds[] = (int) $question->getIid();
         }
 
-        if ($mustShuffle || 0 < $randomCount) {
+        return $questionIds;
+    }
+
+    /**
+     * @param array<int, mixed> $relations
+     *
+     * @return array<int, int>
+     */
+    private function buildCategoryMatrixQuestionList(CQuiz $quiz, array $relations, int $selectionType): array
+    {
+        $categoryRows = $this->getExerciseCategoryRows((int) ($quiz->getIid() ?? 0));
+        if ([] === $categoryRows) {
+            return $this->buildOrderedQuestionIds($relations, true);
+        }
+
+        $questionsByCategory = $this->groupQuestionsByCategory($relations, true);
+        if ([] === $questionsByCategory) {
+            return $this->buildOrderedQuestionIds($relations, true);
+        }
+
+        if (\in_array($selectionType, [
+            self::QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_ORDERED,
+            self::QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_RANDOM,
+        ], true)) {
+            uasort(
+                $categoryRows,
+                static fn (array $left, array $right): int => strcasecmp((string) $left['title'], (string) $right['title'])
+            );
+        } else {
+            shuffle($categoryRows);
+        }
+
+        $randomizeQuestions = \in_array($selectionType, [
+            self::QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_RANDOM,
+            self::QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM,
+        ], true);
+
+        $questionIds = [];
+        foreach ($categoryRows as $categoryRow) {
+            $categoryId = (int) $categoryRow['categoryId'];
+            $countQuestions = (int) $categoryRow['countQuestions'];
+            if (0 === $countQuestions || !isset($questionsByCategory[$categoryId])) {
+                continue;
+            }
+
+            $categoryQuestionIds = $questionsByCategory[$categoryId];
+            $mandatoryQuestionIds = $this->getMandatoryQuestionIdsForCategory($quiz, $categoryId, $selectionType);
+            if ($randomizeQuestions) {
+                shuffle($categoryQuestionIds);
+            }
+
+            if (-1 !== $countQuestions) {
+                $categoryQuestionIds = $this->pickCategoryQuestions(
+                    $categoryQuestionIds,
+                    max(0, $countQuestions),
+                    $randomizeQuestions,
+                    $mandatoryQuestionIds
+                );
+            }
+
+            foreach ($categoryQuestionIds as $questionId) {
+                if (\in_array($questionId, $questionIds, true)) {
+                    continue;
+                }
+
+                $questionIds[] = $questionId;
+            }
+        }
+
+        if ([] === $questionIds) {
+            return $this->buildOrderedQuestionIds($relations, true);
+        }
+
+        return $questionIds;
+    }
+
+    /**
+     * @param array<int, mixed> $relations
+     *
+     * @return array<int, int>
+     */
+    private function buildRandomByCategoryQuestionList(CQuiz $quiz, array $relations, int $randomCount): array
+    {
+        $questionsByCategory = $this->groupQuestionsByCategory($relations, true);
+        if ([] === $questionsByCategory) {
+            return $this->buildOrderedQuestionIds($relations, true);
+        }
+
+        $categoryRows = [];
+        foreach (array_keys($questionsByCategory) as $categoryId) {
+            $categoryRows[] = [
+                'categoryId' => (int) $categoryId,
+                'title' => $this->getCategoryTitle((int) $categoryId),
+            ];
+        }
+
+        if (2 === (int) $quiz->getRandomByCategory()) {
+            uasort(
+                $categoryRows,
+                static fn (array $left, array $right): int => strcasecmp((string) $left['title'], (string) $right['title'])
+            );
+        }
+
+        $questionIds = [];
+        foreach ($categoryRows as $categoryRow) {
+            $categoryQuestionIds = $questionsByCategory[(int) $categoryRow['categoryId']] ?? [];
+            if ([] === $categoryQuestionIds) {
+                continue;
+            }
+
+            shuffle($categoryQuestionIds);
+            if (-1 !== $randomCount) {
+                $categoryQuestionIds = \array_slice($categoryQuestionIds, 0, max(0, $randomCount));
+            }
+
+            foreach ($categoryQuestionIds as $questionId) {
+                if (\in_array($questionId, $questionIds, true)) {
+                    continue;
+                }
+
+                $questionIds[] = $questionId;
+            }
+        }
+
+        if (1 === (int) $quiz->getRandomByCategory()) {
             shuffle($questionIds);
         }
 
-        if (0 < $randomCount && $randomCount < \count($questionIds)) {
-            $questionIds = \array_slice($questionIds, 0, $randomCount);
+        if ([] === $questionIds) {
+            return $this->buildOrderedQuestionIds($relations, true);
         }
 
         return $questionIds;
     }
 
+    /**
+     * @param array<int, int> $questionIds
+     * @param array<int, int> $mandatoryQuestionIds
+     *
+     * @return array<int, int>
+     */
+    private function pickCategoryQuestions(array $questionIds, int $countQuestions, bool $randomizeQuestions, array $mandatoryQuestionIds): array
+    {
+        if ([] === $mandatoryQuestionIds) {
+            return \array_slice($questionIds, 0, $countQuestions);
+        }
+
+        $mandatoryQuestionIds = array_values(array_intersect($mandatoryQuestionIds, $questionIds));
+        if (\count($mandatoryQuestionIds) >= $countQuestions) {
+            if ($randomizeQuestions) {
+                shuffle($mandatoryQuestionIds);
+            }
+
+            return \array_slice($mandatoryQuestionIds, 0, $countQuestions);
+        }
+
+        $remainingQuestionIds = array_values(array_diff($questionIds, $mandatoryQuestionIds));
+        if ($randomizeQuestions) {
+            shuffle($remainingQuestionIds);
+        }
+
+        $selectedQuestionIds = array_merge(
+            $mandatoryQuestionIds,
+            \array_slice($remainingQuestionIds, 0, $countQuestions - \count($mandatoryQuestionIds))
+        );
+
+        if ($randomizeQuestions) {
+            shuffle($selectedQuestionIds);
+        }
+
+        return $selectedQuestionIds;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getMandatoryQuestionIdsForCategory(CQuiz $quiz, int $categoryId, int $selectionType): array
+    {
+        if (self::QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_RANDOM !== $selectionType) {
+            return [];
+        }
+
+        if ('true' !== $this->settingsManager->getSetting('exercise.allow_mandatory_question_in_category', true)
+            || !$this->hasMandatoryQuestionCategoryColumn()
+        ) {
+            return [];
+        }
+
+        $rows = $this->entityManager->getConnection()->fetchFirstColumn(
+            'SELECT qrc.question_id '
+            .'FROM c_quiz_question_rel_category qrc '
+            .'INNER JOIN c_quiz_rel_question rel ON rel.question_id = qrc.question_id '
+            .'WHERE rel.quiz_id = :exerciseId AND qrc.category_id = :categoryId AND qrc.mandatory = 1',
+            [
+                'exerciseId' => (int) ($quiz->getIid() ?? 0),
+                'categoryId' => $categoryId,
+            ],
+            [
+                'exerciseId' => Types::INTEGER,
+                'categoryId' => Types::INTEGER,
+            ]
+        );
+
+        return array_values(array_map(static fn (mixed $questionId): int => (int) $questionId, $rows));
+    }
+
+    private function hasMandatoryQuestionCategoryColumn(): bool
+    {
+        try {
+            return $this->entityManager
+                ->getConnection()
+                ->createSchemaManager()
+                ->introspectTable('c_quiz_question_rel_category')
+                ->hasColumn('mandatory');
+        } catch (\Throwable) {
+            return false;
+        }
+    }
+
+    /**
+     * @param array<int, mixed> $relations
+     *
+     * @return array<int, array<int, int>>
+     */
+    private function groupQuestionsByCategory(array $relations, bool $skipStructuralQuestions): array
+    {
+        $questionsByCategory = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+                continue;
+            }
+
+            $type = (int) $question->getType();
+            if (self::MEDIA_QUESTION === $type) {
+                continue;
+            }
+
+            if ($skipStructuralQuestions && self::PAGE_BREAK === $type) {
+                continue;
+            }
+
+            $questionId = (int) $question->getIid();
+            $categories = $question->getCategories();
+            if (0 === $categories->count()) {
+                $questionsByCategory[0][] = $questionId;
+                continue;
+            }
+
+            foreach ($categories as $category) {
+                $categoryId = (int) ($category->getIid() ?? 0);
+                $questionsByCategory[$categoryId][] = $questionId;
+            }
+        }
+
+        return $questionsByCategory;
+    }
+
+    /**
+     * @return array<int, array{categoryId: int, title: string, countQuestions: int}>
+     */
+    private function getExerciseCategoryRows(int $exerciseId): array
+    {
+        if (0 >= $exerciseId) {
+            return [];
+        }
+
+        $rows = $this->entityManager->getConnection()->fetchAllAssociative(
+            'SELECT rel.category_id, rel.count_questions, category.title '
+            .'FROM c_quiz_rel_category rel '
+            .'LEFT JOIN c_quiz_question_category category ON category.iid = rel.category_id '
+            .'WHERE rel.exercise_id = :exerciseId',
+            ['exerciseId' => $exerciseId],
+            ['exerciseId' => Types::INTEGER]
+        );
+
+        $categories = [];
+        foreach ($rows as $row) {
+            $categoryId = (int) $row['category_id'];
+            $categories[] = [
+                'categoryId' => $categoryId,
+                'title' => 0 === $categoryId ? 'General' : (string) ($row['title'] ?? ''),
+                'countQuestions' => (int) $row['count_questions'],
+            ];
+        }
+
+        return $categories;
+    }
+
+    private function getCategoryTitle(int $categoryId): string
+    {
+        if (0 === $categoryId) {
+            return 'General';
+        }
+
+        $row = $this->entityManager->getConnection()->fetchAssociative(
+            'SELECT title FROM c_quiz_question_category WHERE iid = :categoryId',
+            ['categoryId' => $categoryId],
+            ['categoryId' => Types::INTEGER]
+        );
+
+        return \is_array($row) ? (string) ($row['title'] ?? '') : '';
+    }
+
     /**
      * @param array<int, int> $questionIds
      */
@@ -392,14 +736,14 @@ private function getTotalWeight(array $questionIds): float
         return (float) ($rows[0]['totalScore'] ?? 0.0);
     }
 
-    private function buildExpiredAt(CQuiz $quiz): ?DateTimeImmutable
+    private function buildExpiredAt(CQuiz $quiz): ?DateTime
     {
         $expiredMinutes = (int) $quiz->getExpiredTime();
         if (0 >= $expiredMinutes) {
             return null;
         }
 
-        return (new DateTimeImmutable())->modify(sprintf('+%d minutes', $expiredMinutes));
+        return (new DateTime())->modify(sprintf('+%d minutes', $expiredMinutes));
     }
 
     private function createTeacherPreviewResponse(CQuiz $quiz, Course $course, ?Session $session, Request $request): ExerciseRuntimeAttempt
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
new file mode 100644
index 00000000000..822c6c94942
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
@@ -0,0 +1,231 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAttemptRecalculate;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Service\Exercise\ExerciseAttemptScoringService;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Recalculates one learner attempt using the migrated scoring service.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeAttemptRecalculate, ExerciseRuntimeAttemptRecalculate>
+ */
+final readonly class ExerciseRuntimeAttemptRecalculateProcessor implements ProcessorInterface
+{
+    private const LINK_TYPE_EXERCISE = 1;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private ExerciseAttemptScoringService $scoringService,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeAttemptRecalculate
+    {
+        if (!$data instanceof ExerciseRuntimeAttemptRecalculate) {
+            throw new BadRequestHttpException('Invalid recalculation request.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to recalculate this exercise attempt.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : (int) ($data->attemptId ?? 0);
+        if (0 >= $exerciseId || 0 >= $attemptId) {
+            throw new BadRequestHttpException('A valid exercise and attempt are required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        if ($this->isGradebookLocked((int) $quiz->getIid(), $course)) {
+            throw new BadRequestHttpException('This exercise is locked by gradebook.');
+        }
+
+        $attempt = $this->getAttempt($attemptId, $quiz, $course, $session);
+        $result = $this->scoringService->recalculateAttempt($attempt, $quiz);
+        $this->entityManager->flush();
+
+        $response = new ExerciseRuntimeAttemptRecalculate();
+        $response->exerciseId = $exerciseId;
+        $response->attemptId = $attemptId;
+        $response->success = true;
+        $response->message = 'Attempt recalculated';
+        $response->score = (float) $result['score'];
+        $response->maxScore = (float) $result['maxScore'];
+
+        return $response;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        return $quiz;
+    }
+
+    private function getAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session): TrackEExercise
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$attempt instanceof TrackEExercise) {
+            throw new NotFoundHttpException('The requested attempt was not found.');
+        }
+
+        return $attempt;
+    }
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
index 575fe3f0d48..1c6df15d2a9 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
@@ -10,14 +10,17 @@
 use ApiPlatform\State\ProcessorInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeCorrection;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\TrackEAttemptQualify;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
@@ -29,7 +32,7 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Corrects manual Vue runtime answers using the same tracking tables as the legacy correction flow.
+ * Corrects manual Vue runtime answers using the migrated tracking flow.
  *
  * @implements ProcessorInterface<ExerciseRuntimeCorrection, ExerciseRuntimeCorrection>
  */
@@ -40,12 +43,14 @@
     private const ORAL_EXPRESSION = 13;
     private const UPLOAD_ANSWER = 23;
     private const ANNOTATION = 20;
+    private const LINK_TYPE_EXERCISE = 1;
 
     public function __construct(
         private RequestStack $requestStack,
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     /**
@@ -82,6 +87,10 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        if ($this->isGradebookLocked((int) $quiz->getIid(), $course)) {
+            throw new BadRequestHttpException('This exercise is locked by gradebook.');
+        }
+
         $attempt = $this->getCompletedAttempt($attemptId, $quiz, $course, $session);
         $question = $this->getQuestionFromExercise($questionId, $quiz);
         if (!$question instanceof CQuizQuestion) {
@@ -111,6 +120,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             ;
         }
 
+        $this->recordCorrectionHistory($attempt, $questionId, $marks, (string) $data->teacherComment, (int) ($session?->getId() ?? 0));
         $this->removeQuestionToCheck($attempt, $questionId);
         $this->recalculateAttemptScore($attempt, $quiz);
         $this->entityManager->flush();
@@ -305,6 +315,58 @@ private function createEmptyAttemptRow(TrackEExercise $attempt, int $questionId)
         return $row;
     }
 
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
+    private function recordCorrectionHistory(TrackEExercise $attempt, int $questionId, float $marks, string $teacherComment, int $sessionId): void
+    {
+        $user = $this->security->getUser();
+        $authorId = $user instanceof User ? (int) $user->getId() : 0;
+
+        $recording = (new TrackEAttemptQualify())
+            ->setTrackExercise($attempt)
+            ->setQuestionId($questionId)
+            ->setAuthor($authorId)
+            ->setTeacherComment($teacherComment)
+            ->setMarks($marks)
+            ->setSessionId($sessionId)
+        ;
+
+        $this->entityManager->persist($recording);
+    }
+
     private function removeQuestionToCheck(TrackEExercise $attempt, int $questionId): void
     {
         $pendingQuestions = array_values(array_filter(
@@ -362,6 +424,6 @@ private function parseQuestionIds(string $value): array
             return [];
         }
 
-        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
+        return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), preg_split('/[,;]+/', $value) ?: [])));
     }
 }
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
index e939c6c86ec..7a690311546 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -49,6 +49,7 @@
     private const FREE_ANSWER = 5;
     private const HOT_SPOT = 6;
     private const CALCULATED_ANSWER = 16;
+    private const DRAGGABLE = 18;
     private const MEDIA_QUESTION = 15;
     private const READING_COMPREHENSION = 21;
     private const PAGE_BREAK = 31;
@@ -95,6 +96,7 @@
         self::FREE_ANSWER => 'Free answer',
         self::HOT_SPOT => 'Hotspot',
         self::CALCULATED_ANSWER => 'Calculated answer',
+        self::DRAGGABLE => 'Sequence ordering',
         self::ORAL_EXPRESSION => 'Oral expression',
         self::UPLOAD_ANSWER => 'Upload answer',
         self::ANNOTATION => 'Annotation',
@@ -519,6 +521,7 @@ private function scoreQuestion(CQuiz $quiz, CQuizQuestion $question, array $answ
             self::FILL_IN_BLANKS_COMBINATION => $this->scoreFillBlanks($quiz, $question, $answers, $rows),
             self::MATCHING,
             self::MATCHING_DRAGGABLE => $this->scoreMatchingAnswer($answers, $rows),
+            self::DRAGGABLE => $this->scoreDraggableAnswer($answers, $rows),
             self::MATCHING_COMBINATION,
             self::MATCHING_DRAGGABLE_COMBINATION => $this->scoreMatchingCombination($question, $answers, $rows),
             self::CALCULATED_ANSWER => $this->scoreCalculatedAnswer($question, $answers, $rows),
@@ -1027,6 +1030,30 @@ private function scoreMatchingAnswer(array $answers, array $rows): float
         return $score;
     }
 
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreDraggableAnswer(array $answers, array $rows): float
+    {
+        $positions = $this->getSavedDraggablePositions($rows);
+        $score = 0.0;
+
+        foreach ($answers as $answer) {
+            $correctPosition = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $correctPosition) {
+                continue;
+            }
+
+            $answerId = (int) $answer->getIid();
+            if (($positions[$answerId] ?? 0) === $correctPosition) {
+                $score += $answer->getPonderation();
+            }
+        }
+
+        return $score;
+    }
+
     /**
      * @param array<int, CQuizAnswer>   $answers
      * @param array<int, TrackEAttempt> $rows
@@ -1355,6 +1382,25 @@ private function getFirstSavedAnswerId(array $rows): int
         return $row instanceof TrackEAttempt ? (int) $row->getAnswer() : 0;
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, int>
+     */
+    private function getSavedDraggablePositions(array $rows): array
+    {
+        $positions = [];
+        foreach ($rows as $row) {
+            $answerId = (int) $row->getPosition();
+            $selectedPosition = (int) $row->getAnswer();
+            if (0 < $answerId && 0 < $selectedPosition) {
+                $positions[$answerId] = $selectedPosition;
+            }
+        }
+
+        return $positions;
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      *
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index d4f38b67854..781c7b84175 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -9,8 +9,10 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntime;
+use Chamilo\CoreBundle\Entity\AttemptFile;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
@@ -52,6 +54,7 @@
     private const TRUE_FALSE_TYPES = [11, 12, 22];
     private const FILL_BLANK_TYPES = [3, 27];
     private const MATCHING_TYPES = [4, 19, 24, 25];
+    private const DRAGGABLE_TYPES = [18];
     private const DROPDOWN_TYPES = [28, 29];
     private const CALCULATED_TYPES = [16];
     private const FREE_ANSWER_TYPES = [5];
@@ -62,6 +65,8 @@
     private const MEDIA_QUESTION = 15;
     private const PAGE_BREAK = 31;
     private const QUESTION_SELECTION_RANDOM = 2;
+    private const QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_ORDERED = 3;
+    private const QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM = 6;
     private const STRUCTURAL_CONTENT_TYPES = [self::MEDIA_QUESTION, self::PAGE_BREAK];
 
     public function __construct(
@@ -99,7 +104,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManage);
         $attempt = $this->getRuntimeAttempt($request, $quiz, $course, $session, $canManage);
         $attemptQuestionIds = $attempt instanceof TrackEExercise ? $this->parseQuestionIds((string) $attempt->getDataTracking()) : null;
-        $questions = $this->getRuntimeQuestions($quiz, $course, $session, $canManage, $attemptQuestionIds);
+        $questions = $this->getRuntimeQuestions($quiz, $course, $session, $canManage, $attemptQuestionIds, $attempt);
         $runtimePages = $this->buildRuntimePages($quiz, $questions);
         $settings = $this->getRuntimeSettings($quiz);
         $settings['runtimePages'] = $runtimePages['pages'];
@@ -156,6 +161,7 @@ private function isFinishSupportedQuestionType(int $type): bool
             || \in_array($type, self::TRUE_FALSE_TYPES, true)
             || \in_array($type, self::FILL_BLANK_TYPES, true)
             || \in_array($type, self::MATCHING_TYPES, true)
+            || \in_array($type, self::DRAGGABLE_TYPES, true)
             || \in_array($type, self::DROPDOWN_TYPES, true)
             || \in_array($type, self::CALCULATED_TYPES, true)
             || \in_array($type, self::FREE_ANSWER_TYPES, true)
@@ -238,48 +244,140 @@ private function normalizeAttempt(TrackEExercise $attempt, array $questions): ar
             'totalQuestions' => \count($questions),
             'expiredAt' => $expiredAt,
             'remainingSeconds' => $remainingSeconds,
-            'savedAnswers' => $this->getSavedAnswers((int) $attempt->getExeId()),
+            'savedAnswers' => $this->getSavedAnswers((int) $attempt->getExeId(), $attempt->getCourse(), $attempt->getSession()),
         ];
     }
 
     /**
-     * @return array<int|string, array<int, array{answer: string, position: int|null}>>
+     * @return array<int|string, array<int, array<string, mixed>>>
      */
-    private function getSavedAnswers(int $attemptId): array
+    private function getSavedAnswers(int $attemptId, Course $course, ?Session $session): array
     {
         $rows = $this->entityManager->createQueryBuilder()
-            ->select('saved.questionId AS questionId')
-            ->addSelect('saved.answer AS answer')
-            ->addSelect('saved.position AS position')
+            ->select('saved')
+            ->addSelect('attemptFile', 'resourceNode', 'resourceFile')
             ->from(TrackEAttempt::class, 'saved')
+            ->leftJoin('saved.attemptFiles', 'attemptFile')
+            ->leftJoin('attemptFile.resourceNode', 'resourceNode')
+            ->leftJoin('resourceNode.resourceFiles', 'resourceFile')
             ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
             ->setParameter('attemptId', $attemptId, Types::INTEGER)
             ->orderBy('saved.questionId', 'ASC')
             ->addOrderBy('saved.position', 'ASC')
             ->getQuery()
-            ->getArrayResult()
+            ->getResult()
         ;
 
         $savedAnswers = [];
         foreach ($rows as $row) {
-            if (!\is_array($row)) {
+            if (!$row instanceof TrackEAttempt) {
                 continue;
             }
 
-            $questionId = (int) ($row['questionId'] ?? 0);
+            $questionId = (int) $row->getQuestionId();
             if (0 >= $questionId) {
                 continue;
             }
 
-            $savedAnswers[$questionId][] = [
-                'answer' => (string) ($row['answer'] ?? ''),
-                'position' => null !== ($row['position'] ?? null) ? (int) $row['position'] : null,
+            $savedRow = [
+                'answer' => $row->getAnswer(),
+                'position' => null !== $row->getPosition() ? (int) $row->getPosition() : null,
             ];
+
+            $files = $this->normalizeSavedAttemptFiles($row, $course, $session);
+            if ([] !== $files) {
+                $savedRow['files'] = $files;
+            }
+
+            $savedAnswers[$questionId][] = $savedRow;
         }
 
         return $savedAnswers;
     }
 
+    /**
+     * @return array<int, array{id: int, name: string, size: int, mimeType: string, url: string, inlineUrl: string}>
+     */
+    private function normalizeSavedAttemptFiles(TrackEAttempt $attemptRow, Course $course, ?Session $session): array
+    {
+        $files = [];
+        foreach ($attemptRow->getAttemptFiles() as $attemptFile) {
+            if (!$attemptFile instanceof AttemptFile) {
+                continue;
+            }
+
+            $resourceNode = $attemptFile->getResourceNode();
+            if (!$resourceNode instanceof ResourceNode || null === $resourceNode->getId()) {
+                continue;
+            }
+
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            $name = $resourceNode->getTitle();
+            $size = 0;
+            $mimeType = '';
+            if ($resourceFile instanceof ResourceFile) {
+                $name = $resourceFile->getOriginalName() ?: $resourceNode->getTitle();
+                $size = (int) $resourceFile->getSize();
+                $mimeType = (string) $resourceFile->getMimeType();
+            }
+
+            $files[] = [
+                'id' => (int) $resourceNode->getId(),
+                'name' => (string) ($name ?: 'answer-file'),
+                'size' => $size,
+                'mimeType' => $mimeType,
+                'url' => $this->getAttemptFileDownloadUrl($attemptRow, $resourceNode, $course, $session),
+                'inlineUrl' => $this->getAttemptFileDownloadUrl($attemptRow, $resourceNode, $course, $session, true),
+            ];
+        }
+
+        return $files;
+    }
+
+    private function getAttemptFileDownloadUrl(
+        TrackEAttempt $attemptRow,
+        ResourceNode $resourceNode,
+        Course $course,
+        ?Session $session,
+        bool $inline = false,
+    ): string {
+        $attempt = $attemptRow->getTrackEExercise();
+        $quiz = $attempt->getQuiz();
+        if (null === $quiz || null === $quiz->getIid() || null === $resourceNode->getId()) {
+            return '';
+        }
+
+        $query = [
+            'cid' => (int) $course->getId(),
+        ];
+
+        if (null !== $session) {
+            $query['sid'] = (int) $session->getId();
+        }
+
+        if ($inline) {
+            $query['inline'] = 1;
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null !== $request) {
+            foreach (['gid', 'origin', 'learnpath_id', 'learnpath_item_id', 'learnpath_item_view_id'] as $queryKey) {
+                $value = $request->query->get($queryKey);
+                if (null !== $value && '' !== (string) $value) {
+                    $query[$queryKey] = (string) $value;
+                }
+            }
+        }
+
+        return sprintf(
+            '/api/exercise/runtime/%d/attempt/%d/file/%d/download?%s',
+            (int) $quiz->getIid(),
+            (int) $attempt->getExeId(),
+            (int) $resourceNode->getId(),
+            http_build_query($query)
+        );
+    }
+
     /**
      * @return array<int, int>
      */
@@ -444,7 +542,7 @@ private function getRuntimeSettings(CQuiz $quiz): array
      *
      * @return array<int, array<string, mixed>>
      */
-    private function getRuntimeQuestions(CQuiz $quiz, Course $course, ?Session $session, bool $canManage, ?array $questionIds = null): array
+    private function getRuntimeQuestions(CQuiz $quiz, Course $course, ?Session $session, bool $canManage, ?array $questionIds = null, ?TrackEExercise $attempt = null): array
     {
         $relations = $this->getOrderedQuestionRelations($quiz);
         $selectedQuestionIds = null !== $questionIds && [] !== $questionIds
@@ -484,7 +582,16 @@ private function getRuntimeQuestions(CQuiz $quiz, Course $course, ?Session $sess
                 continue;
             }
 
-            $item = $this->normalizeQuestion($question, $relation, $course, $session, $canManage);
+            $item = $this->normalizeQuestion(
+                $question,
+                $relation,
+                $course,
+                $session,
+                $canManage,
+                $attempt,
+                true === $quiz->getRandomAnswers(),
+                $this->buildAnswerShuffleSeed($quiz, $question, $attempt)
+            );
             $normalizedById[$questionId] = $item;
         }
 
@@ -557,7 +664,7 @@ private function getOrderedQuestionRelations(CQuiz $quiz): array
     /**
      * @return array<string, mixed>
      */
-    private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $relation, Course $course, ?Session $session, bool $canManage): array
+    private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $relation, Course $course, ?Session $session, bool $canManage, ?TrackEExercise $attempt = null, bool $shuffleAnswers = false, string $answerShuffleSeed = ""): array
     {
         $type = (int) $question->getType();
 
@@ -575,13 +682,13 @@ private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $re
             'duration' => $question->getDuration(),
             'difficulty' => max(1, (int) $question->getLevel()),
             'canRevealTeacherData' => $canManage,
-            'choices' => $this->getChoiceItems($question),
+            'choices' => $this->getChoiceItems($question, $shuffleAnswers, $answerShuffleSeed),
             'trueFalseOptions' => $this->getQuestionOptions($question),
             'fillBlanks' => $this->getFillBlanksRuntime($question),
-            'matching' => $this->getMatchingRuntime($question),
-            'draggable' => $this->getDraggableRuntime($question),
-            'dropdown' => $this->getDropdownRuntime($question),
-            'calculated' => $this->getCalculatedRuntime($question),
+            'matching' => $this->getMatchingRuntime($question, $shuffleAnswers, $answerShuffleSeed),
+            'draggable' => $this->getDraggableRuntime($question, $shuffleAnswers, $answerShuffleSeed),
+            'dropdown' => $this->getDropdownRuntime($question, $shuffleAnswers, $answerShuffleSeed),
+            'calculated' => $this->getCalculatedRuntime($question, $attempt),
             'annotation' => $this->getImageRuntime($question, $course, $session, [20]),
             'hotspot' => $this->getHotspotRuntime($question, $course, $session, $canManage),
             'reading' => $this->getReadingRuntime($question),
@@ -610,8 +717,13 @@ private function normalizeMediaParentQuestion(CQuizQuestion $question): array
 
     private function usesRandomQuestionOrder(CQuiz $quiz): bool
     {
+        $selectionType = (int) ($quiz->getQuestionSelectionType() ?? 0);
+
         return 0 < (int) $quiz->getRandom()
-            || self::QUESTION_SELECTION_RANDOM === (int) ($quiz->getQuestionSelectionType() ?? 0);
+            || 0 < (int) $quiz->getRandomByCategory()
+            || self::QUESTION_SELECTION_RANDOM === $selectionType
+            || ($selectionType >= self::QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_ORDERED
+                && $selectionType <= self::QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM);
     }
 
     /**
@@ -810,7 +922,7 @@ private function normalizePageBreakForPage(array $question): array
     private function reindexPages(array $pages): array
     {
         $result = [];
-        foreach (array_values($pages) as $index => $page) {
+        foreach ($this->removeEmptyRuntimePages($pages) as $index => $page) {
             $page['index'] = $index;
             $page['number'] = $index + 1;
             $result[] = $page;
@@ -819,6 +931,56 @@ private function reindexPages(array $pages): array
         return $result;
     }
 
+    /**
+     * @param array<int, array<string, mixed>> $pages
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function removeEmptyRuntimePages(array $pages): array
+    {
+        $result = [];
+        foreach ($pages as $page) {
+            if (!\is_array($page)) {
+                continue;
+            }
+
+            $questionIds = array_values(array_filter(
+                array_map(static fn (mixed $questionId): int => (int) $questionId, (array) ($page['questionIds'] ?? [])),
+                static fn (int $questionId): bool => $questionId > 0
+            ));
+            $page['questionIds'] = $questionIds;
+
+            if ([] !== $questionIds || $this->hasVisibleRuntimePageContent($page)) {
+                $result[] = $page;
+            }
+        }
+
+        return array_values($result);
+    }
+
+    /**
+     * @param array<string, mixed> $page
+     */
+    private function hasVisibleRuntimePageContent(array $page): bool
+    {
+        $media = \is_array($page['media'] ?? null) ? $page['media'] : [];
+        $mediaContent = \is_array($media['content'] ?? null) ? $media['content'] : [];
+        $pageBreak = \is_array($page['pageBreak'] ?? null) ? $page['pageBreak'] : [];
+        $pageBreakContent = \is_array($pageBreak['content'] ?? null) ? $pageBreak['content'] : [];
+
+        return $this->hasNonEmptyText($media['title'] ?? null)
+            || $this->hasNonEmptyText($media['description'] ?? null)
+            || $this->hasNonEmptyText($mediaContent['description'] ?? null)
+            || $this->hasNonEmptyText($pageBreak['title'] ?? null)
+            || $this->hasNonEmptyText($pageBreak['description'] ?? null)
+            || $this->hasNonEmptyText($pageBreakContent['description'] ?? null);
+    }
+
+    private function hasNonEmptyText(mixed $value): bool
+    {
+        return \is_string($value) && '' !== trim($value);
+    }
+
     /**
      * @param array<int, array<string, mixed>> $questions
      */
@@ -839,7 +1001,7 @@ private function countAnswerableQuestions(array $questions): int
     /**
      * @return array<int, array<string, mixed>>
      */
-    private function getChoiceItems(CQuizQuestion $question): array
+    private function getChoiceItems(CQuizQuestion $question, bool $shuffleAnswers = false, string $shuffleSeed = ""): array
     {
         $type = (int) $question->getType();
         if (!\in_array($type, [1, 2, 9, 10, 11, 12, 14, 17, 21, 22], true)) {
@@ -855,7 +1017,7 @@ private function getChoiceItems(CQuizQuestion $question): array
             ];
         }
 
-        return $items;
+        return $this->stableShuffleItems($items, $shuffleAnswers, $shuffleSeed);
     }
 
     /**
@@ -1010,7 +1172,7 @@ private function getFillBlankSeparators(int $separator): array
     /**
      * @return array<string, mixed>|null
      */
-    private function getMatchingRuntime(CQuizQuestion $question): ?array
+    private function getMatchingRuntime(CQuizQuestion $question, bool $shuffleAnswers = false, string $shuffleSeed = ""): ?array
     {
         if (!\in_array((int) $question->getType(), [4, 19, 24, 25], true)) {
             return null;
@@ -1039,7 +1201,7 @@ private function getMatchingRuntime(CQuizQuestion $question): ?array
         }
 
         return [
-            'options' => $options,
+            'options' => $this->stableShuffleItems($options, $shuffleAnswers, $shuffleSeed.':matching-options'),
             'prompts' => $prompts,
         ];
     }
@@ -1047,7 +1209,7 @@ private function getMatchingRuntime(CQuizQuestion $question): ?array
     /**
      * @return array<string, mixed>|null
      */
-    private function getDraggableRuntime(CQuizQuestion $question): ?array
+    private function getDraggableRuntime(CQuizQuestion $question, bool $shuffleAnswers = false, string $shuffleSeed = ""): ?array
     {
         if (18 !== (int) $question->getType()) {
             return null;
@@ -1055,23 +1217,30 @@ private function getDraggableRuntime(CQuizQuestion $question): ?array
 
         $items = [];
         foreach ($this->getOrderedAnswers($question) as $answer) {
+            $targetPosition = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $targetPosition) {
+                continue;
+            }
+
             $items[] = [
                 'id' => (int) $answer->getIid(),
                 'answer' => $answer->getAnswer(),
                 'position' => (int) $answer->getPosition(),
+                'targetPosition' => $targetPosition,
+                'score' => (float) $answer->getPonderation(),
             ];
         }
 
         return [
             'orientation' => \in_array((string) $question->getExtra(), ['h', 'v'], true) ? (string) $question->getExtra() : 'h',
-            'items' => $items,
+            'items' => $this->stableShuffleItems($items, $shuffleAnswers, $shuffleSeed.':draggable-items'),
         ];
     }
 
     /**
      * @return array<string, mixed>|null
      */
-    private function getDropdownRuntime(CQuizQuestion $question): ?array
+    private function getDropdownRuntime(CQuizQuestion $question, bool $shuffleAnswers = false, string $shuffleSeed = ""): ?array
     {
         if (!\in_array((int) $question->getType(), [28, 29], true)) {
             return null;
@@ -1086,13 +1255,13 @@ private function getDropdownRuntime(CQuizQuestion $question): ?array
             ];
         }
 
-        return ['options' => $options];
+        return ['options' => $this->stableShuffleItems($options, $shuffleAnswers, $shuffleSeed.':dropdown-options')];
     }
 
     /**
      * @return array<string, mixed>|null
      */
-    private function getCalculatedRuntime(CQuizQuestion $question): ?array
+    private function getCalculatedRuntime(CQuizQuestion $question, ?TrackEExercise $attempt = null): ?array
     {
         if (!\in_array((int) $question->getType(), self::CALCULATED_TYPES, true)) {
             return null;
@@ -1108,15 +1277,83 @@ private function getCalculatedRuntime(CQuizQuestion $question): ?array
             ];
         }
 
-        $firstVariation = $variations[0] ?? null;
+        $selectedVariation = $this->selectCalculatedRuntimeVariation($question, $variations, $attempt);
 
         return [
-            'answerId' => null !== $firstVariation ? (int) $firstVariation['id'] : null,
-            'text' => (string) ($firstVariation['text'] ?? ''),
+            'answerId' => null !== $selectedVariation ? (int) $selectedVariation['id'] : null,
+            'text' => (string) ($selectedVariation['text'] ?? ''),
             'variations' => $variations,
         ];
     }
 
+    /**
+     * Legacy stores the random calculated-answer variation in session for the current attempt.
+     * The Vue runtime must keep the same variation stable for an attempt without relying on session state.
+     *
+     * @param array<int, array{id: int, text: string, position: int}> $variations
+     *
+     * @return array{id: int, text: string, position: int}|null
+     */
+    private function selectCalculatedRuntimeVariation(CQuizQuestion $question, array $variations, ?TrackEExercise $attempt): ?array
+    {
+        if ([] === $variations) {
+            return null;
+        }
+
+        $savedAnswerId = $this->getSavedCalculatedRuntimeAnswerId($question, $attempt);
+        if (0 < $savedAnswerId) {
+            foreach ($variations as $variation) {
+                if ((int) ($variation['id'] ?? 0) === $savedAnswerId) {
+                    return $variation;
+                }
+            }
+        }
+
+        if (!$attempt instanceof TrackEExercise || null === $attempt->getExeId()) {
+            return $variations[0];
+        }
+
+        $index = abs((int) crc32(sprintf(
+            '%d:%d:%d',
+            (int) $attempt->getExeId(),
+            (int) ($question->getIid() ?? 0),
+            \count($variations)
+        ))) % \count($variations);
+
+        return $variations[$index] ?? $variations[0];
+    }
+
+    private function getSavedCalculatedRuntimeAnswerId(CQuizQuestion $question, ?TrackEExercise $attempt): int
+    {
+        if (!$attempt instanceof TrackEExercise || null === $attempt->getExeId() || null === $question->getIid()) {
+            return 0;
+        }
+
+        $row = $this->entityManager->createQueryBuilder()
+            ->select('attemptRow.answer')
+            ->from(TrackEAttempt::class, 'attemptRow')
+            ->andWhere('IDENTITY(attemptRow.trackExercise) = :attemptId')
+            ->andWhere('attemptRow.questionId = :questionId')
+            ->setParameter('attemptId', (int) $attempt->getExeId(), Types::INTEGER)
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        $answer = \is_array($row) ? (string) ($row['answer'] ?? '') : '';
+        if ('' === trim($answer)) {
+            return 0;
+        }
+
+        $parts = explode(':', $answer, 2);
+        if (2 !== \count($parts)) {
+            return 0;
+        }
+
+        return max(0, (int) $parts[0]);
+    }
+
     /**
      * @return array<string, mixed>|null
      */
@@ -1231,6 +1468,45 @@ private function getContentRuntime(CQuizQuestion $question): ?array
         ];
     }
 
+
+    private function buildAnswerShuffleSeed(CQuiz $quiz, CQuizQuestion $question, ?TrackEExercise $attempt): string
+    {
+        $attemptPart = $attempt instanceof TrackEExercise ? (string) $attempt->getExeId() : 'preview';
+
+        return implode(':', [
+            'exercise',
+            (string) $quiz->getIid(),
+            'attempt',
+            $attemptPart,
+            'question',
+            (string) $question->getIid(),
+        ]);
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $items
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function stableShuffleItems(array $items, bool $shuffle, string $seed): array
+    {
+        if (!$shuffle || 2 > \count($items)) {
+            return $items;
+        }
+
+        usort(
+            $items,
+            static function (array $first, array $second) use ($seed): int {
+                $firstId = (string) ($first['id'] ?? $first['position'] ?? '');
+                $secondId = (string) ($second['id'] ?? $second['position'] ?? '');
+
+                return crc32($seed.':'.$firstId) <=> crc32($seed.':'.$secondId);
+            }
+        );
+
+        return array_values($items);
+    }
+
     /**
      * @return array<int, CQuizAnswer>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
new file mode 100644
index 00000000000..2759f3632e8
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
@@ -0,0 +1,406 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeReportBulkAction;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Service\Exercise\ExerciseAttemptScoringService;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeImmutable;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * Runs non-legacy bulk cleanup actions from the exercise learner attempts report.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeReportBulkAction, ExerciseRuntimeReportBulkAction>
+ */
+final readonly class ExerciseRuntimeReportBulkActionProcessor implements ProcessorInterface
+{
+    private const ACTION_DELETE_SELECTED = 'delete_selected';
+    private const ACTION_CLEAN_BEFORE_DATE = 'clean_before_date';
+    private const ACTION_RECALCULATE_ALL = 'recalculate_all';
+    private const LINK_TYPE_EXERCISE = 1;
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+        private ExerciseAttemptScoringService $scoringService,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeReportBulkAction
+    {
+        if (!$data instanceof ExerciseRuntimeReportBulkAction) {
+            throw new BadRequestHttpException('Invalid report bulk action payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to run this exercise report action.');
+        }
+
+        $this->validateCsrfToken($data->submittedCsrfToken);
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $data->exerciseId = $exerciseId;
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        if ($this->isGradebookLocked((int) $quiz->getIid(), $course)) {
+            throw new BadRequestHttpException('This exercise is locked by gradebook.');
+        }
+
+        $action = strtolower(trim($data->action));
+
+        return match ($action) {
+            self::ACTION_DELETE_SELECTED => $this->deleteSelected($data, $quiz, $course, $session),
+            self::ACTION_CLEAN_BEFORE_DATE => $this->cleanBeforeDate($data, $quiz, $course, $session),
+            self::ACTION_RECALCULATE_ALL => $this->recalculateAll($data, $quiz, $course, $session),
+            default => throw new BadRequestHttpException('Unsupported report bulk action.'),
+        };
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function validateCsrfToken(string $submittedCsrfToken): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(ExerciseRuntimeReportProvider::BULK_ACTION_CSRF_TOKEN_ID, $submittedCsrfToken))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+        }
+
+        return $quiz;
+    }
+
+    private function deleteSelected(ExerciseRuntimeReportBulkAction $data, CQuiz $quiz, Course $course, ?Session $session): ExerciseRuntimeReportBulkAction
+    {
+        if (!$this->canDeleteResults()) {
+            throw new AccessDeniedHttpException('Deleting exercise results is not allowed.');
+        }
+
+        $attemptIds = $this->getSubmittedAttemptIds($data);
+        if ([] === $attemptIds) {
+            throw new BadRequestHttpException('Select at least one attempt.');
+        }
+
+        $attempts = $this->getAttempts($quiz, $course, $session, $attemptIds);
+        foreach ($attempts as $attempt) {
+            $this->entityManager->remove($attempt);
+        }
+        $this->entityManager->flush();
+
+        $processedCount = \count($attempts);
+        $failedCount = \count($attemptIds) - $processedCount;
+
+        return $this->buildResponse($data, true, 'Attempts deleted', $processedCount, max(0, $failedCount));
+    }
+
+    private function cleanBeforeDate(ExerciseRuntimeReportBulkAction $data, CQuiz $quiz, Course $course, ?Session $session): ExerciseRuntimeReportBulkAction
+    {
+        if (!$this->canCleanResults()) {
+            throw new AccessDeniedHttpException('Cleaning exercise results is not allowed.');
+        }
+
+        $beforeDate = $this->getValidBeforeDate($data->beforeDate);
+        $attempts = $this->getAttemptsBeforeDate($quiz, $course, $session, $beforeDate);
+        foreach ($attempts as $attempt) {
+            $this->entityManager->remove($attempt);
+        }
+        $this->entityManager->flush();
+
+        return $this->buildResponse($data, true, 'Results cleaned', \count($attempts), 0);
+    }
+
+    private function recalculateAll(ExerciseRuntimeReportBulkAction $data, CQuiz $quiz, Course $course, ?Session $session): ExerciseRuntimeReportBulkAction
+    {
+        $attempts = $this->getAttempts($quiz, $course, $session);
+        $processedCount = 0;
+        $failedCount = 0;
+
+        foreach ($attempts as $attempt) {
+            try {
+                $this->scoringService->recalculateAttempt($attempt, $quiz);
+                ++$processedCount;
+            } catch (BadRequestHttpException) {
+                ++$failedCount;
+            }
+        }
+
+        $this->entityManager->flush();
+
+        return $this->buildResponse($data, true, 'Attempts recalculated', $processedCount, $failedCount);
+    }
+
+    /**
+     * @param array<int, int> $attemptIds
+     *
+     * @return array<int, TrackEExercise>
+     */
+    private function getAttempts(CQuiz $quiz, Course $course, ?Session $session, array $attemptIds = []): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('attempt.exeDate', 'DESC')
+            ->addOrderBy('attempt.exeId', 'DESC')
+        ;
+
+        if ([] !== $attemptIds) {
+            $queryBuilder
+                ->andWhere('attempt.exeId IN (:attemptIds)')
+                ->setParameter('attemptIds', $attemptIds, ArrayParameterType::INTEGER)
+            ;
+        }
+
+        $this->addSessionCondition($queryBuilder, $session);
+
+        return array_values(array_filter(
+            $queryBuilder->getQuery()->getResult(),
+            static fn (mixed $attempt): bool => $attempt instanceof TrackEExercise,
+        ));
+    }
+
+    /**
+     * @return array<int, TrackEExercise>
+     */
+    private function getAttemptsBeforeDate(CQuiz $quiz, Course $course, ?Session $session, DateTimeImmutable $beforeDate): array
+    {
+        $endOfDay = $beforeDate->setTime(23, 59, 59);
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('attempt.exeDate <= :beforeDate')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('beforeDate', $endOfDay, Types::DATETIME_IMMUTABLE)
+            ->orderBy('attempt.exeDate', 'ASC')
+        ;
+
+        $this->addSessionCondition($queryBuilder, $session);
+
+        return array_values(array_filter(
+            $queryBuilder->getQuery()->getResult(),
+            static fn (mixed $attempt): bool => $attempt instanceof TrackEExercise,
+        ));
+    }
+
+    private function addSessionCondition(QueryBuilder $queryBuilder, ?Session $session): void
+    {
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+
+            return;
+        }
+
+        $queryBuilder->andWhere('attempt.session IS NULL');
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getSubmittedAttemptIds(ExerciseRuntimeReportBulkAction $data): array
+    {
+        return array_values(array_unique(array_filter(
+            array_map(static fn (mixed $attemptId): int => (int) $attemptId, $data->attemptIds),
+            static fn (int $attemptId): bool => 0 < $attemptId,
+        )));
+    }
+
+    private function getValidBeforeDate(string $beforeDate): DateTimeImmutable
+    {
+        $beforeDate = trim($beforeDate);
+        $date = DateTimeImmutable::createFromFormat('!Y-m-d', $beforeDate);
+        $errors = DateTimeImmutable::getLastErrors();
+        if (!$date instanceof DateTimeImmutable || (\is_array($errors) && (0 < $errors['warning_count'] || 0 < $errors['error_count']))) {
+            throw new BadRequestHttpException('A valid date is required.');
+        }
+
+        return $date;
+    }
+
+    private function canDeleteResults(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access');
+    }
+
+    private function canCleanResults(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access')
+            && !$this->isSettingEnabled('exercise.disable_clean_exercise_results_for_teachers');
+    }
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
+    private function buildResponse(
+        ExerciseRuntimeReportBulkAction $data,
+        bool $success,
+        string $message,
+        int $processedCount,
+        int $failedCount,
+    ): ExerciseRuntimeReportBulkAction {
+        $response = new ExerciseRuntimeReportBulkAction();
+        $response->exerciseId = $data->exerciseId;
+        $response->action = $data->action;
+        $response->attemptIds = $data->attemptIds;
+        $response->beforeDate = $data->beforeDate;
+        $response->success = $success;
+        $response->message = $message;
+        $response->processedCount = $processedCount;
+        $response->failedCount = $failedCount;
+
+        return $response;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportEmailProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportEmailProcessor.php
new file mode 100644
index 00000000000..0d0de3e2b1e
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportEmailProcessor.php
@@ -0,0 +1,68 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeReportEmail;
+use Chamilo\CoreBundle\Service\Exercise\ExerciseRuntimeResultEmailService;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * Sends reviewed exercise result emails from the migrated report.
+ *
+ * @implements ProcessorInterface<ExerciseRuntimeReportEmail, ExerciseRuntimeReportEmail>
+ */
+final readonly class ExerciseRuntimeReportEmailProcessor implements ProcessorInterface
+{
+    public function __construct(
+        private RequestStack $requestStack,
+        private ExerciseRuntimeResultEmailService $emailService,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseRuntimeReportEmail
+    {
+        if (!$data instanceof ExerciseRuntimeReportEmail) {
+            throw new BadRequestHttpException('Invalid email request.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(
+            ExerciseRuntimeReportProvider::EMAIL_ACTION_CSRF_TOKEN_ID,
+            $data->submittedCsrfToken
+        ))) {
+            throw new BadRequestHttpException('Invalid security token.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        $result = $this->emailService->sendReviewedAttempts($exerciseId, $request, $data->node);
+
+        $response = new ExerciseRuntimeReportEmail();
+        $response->exerciseId = $exerciseId;
+        $response->success = $result['success'];
+        $response->message = $result['message'];
+        $response->totalCount = $result['totalCount'];
+        $response->sentCount = $result['sentCount'];
+        $response->skippedCount = $result['skippedCount'];
+        $response->failedCount = $result['failedCount'];
+        $response->failures = $result['failures'];
+
+        return $response;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
index 00f3c332ab9..67fbad15d0d 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
@@ -10,9 +10,11 @@
 use ApiPlatform\State\ProviderInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeReport;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTimeInterface;
@@ -24,6 +26,7 @@
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
 /**
  * Read-only provider for the migrated exercise learner attempts report.
@@ -32,7 +35,11 @@
  */
 final readonly class ExerciseRuntimeReportProvider implements ProviderInterface
 {
+    public const BULK_ACTION_CSRF_TOKEN_ID = 'exercise_runtime_report_bulk_action';
+    public const EMAIL_ACTION_CSRF_TOKEN_ID = 'exercise_runtime_report_email_action';
+
     private const VISIBILITY_PUBLISHED = 2;
+    private const LINK_TYPE_EXERCISE = 1;
     private const STATUS_INCOMPLETE = 'incomplete';
     private const STATUS_PENDING_CORRECTION = 'pending_correction';
     private const STATUS_COMPLETED = 'completed';
@@ -42,6 +49,8 @@ public function __construct(
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
     ) {}
 
     /**
@@ -67,7 +76,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
-        $attempts = $this->getAttempts($request, $quiz, $course, $session);
+        $lockedByGradebook = $this->isGradebookLocked((int) $quiz->getIid(), $course);
+        $attempts = $this->getAttempts($request, $quiz, $course, $session, $lockedByGradebook);
 
         $response = new ExerciseRuntimeReport();
         $response->exerciseId = $exerciseId;
@@ -79,9 +89,15 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             'lastName' => trim((string) $request->query->get('lastName', '')),
             'status' => trim((string) $request->query->get('status', '')),
         ];
-        $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session, $request);
+        $response->actionUrls = $this->getActionUrls($quiz, $request);
         $response->totalItems = \count($attempts);
         $response->canManage = true;
+        $response->lockedByGradebook = $lockedByGradebook;
+        $response->canBulkDelete = !$lockedByGradebook && $this->canDeleteResults();
+        $response->canCleanResults = !$lockedByGradebook && $this->canCleanResults();
+        $response->canBulkRecalculate = !$lockedByGradebook;
+        $response->bulkActionToken = $this->csrfTokenManager->getToken(self::BULK_ACTION_CSRF_TOKEN_ID)->getValue();
+        $response->emailActionToken = $this->csrfTokenManager->getToken(self::EMAIL_ACTION_CSRF_TOKEN_ID)->getValue();
 
         return $response;
     }
@@ -169,7 +185,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
     /**
      * @return array<int, array<string, mixed>>
      */
-    private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Session $session): array
+    private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Session $session, bool $lockedByGradebook): array
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
             ->select('attempt', 'user')
@@ -230,7 +246,7 @@ private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Ses
                 continue;
             }
 
-            $attempts[] = $this->normalizeAttempt($attempt, $quiz, $request);
+            $attempts[] = $this->normalizeAttempt($attempt, $quiz, $request, $lockedByGradebook);
         }
 
         return $attempts;
@@ -239,7 +255,7 @@ private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Ses
     /**
      * @return array<string, mixed>
      */
-    private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request $request): array
+    private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request $request, bool $lockedByGradebook): array
     {
         $user = $attempt->getUser();
         $questionsToCheck = $this->parseQuestionIds($attempt->getQuestionsToCheck());
@@ -253,7 +269,6 @@ private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request
         $score = $attempt->getScore();
         $maxScore = $attempt->getMaxScore();
         $percentage = 0.0 < $maxScore ? round(($score * 100) / $maxScore, 2) : 0.0;
-        $baseParams = $this->getBaseParams((int) $quiz->getIid(), $request);
         $attemptId = (int) $attempt->getExeId();
         $userId = (int) $user->getId();
 
@@ -280,13 +295,9 @@ private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request
             'questionsToCheck' => $questionsToCheck,
             'learningPath' => $this->formatLearningPath($attempt),
             'canReview' => self::STATUS_INCOMPLETE !== $status,
-            'canDelete' => true,
-            'legacyUrls' => [
-                'result' => api_get_path(WEB_CODE_PATH).'exercise/exercise_result.php?'.http_build_query(['exe_id' => $attemptId] + $baseParams),
-                'pdf' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'export_pdf', 'attemptId' => $attemptId, 'userId' => $userId] + $baseParams),
-                'sendEmail' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'send_email', 'attemptId' => $attemptId] + $baseParams),
-                'recalculate' => api_get_path(WEB_CODE_PATH).'exercise/recalculate.php?'.http_build_query(['id' => $attemptId, 'exercise' => (int) $quiz->getIid(), 'user' => $userId] + $this->getContextParams($request)),
-            ],
+            'canClose' => self::STATUS_INCOMPLETE === $status && !$lockedByGradebook,
+            'canRecalculate' => !$lockedByGradebook,
+            'canDelete' => !$lockedByGradebook && $this->canDeleteResults(),
         ];
     }
 
@@ -333,27 +344,104 @@ private function parseQuestionIds(string $value): array
         return array_values(array_unique($ids));
     }
 
+    private function canDeleteResults(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access');
+    }
+
+    private function canCleanResults(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access')
+            && !$this->isSettingEnabled('exercise.disable_clean_exercise_results_for_teachers');
+    }
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
     /**
      * @return array<string, string>
      */
-    private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session, Request $request): array
+    private function getActionUrls(CQuiz $quiz, Request $request): array
     {
-        $baseParams = $this->getBaseParams((int) $quiz->getIid(), $request);
-        $contextParams = $this->getContextParams($request);
+        $exerciseId = (int) $quiz->getIid();
 
         return [
-            'legacyReport' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query($baseParams),
-            'backToQuestions' => api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.http_build_query($contextParams),
-            'liveStats' => api_get_path(WEB_CODE_PATH).'exercise/live_stats.php?'.http_build_query($baseParams),
-            'questionReport' => api_get_path(WEB_CODE_PATH).'exercise/stats.php?'.http_build_query($baseParams),
-            'questionStats' => api_get_path(WEB_CODE_PATH).'exercise/question_stats.php?'.http_build_query(['id' => (int) $quiz->getIid()] + $contextParams),
-            'export' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['export_report' => 1] + $baseParams),
-            'recalculateAll' => api_get_path(WEB_CODE_PATH).'exercise/recalculate_all.php?'.http_build_query(['exercise' => (int) $quiz->getIid()] + $contextParams),
-            'exportAllPdf' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'export_all_results'] + $baseParams),
-            'sendAllEmails' => api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.http_build_query(['action' => 'send_all_emails'] + $baseParams),
+            'exportCsv' => $this->getModernExportUrl($exerciseId, 'csv', $request),
+            'exportXlsx' => $this->getModernExportUrl($exerciseId, 'xlsx', $request),
+            'exportAllAttempts' => $this->getModernExportAllAttemptsUrl($exerciseId, $request),
         ];
     }
 
+    private function getModernExportUrl(int $exerciseId, string $extension, Request $request): string
+    {
+        $params = $this->getExportParams($exerciseId, $request);
+
+        return '/api/exercise/runtime/'.$exerciseId.'/attempts/export.'.$extension.'?'.http_build_query($params);
+    }
+
+    private function getModernExportAllAttemptsUrl(int $exerciseId, Request $request): string
+    {
+        $params = $this->getExportParams($exerciseId, $request);
+
+        return '/api/exercise/runtime/'.$exerciseId.'/attempts/export-all.zip?'.http_build_query($params);
+    }
+
+    /**
+     * @return array<string, int|string>
+     */
+    private function getExportParams(int $exerciseId, Request $request): array
+    {
+        $params = $this->getBaseParams($exerciseId, $request);
+
+        foreach (['firstName', 'lastName', 'status'] as $filterName) {
+            $value = trim((string) $request->query->get($filterName, ''));
+            if ('' !== $value) {
+                $params[$filterName] = $value;
+            }
+        }
+
+        return $params;
+    }
+
     /**
      * @return array<string, int|string>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index fe87f5922a3..a2c225d2770 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -44,6 +44,7 @@
 {
     private const STATUS_COMPLETED = 'completed';
     private const ANNOTATION = 20;
+    private const DRAGGABLE = 18;
     private const VISIBILITY_PUBLISHED = 2;
     private const FEEDBACK_TYPE_EXAM = 2;
     private const RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS = 0;
@@ -105,12 +106,22 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $pendingQuestionIds = $this->parseQuestionIds((string) $attempt->getQuestionsToCheck());
         $isLastAllowedAttempt = $this->isLastAllowedAttempt($quiz, $attempt, $course, $session);
         $visibility = $this->getResultVisibility($quiz, $isLastAllowedAttempt);
-        $questions = $this->getQuestions($quiz, $questionIds, $rowsByQuestion, $visibility, $pendingQuestionIds, $canManage);
-        if (true === ($visibility['hideCorrectAnsweredQuestions'] ?? false) && true === ($visibility['showQuestionScore'] ?? false)) {
-            $questions = array_values(array_filter(
-                $questions,
-                static fn (array $question): bool => true !== ($question['isCorrect'] ?? false)
-            ));
+        if ($canManage) {
+            $visibility = $this->getManagerResultVisibility($visibility);
+        }
+
+        $questions = [];
+        if ($canManage || true === ($visibility['showQuestionDetails'] ?? false)) {
+            $questions = $this->getQuestions($quiz, $questionIds, $rowsByQuestion, $visibility, $pendingQuestionIds, $canManage);
+            if (
+                true === ($visibility['hideCorrectAnsweredQuestions'] ?? false)
+                && true === ($visibility['showQuestionScore'] ?? false)
+            ) {
+                $questions = array_values(array_filter(
+                    $questions,
+                    static fn (array $question): bool => true !== ($question['isCorrect'] ?? false)
+                ));
+            }
         }
 
         $response = new ExerciseRuntimeResult();
@@ -121,7 +132,9 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->attempt = $this->normalizeAttempt($attempt, $quiz, $visibility);
         $response->visibility = $visibility;
         $response->questions = $questions;
-        $response->legacyUrls = $this->getLegacyUrls($quiz, $attempt, $course, $session, $request);
+        $response->ranking = true === ($visibility['showRanking'] ?? false)
+            ? $this->getRanking($quiz, $course, $session, $attempt)
+            : [];
         $response->canManage = $canManage;
 
         return $response;
@@ -341,48 +354,103 @@ private function getAttemptRowsByQuestion(int $attemptId): array
     private function getResultVisibility(CQuiz $quiz, bool $isLastAllowedAttempt): array
     {
         $resultsDisabled = (int) $quiz->getResultsDisabled();
+        $feedbackType = (int) $quiz->getFeedbackType();
         $pageResultConfiguration = $this->normalizePageResultConfiguration($quiz->getPageResultConfiguration());
+
         $showScore = self::RESULT_NO_SCORE_AND_EXPECTED_ANSWERS !== $resultsDisabled;
-        $showCorrections = \in_array($resultsDisabled, [
-            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS,
-            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
-            self::RESULT_SHOW_ONLY_IN_CORRECT_ANSWER,
+        if (
+            self::RESULT_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK === $resultsDisabled
+            && !$isLastAllowedAttempt
+        ) {
+            $showScore = false;
+        }
+
+        $showQuestionDetails = !\in_array($resultsDisabled, [
+            self::RESULT_NO_SCORE_AND_EXPECTED_ANSWERS,
+            self::RESULT_SHOW_SCORE_ONLY,
+            self::RESULT_SHOW_FINAL_SCORE_ONLY_WITH_CATEGORIES,
+            self::RESULT_RANKING,
+            self::RESULT_RADAR,
         ], true);
 
-        if (\in_array($resultsDisabled, [
+        $showExpectedAnswers = match ($resultsDisabled) {
+            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS,
+            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            self::RESULT_SHOW_ONLY_IN_CORRECT_ANSWER => true,
             self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT,
-            self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK,
-        ], true)) {
-            $showCorrections = $isLastAllowedAttempt;
-        }
+            self::RESULT_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK,
+            self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK => $isLastAllowedAttempt,
+            default => false,
+        };
 
         if (true === $pageResultConfiguration['hideExpectedAnswers']) {
-            $showCorrections = false;
+            $showExpectedAnswers = false;
         }
 
-        $showOnlyIncorrect = self::RESULT_SHOW_ONLY_IN_CORRECT_ANSWER === $resultsDisabled;
-        $showFeedback = $showCorrections
-            && self::FEEDBACK_TYPE_EXAM !== (int) $quiz->getFeedbackType()
-            && self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK !== $resultsDisabled;
+        $showOnlyCorrectAnswers = self::RESULT_SHOW_ONLY_IN_CORRECT_ANSWER === $resultsDisabled;
+        $showFeedback = self::FEEDBACK_TYPE_EXAM !== $feedbackType && match ($resultsDisabled) {
+            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS,
+            self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            self::RESULT_SHOW_ONLY_IN_CORRECT_ANSWER => $showExpectedAnswers,
+            self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT => $showExpectedAnswers,
+            self::RESULT_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK,
+            self::RESULT_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK => true,
+            default => false,
+        };
+
+        $showQuestionScore = $showScore
+            && $showQuestionDetails
+            && false === $pageResultConfiguration['hideQuestionScore']
+            && !$showOnlyCorrectAnswers;
 
         return [
             'resultsDisabled' => $resultsDisabled,
-            'feedbackType' => (int) $quiz->getFeedbackType(),
+            'feedbackType' => $feedbackType,
             'reviewAnswers' => 1 === (int) $quiz->getReviewAnswers(),
             'saveCorrectAnswers' => (int) ($quiz->getSaveCorrectAnswers() ?? 0),
             'showScore' => $showScore,
             'showTotalScore' => $showScore && false === $pageResultConfiguration['hideTotalScore'],
-            'showQuestionScore' => $showScore && false === $pageResultConfiguration['hideQuestionScore'],
-            'showCorrections' => $showCorrections,
-            'showOnlyIncorrect' => $showOnlyIncorrect,
+            'showQuestionScore' => $showQuestionScore,
+            'showQuestionStatus' => $showQuestionScore,
+            'showQuestionDetails' => $showQuestionDetails,
+            'showCorrections' => $showExpectedAnswers,
+            'showExpectedAnswers' => $showExpectedAnswers,
+            'showStudentAnswers' => !$showOnlyCorrectAnswers,
+            'showOnlyCorrectAnswers' => $showOnlyCorrectAnswers,
             'showFeedback' => $showFeedback,
             'hideCorrectAnsweredQuestions' => $pageResultConfiguration['hideCorrectAnsweredQuestions'],
             'showCategoryTable' => false === $pageResultConfiguration['hideCategoryTable'],
+            'showRanking' => \in_array($resultsDisabled, [
+                self::RESULT_RANKING,
+                self::RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
+            ], true),
+            'showRadar' => self::RESULT_RADAR === $resultsDisabled,
             'isLastAllowedAttempt' => $isLastAllowedAttempt,
             'pageResultConfiguration' => $pageResultConfiguration,
         ];
     }
 
+    /**
+     * @param array<string, mixed> $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function getManagerResultVisibility(array $visibility): array
+    {
+        $visibility['showScore'] = true;
+        $visibility['showTotalScore'] = true;
+        $visibility['showQuestionScore'] = true;
+        $visibility['showQuestionStatus'] = true;
+        $visibility['showQuestionDetails'] = true;
+        $visibility['showCorrections'] = true;
+        $visibility['showExpectedAnswers'] = true;
+        $visibility['showStudentAnswers'] = true;
+        $visibility['showOnlyCorrectAnswers'] = false;
+        $visibility['showFeedback'] = true;
+
+        return $visibility;
+    }
+
     /**
      * @param array<string, mixed> $configuration
      *
@@ -567,7 +635,7 @@ private function normalizeQuestion(CQuizQuestion $question, array $rows, array $
             'parent' => $this->normalizeParentMediaQuestion($question),
             'score' => !$isStructuralContent && true === ($visibility['showQuestionScore'] ?? false) ? $questionScore : null,
             'maxScore' => !$isStructuralContent && true === ($visibility['showQuestionScore'] ?? false) ? $maxScore : null,
-            'isCorrect' => !$isStructuralContent && true === ($visibility['showQuestionScore'] ?? false) ? $isCorrect : null,
+            'isCorrect' => !$isStructuralContent && true === ($visibility['showQuestionStatus'] ?? false) ? $isCorrect : null,
             'requiresManualCorrection' => $requiresManualCorrection,
             'pendingCorrection' => $pendingCorrection,
             'canCorrect' => $canManage && $requiresManualCorrection,
@@ -675,23 +743,27 @@ private function normalizeQuestionAnswer(CQuizQuestion $question, array $rows, a
         }
 
         if (\in_array($type, [3, 27], true)) {
-            return $this->normalizeFillBlankAnswer($question, $rows, $showQuestionCorrection);
+            return $this->normalizeFillBlankAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
         if (\in_array($type, [4, 19, 24, 25], true)) {
             return $this->normalizeMatchingAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
+        if (self::DRAGGABLE === $type) {
+            return $this->normalizeDraggableAnswer($question, $rows, $visibility, $showQuestionCorrection);
+        }
+
         if (\in_array($type, [28, 29], true)) {
             return $this->normalizeDropdownAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
         if (16 === $type) {
-            return $this->normalizeCalculatedAnswer($question, $rows, $showQuestionCorrection);
+            return $this->normalizeCalculatedAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
         if (\in_array($type, [6, 26], true)) {
-            return $this->normalizeHotspotAnswer($question, $rows, $showQuestionCorrection);
+            return $this->normalizeHotspotAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
         if (5 === $type) {
@@ -747,38 +819,50 @@ private function normalizeChoiceAnswer(CQuizQuestion $question, array $rows, arr
         $degreeCertaintyChoices = $isDegreeCertainty ? $this->getSavedTrueFalseDegreeCertaintyChoices($rows) : [];
         $options = $this->getQuestionOptions($question);
         $choices = [];
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
+        $showOnlyCorrectAnswers = true === ($visibility['showOnlyCorrectAnswers'] ?? false);
+        $showFeedback = true === ($visibility['showFeedback'] ?? false);
 
         foreach ($this->getOrderedAnswers($question) as $answer) {
             $answerId = (int) $answer->getIid();
+            $isCorrectAnswer = 1 === (int) $answer->getCorrect();
+            if ($showOnlyCorrectAnswers && !$isTrueFalse && !$isCorrectAnswer) {
+                continue;
+            }
+
+            $isSelected = isset($selectedIds[$answerId]);
             $choice = [
                 'id' => $answerId,
                 'answer' => $answer->getAnswer(),
-                'selected' => isset($selectedIds[$answerId]),
+                'selected' => $showStudentAnswers && $isSelected,
             ];
 
             if ($isTrueFalse) {
                 if ($isDegreeCertainty) {
                     $selectedOption = (int) ($degreeCertaintyChoices[$answerId]['choice'] ?? 0);
                     $selectedDegree = (int) ($degreeCertaintyChoices[$answerId]['degree'] ?? 0);
-                    $choice['selectedDegreeId'] = $selectedDegree ?: null;
-                    $choice['selectedDegreeLabel'] = $this->getOptionTitle($options, $selectedDegree);
+                    $choice['selectedDegreeId'] = $showStudentAnswers && 0 < $selectedDegree ? $selectedDegree : null;
+                    $choice['selectedDegreeLabel'] = $showStudentAnswers ? $this->getOptionTitle($options, $selectedDegree) : '';
                 } else {
                     $selectedOption = $trueFalseChoices[$answerId] ?? 0;
                 }
 
-                $choice['selectedOptionId'] = $selectedOption ?: null;
-                $choice['selectedOptionLabel'] = $this->getOptionTitle($options, $selectedOption);
+                $choice['selectedOptionId'] = $showStudentAnswers && 0 < $selectedOption ? $selectedOption : null;
+                $choice['selectedOptionLabel'] = $showStudentAnswers ? $this->getOptionTitle($options, $selectedOption) : '';
             }
 
-            if ($showQuestionCorrection) {
+            if ($showExpectedAnswers) {
                 if ($isTrueFalse) {
                     $choice['correctOptionId'] = (int) $answer->getCorrect();
                     $choice['correctOptionLabel'] = $this->getOptionTitle($options, (int) $answer->getCorrect());
                 } else {
-                    $choice['correct'] = 1 === (int) $answer->getCorrect();
+                    $choice['correct'] = $isCorrectAnswer;
                 }
+            }
 
-                if (true === ($visibility['showFeedback'] ?? false) && '' !== (string) $answer->getComment()) {
+            if ($showFeedback && '' !== (string) $answer->getComment()) {
+                if ($showExpectedAnswers || $isSelected || ($showOnlyCorrectAnswers && $isCorrectAnswer)) {
                     $choice['comment'] = (string) $answer->getComment();
                 }
             }
@@ -823,23 +907,25 @@ private function getSavedTrueFalseDegreeCertaintyChoices(array $rows): array
      *
      * @return array<string, mixed>
      */
-    private function normalizeFillBlankAnswer(CQuizQuestion $question, array $rows, bool $showQuestionCorrection): array
+    private function normalizeFillBlankAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
     {
         $row = $rows[0] ?? null;
         $answer = $this->getFirstAnswer($question);
         $teacherInfo = $answer instanceof CQuizAnswer ? $this->parseFillBlankAnswer($answer->getAnswer(), false) : null;
         $studentInfo = $row instanceof TrackEAttempt ? $this->parseFillBlankAnswer($row->getAnswer(), true) : null;
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
         $blankCount = null !== $teacherInfo ? \count($teacherInfo['words']) : \count($studentInfo['student_answer'] ?? []);
         $blanks = [];
 
         for ($index = 0; $index < $blankCount; ++$index) {
             $blank = [
                 'position' => $index + 1,
-                'studentAnswer' => (string) ($studentInfo['student_answer'][$index] ?? ''),
-                'studentScore' => (string) ($studentInfo['student_score'][$index] ?? ''),
+                'studentAnswer' => $showStudentAnswers ? (string) ($studentInfo['student_answer'][$index] ?? '') : '',
+                'studentScore' => $showStudentAnswers ? (string) ($studentInfo['student_score'][$index] ?? '') : '',
             ];
 
-            if ($showQuestionCorrection && null !== $teacherInfo) {
+            if ($showExpectedAnswers && null !== $teacherInfo) {
                 $blank['correctAnswer'] = (string) ($teacherInfo['words'][$index] ?? '');
             }
 
@@ -850,6 +936,7 @@ private function normalizeFillBlankAnswer(CQuizQuestion $question, array $rows,
             'kind' => 'fill_blanks',
             'text' => (string) ($teacherInfo['text'] ?? ''),
             'blanks' => $blanks,
+            'showStudentAnswers' => $showStudentAnswers,
         ];
     }
 
@@ -865,6 +952,9 @@ private function normalizeMatchingAnswer(CQuizQuestion $question, array $rows, a
         $options = [];
         $prompts = [];
         $answers = $this->getOrderedAnswers($question);
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
+        $showFeedback = true === ($visibility['showFeedback'] ?? false);
 
         foreach ($answers as $answer) {
             $answerId = (int) $answer->getIid();
@@ -886,17 +976,21 @@ private function normalizeMatchingAnswer(CQuizQuestion $question, array $rows, a
                 continue;
             }
 
+            $hasStudentAnswer = isset($selected[$answerId]);
             $prompt = [
                 'id' => $answerId,
                 'answer' => $answer->getAnswer(),
-                'selectedOptionId' => $selected[$answerId] ?? null,
-                'selectedOptionAnswer' => isset($selected[$answerId]) ? (string) ($options[$selected[$answerId]]['answer'] ?? '') : '',
+                'selectedOptionId' => $showStudentAnswers ? ($selected[$answerId] ?? null) : null,
+                'selectedOptionAnswer' => $showStudentAnswers && $hasStudentAnswer ? (string) ($options[$selected[$answerId]]['answer'] ?? '') : '',
             ];
 
-            if ($showQuestionCorrection) {
+            if ($showExpectedAnswers) {
                 $prompt['correctOptionId'] = $correct;
                 $prompt['correctOptionAnswer'] = (string) ($options[$correct]['answer'] ?? '');
-                if (true === ($visibility['showFeedback'] ?? false) && '' !== (string) $answer->getComment()) {
+            }
+
+            if ($showFeedback && '' !== (string) $answer->getComment()) {
+                if ($showExpectedAnswers || $hasStudentAnswer) {
                     $prompt['comment'] = (string) $answer->getComment();
                 }
             }
@@ -911,6 +1005,55 @@ private function normalizeMatchingAnswer(CQuizQuestion $question, array $rows, a
         ];
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeDraggableAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
+    {
+        $savedPositions = $this->getSavedMatchingChoices($rows);
+        $studentItems = [];
+        $expectedItems = [];
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
+
+        foreach ($this->getOrderedAnswers($question) as $answer) {
+            $answerId = (int) $answer->getIid();
+            $targetPosition = (int) ($answer->getCorrect() ?? 0);
+            if (0 >= $targetPosition) {
+                continue;
+            }
+
+            $selectedPosition = $savedPositions[$answerId] ?? null;
+            $item = [
+                'id' => $answerId,
+                'answer' => $answer->getAnswer(),
+                'selectedPosition' => $selectedPosition,
+                'correctPosition' => $showQuestionCorrection ? $targetPosition : null,
+                'isCorrect' => null !== $selectedPosition && $selectedPosition === $targetPosition,
+            ];
+
+            if ($showStudentAnswers && null !== $selectedPosition) {
+                $studentItems[] = $item;
+            }
+
+            if ($showExpectedAnswers) {
+                $expectedItems[] = $item;
+            }
+        }
+
+        usort($studentItems, static fn (array $left, array $right): int => ((int) ($left['selectedPosition'] ?? 0)) <=> ((int) ($right['selectedPosition'] ?? 0)));
+        usort($expectedItems, static fn (array $left, array $right): int => ((int) ($left['correctPosition'] ?? 0)) <=> ((int) ($right['correctPosition'] ?? 0)));
+
+        return [
+            'kind' => 'draggable',
+            'orientation' => \in_array((string) $question->getExtra(), ['h', 'v'], true) ? (string) $question->getExtra() : 'h',
+            'studentItems' => $studentItems,
+            'expectedItems' => $showExpectedAnswers ? $expectedItems : [],
+        ];
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      * @param array<string, mixed>      $visibility
@@ -920,18 +1063,31 @@ private function normalizeMatchingAnswer(CQuizQuestion $question, array $rows, a
     private function normalizeDropdownAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
     {
         $selectedId = $this->getFirstSavedAnswerId($rows);
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
+        $showOnlyCorrectAnswers = true === ($visibility['showOnlyCorrectAnswers'] ?? false);
+        $showFeedback = true === ($visibility['showFeedback'] ?? false);
         $options = [];
         foreach ($this->getOrderedAnswers($question) as $answer) {
             $answerId = (int) $answer->getIid();
+            $isCorrectAnswer = 1 === (int) $answer->getCorrect();
+            if ($showOnlyCorrectAnswers && !$isCorrectAnswer) {
+                continue;
+            }
+
+            $isSelected = $answerId === $selectedId;
             $option = [
                 'id' => $answerId,
                 'answer' => $answer->getAnswer(),
-                'selected' => $answerId === $selectedId,
+                'selected' => $showStudentAnswers && $isSelected,
             ];
 
-            if ($showQuestionCorrection) {
-                $option['correct'] = 1 === (int) $answer->getCorrect();
-                if (true === ($visibility['showFeedback'] ?? false) && '' !== (string) $answer->getComment()) {
+            if ($showExpectedAnswers) {
+                $option['correct'] = $isCorrectAnswer;
+            }
+
+            if ($showFeedback && '' !== (string) $answer->getComment()) {
+                if ($showExpectedAnswers || $isSelected || ($showOnlyCorrectAnswers && $isCorrectAnswer)) {
                     $option['comment'] = (string) $answer->getComment();
                 }
             }
@@ -941,7 +1097,7 @@ private function normalizeDropdownAnswer(CQuizQuestion $question, array $rows, a
 
         return [
             'kind' => 'dropdown',
-            'selectedId' => $selectedId ?: null,
+            'selectedId' => $showStudentAnswers && 0 < $selectedId ? $selectedId : null,
             'options' => $options,
         ];
     }
@@ -951,7 +1107,7 @@ private function normalizeDropdownAnswer(CQuizQuestion $question, array $rows, a
      *
      * @return array<string, mixed>
      */
-    private function normalizeCalculatedAnswer(CQuizQuestion $question, array $rows, bool $showQuestionCorrection): array
+    private function normalizeCalculatedAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
     {
         $row = $rows[0] ?? null;
         $studentAnswer = '';
@@ -965,11 +1121,14 @@ private function normalizeCalculatedAnswer(CQuizQuestion $question, array $rows,
             ? $this->parseCalculatedTeacherAnswer((string) $teacherAnswer->getAnswer())
             : ['text' => '', 'expectedAnswer' => ''];
 
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
+
         return [
             'kind' => 'calculated',
             'text' => (string) ($parsedTeacherAnswer['text'] ?? ''),
-            'studentAnswer' => $studentAnswer,
-            'expectedAnswer' => $showQuestionCorrection ? (string) ($parsedTeacherAnswer['expectedAnswer'] ?? '') : null,
+            'studentAnswer' => $showStudentAnswers ? $studentAnswer : '',
+            'expectedAnswer' => $showExpectedAnswers ? (string) ($parsedTeacherAnswer['expectedAnswer'] ?? '') : null,
         ];
     }
 
@@ -1023,13 +1182,15 @@ private function getAnswerById(CQuizQuestion $question, int $answerId): ?CQuizAn
      *
      * @return array<string, mixed>
      */
-    private function normalizeHotspotAnswer(CQuizQuestion $question, array $rows, bool $showQuestionCorrection): array
+    private function normalizeHotspotAnswer(CQuizQuestion $question, array $rows, array $visibility, bool $showQuestionCorrection): array
     {
         $row = $rows[0] ?? null;
-        $studentPoints = $row instanceof TrackEAttempt ? $this->parseHotspotCoordinates((string) $row->getAnswer()) : [];
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
+        $studentPoints = $showStudentAnswers && $row instanceof TrackEAttempt ? $this->parseHotspotCoordinates((string) $row->getAnswer()) : [];
         $zones = [];
 
-        if ($showQuestionCorrection) {
+        if ($showExpectedAnswers) {
             foreach ($this->getOrderedAnswers($question) as $answer) {
                 $hotspotType = (string) ($answer->getHotspotType() ?: 'square');
                 if (!\in_array($hotspotType, ['square', 'circle', 'poly'], true)) {
@@ -1131,11 +1292,14 @@ private function normalizeFreeAnswer(array $rows, array $visibility): array
             ];
         }
 
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+
         return [
             'kind' => 'free_answer',
-            'studentAnswer' => $row->getAnswer(),
+            'studentAnswer' => $showStudentAnswers ? $row->getAnswer() : '',
             'teacherComment' => true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
             'marks' => (float) $row->getMarks(),
+            'showStudentAnswers' => $showStudentAnswers,
         ];
     }
 
@@ -1149,14 +1313,20 @@ private function normalizeAnnotationAnswer(CQuizQuestion $question, array $rows,
     {
         $row = $rows[0] ?? null;
 
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+        $annotationAnswer = $showStudentAnswers && $row instanceof TrackEAttempt
+            ? $this->parseAnnotationAnswer((string) $row->getAnswer())
+            : ['paths' => [], 'texts' => []];
+
         return [
             'kind' => 'annotation',
             'imageUrl' => $this->getHotspotImageUrl($question),
             'imageName' => $this->getHotspotImageName($question),
-            'paths' => $row instanceof TrackEAttempt ? $this->parseAnnotationAnswer((string) $row->getAnswer())['paths'] : [],
-            'texts' => $row instanceof TrackEAttempt ? $this->parseAnnotationAnswer((string) $row->getAnswer())['texts'] : [],
+            'paths' => $annotationAnswer['paths'],
+            'texts' => $annotationAnswer['texts'],
             'teacherComment' => $row instanceof TrackEAttempt && true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
             'marks' => $row instanceof TrackEAttempt ? (float) $row->getMarks() : 0.0,
+            'showStudentAnswers' => $showStudentAnswers,
         ];
     }
 
@@ -1243,11 +1413,14 @@ private function normalizeUploadAnswer(array $rows, array $visibility): array
             ];
         }
 
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+
         return [
             'kind' => 'upload_answer',
-            'files' => $this->normalizeAttemptFiles($row),
+            'files' => $showStudentAnswers ? $this->normalizeAttemptFiles($row) : [],
             'teacherComment' => true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
             'marks' => (float) $row->getMarks(),
+            'showStudentAnswers' => $showStudentAnswers,
         ];
     }
 
@@ -1269,11 +1442,14 @@ private function normalizeOralExpressionAnswer(array $rows, array $visibility):
             ];
         }
 
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+
         return [
             'kind' => 'oral_expression',
-            'files' => $this->normalizeAttemptFiles($row, true),
+            'files' => $showStudentAnswers ? $this->normalizeAttemptFiles($row, true) : [],
             'teacherComment' => true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
             'marks' => (float) $row->getMarks(),
+            'showStudentAnswers' => $showStudentAnswers,
         ];
     }
 
@@ -1619,6 +1795,7 @@ private function getQuestionTypeLabel(int $type): string
             12 => 'Multiple answer combination true/false',
             14 => 'Global multiple answer',
             17 => 'Unique answer with images',
+            18 => 'Sequence ordering',
             19 => 'Matching draggable',
             20 => 'Annotation',
             21 => 'Reading comprehension',
@@ -1636,31 +1813,79 @@ private function getQuestionTypeLabel(int $type): string
     }
 
     /**
-     * @return array<string, string>
+     * @return array<int, array<string, mixed>>
      */
-    private function getLegacyUrls(CQuiz $quiz, TrackEExercise $attempt, Course $course, ?Session $session, Request $request): array
+    private function getRanking(CQuiz $quiz, Course $course, ?Session $session, TrackEExercise $currentAttempt): array
     {
-        $baseParams = [
-            'exerciseId' => (int) $quiz->getIid(),
-            'cid' => (int) $course->getId(),
-            'sid' => (int) ($session?->getId() ?? 0),
-        ];
-        $resultParams = [
-            'cid' => (int) $course->getId(),
-            'sid' => (int) ($session?->getId() ?? $request->query->getInt('sid')),
-            'gid' => $request->query->getInt('gid'),
-            'exe_id' => (int) $attempt->getExeId(),
-            'learnpath_id' => (int) $attempt->getOrigLpId(),
-            'learnpath_item_id' => (int) $attempt->getOrigLpItemId(),
-            'learnpath_item_view_id' => (int) $attempt->getOrigLpItemViewId(),
-            'origin' => (string) $request->query->get('origin', ''),
-        ];
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('attempt.status = :status')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_COMPLETED)
+            ->orderBy('attempt.score', 'DESC')
+            ->addOrderBy('attempt.exeDate', 'ASC')
+        ;
 
-        return [
-            'overview' => '/main/exercise/overview.php?'.http_build_query($baseParams),
-            'legacyResult' => api_get_path(WEB_CODE_PATH).'exercise/exercise_result.php?'.http_build_query($resultParams),
-            'results' => '/main/exercise/exercise_report.php?'.http_build_query($baseParams),
-            'list' => '/main/exercise/exercise.php?'.http_build_query($baseParams),
-        ];
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $rows = $queryBuilder->getQuery()->getResult();
+        $bestAttemptsByUser = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof TrackEExercise) {
+                continue;
+            }
+
+            $userId = (int) $row->getUser()->getId();
+            if (0 >= $userId || isset($bestAttemptsByUser[$userId])) {
+                continue;
+            }
+
+            $bestAttemptsByUser[$userId] = $row;
+        }
+
+        $ranking = [];
+        $position = 0;
+        $lastScore = null;
+        foreach (array_values($bestAttemptsByUser) as $index => $row) {
+            $score = (float) $row->getScore();
+            if (null === $lastScore || $score < $lastScore) {
+                $position = $index + 1;
+            }
+            $lastScore = $score;
+
+            $ranking[] = [
+                'position' => $position,
+                'userId' => (int) $row->getUser()->getId(),
+                'user' => $this->getUserDisplayName($row->getUser()),
+                'score' => $score,
+                'maxScore' => (float) $row->getMaxScore(),
+                'date' => $row->getExeDate()->format(DateTimeInterface::ATOM),
+                'currentUser' => (int) $row->getUser()->getId() === (int) $currentAttempt->getUser()->getId(),
+            ];
+        }
+
+        return $ranking;
     }
+
+    private function getUserDisplayName(User $user): string
+    {
+        $username = method_exists($user, 'getUsername') ? trim((string) $user->getUsername()) : '';
+        if ('' !== $username) {
+            return $username;
+        }
+
+        return 'User #'.(int) $user->getId();
+    }
+
 }
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index db32a8e202c..7e7440698bf 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -104,8 +104,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $uploadedFiles = $this->getUploadedFiles($request);
-        $postedNodeIds = $this->getPostedResourceNodeIds($request);
-        if ([] === $uploadedFiles && [] === $postedNodeIds) {
+        if ([] === $uploadedFiles) {
             throw new BadRequestHttpException('A file is required for this answer.');
         }
 
@@ -114,12 +113,6 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $this->validateUploadedFileForQuestion($uploadedFile, $question);
             $resourceNodes[] = $this->createAttemptFileResourceNode($uploadedFile, $user);
         }
-        foreach ($postedNodeIds as $postedNodeId) {
-            $node = $this->entityManager->getRepository(ResourceNode::class)->find($postedNodeId);
-            if ($node instanceof ResourceNode) {
-                $resourceNodes[] = $node;
-            }
-        }
 
         if ([] === $resourceNodes) {
             throw new BadRequestHttpException('No valid uploaded file could be attached to this answer.');
@@ -351,27 +344,6 @@ private function getUploadedFiles(Request $request): array
         return array_values(array_filter($files, static fn (mixed $item): bool => $item instanceof UploadedFile));
     }
 
-    /**
-     * @return array<int, int>
-     */
-    private function getPostedResourceNodeIds(Request $request): array
-    {
-        $value = $request->request->all('resourceNodeIds');
-        if ([] === $value) {
-            $singleValue = $request->request->get('resourceNodeId');
-            $value = null === $singleValue ? [] : [$singleValue];
-        }
-
-        $nodeIds = [];
-        foreach ($value as $item) {
-            $nodeId = (int) $item;
-            if (0 < $nodeId && !\in_array($nodeId, $nodeIds, true)) {
-                $nodeIds[] = $nodeId;
-            }
-        }
-
-        return $nodeIds;
-    }
 
     private function validateUploadedFileForQuestion(UploadedFile $uploadedFile, CQuizQuestion $question): void
     {

From 1bdfdafcd4cbcdb51e4d855780a19c0f461f3d54 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Sun, 14 Jun 2026 23:57:57 -0500
Subject: [PATCH 04/21] Exercise: Complete exercise Vue migration parity

---
 assets/vue/App.vue                            |  33 +-
 .../components/basecomponents/ChamiloIcons.js |   5 +
 assets/vue/components/course/CourseTool.vue   |  92 ++-
 assets/vue/router/exercise.js                 |  32 +-
 assets/vue/router/index.js                    |  11 +-
 assets/vue/services/exerciseService.js        |  64 +-
 assets/vue/views/course/CourseHome.vue        |  73 +-
 .../exercise/ExerciseAiAikenGeneratorView.vue | 700 ++++++++++++++++++
 .../exercise/ExerciseCategoryManagerView.vue  |  33 +-
 .../exercise/ExerciseConfigurationView.vue    | 110 ++-
 .../ExerciseGlobalQuestionSelectorView.vue    | 197 +++++
 .../vue/views/exercise/ExerciseListView.vue   | 401 +++++++++-
 .../views/exercise/ExerciseOverviewView.vue   | 171 ++++-
 .../vue/views/exercise/ExercisePlayerView.vue | 488 ++++++++++--
 .../exercise/ExerciseQuestionBankView.vue     | 214 ++++--
 .../exercise/ExerciseQuestionEditorView.vue   | 125 +++-
 .../exercise/ExerciseQuestionSelectorView.vue | 178 ++++-
 .../vue/views/exercise/ExerciseResultView.vue | 700 +++++++++++++++++-
 public/main/gradebook/exercise_jump.php       |  26 +-
 public/main/inc/lib/exercise.lib.php          |  90 +++
 public/main/lp/learnpath.class.php            |  44 +-
 .../Exercise/ExerciseAiAikenGenerator.php     | 101 +++
 .../Exercise/ExerciseConfiguration.php        |  12 +
 .../Exercise/ExerciseGlobalQuestion.php       |  65 ++
 .../Exercise/ExerciseLearningPathItem.php     |  60 ++
 .../ApiResource/Exercise/ExerciseList.php     |  12 +
 .../ApiResource/Exercise/ExerciseQuestion.php |   9 +
 .../Exercise/ExerciseQuestionBank.php         |  41 +
 .../Exercise/ExerciseQuestionEditor.php       |  70 ++
 .../Exercise/ExerciseRuntimeAnswer.php        |   3 +
 .../Exercise/ExerciseRuntimeAttempt.php       |   5 +-
 .../Exercise/ExerciseRuntimeFinish.php        |  11 +
 .../Exercise/ExerciseRuntimeResult.php        |  12 +
 src/CoreBundle/Controller/AiController.php    |   6 +
 .../Controller/CourseController.php           |  75 +-
 src/CoreBundle/Entity/TrackEExercise.php      |  12 +
 .../Repository/ResourceLinkRepository.php     |   2 +-
 .../ExerciseAiAikenGeneratorProvider.php      | 312 ++++++++
 .../ExerciseCategoryManagementProcessor.php   |   2 +-
 .../ExerciseCategoryManagementProvider.php    |  27 +-
 .../ExerciseConfigurationProcessor.php        |  83 ++-
 .../ExerciseConfigurationProvider.php         |  69 +-
 .../ExerciseGlobalQuestionProvider.php        | 213 ++++++
 .../ExerciseLearningPathItemProcessor.php     | 356 +++++++++
 .../Exercise/ExerciseListActionProcessor.php  | 372 +++++++++-
 .../State/Exercise/ExerciseListProvider.php   | 239 +++++-
 .../Exercise/ExerciseLiveResultsProvider.php  |   2 +-
 .../Exercise/ExerciseOverviewProvider.php     |  16 +-
 .../ExerciseQuestionActionProcessor.php       |  34 +-
 .../ExerciseQuestionBankProcessor.php         | 145 +++-
 .../Exercise/ExerciseQuestionBankProvider.php |  83 ++-
 .../ExerciseQuestionEditorProcessor.php       | 219 +++++-
 .../ExerciseQuestionEditorProvider.php        | 200 ++++-
 .../ExerciseQuestionImportProcessor.php       |  11 +-
 .../Exercise/ExerciseQuestionProvider.php     |  32 +-
 .../ExerciseQuestionStatsProvider.php         |   2 +-
 .../ExerciseReportByQuestionProvider.php      |   2 +-
 .../ExerciseRuntimeAnswerProcessor.php        | 149 +++-
 .../ExerciseRuntimeAttemptCloseProcessor.php  |   2 +-
 .../ExerciseRuntimeAttemptDeleteProcessor.php |   2 +-
 .../ExerciseRuntimeAttemptProcessor.php       | 245 +++++-
 ...ciseRuntimeAttemptRecalculateProcessor.php |   2 +-
 .../ExerciseRuntimeCorrectionProcessor.php    |   2 +-
 .../ExerciseRuntimeFinishProcessor.php        | 326 +++++++-
 .../Exercise/ExerciseRuntimeProvider.php      | 231 +++++-
 ...erciseRuntimeReportBulkActionProcessor.php |   2 +-
 .../ExerciseRuntimeReportProvider.php         |   2 +-
 .../ExerciseRuntimeResultProvider.php         | 116 ++-
 .../ExerciseRuntimeUploadAnswerProcessor.php  |  37 +-
 69 files changed, 7387 insertions(+), 431 deletions(-)
 create mode 100644 assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue
 create mode 100644 assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseAiAikenGenerator.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseGlobalQuestion.php
 create mode 100644 src/CoreBundle/ApiResource/Exercise/ExerciseLearningPathItem.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseAiAikenGeneratorProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseGlobalQuestionProvider.php
 create mode 100644 src/CoreBundle/State/Exercise/ExerciseLearningPathItemProcessor.php

diff --git a/assets/vue/App.vue b/assets/vue/App.vue
index 650a5837654..39cba621c7a 100644
--- a/assets/vue/App.vue
+++ b/assets/vue/App.vue
@@ -225,6 +225,37 @@ const isEmbeddedContext = computed(() => {
   return isPickerContext.value || isIframeContext.value || isDialogContext.value
 })
 
+const isTruthyQueryValue = (value) => {
+  return ["1", "true", "yes", "on"].includes(String(value || "").toLowerCase())
+}
+
+const isLearnpathEmbeddedRoute = computed(() => {
+  const qp = queryParams.value
+  const origin = String(qp.get("origin") || "").toLowerCase()
+
+  if (qp.has("lp_id") && "view" === qp.get("action")) {
+    return true
+  }
+
+  if ("learnpath" !== origin) {
+    return false
+  }
+
+  // Exercise creation launched from the LP add-item screen must keep the full
+  // course layout. Only the runtime/result embedded inside the LP player needs
+  // the empty layout to avoid duplicated Chamilo menus.
+  if (isTruthyQueryValue(qp.get("returnToLp"))) {
+    return false
+  }
+
+  return (
+    qp.has("lp_init") ||
+    qp.has("learnpath_id") ||
+    qp.has("learnpath_item_id") ||
+    qp.has("learnpath_item_view_id")
+  )
+})
+
 const layout = computed(() => {
   if (showAccessUrlChosserLayout.value) {
     return AccessUrlChooserLayout
@@ -242,7 +273,7 @@ const layout = computed(() => {
     return EmptyLayout
   }
 
-  if ((qp.has("lp_id") && "view" === qp.get("action")) || (qp.has("origin") && "learnpath" === qp.get("origin"))) {
+  if (isLearnpathEmbeddedRoute.value) {
     return EmptyLayout
   }
 
diff --git a/assets/vue/components/basecomponents/ChamiloIcons.js b/assets/vue/components/basecomponents/ChamiloIcons.js
index eea388bd96a..b5898e65a9c 100644
--- a/assets/vue/components/basecomponents/ChamiloIcons.js
+++ b/assets/vue/components/basecomponents/ChamiloIcons.js
@@ -16,6 +16,7 @@ export const chamiloIconToClass = {
   "back": "mdi mdi-arrow-left-bold-box",
   "bug-check": "",
   "bug-outline": "",
+  "broom": "mdi mdi-broom",
   "catalogue-add": "mdi mdi-book-plus",
   "catalogue-remove": "mdi mdi-book-minus-outline",
   "calendar-plus": "mdi mdi-calendar-plus",
@@ -102,6 +103,9 @@ export const chamiloIconToClass = {
   "reply": "mdi mdi-reply",
   "reply-all": "mdi mdi-reply-all",
   "restart": "mdi mdi-restart",
+  "rocket": "mdi mdi-rocket",
+  "rocket-launch": "mdi mdi-rocket-launch",
+  "rocket-launch-outline": "mdi mdi-rocket-launch-outline",
   "autolunch": "mdi mdi-rocket-launch",
   "autolunch-off": "mdi mdi-rocket-launch-outline",
   "select-all": "mdi mdi-select-group",
@@ -150,6 +154,7 @@ export const chamiloIconToClass = {
   "account-cancel": "mdi mdi-account-cancel",
   "zip-pack": "mdi mdi-archive-arrow-down",
   "zip-unpack": "mdi mdi-archive-arrow-up",
+  "clean-all": "mdi mdi-broom",
   "clear-all": "mdi mdi-broom",
   "qrcode": "mdi mdi-qrcode",
   "minus": "mdi mdi-minus",
diff --git a/assets/vue/components/course/CourseTool.vue b/assets/vue/components/course/CourseTool.vue
index b7793ebc47a..3bbd5e719d9 100644
--- a/assets/vue/components/course/CourseTool.vue
+++ b/assets/vue/components/course/CourseTool.vue
@@ -3,8 +3,8 @@
     <BaseAppLink
       :aria-labelledby="`course-tool-${tool.iid}`"
       :class="cardCustomClass"
-      :to="tool.to"
-      :url="tool.url"
+      :to="resolvedToolTo"
+      :url="resolvedToolUrl"
       class="course-tool__link hover:primary-gradient"
     >
       <svg
@@ -29,8 +29,8 @@
     <BaseAppLink
       :id="`course-tool-${tool.iid}`"
       :class="titleCustomClass"
-      :to="tool.to"
-      :url="tool.url"
+      :to="resolvedToolTo"
+      :url="resolvedToolUrl"
       class="course-tool__title"
     >
       {{ $t(tool.tool.titleToShow) }}
@@ -80,7 +80,7 @@ import { useCidReqStore } from "../../store/cidReq"
 const platformConfigStore = usePlatformConfig()
 const cidReqStore = useCidReqStore()
 
-const { session } = storeToRefs(cidReqStore)
+const { course, session } = storeToRefs(cidReqStore)
 const { getSetting } = storeToRefs(platformConfigStore)
 
 const isSorting = inject("isSorting")
@@ -126,5 +126,85 @@ const titleCustomClass = computed(() => {
   }
   return ""
 })
-const isVisible = computed(() => props.tool.resourceNode.resourceLinks[0].visibility === 2)
+
+function extractIdFromIri(value) {
+  if (!value) {
+    return 0
+  }
+
+  const match = String(value).match(/\/(\d+)$/)
+
+  return match ? Number(match[1]) : 0
+}
+
+function getCourseResourceNodeId() {
+  const courseNode = course.value?.resourceNode
+  const toolNode = props.tool?.resourceNode
+
+  return (
+    Number(courseNode?.id) ||
+    extractIdFromIri(courseNode?.["@id"]) ||
+    Number(toolNode?.parent?.id) ||
+    extractIdFromIri(toolNode?.parent?.["@id"]) ||
+    Number(toolNode?.id) ||
+    extractIdFromIri(toolNode?.["@id"]) ||
+    0
+  )
+}
+
+const isExerciseTool = computed(() => {
+  const values = [
+    props.tool?.title,
+    props.tool?.titleToShow,
+    props.tool?.name,
+    props.tool?.tool?.title,
+    props.tool?.tool?.titleToShow,
+    props.tool?.tool?.name,
+    props.tool?.url,
+  ]
+    .filter(Boolean)
+    .join(" ")
+    .toLowerCase()
+
+  return (
+    values.includes("quiz") ||
+    values.includes("exercise/exercise.php") ||
+    values.includes("/main/exercise/exercise.php") ||
+    values.includes("tests") ||
+    values.includes("exercises")
+  )
+})
+
+const exerciseToolRoute = computed(() => {
+  if (!isExerciseTool.value) {
+    return null
+  }
+
+  const nodeId = getCourseResourceNodeId()
+  const courseId = Number(course.value?.id) || Number(cidReqStore.course?.id) || 0
+
+  if (nodeId <= 0 || courseId <= 0) {
+    return null
+  }
+
+  return {
+    name: "ExerciseList",
+    params: { node: nodeId },
+    query: {
+      cid: courseId,
+      sid: Number(session.value?.id) || 0,
+      gid: 0,
+    },
+  }
+})
+
+const resolvedToolTo = computed(() => {
+  return exerciseToolRoute.value || props.tool.to || null
+})
+
+const resolvedToolUrl = computed(() => {
+  return exerciseToolRoute.value ? null : props.tool.url || null
+})
+
+const isVisible = computed(() => props.tool?.resourceNode?.resourceLinks?.[0]?.visibility === 2)
 </script>
diff --git a/assets/vue/router/exercise.js b/assets/vue/router/exercise.js
index 23fed19e27e..a467988d5e1 100644
--- a/assets/vue/router/exercise.js
+++ b/assets/vue/router/exercise.js
@@ -57,6 +57,12 @@ export default {
       component: () => import("../views/exercise/ExerciseQuestionImportView.vue"),
       props: { importType: "qti2" },
     },
+    {
+      name: "ExerciseAiAikenGenerator",
+      path: "aiken-generator",
+      meta: { breadcrumb: "AI Aiken generator" },
+      component: () => import("../views/exercise/ExerciseAiAikenGeneratorView.vue"),
+    },
     {
       name: "ExerciseOverview",
       path: ":exerciseId/overview",
@@ -105,6 +111,30 @@ export default {
       meta: { breadcrumb: "Live results" },
       component: () => import("../views/exercise/ExerciseLiveResultsView.vue"),
     },
+    {
+      name: "ExerciseGlobalQuestionSelector",
+      path: "questions/create",
+      meta: { breadcrumb: "Add a question" },
+      component: () => import("../views/exercise/ExerciseGlobalQuestionSelectorView.vue"),
+    },
+    {
+      name: "ExerciseGlobalQuestionCreate",
+      path: "questions/create/:questionType",
+      meta: { breadcrumb: "Create question" },
+      component: () => import("../views/exercise/ExerciseQuestionEditorView.vue"),
+    },
+    {
+      name: "ExerciseQuestionPool",
+      path: "questions/recycle",
+      meta: { breadcrumb: "Recycle existing questions" },
+      component: () => import("../views/exercise/ExerciseQuestionBankView.vue"),
+    },
+    {
+      name: "ExerciseGlobalQuestionEdit",
+      path: "questions/:questionId/edit",
+      meta: { breadcrumb: "Edit question" },
+      component: () => import("../views/exercise/ExerciseQuestionEditorView.vue"),
+    },
     {
       name: "ExerciseQuestions",
       path: ":exerciseId/questions",
@@ -114,7 +144,7 @@ export default {
     {
       name: "ExerciseQuestionBank",
       path: ":exerciseId/question-bank",
-      meta: { breadcrumb: "Question bank" },
+      meta: { breadcrumb: "Recycle existing questions" },
       component: () => import("../views/exercise/ExerciseQuestionBankView.vue"),
     },
     {
diff --git a/assets/vue/router/index.js b/assets/vue/router/index.js
index 16b2ba4c2f8..ac6e8a5da1f 100644
--- a/assets/vue/router/index.js
+++ b/assets/vue/router/index.js
@@ -217,18 +217,21 @@ async function courseHomeBeforeEnter(to) {
 
     // Exercise auto-launch
     const exerciseAutoLaunch = parseInt(courseSettingsStore.getSetting("enable_exercise_auto_launch"), 10) || 0
+    const exerciseResourceNodeId = cidReqStore.course?.resourceNode?.id
+    const gid = "&gid=0"
 
-    if (exerciseAutoLaunch === 2) {
+    if (exerciseAutoLaunch === 2 && exerciseResourceNodeId) {
       sessionStorage.setItem(autoLaunchKey, "true")
-      window.location.href = `/main/exercise/exercise.php?cid=${courseId}` + sid
+      window.location.href = `/resources/exercise/${exerciseResourceNodeId}/?cid=${courseId}` + sid + gid
 
       return false
     } else if (exerciseAutoLaunch === 1) {
       const exerciseId = await courseService.getAutoLaunchExerciseId(courseId, sessionId)
 
-      if (exerciseId) {
+      if (exerciseId && exerciseResourceNodeId) {
         sessionStorage.setItem(autoLaunchKey, "true")
-        window.location.href = `/main/exercise/overview.php?exerciseId=${exerciseId}&cid=${courseId}` + sid
+        window.location.href =
+          `/resources/exercise/${exerciseResourceNodeId}/${exerciseId}/overview?cid=${courseId}` + sid + gid
 
         return false
       }
diff --git a/assets/vue/services/exerciseService.js b/assets/vue/services/exerciseService.js
index e56d6342d6b..7df26e3d939 100644
--- a/assets/vue/services/exerciseService.js
+++ b/assets/vue/services/exerciseService.js
@@ -72,6 +72,10 @@ export default {
     return await baseService.get(`/api/exercise/questions/${exerciseId}`, cleanParams(params), exerciseRequestConfig())
   },
 
+  async getExerciseGlobalQuestionTypes(params = {}) {
+    return await baseService.get('/api/exercise/questions/global', cleanParams(params), exerciseRequestConfig())
+  },
+
   async getExerciseRuntime(params = {}, exerciseId) {
     return await baseService.get(`/api/exercise/runtime/${exerciseId}`, cleanParams(params), exerciseRequestConfig())
   },
@@ -241,6 +245,31 @@ export default {
     )
   },
 
+  async getExerciseGlobalQuestionEditor(params = {}, questionType = null) {
+    const queryParams = { ...params }
+
+    if (questionType !== null && questionType !== undefined) {
+      queryParams.type = questionType
+    }
+
+    const endpoint = questionType !== null && questionType !== undefined
+      ? '/api/exercise/questions/global/editor'
+      : `/api/exercise/questions/global/editor/${params.questionId}`
+
+    delete queryParams.questionId
+
+    return await baseService.get(endpoint, cleanParams(queryParams), exerciseRequestConfig())
+  },
+
+  async saveExerciseGlobalQuestion(payload, params = {}, questionId = null) {
+    const queryString = buildQueryString(params)
+    const endpoint = questionId
+      ? `/api/exercise/questions/global/editor/${questionId}${queryString}`
+      : `/api/exercise/questions/global/editor${queryString}`
+
+    return await baseService.post(endpoint, payload, {}, exerciseRequestConfig())
+  },
+
   async getExerciseQuestionEditor(params = {}, exerciseId, questionId = null, questionType = null) {
     const queryParams = { ...params }
 
@@ -275,21 +304,44 @@ export default {
     )
   },
 
-  async getExerciseQuestionBank(params = {}, exerciseId) {
-    return await baseService.get(`/api/exercise/questions/${exerciseId}/bank`, cleanParams(params), exerciseRequestConfig())
-  },
-
-  async saveExerciseQuestionBankAction(payload, params = {}, exerciseId) {
+  async attachExerciseToLearningPath(payload = {}, params = {}, exerciseId) {
     const queryString = buildQueryString(params)
 
     return await baseService.post(
-      `/api/exercise/questions/${exerciseId}/bank/action${queryString}`,
+      `/api/exercise/questions/${exerciseId}/learning-path-item${queryString}`,
       payload,
       {},
       exerciseRequestConfig(),
     )
   },
 
+  async getExerciseQuestionBank(params = {}, exerciseId = null) {
+    const endpoint = exerciseId ? `/api/exercise/questions/${exerciseId}/bank` : '/api/exercise/questions/bank'
+
+    return await baseService.get(endpoint, cleanParams(params), exerciseRequestConfig())
+  },
+
+  async saveExerciseQuestionBankAction(payload, params = {}, exerciseId = null) {
+    const queryString = buildQueryString(params)
+    const endpoint = exerciseId
+      ? `/api/exercise/questions/${exerciseId}/bank/action${queryString}`
+      : `/api/exercise/questions/bank/action${queryString}`
+
+    return await baseService.post(endpoint, payload, {}, exerciseRequestConfig())
+  },
+
+  async getExerciseAiAikenGenerator(params = {}) {
+    return await baseService.get("/api/exercise/ai-aiken-generator", cleanParams(params), exerciseRequestConfig())
+  },
+
+  async generateExerciseAikenFromTopic(payload = {}) {
+    return await baseService.post("/ai/generate_aiken", payload, {}, exerciseRequestConfig())
+  },
+
+  async generateExerciseAikenFromDocument(payload = {}) {
+    return await baseService.post("/ai/generate_aiken_from_document", payload, {}, exerciseRequestConfig())
+  },
+
   async getExerciseQuestionImport(importType, params = {}) {
     return await baseService.get(`/api/exercise/import/${importType}`, cleanParams(params), exerciseRequestConfig())
   },
diff --git a/assets/vue/views/course/CourseHome.vue b/assets/vue/views/course/CourseHome.vue
index 101949c3c81..b5b47c90bd8 100644
--- a/assets/vue/views/course/CourseHome.vue
+++ b/assets/vue/views/course/CourseHome.vue
@@ -368,6 +368,73 @@ const courseSettingsStore = useCourseSettings()
 
 const TOOL_VISIBILITY_VISIBLE = 2
 
+function extractIdFromIri(value) {
+  if (!value) {
+    return 0
+  }
+
+  const match = String(value).match(/\/(\d+)$/)
+
+  return match ? Number(match[1]) : 0
+}
+
+function getCourseResourceNodeId() {
+  return Number(course.value?.resourceNode?.id) || extractIdFromIri(course.value?.resourceNode?.["@id"])
+}
+
+function getCourseContextQuery() {
+  return {
+    cid: Number(course.value?.id) || 0,
+    sid: Number(session.value?.id) || 0,
+    gid: 0,
+  }
+}
+
+function isExerciseTool(tool) {
+  const toolTitle = String(tool?.title || tool?.tool?.title || "").toLowerCase()
+  const toolUrl = String(tool?.url || "").toLowerCase()
+
+  return ["quiz", "exercise", "exercises"].includes(toolTitle) || toolUrl.includes("/main/exercise/exercise.php") || toolUrl.includes("exercise/exercise.php")
+}
+
+function getExerciseToolUrl() {
+  const nodeId = getCourseResourceNodeId()
+
+  if (nodeId <= 0) {
+    return null
+  }
+
+  const query = getCourseContextQuery()
+  const params = new URLSearchParams()
+
+  params.set("cid", String(query.cid))
+  params.set("sid", String(query.sid))
+  params.set("gid", String(query.gid))
+
+  return `/resources/exercise/${nodeId}/?${params.toString()}`
+}
+
+function normalizeToolNavigation(tool) {
+  if (!isExerciseTool(tool)) {
+    if (routerTools.includes(tool.title)) {
+      tool.to = tool.url
+    }
+
+    return tool
+  }
+
+  const exerciseUrl = getExerciseToolUrl()
+
+  if (!exerciseUrl) {
+    return tool
+  }
+
+  tool.to = null
+  tool.url = exerciseUrl
+
+  return tool
+}
+
 function getToolVisibility(tool) {
   return tool?.resourceNode?.resourceLinks?.[0]?.visibility
 }
@@ -437,11 +504,7 @@ async function loadCourseTools(showSkeleton = true) {
     const cTools = await courseService.loadCTools(course.value.id, session.value?.id)
 
     const normalizedTools = cTools.map((rawTool) => {
-      const tool = { ...rawTool }
-
-      if (routerTools.includes(tool.title)) {
-        tool.to = tool.url
-      }
+      const tool = normalizeToolNavigation({ ...rawTool })
 
       // Convenience flag for UI states (e.g. customize mode)
       tool.isEnabled =
diff --git a/assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue b/assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue
new file mode 100644
index 00000000000..6d1954140bf
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue
@@ -0,0 +1,700 @@
+<template>
+  <section class="space-y-6">
+    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+      <BaseButton
+        :label="t('Back to Tests tool')"
+        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <section class="space-y-1">
+      <h1 class="text-xl font-semibold text-gray-90">
+        {{ t("AI Aiken generator") }}
+      </h1>
+      <p class="text-sm text-gray-600">
+        {{ t("Generate an Aiken quiz from a topic or from one course document.") }}
+      </p>
+    </section>
+
+    <div
+      v-if="errorMessage"
+      ref="errorAlert"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+      role="alert"
+      tabindex="-1"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <div
+      v-if="successMessage"
+      ref="successAlert"
+      class="rounded-xl border border-success/30 bg-success/10 p-4 text-sm text-success"
+      role="status"
+      tabindex="-1"
+    >
+      <p class="font-semibold">{{ successMessage }}</p>
+      <p
+        v-if="importedQuestionCount > 0"
+        class="mt-1"
+      >
+        {{ t("Imported questions") }}: {{ importedQuestionCount }}
+      </p>
+      <div
+        v-if="createdExerciseId"
+        class="mt-3 flex flex-wrap gap-2"
+      >
+        <BaseButton
+          :label="t('Edit questions')"
+          icon="edit"
+          type="primary"
+          :route="{
+            name: 'ExerciseQuestions',
+            params: { ...route.params, exerciseId: createdExerciseId },
+            query: getContextParams(),
+          }"
+        />
+        <BaseButton
+          :label="t('Configure')"
+          icon="settings"
+          type="secondary"
+          :route="{
+            name: 'ExerciseEdit',
+            params: { ...route.params, exerciseId: createdExerciseId },
+            query: getContextParams(),
+          }"
+        />
+      </div>
+    </div>
+
+    <div
+      v-if="isLoadingConfig"
+      class="rounded-xl border border-gray-20 bg-white p-6 text-sm text-gray-600 shadow-sm"
+    >
+      {{ t("Loading") }}...
+    </div>
+
+    <div
+      v-else-if="!config.enabled"
+      class="rounded-xl border border-yellow-200 bg-yellow-50 p-4 text-sm text-yellow-800"
+    >
+      {{ t(config.message || "No AI text providers configured.") }}
+    </div>
+
+    <template v-else>
+      <div class="rounded-xl border border-gray-20 bg-white p-2 shadow-sm">
+        <div class="flex flex-wrap gap-2">
+          <BaseButton
+            :label="t('Test from topic')"
+            :type="activeTab === 'topic' ? 'primary' : 'plain'"
+            @click="activeTab = 'topic'"
+          />
+          <BaseButton
+            v-if="hasDocumentTab"
+            :label="t('Test from document')"
+            :type="activeTab === 'document' ? 'primary' : 'plain'"
+            @click="activeTab = 'document'"
+          />
+        </div>
+      </div>
+
+      <form
+        v-if="activeTab === 'topic'"
+        class="space-y-6 rounded-xl border border-gray-20 bg-white p-6 shadow-sm"
+        @submit.prevent="generateFromTopic"
+      >
+        <div>
+          <h2 class="text-lg font-semibold text-gray-90">
+            {{ t("Generate from topic") }}
+          </h2>
+          <p class="mt-1 text-sm text-gray-600">
+            {{ t("Use a topic prompt to generate a new Aiken questionnaire.") }}
+          </p>
+        </div>
+
+        <div class="grid gap-4 md:grid-cols-2">
+          <BaseInputText
+            id="aiken-topic-exercise-title"
+            v-model="topicForm.exerciseTitle"
+            :label="t('Quiz title')"
+            name="exerciseTitle"
+          />
+          <BaseInputText
+            id="aiken-topic-prompt"
+            v-model="topicForm.topic"
+            :label="t('Questions topic')"
+            name="quizName"
+          />
+          <BaseInputText
+            id="aiken-topic-count"
+            v-model="topicForm.numberOfQuestions"
+            :label="t('Number of questions')"
+            name="numberOfQuestions"
+            type="number"
+          />
+          <BaseSelect
+            id="aiken-topic-question-type"
+            v-model="topicForm.questionType"
+            :label="t('Question type')"
+            name="questionType"
+            :options="questionTypeOptions"
+            option-label="label"
+            option-value="value"
+          />
+          <BaseSelect
+            v-if="textProviderOptions.length > 1"
+            id="aiken-topic-provider"
+            v-model="topicForm.provider"
+            class="md:col-span-2"
+            :label="t('AI provider')"
+            name="aiProvider"
+            :options="textProviderOptions"
+            option-label="label"
+            option-value="value"
+          />
+          <div
+            v-else-if="textProviderOptions.length === 1"
+            class="rounded-xl border border-gray-20 bg-gray-10 p-4 text-sm text-gray-700 md:col-span-2"
+          >
+            <span class="font-semibold">{{ t("AI provider") }}:</span>
+            {{ textProviderOptions[0].label }}
+          </div>
+        </div>
+
+        <div class="flex justify-end">
+          <BaseButton
+            :is-loading="isGenerating"
+            :is-submit="true"
+            :label="t('Generate Aiken')"
+            :icon="safeIcon('robot', 'settings')"
+            type="success"
+          />
+        </div>
+      </form>
+
+      <form
+        v-if="activeTab === 'document' && hasDocumentTab"
+        class="space-y-6 rounded-xl border border-gray-20 bg-white p-6 shadow-sm"
+        @submit.prevent="generateFromDocument"
+      >
+        <div>
+          <h2 class="text-lg font-semibold text-gray-90">
+            {{ t("Generate from document") }}
+          </h2>
+          <p class="mt-1 text-sm text-gray-600">
+            {{ t("Select one course document and generate questions based only on its contents.") }}
+          </p>
+        </div>
+
+        <div class="grid gap-4 md:grid-cols-2">
+          <BaseInputText
+            id="aiken-document-exercise-title"
+            v-model="documentForm.exerciseTitle"
+            :label="t('Quiz title')"
+            name="documentExerciseTitle"
+          />
+          <BaseInputText
+            id="aiken-document-topic"
+            v-model="documentForm.topic"
+            :label="t('Questions topic')"
+            name="documentTopic"
+          />
+          <BaseInputText
+            id="aiken-document-count"
+            v-model="documentForm.numberOfQuestions"
+            :label="t('Number of questions')"
+            name="documentNumberOfQuestions"
+            type="number"
+          />
+          <BaseSelect
+            id="aiken-document-question-type"
+            v-model="documentForm.questionType"
+            :label="t('Question type')"
+            name="documentQuestionType"
+            :options="questionTypeOptions"
+            option-label="label"
+            option-value="value"
+          />
+          <BaseSelect
+            v-if="documentProviderOptions.length > 1"
+            id="aiken-document-provider"
+            v-model="documentForm.provider"
+            class="md:col-span-2"
+            :label="t('AI provider')"
+            name="documentAiProvider"
+            :options="documentProviderOptions"
+            option-label="label"
+            option-value="value"
+          />
+          <div
+            v-else-if="documentProviderOptions.length === 1"
+            class="rounded-xl border border-gray-20 bg-gray-10 p-4 text-sm text-gray-700 md:col-span-2"
+          >
+            <span class="font-semibold">{{ t("AI provider") }}:</span>
+            {{ documentProviderOptions[0].label }}
+          </div>
+        </div>
+
+        <div class="space-y-3 rounded-xl border border-gray-20 bg-gray-10 p-4">
+          <div class="flex flex-wrap items-center justify-between gap-3">
+            <div>
+              <h3 class="text-base font-semibold text-gray-90">
+                {{ t("Select a document") }}
+              </h3>
+              <p class="text-sm text-gray-600">
+                {{ t("Only supported documents will be listed here.") }}
+              </p>
+            </div>
+            <BaseInputText
+              id="aiken-document-search"
+              v-model="documentSearch"
+              :label="t('Search')"
+              name="documentSearch"
+            />
+          </div>
+
+          <div
+            v-if="filteredDocuments.length === 0"
+            class="rounded-xl border border-dashed border-gray-30 bg-white p-6 text-center text-sm text-gray-600"
+          >
+            {{ t("No documents available.") }}
+          </div>
+          <div
+            v-else
+            class="max-h-80 space-y-2 overflow-y-auto"
+          >
+            <label
+              v-for="documentItem in filteredDocuments"
+              :key="documentItem.resourceFileId"
+              class="flex cursor-pointer items-start gap-3 rounded-xl border border-gray-20 bg-white px-4 py-3 hover:border-primary"
+            >
+              <input
+                v-model="documentForm.resourceFileId"
+                class="mt-1 h-4 w-4 rounded border-gray-30"
+                name="resourceFileId"
+                type="radio"
+                :value="Number(documentItem.resourceFileId)"
+                @change="documentForm.documentTitle = documentItem.title || documentItem.filename || ''"
+              />
+              <span class="min-w-0 flex-1">
+                <span class="block truncate text-sm font-semibold text-gray-90">
+                  {{ documentItem.title || documentItem.filename }}
+                </span>
+                <span class="mt-1 flex flex-wrap gap-2 text-xs text-gray-500">
+                  <span>{{ String(documentItem.extension || '').toUpperCase() }}</span>
+                  <span v-if="documentItem.filename">{{ documentItem.filename }}</span>
+                </span>
+              </span>
+            </label>
+          </div>
+        </div>
+
+        <div class="flex justify-end">
+          <BaseButton
+            :is-loading="isGenerating"
+            :is-submit="true"
+            :label="t('Generate Aiken')"
+            :icon="safeIcon('robot', 'settings')"
+            type="success"
+          />
+        </div>
+      </form>
+
+      <section
+        v-if="generatedAikenText"
+        ref="generatedContentSection"
+        class="space-y-4 rounded-xl border border-gray-20 bg-white p-6 shadow-sm"
+        tabindex="-1"
+      >
+        <div>
+          <h2 class="text-lg font-semibold text-gray-90">
+            {{ t("Generated Aiken content") }}
+          </h2>
+          <p class="mt-1 text-sm text-gray-600">
+            {{ t("Review the generated content before importing it as a new exercise.") }}
+          </p>
+        </div>
+
+        <div class="space-y-2">
+          <label
+            class="text-sm font-semibold text-gray-90"
+            for="aiken-generated-content"
+          >
+            {{ t("Aiken content") }}
+          </label>
+          <textarea
+            id="aiken-generated-content"
+            v-model="generatedAikenText"
+            class="min-h-80 w-full rounded-xl border border-gray-30 bg-white px-4 py-3 text-sm text-gray-90 shadow-sm focus:border-primary focus:ring-2 focus:ring-support-3"
+            name="aikenText"
+          />
+        </div>
+
+        <div class="grid gap-4 md:grid-cols-2">
+          <BaseInputText
+            id="aiken-import-exercise-title"
+            v-model="generatedExerciseTitle"
+            :label="t('Quiz title')"
+            name="generatedExerciseTitle"
+          />
+          <BaseInputText
+            id="aiken-total-weight"
+            v-model="totalWeight"
+            :label="t('Total weight')"
+            name="totalWeight"
+            type="number"
+          />
+        </div>
+
+        <div class="flex flex-wrap justify-end gap-2">
+          <BaseButton
+            :label="t('Clear')"
+            icon="close"
+            type="plain"
+            @click="clearGeneratedContent"
+          />
+          <BaseButton
+            :disabled="!generatedAikenText.trim() || isImporting"
+            :is-loading="isImporting"
+            :label="t('Import')"
+            icon="import"
+            type="success"
+            @click="importGeneratedAiken"
+          />
+        </div>
+      </section>
+    </template>
+  </section>
+</template>
+
+<script setup>
+import { computed, nextTick, onMounted, reactive, ref, watch } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
+import exerciseService from "../../services/exerciseService"
+
+const { t } = useI18n()
+const route = useRoute()
+const availableIcons = Object.keys(chamiloIconToClass)
+
+const config = ref({})
+const activeTab = ref("topic")
+const isLoadingConfig = ref(true)
+const isGenerating = ref(false)
+const isImporting = ref(false)
+const errorMessage = ref("")
+const successMessage = ref("")
+const generatedAikenText = ref("")
+const generatedExerciseTitle = ref("")
+const totalWeight = ref("20")
+const documentSearch = ref("")
+const createdExerciseId = ref(null)
+const importedQuestionCount = ref(0)
+const skippedQuestionCount = ref(0)
+const errorAlert = ref(null)
+const successAlert = ref(null)
+const generatedContentSection = ref(null)
+
+const topicForm = reactive({
+  exerciseTitle: "",
+  topic: "",
+  numberOfQuestions: "10",
+  questionType: "multiple_choice",
+  provider: "",
+})
+
+const documentForm = reactive({
+  exerciseTitle: "",
+  topic: "",
+  numberOfQuestions: "10",
+  questionType: "multiple_choice",
+  provider: "",
+  resourceFileId: 0,
+  documentTitle: "",
+})
+
+const textProviderOptions = computed(() => Array.isArray(config.value.textProviders) ? config.value.textProviders : [])
+const documentProviderOptions = computed(() => Array.isArray(config.value.documentProviders) ? config.value.documentProviders : [])
+const questionTypeOptions = computed(() => Array.isArray(config.value.questionTypes) ? config.value.questionTypes : [])
+const documents = computed(() => Array.isArray(config.value.documents) ? config.value.documents : [])
+const hasDocumentTab = computed(() => documentProviderOptions.value.length > 0)
+const filteredDocuments = computed(() => {
+  const query = documentSearch.value.trim().toLowerCase()
+  if (!query) {
+    return documents.value
+  }
+
+  return documents.value.filter((documentItem) => {
+    const title = String(documentItem.title || documentItem.filename || "").toLowerCase()
+
+    return title.includes(query)
+  })
+})
+
+function safeIcon(icon, fallback = "information") {
+  if (icon && availableIcons.includes(icon)) {
+    return icon
+  }
+
+  if (fallback && availableIcons.includes(fallback)) {
+    return fallback
+  }
+
+  return availableIcons[0] || "information"
+}
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function normalizePositiveInt(value, fallback = 1, max = 100) {
+  const numericValue = Number.parseInt(String(value || ""), 10)
+  if (Number.isNaN(numericValue) || numericValue <= 0) {
+    return fallback
+  }
+
+  return Math.min(numericValue, max)
+}
+
+function firstProvider(options) {
+  return options.length > 0 ? String(options[0].value || "") : ""
+}
+
+function selectedTopicProvider() {
+  return topicForm.provider || firstProvider(textProviderOptions.value)
+}
+
+function selectedDocumentProvider() {
+  return documentForm.provider || firstProvider(documentProviderOptions.value)
+}
+
+function clearMessages() {
+  errorMessage.value = ""
+  successMessage.value = ""
+}
+
+async function focusElement(elementRef) {
+  await nextTick()
+
+  const element = elementRef.value
+  if (!element) {
+    return
+  }
+
+  element.scrollIntoView({ behavior: "smooth", block: "center" })
+  element.focus({ preventScroll: true })
+}
+
+function setErrorMessage(message) {
+  errorMessage.value = message
+  void focusElement(errorAlert)
+}
+
+async function setSuccessMessage(message) {
+  successMessage.value = message
+  await focusElement(successAlert)
+}
+
+async function focusGeneratedContent() {
+  await focusElement(generatedContentSection)
+}
+
+function resetImportResult() {
+  createdExerciseId.value = null
+  importedQuestionCount.value = 0
+  skippedQuestionCount.value = 0
+}
+
+function setGeneratedContent(text, exerciseTitle) {
+  generatedAikenText.value = String(text || "").trim()
+  generatedExerciseTitle.value = String(exerciseTitle || "").trim()
+  totalWeight.value = String(config.value.defaultTotalWeight || 20)
+  resetImportResult()
+}
+
+function clearGeneratedContent() {
+  generatedAikenText.value = ""
+  generatedExerciseTitle.value = ""
+  resetImportResult()
+}
+
+function ensureGenerationFields(mode) {
+  if (mode === "topic") {
+    if (!topicForm.exerciseTitle.trim() || !topicForm.topic.trim()) {
+      setErrorMessage(t("Required field"))
+      return false
+    }
+
+    return true
+  }
+
+  if (!documentForm.exerciseTitle.trim() || Number(documentForm.resourceFileId || 0) <= 0) {
+    setErrorMessage(t("Required field"))
+    return false
+  }
+
+  return true
+}
+
+async function loadGeneratorData() {
+  isLoadingConfig.value = true
+  clearMessages()
+
+  try {
+    const response = await exerciseService.getExerciseAiAikenGenerator(getContextParams())
+    config.value = response || {}
+    topicForm.numberOfQuestions = String(config.value.defaultNumberOfQuestions || 10)
+    documentForm.numberOfQuestions = String(config.value.defaultNumberOfQuestions || 10)
+    totalWeight.value = String(config.value.defaultTotalWeight || 20)
+    topicForm.provider = firstProvider(textProviderOptions.value)
+    documentForm.provider = firstProvider(documentProviderOptions.value)
+    topicForm.questionType = questionTypeOptions.value[0]?.value || "multiple_choice"
+    documentForm.questionType = questionTypeOptions.value[0]?.value || "multiple_choice"
+  } catch (error) {
+    console.error("Error loading AI Aiken generator data", error)
+    setErrorMessage(error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not load AI Aiken generator"))
+  } finally {
+    isLoadingConfig.value = false
+  }
+}
+
+async function generateFromTopic() {
+  clearMessages()
+  resetImportResult()
+
+  if (!ensureGenerationFields("topic")) {
+    return
+  }
+
+  isGenerating.value = true
+
+  try {
+    const response = await exerciseService.generateExerciseAikenFromTopic({
+      quiz_name: topicForm.topic.trim(),
+      nro_questions: normalizePositiveInt(topicForm.numberOfQuestions, 1, Number(config.value.maxNumberOfQuestions || 100)),
+      question_type: topicForm.questionType,
+      language: config.value.language || "en",
+      ai_provider: selectedTopicProvider(),
+      cid: Number(getContextParams().cid || 0),
+      sid: Number(getContextParams().sid || 0),
+    })
+
+    if (response?.success) {
+      setGeneratedContent(response.text || "", topicForm.exerciseTitle)
+      await focusGeneratedContent()
+      return
+    }
+
+    setErrorMessage(response?.text || t("Could not generate Aiken content"))
+  } catch (error) {
+    console.error("Error generating Aiken content", error)
+    setErrorMessage(error?.response?.data?.text || error?.response?.data?.detail || t("Could not generate Aiken content"))
+  } finally {
+    isGenerating.value = false
+  }
+}
+
+async function generateFromDocument() {
+  clearMessages()
+  resetImportResult()
+
+  if (!ensureGenerationFields("document")) {
+    return
+  }
+
+  isGenerating.value = true
+
+  try {
+    const response = await exerciseService.generateExerciseAikenFromDocument({
+      prompt: documentForm.topic.trim(),
+      quiz_name: documentForm.topic.trim(),
+      nro_questions: normalizePositiveInt(documentForm.numberOfQuestions, 1, Number(config.value.maxNumberOfQuestions || 100)),
+      question_type: documentForm.questionType,
+      language: config.value.language || "en",
+      ai_provider: selectedDocumentProvider(),
+      resource_file_id: Number(documentForm.resourceFileId || 0),
+      document_title: documentForm.documentTitle,
+      cid: Number(getContextParams().cid || 0),
+      sid: Number(getContextParams().sid || 0),
+      gid: Number(getContextParams().gid || 0),
+    })
+
+    if (response?.success) {
+      setGeneratedContent(response.text || "", documentForm.exerciseTitle)
+      await focusGeneratedContent()
+      return
+    }
+
+    setErrorMessage(response?.text || t("Could not generate Aiken content"))
+  } catch (error) {
+    console.error("Error generating Aiken content from document", error)
+    setErrorMessage(error?.response?.data?.text || error?.response?.data?.detail || t("Could not generate Aiken content"))
+  } finally {
+    isGenerating.value = false
+  }
+}
+
+async function importGeneratedAiken() {
+  clearMessages()
+
+  const text = generatedAikenText.value.trim()
+  if (!text) {
+    setErrorMessage(t("Required field"))
+    return
+  }
+
+  const exerciseTitle = generatedExerciseTitle.value.trim() || t("Imported Aiken quiz")
+  const filename = `${exerciseTitle.replace(/[^a-z0-9_-]+/gi, "_").replace(/^_+|_+$/g, "") || "aiken_quiz"}.txt`
+  const file = new File([text], filename, { type: "text/plain" })
+  const formData = new FormData()
+  formData.append("submittedCsrfToken", config.value.csrfToken || "")
+  formData.append("file", file)
+  formData.append("totalWeight", totalWeight.value)
+  formData.append("exerciseTitle", exerciseTitle)
+  formData.append("exercise_title", exerciseTitle)
+  formData.append("quiz_name", exerciseTitle)
+
+  isImporting.value = true
+
+  try {
+    const response = await exerciseService.importExerciseQuestions("aiken", formData, getContextParams())
+    createdExerciseId.value = response.exerciseId || null
+    importedQuestionCount.value = Number(response.importedQuestionCount || 0)
+    skippedQuestionCount.value = Number(response.skippedQuestionCount || 0)
+    await setSuccessMessage(t(response.message || "Aiken quiz imported"))
+  } catch (error) {
+    console.error("Error importing generated Aiken content", error)
+    setErrorMessage(error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not import generated Aiken content"))
+  } finally {
+    isImporting.value = false
+  }
+}
+
+watch(
+  () => documentForm.resourceFileId,
+  (resourceFileId) => {
+    const selectedDocument = documents.value.find((documentItem) => Number(documentItem.resourceFileId) === Number(resourceFileId))
+    documentForm.documentTitle = selectedDocument?.title || selectedDocument?.filename || ""
+  },
+)
+
+onMounted(loadGeneratorData)
+</script>
diff --git a/assets/vue/views/exercise/ExerciseCategoryManagerView.vue b/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
index 31d0ccd1e29..6f2c24c781c 100644
--- a/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
+++ b/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
@@ -20,14 +20,14 @@
         @click="startCreate"
       />
       <BaseButton
-        v-if="isQuestionCategoryPage && legacyUrls.export"
+        v-if="isQuestionCategoryPage && categories.length > 0"
         class="exercise-category-toolbar__button"
         :label="t('CSV export')"
-        :to-url="legacyUrls.export"
         icon="export"
         only-icon
         size="small"
         type="primary-text"
+        @click="exportQuestionCategoriesCsv"
       />
       <BaseButton
         v-if="isQuestionCategoryPage"
@@ -230,7 +230,6 @@ const route = useRoute()
 const { requireConfirmation } = useConfirmation()
 
 const categories = ref([])
-const legacyUrls = ref({})
 const csrfToken = ref("")
 const isLoading = ref(false)
 const isSaving = ref(false)
@@ -275,7 +274,6 @@ async function loadCategories() {
   try {
     const response = await exerciseService.getExerciseCategories(props.categoryType, getContextParams())
     categories.value = Array.isArray(response.items) ? response.items : []
-    legacyUrls.value = response.legacyUrls || {}
     csrfToken.value = response.csrfToken || ""
   } catch (error) {
     console.error("Error loading exercise categories", error)
@@ -323,6 +321,33 @@ function cancelImport() {
   isImportVisible.value = false
 }
 
+function exportQuestionCategoriesCsv() {
+  const rows = [["title", "description"]]
+
+  for (const category of categories.value) {
+    rows.push([
+      displayText(category.title),
+      displayText(category.description),
+    ])
+  }
+
+  const csvContent = rows.map((row) => row.map(escapeCsvValue).join(",")).join("\n")
+  const blob = new Blob([`${csvContent}\n`], { type: "text/csv;charset=utf-8" })
+  const link = document.createElement("a")
+  link.href = URL.createObjectURL(blob)
+  link.download = "question_categories.csv"
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+  URL.revokeObjectURL(link.href)
+}
+
+function escapeCsvValue(value) {
+  const stringValue = String(value || "")
+
+  return `"${stringValue.replace(/"/g, '""')}"`
+}
+
 function selectImportFile(event) {
   const files = event?.target?.files
   importFile.value = files && files.length > 0 ? files[0] : null
diff --git a/assets/vue/views/exercise/ExerciseConfigurationView.vue b/assets/vue/views/exercise/ExerciseConfigurationView.vue
index 48335ac7877..ab5b9a718dd 100644
--- a/assets/vue/views/exercise/ExerciseConfigurationView.vue
+++ b/assets/vue/views/exercise/ExerciseConfigurationView.vue
@@ -2,8 +2,9 @@
   <section class="space-y-5">
     <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
       <BaseButton
-        :label="t('Back to exercises')"
-        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        :label="backButtonLabel"
+        :route="learningPathContext ? null : { name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        :to-url="learningPathContext ? learningPathBackUrl : null"
         icon="back"
         only-icon
         size="small"
@@ -188,7 +189,7 @@
                 id="exercise-random"
                 v-model="form.random"
                 :disabled="isFieldLocked('random')"
-                :help-text="t('Use 0 to keep all available questions. Use -1 for all questions where legacy accepts it.')"
+                :help-text="t('Use 0 to keep all available questions. Use -1 where all available questions are allowed.')"
                 :label="t('Random questions')"
                 name="random"
                 :min="-1"
@@ -419,7 +420,7 @@
               id="exercise-expired-time"
               v-model="form.expiredTime"
               :disabled="isFieldLocked('expiredTime')"
-              :help-text="t('Legacy stores this value as total duration in minutes.')"
+              :help-text="t('This value is stored as total duration in minutes.')"
               :label="t('Total duration in minutes of the test')"
               name="expiredTime"
               :min="0"
@@ -447,6 +448,46 @@
           />
           <p class="-mt-3 text-sm text-gray-50">%</p>
 
+          <div
+            v-if="gradebookCategoryOptions.length > 0"
+            class="space-y-3 rounded-lg border border-gray-20 bg-gray-5 p-3"
+          >
+            <h3 class="text-sm font-semibold text-gray-90">{{ t("Assessment") }}</h3>
+            <BaseCheckbox
+              id="exercise-add-to-gradebook"
+              v-model="form.addToGradebook"
+              :label="t('Add this test to the assessment tool')"
+              name="addToGradebook"
+            />
+            <div
+              v-if="form.addToGradebook"
+              class="grid gap-4 md:grid-cols-3"
+            >
+              <BaseSelect
+                id="exercise-gradebook-category"
+                v-model="form.gradebookCategoryId"
+                :label="t('Assessment')"
+                name="gradebookCategoryId"
+                :options="gradebookCategoryOptions"
+                option-label="label"
+                option-value="value"
+              />
+              <BaseInputNumber
+                id="exercise-gradebook-weight"
+                v-model="form.gradebookWeight"
+                :label="t('Weight')"
+                name="gradebookWeight"
+                :min="0"
+              />
+              <BaseCheckbox
+                id="exercise-gradebook-visible"
+                v-model="form.gradebookVisible"
+                :label="t('Visible')"
+                name="gradebookVisible"
+              />
+            </div>
+          </div>
+
           <BaseTinyEditor
             editor-id="exercise-text-when-finished"
             v-model="form.textWhenFinished"
@@ -607,8 +648,9 @@
 
       <div class="flex flex-col-reverse items-stretch gap-3 pt-4 md:flex-row md:items-center md:justify-end">
         <BaseButton
-          :label="t('Cancel')"
-          :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+          :label="learningPathContext ? t('Cancel and return to learning path') : t('Cancel')"
+          :route="learningPathContext ? null : { name: 'ExerciseList', params: route.params, query: getContextParams() }"
+          :to-url="learningPathContext ? learningPathBackUrl : null"
           icon="close"
           type="black"
         />
@@ -768,6 +810,10 @@ const form = reactive({
   preventBackwards: false,
   hideAttemptsTable: false,
   autoLaunch: false,
+  addToGradebook: false,
+  gradebookCategoryId: null,
+  gradebookWeight: 100,
+  gradebookVisible: true,
   notifications: [],
   accessCondition: "",
   sound: "",
@@ -805,6 +851,9 @@ const questionsRoute = computed(() => ({
   params: { ...route.params, exerciseId: exerciseId.value },
   query: getContextParams(),
 }))
+const learningPathContext = computed(() => isLearningPathContext())
+const learningPathBackUrl = computed(() => buildLearningPathBackUrl())
+const backButtonLabel = computed(() => (learningPathContext.value ? t("Back to learning path") : t("Back to exercises")))
 const typeOptions = computed(() => {
   const items = (options.value.typeOptions || []).map((option) => ({
     value: Number(option.value),
@@ -824,6 +873,12 @@ const categoryOptions = computed(() => [
     label: option.label,
   })),
 ])
+const gradebookCategoryOptions = computed(() =>
+  (options.value.gradebookCategoryOptions || []).map((option) => ({
+    value: Number(option.value),
+    label: option.label,
+  })),
+)
 const languageOptions = computed(() =>
   (options.value.languageOptions || []).map((option) => ({
     value: option.value || "",
@@ -893,11 +948,44 @@ function getQueryValue(value) {
 }
 
 function getContextParams() {
-  return {
+  const params = {
     cid: getQueryValue(route.query.cid),
     sid: getQueryValue(route.query.sid),
     gid: getQueryValue(route.query.gid),
   }
+
+  for (const key of ["origin", "lp_id", "learnpath_id", "node", "type", "returnToLp", "isStudentView", "gradebook"]) {
+    const value = getQueryValue(route.query[key])
+    if (value !== undefined && value !== null && String(value) !== "") {
+      params[key] = value
+    }
+  }
+
+  return params
+}
+
+function isLearningPathContext() {
+  const origin = String(getQueryValue(route.query.origin) || "").toLowerCase()
+  const returnToLp = String(getQueryValue(route.query.returnToLp) || "").toLowerCase()
+  const lpId = Number(getQueryValue(route.query.lp_id) || getQueryValue(route.query.learnpath_id) || 0)
+
+  return lpId > 0 && (origin === "learnpath" || ["1", "true", "yes"].includes(returnToLp))
+}
+
+function buildLearningPathBackUrl() {
+  const params = new URLSearchParams()
+  params.set("action", "build")
+  params.set("type", getQueryValue(route.query.type) || "step")
+  params.set("lp_id", getQueryValue(route.query.lp_id) || getQueryValue(route.query.learnpath_id) || "0")
+
+  for (const key of ["cid", "sid", "gid", "gradebook", "origin", "node", "isStudentView"]) {
+    const value = getQueryValue(route.query[key])
+    if (value !== undefined && value !== null && String(value) !== "") {
+      params.set(key, String(value))
+    }
+  }
+
+  return `/main/lp/lp_controller.php?${params.toString()}#resource_tab-2`
 }
 
 function fillForm(data) {
@@ -924,6 +1012,10 @@ function fillForm(data) {
   form.preventBackwards = true === data.preventBackwards
   form.hideAttemptsTable = true === data.hideAttemptsTable
   form.autoLaunch = true === data.autoLaunch
+  form.addToGradebook = true === data.addToGradebook
+  form.gradebookCategoryId = data.gradebookCategoryId ? Number(data.gradebookCategoryId) : null
+  form.gradebookWeight = Number(data.gradebookWeight || 100)
+  form.gradebookVisible = false !== data.gradebookVisible
   form.notifications = normalizeNotificationValues(data.notifications || [])
   form.accessCondition = data.accessCondition || ""
   form.sound = data.sound || ""
@@ -1133,6 +1225,10 @@ function buildPayload() {
     preventBackwards: form.preventBackwards,
     hideAttemptsTable: form.hideAttemptsTable,
     autoLaunch: form.autoLaunch,
+    addToGradebook: form.addToGradebook,
+    gradebookCategoryId: form.addToGradebook ? Number(form.gradebookCategoryId || 0) : null,
+    gradebookWeight: Number(form.gradebookWeight || 0),
+    gradebookVisible: form.gradebookVisible,
     notifications: normalizeNotificationValues(form.notifications),
     accessCondition: form.accessCondition,
     sound: form.sound,
diff --git a/assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue b/assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue
new file mode 100644
index 00000000000..4b2135defb1
--- /dev/null
+++ b/assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue
@@ -0,0 +1,197 @@
+<template>
+  <section class="space-y-5">
+    <div class="exercise-question-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <BaseButton
+        class="exercise-question-toolbar__button"
+        :label="t('Back to exercises')"
+        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        icon="back"
+        only-icon
+        size="small"
+        type="primary-text"
+      />
+    </div>
+
+    <div class="border-b border-gray-20" />
+
+    <div
+      v-if="isLoading"
+      class="rounded-xl border border-gray-20 bg-white p-4 text-sm text-gray-700 shadow-sm"
+    >
+      {{ t("Loading") }}
+    </div>
+
+    <div
+      v-if="errorMessage"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
+    >
+      {{ errorMessage }}
+    </div>
+
+    <form
+      v-if="!isLoading"
+      class="space-y-6"
+      @submit.prevent="createQuestion"
+    >
+      <section class="space-y-3 border-b border-gray-20 pb-4">
+        <h1 class="text-2xl font-semibold text-gray-90">
+          {{ t("Add this question to the test") }}
+        </h1>
+      </section>
+
+      <section class="space-y-5 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+        <BaseSelect
+          id="exercise-global-question-type"
+          v-model="selectedQuestionType"
+          :label="t('Question type')"
+          name="question_type_hidden"
+          :options="questionTypeOptions"
+        />
+
+        <BaseSelect
+          id="exercise-global-question-exercise"
+          v-model="selectedExerciseId"
+          :label="t('* Test')"
+          name="exercise"
+          :options="exerciseOptions"
+        />
+
+        <div class="flex items-center gap-2">
+          <input
+            id="exercise-global-question-is-content"
+            v-model="generateDefaultContent"
+            class="h-4 w-4 rounded border-gray-25 text-primary focus:ring-primary"
+            name="is_content"
+            type="checkbox"
+          />
+          <label
+            class="text-sm text-gray-90"
+            for="exercise-global-question-is-content"
+          >
+            {{ t("Generate default content") }}
+          </label>
+        </div>
+      </section>
+
+      <div class="flex justify-end">
+        <BaseButton
+          :label="t('Create a question')"
+          icon="plus"
+          :is-submit="true"
+          type="success"
+        />
+      </div>
+
+      <p class="text-sm font-semibold text-gray-90">
+        * {{ t("Required field") }}
+      </p>
+    </form>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, ref } from "vue"
+import { useI18n } from "vue-i18n"
+import { useRoute, useRouter } from "vue-router"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
+import exerciseService from "../../services/exerciseService"
+
+const IMMEDIATE_FEEDBACK = 1
+const UNIQUE_ANSWER = 1
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+
+const isLoading = ref(false)
+const errorMessage = ref("")
+const questionTypes = ref([])
+const exercises = ref([])
+const selectedQuestionType = ref(UNIQUE_ANSWER)
+const selectedExerciseId = ref(0)
+const generateDefaultContent = ref(true)
+
+const questionTypeOptions = computed(() =>
+  questionTypes.value.map((questionType) => ({
+    label: t(questionType.label),
+    value: Number(questionType.type),
+  })),
+)
+
+const exerciseOptions = computed(() => [
+  { label: `-${t("Select exercise")}-`, value: 0 },
+  ...exercises.value.map((exercise) => ({
+    label: exercise.title,
+    value: Number(exercise.id),
+  })),
+])
+
+function getQueryValue(value) {
+  return Array.isArray(value) ? value[0] : value
+}
+
+function getContextParams() {
+  return {
+    cid: getQueryValue(route.query.cid),
+    sid: getQueryValue(route.query.sid),
+    gid: getQueryValue(route.query.gid),
+  }
+}
+
+function selectedExercise() {
+  const exerciseId = Number(selectedExerciseId.value || 0)
+
+  return exercises.value.find((exercise) => Number(exercise.id) === exerciseId) || null
+}
+
+async function createQuestion() {
+  const exerciseId = Number(selectedExerciseId.value || 0)
+  const questionType = Number(selectedQuestionType.value || 0)
+
+  if (exerciseId <= 0) {
+    errorMessage.value = t("You have to select a test")
+    return
+  }
+
+  if (questionType <= 0) {
+    errorMessage.value = t("Invalid question type")
+    return
+  }
+
+  const exercise = selectedExercise()
+  if (exercise && Number(exercise.feedbackType || 0) === IMMEDIATE_FEEDBACK && questionType !== UNIQUE_ANSWER) {
+    errorMessage.value = t("Invalid question type")
+    return
+  }
+
+  await router.push({
+    name: "ExerciseQuestionCreate",
+    params: { node: route.params.node, exerciseId, questionType },
+    query: {
+      ...getContextParams(),
+      isContent: generateDefaultContent.value ? 1 : 0,
+    },
+  })
+}
+
+async function loadForm() {
+  isLoading.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.getExerciseGlobalQuestionTypes(getContextParams())
+    questionTypes.value = Array.isArray(response.questionTypes) ? response.questionTypes : []
+    exercises.value = Array.isArray(response.exercises) ? response.exercises : []
+    selectedQuestionType.value = Number(questionTypes.value[0]?.type || UNIQUE_ANSWER)
+    selectedExerciseId.value = 0
+  } catch (error) {
+    console.error("Error loading global exercise question form", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not load exercise questions")
+  } finally {
+    isLoading.value = false
+  }
+}
+
+onMounted(loadForm)
+</script>
diff --git a/assets/vue/views/exercise/ExerciseListView.vue b/assets/vue/views/exercise/ExerciseListView.vue
index 091459e65bc..b0ef4eaa830 100644
--- a/assets/vue/views/exercise/ExerciseListView.vue
+++ b/assets/vue/views/exercise/ExerciseListView.vue
@@ -1,6 +1,9 @@
 <template>
   <section class="space-y-6">
-    <div class="flex flex-wrap items-center gap-2">
+    <div
+      v-if="canManage"
+      class="flex flex-wrap items-center gap-2"
+    >
       <div class="exercise-list-toolbar flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
         <BaseButton
           v-if="canCreate"
@@ -12,6 +15,16 @@
           size="small"
           type="primary-text"
         />
+        <BaseButton
+          v-if="canManage"
+          class="exercise-list-toolbar__button"
+          :label="t('Add a question')"
+          :route="{ name: 'ExerciseGlobalQuestionSelector', params: route.params, query: getContextParams() }"
+          :icon="safeIcon('multiple-marked', 'file-text')"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
         <BaseButton
           v-if="canManage && settings.allowExerciseCategories"
           class="exercise-list-toolbar__button"
@@ -32,6 +45,16 @@
           size="small"
           type="primary-text"
         />
+        <BaseButton
+          v-if="canManage"
+          class="exercise-list-toolbar__button"
+          :label="t('Recycle existing questions')"
+          :route="{ name: 'ExerciseQuestionPool', params: route.params, query: getContextParams() }"
+          :icon="safeIcon('table', 'file-text')"
+          only-icon
+          size="small"
+          type="primary-text"
+        />
         <BaseButton
           v-if="canManage"
           class="exercise-list-toolbar__button"
@@ -66,12 +89,22 @@
           v-if="canManage && settings.exerciseGeneratorEnabled"
           class="exercise-list-toolbar__button"
           :label="t('AI Aiken generator')"
-          :to-url="aiAikenGeneratorUrl()"
+          :route="{ name: 'ExerciseAiAikenGenerator', params: route.params, query: getContextParams() }"
           :icon="safeIcon('robot', 'settings')"
           only-icon
           size="small"
           type="primary-text"
         />
+        <BaseButton
+          v-if="canManage && settings.canCleanAllResults"
+          class="exercise-list-toolbar__button"
+          :label="t('Are you sure to delete all test\'s results ?')"
+          :icon="safeIcon('clean-all', 'broom')"
+          only-icon
+          size="small"
+          type="danger-text"
+          @click="confirmCleanAllResults"
+        />
         <span
           class="mx-1 h-6 w-px bg-gray-20"
           aria-hidden="true"
@@ -91,7 +124,7 @@
     <div class="border-b border-gray-20" />
 
     <div
-      v-if="activeSearch && !isSearchVisible"
+      v-if="canManage && activeSearch && !isSearchVisible"
       class="flex flex-wrap items-center gap-2 rounded-xl border border-gray-20 bg-white px-4 py-3 text-sm text-gray-700 shadow-sm"
     >
       <span>{{ t("Showing results for: {0}", [activeSearch]) }}</span>
@@ -106,7 +139,7 @@
     </div>
 
     <form
-      v-if="isSearchVisible"
+      v-if="canManage && isSearchVisible"
       class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
       @submit.prevent="applySearch"
     >
@@ -156,6 +189,13 @@
       </div>
     </form>
 
+    <div
+      v-if="successMessage"
+      class="rounded-xl border border-green-200 bg-green-50 p-4 text-sm text-green-700"
+    >
+      {{ successMessage }}
+    </div>
+
     <div
       v-if="errorMessage"
       class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
@@ -163,13 +203,19 @@
       {{ errorMessage }}
     </div>
 
-    <BaseTable
+    <template v-if="canManage">
+      <BaseTable
+        v-model:selected-items="selectedExercises"
       :is-loading="isLoading"
       :text-for-empty="t('No exercises found')"
       :total-items="exercises.length"
       :values="exercises"
       data-key="iid"
     >
+      <Column
+        selection-mode="multiple"
+        header-style="width: 3rem"
+      />
       <Column
         :header="t('Title')"
         field="title"
@@ -210,6 +256,13 @@
               >
                 {{ t("Hidden") }}
               </span>
+              <span
+                v-if="data.isLinkedToLearningPath"
+                class="rounded-full bg-yellow-100 px-2 py-0.5 text-yellow-800"
+                :title="t(data.learningPathReadOnlyMessage)"
+              >
+                {{ t("Learning path") }}
+              </span>
               <span
                 v-if="data.duration"
                 class="rounded-full bg-blue-100 px-2 py-0.5 text-blue-700"
@@ -325,13 +378,40 @@
               type="primary-text"
             />
             <BaseButton
-              v-if="data.canExport"
-              :label="t('Export QTI2')"
-              :to-url="qti2ExportUrl(data.iid)"
-              icon="export"
+              v-if="data.canToggleAutoLaunch"
+              :label="data.autoLaunch ? t('Disable autolaunch') : t('Enable autolaunch')"
+              :icon="safeIcon(data.autoLaunch ? 'rocket-launch' : 'rocket', 'play-box-outline')"
               only-icon
               size="small"
-              type="primary-text"
+              :type="data.autoLaunch ? 'primary-text' : 'secondary-text'"
+              @click="toggleAutoLaunch(data)"
+            />
+            <BaseButton
+              v-if="data.canCopy"
+              :label="t('Copy this exercise as a new one')"
+              icon="copy"
+              only-icon
+              size="small"
+              type="secondary-text"
+              @click="confirmCopyExercise(data)"
+            />
+            <BaseButton
+              v-if="data.canCleanResults"
+              :label="t('Clear all learners results for this exercise')"
+              :icon="safeIcon('clean-all', 'broom')"
+              only-icon
+              size="small"
+              type="danger-text"
+              @click="confirmCleanExerciseResults(data)"
+            />
+            <BaseButton
+              v-else-if="data.canCleanResultsDisabled"
+              :label="t('This option is not available because this activity is contained by an assessment, which is currently locked. To unlock the assessment, ask your platform administrator.')"
+              :icon="safeIcon('clean-all', 'broom')"
+              :disabled="true"
+              only-icon
+              size="small"
+              type="plain"
             />
             <BaseButton
               v-if="data.canToggleVisibility"
@@ -343,13 +423,22 @@
               @click="toggleVisibility(data)"
             />
             <BaseButton
-              v-if="data.canCopy"
-              :label="t('Copy this exercise as a new one')"
-              icon="copy"
+              v-else-if="data.canToggleVisibilityDisabled"
+              :label="t(data.learningPathReadOnlyMessage)"
+              :icon="safeIcon('eye-off', 'invisible')"
+              :disabled="true"
               only-icon
               size="small"
-              type="secondary-text"
-              @click="confirmCopyExercise(data)"
+              type="plain"
+            />
+            <BaseButton
+              v-if="data.canExport"
+              :label="t('Export QTI2')"
+              :to-url="qti2ExportUrl(data.iid)"
+              icon="export"
+              only-icon
+              size="small"
+              type="primary-text"
             />
             <BaseButton
               v-if="data.canDelete"
@@ -360,10 +449,136 @@
               type="danger-text"
               @click="confirmDeleteExercise(data)"
             />
+            <BaseButton
+              v-else-if="data.canDeleteDisabled"
+              :label="t('This option is not available because this activity is contained by an assessment, which is currently locked. To unlock the assessment, ask your platform administrator.')"
+              :disabled="true"
+              icon="delete"
+              only-icon
+              size="small"
+              type="plain"
+            />
           </div>
         </template>
       </Column>
-    </BaseTable>
+      </BaseTable>
+
+      <div
+        v-if="exercises.length > 0"
+        class="flex flex-col gap-3 rounded-xl border border-gray-20 bg-white p-3 shadow-sm md:flex-row md:items-center md:justify-between"
+      >
+        <div class="flex flex-wrap items-center gap-2">
+          <BaseButton
+            :label="t('Select all')"
+            icon="check-all"
+            size="small"
+            type="secondary"
+            @click="selectAllExercises"
+          />
+          <BaseButton
+            :disabled="selectedExercises.length === 0"
+            :label="t('Deselect all')"
+            icon="close"
+            size="small"
+            type="plain"
+            @click="deselectAllExercises"
+          />
+          <BaseSelect
+            id="exercise-bulk-action"
+            v-model="bulkAction"
+            class="!mb-0 min-w-56 md:min-w-72"
+            :label="t('Bulk actions')"
+            name="bulkAction"
+            :options="bulkActionOptions"
+            option-label="label"
+            option-value="value"
+          />
+          <BaseButton
+            :disabled="!canApplyBulkAction"
+            :is-loading="isLoading"
+            :label="t('Apply')"
+            icon="check"
+            size="small"
+            type="primary"
+            @click="confirmBulkAction"
+          />
+        </div>
+        <span class="whitespace-nowrap text-sm text-gray-600">
+          {{ t('Selected exercises') }}: {{ selectedExercises.length }}
+        </span>
+      </div>
+    </template>
+
+    <div
+      v-else
+      class="space-y-8"
+    >
+      <div
+        v-if="isLoading"
+        class="rounded-xl border border-gray-20 bg-white p-4 text-sm text-gray-600 shadow-sm"
+      >
+        {{ t("Loading") }}
+      </div>
+
+      <section
+        v-for="group in studentExerciseGroups"
+        :key="group.id"
+        class="space-y-3"
+      >
+        <h2 class="text-2xl font-semibold text-gray-90">
+          {{ group.title }}
+        </h2>
+        <div class="border-b border-gray-20" />
+
+        <div
+          v-if="group.items.length > 0"
+          class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm"
+        >
+          <table class="w-full border-collapse text-sm">
+            <thead class="bg-gray-15 text-left text-gray-90">
+              <tr>
+                <th class="w-1/2 border border-gray-25 px-3 py-2 font-semibold">
+                  {{ t("Test name") }}
+                </th>
+                <th class="w-1/2 border border-gray-25 px-3 py-2 font-semibold">
+                  {{ t("Status") }}
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="exercise in group.items"
+                :key="exercise.iid"
+                class="hover:bg-gray-10"
+              >
+                <td class="border border-gray-25 px-3 py-2">
+                  <router-link
+                    v-if="exercise.canOverview"
+                    class="font-medium text-gray-90 hover:underline"
+                    :to="{
+                      name: 'ExerciseOverview',
+                      params: { ...route.params, exerciseId: exercise.iid },
+                      query: getContextParams(),
+                    }"
+                  >
+                    {{ displayText(exercise.title, t("Untitled")) }}
+                  </router-link>
+                  <span
+                    v-else
+                    class="font-medium text-gray-90"
+                  >
+                    {{ displayText(exercise.title, t("Untitled")) }}
+                  </span>
+                </td>
+                <td class="border border-gray-25 px-3 py-2">
+                  {{ studentStatusLabel(exercise) }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </section>
+    </div>
   </section>
 </template>
 
@@ -390,8 +605,11 @@ const settings = ref({})
 const canManage = ref(false)
 const canCreate = ref(false)
 const isLoading = ref(false)
+const successMessage = ref("")
 const errorMessage = ref("")
 const actionCsrfToken = ref("")
+const selectedExercises = ref([])
+const bulkAction = ref("")
 const searchTerm = ref(getSearchQuery())
 const selectedCategoryId = ref(getCategoryQuery())
 const isSearchVisible = ref(Boolean(getSearchQuery() || getCategoryQuery()))
@@ -401,6 +619,56 @@ const categoryOptions = computed(() => [
   { label: t("All categories"), value: 0 },
   ...categories.value.map((category) => ({ label: displayText(category.title, t("Untitled")), value: Number(category.id) })),
 ])
+const bulkActionOptions = computed(() => [
+  { label: t("Select an action"), value: "" },
+  { label: t("Activate"), value: "bulk_activate" },
+  { label: t("Deactivate"), value: "bulk_deactivate" },
+  { label: t("Delete"), value: "bulk_delete" },
+])
+const selectedExerciseIds = computed(() =>
+  selectedExercises.value
+    .map((exercise) => Number(exercise?.iid || 0))
+    .filter((exerciseId) => exerciseId > 0),
+)
+const canApplyBulkAction = computed(() => Boolean(bulkAction.value && selectedExerciseIds.value.length > 0 && !isLoading.value))
+const studentExerciseGroups = computed(() => {
+  const selectedCategory = getCategoryQuery()
+
+  if (!settings.value.allowExerciseCategories) {
+    return [
+      {
+        id: "all",
+        title: t("Tests"),
+        items: exercises.value,
+      },
+    ]
+  }
+
+  const groups = [
+    {
+      id: "category-0",
+      title: t("General"),
+      categoryId: 0,
+      items: exercises.value.filter((exercise) => Number(exercise.categoryId || 0) === 0),
+    },
+    ...categories.value.map((category) => {
+      const categoryId = Number(category.id || 0)
+
+      return {
+        id: `category-${categoryId}`,
+        title: displayText(category.title, t("Untitled")),
+        categoryId,
+        items: exercises.value.filter((exercise) => Number(exercise.categoryId || 0) === categoryId),
+      }
+    }),
+  ]
+
+  if (selectedCategory > 0) {
+    return groups.filter((group) => Number(group.categoryId || 0) === selectedCategory)
+  }
+
+  return groups
+})
 const availableIcons = Object.keys(chamiloIconToClass)
 
 function safeIcon(icon, fallback = "information") {
@@ -469,10 +737,6 @@ function qti2ExportUrl(exerciseId) {
   return `/api/exercise/${exerciseId}/qti2-export.zip${buildQueryString(getContextParams())}`
 }
 
-function aiAikenGeneratorUrl() {
-  return `/main/exercise/exercise_aiken_generator.php${buildQueryString(getContextParams())}`
-}
-
 function toggleSearchForm() {
   isSearchVisible.value = !isSearchVisible.value
 }
@@ -515,20 +779,70 @@ async function clearSearch() {
   await applySearch()
 }
 
+function selectAllExercises() {
+  selectedExercises.value = [...exercises.value]
+}
+
+function deselectAllExercises() {
+  selectedExercises.value = []
+}
+
+function confirmBulkAction() {
+  if (!canApplyBulkAction.value) {
+    errorMessage.value = t("No exercises selected")
+
+    return
+  }
+
+  requireConfirmation({
+    title: t("Bulk actions"),
+    message: t("Are you sure you want to apply this action to the selected exercises?"),
+    accept: () => runBulkAction(),
+  })
+}
+
+async function runBulkAction() {
+  isLoading.value = true
+  successMessage.value = ""
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.saveExerciseListAction(
+      {
+        action: bulkAction.value,
+        exerciseIds: selectedExerciseIds.value,
+        submittedCsrfToken: actionCsrfToken.value,
+      },
+      getContextParams(),
+    )
+    selectedExercises.value = []
+    bulkAction.value = ""
+    await loadExercises()
+    successMessage.value = displayText(response?.message, t("Bulk action completed"))
+  } catch (error) {
+    console.error("Error running exercise bulk action", error)
+    errorMessage.value = t("Could not update exercises")
+  } finally {
+    isLoading.value = false
+  }
+}
+
 async function runExerciseAction(exercise, action) {
   isLoading.value = true
+  successMessage.value = ""
   errorMessage.value = ""
 
   try {
-    await exerciseService.saveExerciseListAction(
+    const response = await exerciseService.saveExerciseListAction(
       {
         action,
-        exerciseId: Number(exercise.iid || 0),
+        exerciseId: Number(exercise?.iid || 0),
         submittedCsrfToken: actionCsrfToken.value,
       },
       getContextParams(),
     )
     await loadExercises()
+    successMessage.value = displayText(response?.message, t("Saved"))
   } catch (error) {
     console.error("Error running exercise action", error)
     errorMessage.value = t("Could not update exercise")
@@ -541,6 +855,10 @@ function toggleVisibility(exercise) {
   runExerciseAction(exercise, "toggle_visibility")
 }
 
+function toggleAutoLaunch(exercise) {
+  runExerciseAction(exercise, "toggle_auto_launch")
+}
+
 function confirmCopyExercise(exercise) {
   requireConfirmation({
     title: t("Copy exercise"),
@@ -557,6 +875,22 @@ function confirmDeleteExercise(exercise) {
   })
 }
 
+function confirmCleanExerciseResults(exercise) {
+  requireConfirmation({
+    title: t("Clear all learners results for this exercise"),
+    message: `${t("Are you sure to delete results")} ${displayText(exercise.title, t("Untitled"))}?`,
+    accept: () => runExerciseAction(exercise, "clean_results"),
+  })
+}
+
+function confirmCleanAllResults() {
+  requireConfirmation({
+    title: t("Are you sure to delete all test's results ?"),
+    message: t("Clear all learners results for every exercises ?"),
+    accept: () => runExerciseAction(null, "clean_all_results"),
+  })
+}
+
 async function loadExercises() {
   isLoading.value = true
   errorMessage.value = ""
@@ -564,6 +898,9 @@ async function loadExercises() {
   try {
     const response = await exerciseService.getExerciseList(getListParams())
     exercises.value = Array.isArray(response.items) ? response.items : []
+    selectedExercises.value = selectedExercises.value.filter((selectedExercise) =>
+      exercises.value.some((exercise) => Number(exercise.iid || 0) === Number(selectedExercise?.iid || 0)),
+    )
     categories.value = Array.isArray(response.categories) ? response.categories : []
     settings.value = response.settings || {}
     actionCsrfToken.value = response.submittedCsrfToken || ""
@@ -577,6 +914,26 @@ async function loadExercises() {
   }
 }
 
+function formatScore(value) {
+  const number = Number(value || 0)
+
+  if (Number.isInteger(number)) {
+    return String(number)
+  }
+
+  return String(Math.round(number * 100) / 100)
+}
+
+function studentStatusLabel(exercise) {
+  const latestAttempt = exercise?.latestAttempt || null
+
+  if (!latestAttempt) {
+    return t("Not attempted")
+  }
+
+  return `${t("Latest attempt")} : ${formatScore(latestAttempt.percentage)} % (${formatScore(latestAttempt.score)} / ${formatScore(latestAttempt.maxScore)})`
+}
+
 function formatDate(date) {
   if (!date) {
     return t("No date")
diff --git a/assets/vue/views/exercise/ExerciseOverviewView.vue b/assets/vue/views/exercise/ExerciseOverviewView.vue
index 4da06b0667f..8415ab56ce7 100644
--- a/assets/vue/views/exercise/ExerciseOverviewView.vue
+++ b/assets/vue/views/exercise/ExerciseOverviewView.vue
@@ -1,7 +1,10 @@
 <template>
   <section class="space-y-6">
     <div class="flex flex-wrap items-center justify-between gap-3">
-      <div class="exercise-overview-toolbar flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+      <div
+        v-if="!isLearnpathContext"
+        class="exercise-overview-toolbar flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm"
+      >
         <BaseButton
           :label="t('Back to exercises')"
           :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
@@ -33,7 +36,7 @@
 
     <div
       v-if="errorMessage"
-      class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
+      class="rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm text-danger"
     >
       {{ errorMessage }}
     </div>
@@ -82,26 +85,16 @@
 
       <div
         v-if="overview.notice"
-        class="rounded-xl border border-blue-200 bg-blue-50 p-4 text-sm text-blue-700"
+        :class="overviewAlertClass('info')"
       >
         {{ t(overview.notice) }}
       </div>
 
       <div
         v-if="overview.maxAttempt > 0"
-        :class="[
-          'rounded-xl border p-4 text-sm',
-          overview.attemptLimitReached ? 'border-red-200 bg-red-50 text-red-700' : 'border-blue-200 bg-blue-50 text-blue-700',
-        ]"
-      >
-        {{ t("Attempts {0} / {1}", [overview.currentUserAttemptCount || 0, overview.maxAttempt]) }}
-      </div>
-
-      <div
-        v-if="overview.attemptLimitReached"
-        class="rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-700"
+        :class="overviewAlertClass(overview.attemptLimitReached ? 'danger' : 'info')"
       >
-        {{ t("Maximum number of attempts reached") }}
+        {{ t("Attempts") }}: {{ overview.currentUserAttemptCount || 0 }} / {{ overview.maxAttempt || 0 }}
       </div>
 
       <div
@@ -109,11 +102,12 @@
         class="rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
       >
         <BaseButton
-          :label="t(overview.startButtonLabel || 'Start test')"
-          :route="{ name: 'ExercisePlayer', params: route.params, query: getContextParams() }"
+          :disabled="isStartingAttempt"
+          :label="isStartingAttempt ? t('Starting') : t(overview.startButtonLabel || 'Start test')"
           icon="play-box-outline"
           size="normal"
           type="success"
+          @click="startAndOpenPlayer"
         />
       </div>
 
@@ -172,9 +166,10 @@
                   type="plain"
                 />
                 <span
+                  v-if="data.showValidationStatus"
                   :class="[
                     'rounded-full px-2 py-0.5 text-xs font-semibold',
-                    data.revised ? 'bg-green-100 text-green-700' : 'bg-blue-100 text-blue-700',
+                    data.revised ? 'bg-success/10 text-success' : 'bg-info/10 text-info',
                   ]"
                 >
                   {{ data.revised ? t("Validated") : t("Not validated") }}
@@ -189,9 +184,9 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref, watch } from "vue"
+import { computed, onMounted, reactive, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
-import { useRoute } from "vue-router"
+import { useRoute, useRouter } from "vue-router"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
 import BaseTable from "../../components/basecomponents/BaseTable.vue"
 import { chamiloIconToClass } from "../../components/basecomponents/ChamiloIcons"
@@ -199,8 +194,10 @@ import exerciseService from "../../services/exerciseService"
 
 const { t } = useI18n()
 const route = useRoute()
+const router = useRouter()
 
 const isLoading = ref(false)
+const isStartingAttempt = ref(false)
 const errorMessage = ref("")
 const overview = reactive({
   exerciseId: 0,
@@ -255,18 +252,137 @@ function getContextParams() {
     gid: getQueryValue(route.query.gid),
   }
 
+  addOptionalQueryParam(params, "origin")
+  addOptionalQueryParam(params, "lp_init")
   addOptionalQueryParam(params, "learnpath_id")
   addOptionalQueryParam(params, "learnpath_item_id")
   addOptionalQueryParam(params, "learnpath_item_view_id")
+  addOptionalQueryParam(params, "lp_id")
+  addOptionalQueryParam(params, "node")
+  addOptionalQueryParam(params, "type")
+  addOptionalQueryParam(params, "returnToLp")
+  addOptionalQueryParam(params, "isStudentView")
   addOptionalQueryParam(params, "preview")
 
   return params
 }
 
+
+function isEmbeddedInLearnpath() {
+  if (typeof window === "undefined") {
+    return false
+  }
+
+  try {
+    if (window.parent && window.parent !== window) {
+      const parentPath = window.parent.location?.pathname || ""
+      const referrer = document.referrer || ""
+
+      return parentPath.includes("/main/lp/")
+        || parentPath.includes("/main/newscorm/")
+        || referrer.includes("/main/lp/")
+        || referrer.includes("/main/newscorm/")
+    }
+  } catch (error) {
+    return (document.referrer || "").includes("/main/lp/")
+      || (document.referrer || "").includes("/main/newscorm/")
+  }
+
+  return false
+}
+
+const isLearnpathContext = computed(() => {
+  const origin = String(getQueryValue(route.query.origin) || "")
+
+  return origin === "learnpath"
+    || Boolean(getQueryValue(route.query.lp_init))
+    || Boolean(getQueryValue(route.query.learnpath_id))
+    || isEmbeddedInLearnpath()
+})
+
 function getExerciseId() {
   return Number(getQueryValue(route.params.exerciseId) || 0)
 }
 
+function getRuntimeStartContextParams() {
+  const params = { ...getContextParams() }
+
+  if (
+    overview.canManage
+    && !isLearnpathContext.value
+    && !Object.prototype.hasOwnProperty.call(params, "preview")
+    && !Object.prototype.hasOwnProperty.call(params, "isStudentView")
+  ) {
+    params.preview = 1
+  }
+
+  return params
+}
+
+function buildPlayerQuery(startResponse = null, contextParams = null) {
+  const query = { ...(contextParams || getContextParams()) }
+  const attemptId = Number(startResponse?.attemptId || 0)
+
+  if (attemptId > 0) {
+    query.attemptId = attemptId
+  }
+
+  return query
+}
+
+async function openPlayer(startResponse = null, contextParams = null) {
+  await router.push({
+    name: "ExercisePlayer",
+    params: route.params,
+    query: buildPlayerQuery(startResponse, contextParams),
+  })
+}
+
+function openLegacyRuntime(startResponse = null) {
+  const overviewUrl = startResponse?.legacyUrls?.overview || startResponse?.legacyUrls?.exercise || ""
+  if (overviewUrl && typeof window !== "undefined") {
+    window.location.href = overviewUrl
+
+    return true
+  }
+
+  return false
+}
+
+async function startAndOpenPlayer() {
+  const exerciseId = getExerciseId()
+  if (exerciseId <= 0) {
+    errorMessage.value = t("Invalid exercise")
+
+    return
+  }
+
+  isStartingAttempt.value = true
+  errorMessage.value = ""
+
+  try {
+    const runtimeContextParams = getRuntimeStartContextParams()
+    const response = await exerciseService.startExerciseAttempt({ exerciseId }, runtimeContextParams, exerciseId)
+
+    if (response?.success) {
+      await openPlayer(response, runtimeContextParams)
+
+      return
+    }
+
+    if (true === response?.usesLegacyRuntime && openLegacyRuntime(response)) {
+      return
+    }
+
+    errorMessage.value = response?.message ? t(response.message) : t("Could not start the attempt")
+  } catch (error) {
+    console.error("Error starting exercise attempt from overview", error)
+    errorMessage.value = t("Could not start the attempt")
+  } finally {
+    isStartingAttempt.value = false
+  }
+}
+
 async function loadOverview() {
   const exerciseId = getExerciseId()
   if (exerciseId <= 0) {
@@ -290,6 +406,21 @@ async function loadOverview() {
   }
 }
 
+
+function overviewAlertClass(type) {
+  switch (type) {
+    case "danger":
+    case "error":
+      return "rounded-xl border border-danger/30 bg-danger/10 p-4 text-sm font-medium text-danger"
+    case "warning":
+      return "rounded-xl border border-warning/30 bg-warning/10 p-4 text-sm font-medium text-warning"
+    case "success":
+      return "rounded-xl border border-success/30 bg-success/10 p-4 text-sm font-medium text-success"
+    default:
+      return "rounded-xl border border-info/30 bg-info/10 p-4 text-sm font-medium text-info"
+  }
+}
+
 function formatDate(date) {
   if (!date) {
     return t("No date")
diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index 1144bbcb37f..203cb87e9aa 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -1,6 +1,9 @@
 <template>
   <section class="space-y-5">
-    <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
+    <div
+      v-if="!isLearnpathContext"
+      class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit"
+    >
       <BaseButton
         :label="t('Back to exercises')"
         :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
@@ -11,7 +14,7 @@
       />
       <BaseButton
         v-if="showLegacyRuntimeFallback"
-        :label="t('Open legacy exercise')"
+        :label="t('Open test')"
         :to-url="legacyUrls.overview"
         icon="play-box-outline"
         only-icon
@@ -29,7 +32,7 @@
       />
     </div>
 
-    <div class="border-b border-gray-20" />
+    <div v-if="!isLearnpathContext" class="border-b border-gray-20" />
 
     <div
       v-if="isLoading"
@@ -115,12 +118,25 @@
         class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
       >
         <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
-          <p>
-            {{ t("This exercise contains options or question types that are not fully supported by the Vue runtime yet. You can continue with the legacy exercise runtime.") }}
-          </p>
+          <div class="space-y-2">
+            <p>
+              {{ t("This exercise uses options that require a different test player.") }}
+            </p>
+            <ul
+              v-if="legacyRuntimeReasons.length"
+              class="list-disc pl-5 text-xs"
+            >
+              <li
+                v-for="reason in legacyRuntimeReasons"
+                :key="reason"
+              >
+                {{ t(reason) }}
+              </li>
+            </ul>
+          </div>
           <BaseButton
             v-if="legacyUrls.overview"
-            :label="t('Continue in legacy exercise')"
+            :label="t('Continue test')"
             :to-url="legacyUrls.overview"
             icon="play-box-outline"
             type="primary"
@@ -128,25 +144,31 @@
         </div>
       </div>
 
-      <div class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+      <div
+        v-if="!showLegacyRuntimeFallback"
+        class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      >
         <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
           <div class="space-y-1 text-sm text-gray-700">
             <div class="font-semibold text-gray-90">
-              {{ activeAttempt ? t("Vue attempt started") : t("Vue attempt") }}
+              {{ activeAttempt ? t("Attempt started") : t("Attempt") }}
             </div>
             <div v-if="canManage">
               {{ t("Teacher preview does not create a tracked attempt.") }}
             </div>
             <div v-else-if="activeAttempt">
-              {{ t("Attempt") }} #{{ activeAttempt.attemptId }} · {{ progressLabel }}
+              {{ currentAttemptLabel }} · {{ progressLabel }}
               <span v-if="hasTimeControl">
-                · {{ t("Time left") }}:
-                <strong :class="isTimeExpired ? 'text-danger' : 'text-gray-90'">{{ formatSeconds(countdownRemainingSeconds) }}</strong>
+                · {{ timeControlLabel }}:
+                <strong :class="isDisplayedTimeExpired ? 'text-danger' : 'text-gray-90'">{{ formatSeconds(displayedRemainingSeconds) }}</strong>
               </span>
             </div>
             <div v-else>
               {{ t("Start or resume an exercise attempt. Draft answers can be saved before final submission.") }}
             </div>
+            <div v-if="currentCategoryLabel" class="text-support-4">
+              {{ t("Category") }}: {{ currentCategoryLabel }}
+            </div>
             <div v-if="attemptMessage" class="text-support-4">
               {{ attemptMessage }}
             </div>
@@ -162,6 +184,9 @@
             <div v-if="isTimeExpired" class="text-danger">
               {{ t("Time limit reached. Finishing the attempt.") }}
             </div>
+            <div v-if="isQuestionTimeExpired" class="text-warning">
+              {{ t("Question time reached. Saving your answer.") }}
+            </div>
             <div v-if="finishMessage" class="text-support-4">
               {{ finishMessage }}
             </div>
@@ -171,20 +196,13 @@
           </div>
           <div class="flex flex-wrap gap-2">
             <BaseButton
-              v-if="!canManage && !activeAttempt"
+              v-if="!canManage && !activeAttempt && canStartAttempt"
               :disabled="isStartingAttempt"
-              :label="isStartingAttempt ? t('Starting') : t('Start Vue attempt')"
+              :label="isStartingAttempt ? t('Starting') : t('Start test')"
               icon="play-box-outline"
               type="primary"
               @click="startAttempt"
             />
-            <BaseButton
-              v-if="showLegacyRuntimeFallback"
-              :label="t('Use legacy runtime')"
-              :to-url="legacyUrls.overview"
-              icon="play-box-outline"
-              type="secondary"
-            />
           </div>
         </div>
       </div>
@@ -995,7 +1013,7 @@
               v-else
               class="rounded-lg border border-yellow-100 bg-yellow-50 p-3 text-sm text-yellow-800"
             >
-              {{ t("This question type is pending runtime rendering in Vue.") }}
+              {{ t("This question type cannot be displayed in this player.") }}
             </div>
           </div>
 
@@ -1050,10 +1068,30 @@
           </div>
         </article>
 
+        <div
+          v-if="requiresSavedAnswerConfirmation"
+          class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
+        >
+          <label class="flex items-start gap-3">
+            <input
+              v-model="confirmedSavedAnswers"
+              class="mt-1"
+              name="confirm_saved_answers"
+              type="checkbox"
+            />
+            <span>
+              {{ t("I confirm that my answers were saved.") }}
+              <span class="block text-xs">
+                {{ t("Saved answers: {0} / {1}", [savedQuestionIds.size, visibleQuestionTotal]) }}
+              </span>
+            </span>
+          </label>
+        </div>
+
         <div class="flex flex-wrap justify-between gap-2 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
           <BaseButton
             v-if="showPreviousNavigationButton"
-            :disabled="!canMovePrevious || isSavingAnswer"
+            :disabled="!canMovePrevious || isSavingAnswer || isQuestionTimeExpired || isAutoAdvancingTimedQuestion"
             :label="previousNavigationLabel"
             icon="back"
             type="secondary"
@@ -1062,7 +1100,7 @@
           <div class="flex flex-wrap gap-2">
             <BaseButton
               v-if="!canManage && activeAttempt"
-              :disabled="isSavingAnswer || isTimeExpired || !visibleQuestions.some(isDraftSaveSupported)"
+              :disabled="isSavingAnswer || isTimeExpired || isQuestionTimeExpired || isAutoAdvancingTimedQuestion || !visibleQuestions.some(isDraftSaveSupported)"
               :label="isSavingAnswer ? t('Saving') : t('Save draft')"
               icon="check"
               type="success"
@@ -1070,26 +1108,19 @@
             />
             <BaseButton
               v-if="canMoveNext"
-              :disabled="isSavingAnswer || isTimeExpired"
+              :disabled="isSavingAnswer || isTimeExpired || isQuestionTimeExpired || isAutoAdvancingTimedQuestion"
               :label="nextNavigationLabel"
               type="primary"
               @click="goToNextQuestion"
             />
             <BaseButton
               v-if="!canManage && activeAttempt && canFinishCurrentPage"
-              :disabled="!canSubmit || isSavingAnswer || isFinishingAttempt || isAutoFinishingExpiredAttempt"
-              :label="isFinishingAttempt ? t('Finishing') : t('Finish in Vue')"
+              :disabled="!canSubmit || !canFinishWithConfirmation || isSavingAnswer || isFinishingAttempt || isAutoFinishingExpiredAttempt || isQuestionTimeExpired || isAutoAdvancingTimedQuestion"
+              :label="isFinishingAttempt ? t('Finishing') : t('Finish test')"
               icon="check"
               type="primary"
               @click="finishAttempt"
             />
-            <BaseButton
-              v-if="showLegacyRuntimeFallback"
-              :label="t('Continue in legacy exercise')"
-              :to-url="legacyUrls.overview"
-              icon="play-box-outline"
-              type="secondary"
-            />
           </div>
         </div>
       </form>
@@ -1197,12 +1228,21 @@ const selectedMatchingOptions = ref({})
 const draggedDraggableItemId = ref(null)
 const countdownRemainingSeconds = ref(null)
 const countdownTimer = ref(null)
+const questionCountdownRemainingSeconds = ref(null)
+const questionCountdownTimer = ref(null)
+const questionTimerStartedAt = ref(null)
+const questionTimerSavedSeconds = ref({})
 const isTimeExpired = ref(false)
+const isQuestionTimeExpired = ref(false)
 const isAutoFinishingExpiredAttempt = ref(false)
+const isAutoAdvancingTimedQuestion = ref(false)
 const directFeedbackByQuestion = ref({})
 const feedbackDialog = ref(null)
 const isFeedbackDialogVisible = ref(false)
 const feedbackShownOnLastSave = ref(false)
+const confirmedSavedAnswers = ref(false)
+let copyPasteCleanup = null
+let keepAliveTimer = null
 
 const questionMap = computed(() => new Map(questions.value.map((question) => [Number(question.id), question])))
 
@@ -1224,7 +1264,9 @@ const usesPagedNavigation = computed(() => {
 })
 
 const showLegacyRuntimeFallback = computed(() => {
-  return !canManage.value && true === usesLegacySubmit.value && Boolean(legacyUrls.value?.overview)
+  return !canManage.value
+    && Boolean(legacyUrls.value?.overview)
+    && (true === settings.value.requiresLegacyRuntime || (Boolean(activeAttempt.value) && true === usesLegacySubmit.value))
 })
 
 const currentRuntimePage = computed(() => {
@@ -1253,12 +1295,32 @@ const visibleQuestions = computed(() => {
 
 const visibleQuestionTotal = computed(() => answerableQuestions.value.length)
 const navigationTotal = computed(() => usesPagedNavigation.value ? Math.max(1, runtimePages.value.length || visibleQuestionTotal.value) : visibleQuestionTotal.value)
-const previousNavigationAllowed = computed(() => !settings.value.preventBackwards && settings.value.showPreviousButton !== false)
+const previousNavigationAllowed = computed(() => !settings.value.preventBackwards && true !== settings.value.blockCategoryQuestions && settings.value.showPreviousButton !== false)
 const showPreviousNavigationButton = computed(() => usesPagedNavigation.value && previousNavigationAllowed.value)
 const canMovePrevious = computed(() => showPreviousNavigationButton.value && currentQuestionIndex.value > 0)
 const canMoveNext = computed(() => usesPagedNavigation.value && currentQuestionIndex.value < navigationTotal.value - 1)
 const canFinishCurrentPage = computed(() => !usesPagedNavigation.value || !canMoveNext.value)
-const hasTimeControl = computed(() => null !== countdownRemainingSeconds.value && undefined !== countdownRemainingSeconds.value)
+const currentTimedQuestion = computed(() => {
+  if (!activeAttempt.value || canManage.value || true !== settings.value.allowTimePerQuestion) {
+    return null
+  }
+
+  if (!usesPagedNavigation.value || visibleQuestions.value.length !== 1) {
+    return null
+  }
+
+  const question = visibleQuestions.value.find((item) => !isStructuralQuestion(item))
+  const duration = Number(question?.duration || 0)
+
+  return duration > 0 ? question : null
+})
+const currentTimedQuestionId = computed(() => Number(currentTimedQuestion.value?.id || 0))
+const hasGlobalTimeControl = computed(() => null !== countdownRemainingSeconds.value && undefined !== countdownRemainingSeconds.value)
+const hasQuestionTimeControl = computed(() => null !== questionCountdownRemainingSeconds.value && undefined !== questionCountdownRemainingSeconds.value)
+const hasTimeControl = computed(() => hasGlobalTimeControl.value || hasQuestionTimeControl.value)
+const displayedRemainingSeconds = computed(() => hasQuestionTimeControl.value ? questionCountdownRemainingSeconds.value : countdownRemainingSeconds.value)
+const isDisplayedTimeExpired = computed(() => isTimeExpired.value || isQuestionTimeExpired.value)
+const timeControlLabel = computed(() => hasQuestionTimeControl.value ? t("Question time left") : t("Time left"))
 const answerableQuestions = computed(() => questions.value.filter((question) => !isStructuralQuestion(question)))
 const currentNavigationIndex = computed(() => Math.min(Math.max(0, currentQuestionIndex.value), Math.max(0, navigationTotal.value - 1)))
 const progressLabel = computed(() => {
@@ -1268,9 +1330,40 @@ const progressLabel = computed(() => {
 
   return `${t("Question")} ${currentNavigationIndex.value + 1} / ${navigationTotal.value}`
 })
+const currentAttemptLabel = computed(() => {
+  const attemptNumber = Number(activeAttempt.value?.attemptNumber || 0)
+  const maxAttempt = Number(settings.value.maxAttempt || 0)
+
+  if (attemptNumber > 0 && maxAttempt > 0) {
+    return `${t("Attempt")} ${attemptNumber} / ${maxAttempt}`
+  }
+
+  if (attemptNumber > 0) {
+    return `${t("Attempt")} ${attemptNumber}`
+  }
+
+  return t("Current attempt")
+})
+const currentCategoryLabel = computed(() => {
+  if (true !== settings.value.blockCategoryQuestions) {
+    return ""
+  }
+
+  const question = visibleQuestions.value.find((item) => !isStructuralQuestion(item))
+  return displayText(question?.primaryCategoryTitle || "")
+})
 const previousNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Previous page") : t("Previous question"))
 const nextNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Next page") : t("Next question"))
 const feedbackDialogTitle = computed(() => t(feedbackDialog.value?.title || "Feedback"))
+const requiresSavedAnswerConfirmation = computed(() => {
+  return !canManage.value && Boolean(activeAttempt.value?.attemptId) && true === settings.value.confirmSavedAnswers
+})
+const canFinishWithConfirmation = computed(() => {
+  return !requiresSavedAnswerConfirmation.value || true === confirmedSavedAnswers.value
+})
+const legacyRuntimeReasons = computed(() => {
+  return Array.isArray(settings.value.legacyRuntimeReasons) ? settings.value.legacyRuntimeReasons : []
+})
 
 watch(navigationTotal, (total) => {
   const safeTotal = Number(total || 0)
@@ -1376,6 +1469,120 @@ async function handleExpiredTimeLimit() {
   await finishAttempt({ skipDraftSave: false, expiredByTimer: true })
 }
 
+function syncQuestionCountdown() {
+  stopQuestionCountdownTimer()
+  isQuestionTimeExpired.value = false
+  isAutoAdvancingTimedQuestion.value = false
+
+  const question = currentTimedQuestion.value
+  if (!question || activeAttempt.value?.status !== "incomplete") {
+    questionCountdownRemainingSeconds.value = null
+    questionTimerStartedAt.value = null
+    return
+  }
+
+  const questionId = Number(question.id || 0)
+  questionTimerSavedSeconds.value = {
+    ...questionTimerSavedSeconds.value,
+    [questionId]: getSavedQuestionSecondsSpent(questionId),
+  }
+  questionTimerStartedAt.value = Date.now()
+  updateQuestionCountdown()
+  questionCountdownTimer.value = window.setInterval(updateQuestionCountdown, 1000)
+}
+
+function stopQuestionCountdownTimer() {
+  if (questionCountdownTimer.value) {
+    window.clearInterval(questionCountdownTimer.value)
+    questionCountdownTimer.value = null
+  }
+}
+
+function updateQuestionCountdown() {
+  const question = currentTimedQuestion.value
+  if (!question || activeAttempt.value?.status !== "incomplete") {
+    questionCountdownRemainingSeconds.value = null
+    return
+  }
+
+  const duration = Number(question.duration || 0)
+  if (duration <= 0) {
+    questionCountdownRemainingSeconds.value = null
+    return
+  }
+
+  const remaining = Math.max(0, duration - getQuestionSecondsSpent(question))
+  questionCountdownRemainingSeconds.value = remaining
+
+  if (remaining <= 0) {
+    handleQuestionTimeLimit()
+  }
+}
+
+async function handleQuestionTimeLimit() {
+  if (isAutoAdvancingTimedQuestion.value || isSavingAnswer.value || isFinishingAttempt.value) {
+    return
+  }
+
+  isQuestionTimeExpired.value = true
+  isAutoAdvancingTimedQuestion.value = true
+  answerSaveMessage.value = t("Question time reached. Saving your answer.")
+
+  const saved = await saveVisibleAnswers({ afterFeedback: canMoveNext.value ? "next" : "finish" })
+  if (!saved || feedbackShownOnLastSave.value) {
+    isAutoAdvancingTimedQuestion.value = false
+    return
+  }
+
+  if (canMoveNext.value) {
+    currentQuestionIndex.value += 1
+    isAutoAdvancingTimedQuestion.value = false
+    syncQuestionCountdown()
+    return
+  }
+
+  await finishAttempt({ skipDraftSave: true, expiredByTimer: true })
+}
+
+function getSavedQuestionSecondsSpent(questionId) {
+  const rows = activeAttempt.value?.savedAnswers?.[questionId] || activeAttempt.value?.savedAnswers?.[String(questionId)] || []
+  if (!Array.isArray(rows)) {
+    return 0
+  }
+
+  return rows.reduce((maxSeconds, row) => Math.max(maxSeconds, Number(row?.secondsSpent || 0)), 0)
+}
+
+function getQuestionSecondsSpent(question) {
+  const questionId = Number(question?.id || 0)
+  if (questionId <= 0) {
+    return 0
+  }
+
+  const savedSeconds = Number(questionTimerSavedSeconds.value[questionId] ?? getSavedQuestionSecondsSpent(questionId))
+  if (questionId !== currentTimedQuestionId.value || !questionTimerStartedAt.value) {
+    return savedSeconds
+  }
+
+  return savedSeconds + Math.max(0, Math.floor((Date.now() - questionTimerStartedAt.value) / 1000))
+}
+
+function rememberQuestionSecondsSpent(question) {
+  const questionId = Number(question?.id || 0)
+  if (questionId <= 0) {
+    return
+  }
+
+  questionTimerSavedSeconds.value = {
+    ...questionTimerSavedSeconds.value,
+    [questionId]: getQuestionSecondsSpent(question),
+  }
+
+  if (questionId === currentTimedQuestionId.value) {
+    questionTimerStartedAt.value = Date.now()
+  }
+}
+
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
 }
@@ -1386,9 +1593,93 @@ function getContextParams() {
     sid: getQueryValue(route.query.sid),
     gid: getQueryValue(route.query.gid),
     origin: getQueryValue(route.query.origin),
+    lp_init: getQueryValue(route.query.lp_init),
     learnpath_id: getQueryValue(route.query.learnpath_id),
     learnpath_item_id: getQueryValue(route.query.learnpath_item_id),
     learnpath_item_view_id: getQueryValue(route.query.learnpath_item_view_id),
+    isStudentView: getQueryValue(route.query.isStudentView),
+    preview: getQueryValue(route.query.preview),
+  }
+}
+
+
+function isEmbeddedInLearnpath() {
+  if (typeof window === "undefined") {
+    return false
+  }
+
+  try {
+    if (window.parent && window.parent !== window) {
+      const parentPath = window.parent.location?.pathname || ""
+      const referrer = document.referrer || ""
+
+      return parentPath.includes("/main/lp/")
+        || parentPath.includes("/main/newscorm/")
+        || referrer.includes("/main/lp/")
+        || referrer.includes("/main/newscorm/")
+    }
+  } catch (error) {
+    return (document.referrer || "").includes("/main/lp/")
+      || (document.referrer || "").includes("/main/newscorm/")
+  }
+
+  return false
+}
+
+const isLearnpathContext = computed(() => {
+  const origin = String(getQueryValue(route.query.origin) || "")
+
+  return origin === "learnpath"
+    || Boolean(getQueryValue(route.query.lp_init))
+    || Boolean(getQueryValue(route.query.learnpath_id))
+    || isEmbeddedInLearnpath()
+})
+
+function syncLearnpathParentFromFinish(response) {
+  const tracking = response?.learnpathTracking || {}
+  if (!tracking?.enabled || !isLearnpathContext.value || typeof window === "undefined") {
+    return
+  }
+
+  let parentWindow = null
+  try {
+    parentWindow = window.parent && window.parent !== window ? window.parent : null
+  } catch (error) {
+    parentWindow = null
+  }
+
+  if (!parentWindow) {
+    return
+  }
+
+  const itemId = Number(tracking.lpItemId || getQueryValue(route.query.learnpath_item_id) || 0)
+  const status = String(tracking.status || response?.status || "completed")
+  const completedItems = Number(tracking.completedItems || 0)
+  const totalItems = Number(tracking.totalItems || 0)
+  const progressMode = String(tracking.progressMode || "%")
+
+  try {
+    if (itemId > 0 && typeof parentWindow.update_toc === "function") {
+      parentWindow.update_toc(status, itemId)
+    }
+  } catch (error) {
+    console.warn("Could not update learning path TOC after exercise finish", error)
+  }
+
+  try {
+    if (completedItems >= 0 && totalItems > 0 && typeof parentWindow.update_progress_bar === "function") {
+      parentWindow.update_progress_bar(completedItems, totalItems, progressMode)
+    }
+  } catch (error) {
+    console.warn("Could not update learning path progress after exercise finish", error)
+  }
+
+  try {
+    if (itemId > 0 && typeof parentWindow.checkCurrentItemPosition === "function") {
+      parentWindow.checkCurrentItemPosition(itemId)
+    }
+  } catch (error) {
+    console.warn("Could not update learning path navigation after exercise finish", error)
   }
 }
 
@@ -1416,7 +1707,7 @@ async function loadRuntime() {
     questionCount.value = Number(response.questionCount || questions.value.length)
     totalScore.value = Number(response.totalScore || 0)
     canManage.value = true === response.canManage
-    canStartAttempt.value = true === response.canStartAttempt
+    canStartAttempt.value = true === response.canStartAttempt && true !== settings.value.requiresLegacyRuntime
     activeAttempt.value = response.attempt || null
     canSubmit.value = true === response.canSubmit
     usesLegacySubmit.value = true === response.usesLegacySubmit && Boolean(activeAttempt.value)
@@ -1426,7 +1717,10 @@ async function loadRuntime() {
     directFeedbackByQuestion.value = {}
     feedbackDialog.value = null
     isFeedbackDialogVisible.value = false
+    confirmedSavedAnswers.value = false
     syncCountdownFromAttempt(activeAttempt.value)
+    syncRuntimeSettingsEffects()
+    syncQuestionCountdown()
   } catch (error) {
     console.error("Error loading exercise runtime", error)
     errorMessage.value = t("Could not load exercise")
@@ -1453,11 +1747,14 @@ async function startAttempt() {
       canSubmit.value = true === response.canFinish && true !== response.usesLegacyRuntime
       usesLegacySubmit.value = true === response.usesLegacyRuntime || false === response.canFinish
       attemptMessage.value = response.message || t("Attempt started")
+      confirmedSavedAnswers.value = false
       applyAttemptState(response)
       reorderQuestionsFromAttempt(response.questionIds || [])
       initializeAnswerState()
       applySavedAnswers(response.savedAnswers || {})
       syncCountdownFromAttempt(response)
+      syncRuntimeSettingsEffects()
+      syncQuestionCountdown()
       return
     }
 
@@ -1467,10 +1764,10 @@ async function startAttempt() {
 
     canSubmit.value = false
     usesLegacySubmit.value = true === response.usesLegacyRuntime
-    attemptError.value = response.message || t("Could not start the Vue attempt")
+    attemptError.value = response.message || t("Could not start the attempt")
   } catch (error) {
     console.error("Error starting exercise attempt", error)
-    attemptError.value = t("Could not start the Vue attempt")
+    attemptError.value = t("Could not start the attempt")
   } finally {
     isStartingAttempt.value = false
   }
@@ -1480,6 +1777,7 @@ function applyAttemptState(attempt) {
   if (!attempt) {
     currentQuestionIndex.value = 0
     syncCountdownFromAttempt(null)
+    syncQuestionCountdown()
     return
   }
 
@@ -1534,25 +1832,27 @@ function reorderQuestionsFromAttempt(questionIds = []) {
 }
 
 async function goToPreviousQuestion() {
-  if (isTimeExpired.value || !canMovePrevious.value) {
+  if (isTimeExpired.value || isQuestionTimeExpired.value || isAutoAdvancingTimedQuestion.value || !canMovePrevious.value) {
     return
   }
 
   if (await saveVisibleAnswers({ afterFeedback: "previous" })) {
     if (!feedbackShownOnLastSave.value) {
       currentQuestionIndex.value -= 1
+      syncQuestionCountdown()
     }
   }
 }
 
 async function goToNextQuestion() {
-  if (isTimeExpired.value || !canMoveNext.value) {
+  if (isTimeExpired.value || isQuestionTimeExpired.value || isAutoAdvancingTimedQuestion.value || !canMoveNext.value) {
     return
   }
 
   if (await saveVisibleAnswers({ afterFeedback: "next" })) {
     if (!feedbackShownOnLastSave.value) {
       currentQuestionIndex.value += 1
+      syncQuestionCountdown()
     }
   }
 }
@@ -1616,6 +1916,7 @@ async function finishAttempt(options = {}) {
       {
         exerciseId,
         attemptId,
+        confirmedSavedAnswers: true === confirmedSavedAnswers.value,
       },
       getContextParams(),
       exerciseId,
@@ -1633,6 +1934,7 @@ async function finishAttempt(options = {}) {
     canSubmit.value = false
     stopCountdownTimer()
     finishMessage.value = response.message ? t(response.message) : t("Attempt finished")
+    syncLearnpathParentFromFinish(response)
 
     await router.push({
       name: "ExerciseResult",
@@ -1667,7 +1969,8 @@ async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
         attemptId,
         questionId: Number(question.id),
         answer: buildAnswerPayload(question),
-        secondsSpent: 0,
+        secondsSpent: getQuestionSecondsSpent(question),
+        navigationAction: afterFeedback,
       },
       getContextParams(),
       exerciseId,
@@ -1694,6 +1997,8 @@ async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
     savedQuestionIds.value = nextSavedQuestionIds
   }
 
+  rememberQuestionSecondsSpent(question)
+  updateQuestionCountdown()
   handleRuntimeFeedback(question, response.feedback || null, afterFeedback)
 
   return response
@@ -1708,7 +2013,7 @@ async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
 
   const formData = new FormData()
   formData.append("questionId", String(Number(question.id)))
-  formData.append("secondsSpent", "0")
+  formData.append("secondsSpent", String(getQuestionSecondsSpent(question)))
   formData.append("file", questionAnswer.uploadFile || questionAnswer.oralFile)
 
   const response = await exerciseService.uploadExerciseRuntimeAnswer(
@@ -1810,11 +2115,13 @@ async function proceedAfterFeedback(feedback) {
 
   if (feedback.afterAction === "next" && canMoveNext.value) {
     currentQuestionIndex.value += 1
+    syncQuestionCountdown()
     return
   }
 
   if (feedback.afterAction === "previous" && canMovePrevious.value) {
     currentQuestionIndex.value -= 1
+    syncQuestionCountdown()
   }
 }
 
@@ -2946,6 +3253,88 @@ function degreeCertaintyOptions(question) {
   })
 }
 
+function syncRuntimeSettingsEffects() {
+  syncCopyPasteProtection()
+  syncKeepAlivePing()
+}
+
+function stopRuntimeSettingsEffects() {
+  stopCopyPasteProtection()
+  stopKeepAlivePing()
+}
+
+function syncCopyPasteProtection() {
+  stopCopyPasteProtection()
+  if (canManage.value || !activeAttempt.value || true !== settings.value.preventCopyPaste) {
+    return
+  }
+
+  const preventDefault = (event) => {
+    event.preventDefault()
+    event.stopPropagation()
+  }
+  const preventKeyboardShortcut = (event) => {
+    if (!event?.ctrlKey && !event?.metaKey) {
+      return
+    }
+
+    const key = String(event.key || "").toLowerCase()
+    if (["a", "c", "p", "s", "u", "v", "x"].includes(key)) {
+      preventDefault(event)
+    }
+  }
+  const handlers = [
+    [document, "copy", preventDefault],
+    [document, "cut", preventDefault],
+    [document, "paste", preventDefault],
+    [document, "contextmenu", preventDefault],
+    [document, "dragstart", preventDefault],
+    [document, "keydown", preventKeyboardShortcut],
+  ]
+
+  for (const [target, eventName, handler] of handlers) {
+    target.addEventListener(eventName, handler, true)
+  }
+
+  copyPasteCleanup = () => {
+    for (const [target, eventName, handler] of handlers) {
+      target.removeEventListener(eventName, handler, true)
+    }
+  }
+}
+
+function stopCopyPasteProtection() {
+  if (copyPasteCleanup) {
+    copyPasteCleanup()
+    copyPasteCleanup = null
+  }
+}
+
+function syncKeepAlivePing() {
+  stopKeepAlivePing()
+  const interval = Number(settings.value.keepAlivePingInterval || 0)
+  if (interval <= 0 || canManage.value || !activeAttempt.value) {
+    return
+  }
+
+  const sendKeepAlivePing = () => {
+    fetch("/main/inc/ajax/keepalive.ajax.php", {
+      method: "GET",
+      credentials: "same-origin",
+      cache: "no-store",
+    }).catch(() => {})
+  }
+
+  keepAliveTimer = window.setInterval(sendKeepAlivePing, Math.max(60, interval) * 1000)
+}
+
+function stopKeepAlivePing() {
+  if (keepAliveTimer) {
+    window.clearInterval(keepAliveTimer)
+    keepAliveTimer = null
+  }
+}
+
 function submitDisabled() {
   return false
 }
@@ -2974,7 +3363,11 @@ function displayText(value, fallback = "") {
   return plainValue || fallback
 }
 
-onBeforeUnmount(stopCountdownTimer)
+onBeforeUnmount(() => {
+  stopCountdownTimer()
+  stopQuestionCountdownTimer()
+  stopRuntimeSettingsEffects()
+})
 
 onMounted(loadRuntime)
 
@@ -2982,6 +3375,11 @@ watch(
   () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid],
   () => loadRuntime(),
 )
+
+watch(
+  () => [currentTimedQuestionId.value, activeAttempt.value?.attemptId, activeAttempt.value?.status],
+  () => syncQuestionCountdown(),
+)
 </script>
 
 <style scoped>
diff --git a/assets/vue/views/exercise/ExerciseQuestionBankView.vue b/assets/vue/views/exercise/ExerciseQuestionBankView.vue
index 739f8caf5ef..3e0ba658333 100644
--- a/assets/vue/views/exercise/ExerciseQuestionBankView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionBankView.vue
@@ -2,8 +2,8 @@
   <section class="space-y-5">
     <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
       <BaseButton
-        :label="t('Back to questions')"
-        :route="{ name: 'ExerciseQuestions', params: { ...route.params, exerciseId }, query: getContextParams() }"
+        :label="isGlobalMode ? t('Back to exercises') : t('Back to questions')"
+        :route="backRoute"
         icon="back"
         only-icon
         size="small"
@@ -15,10 +15,10 @@
 
     <section class="space-y-1">
       <h1 class="text-xl font-semibold text-gray-90">
-        {{ t("Question bank") }}
+        {{ t("Recycle existing questions") }}
       </h1>
       <p class="text-sm text-gray-600">
-        {{ t("Reuse existing questions in this test.") }}
+        {{ isGlobalMode ? t("Manage all questions") : t("Add question to test") }}
       </p>
     </section>
 
@@ -104,9 +104,12 @@
 
     <div class="flex flex-wrap items-center justify-between gap-3 rounded-xl border border-gray-20 bg-white px-4 py-3 shadow-sm">
       <div class="text-sm text-gray-700">
-        {{ t("{0} questions found", [totalItems]) }}
+        {{ t("Questions") }}: {{ totalItems }}
       </div>
-      <div class="flex flex-wrap gap-2">
+      <div
+        v-if="!isGlobalMode"
+        class="flex flex-wrap gap-2"
+      >
         <BaseButton
           :disabled="0 === selectedQuestionIds.length || isSaving"
           :is-loading="isSaving"
@@ -119,13 +122,20 @@
     </div>
 
     <BaseTable
+      :key="tableKey"
+      v-model:rows="filters.itemsPerPage"
       :is-loading="isLoading"
+      lazy
       :text-for-empty="t('No questions found')"
       :total-items="totalItems"
       :values="questions"
       data-key="id"
+      @page="handleTablePage"
     >
-      <Column class="w-12">
+      <Column
+        v-if="!isGlobalMode"
+        class="w-12"
+      >
         <template #header>
           <input
             :checked="areAllReusableQuestionsSelected"
@@ -213,53 +223,71 @@
       >
         <template #body="{ data }">
           <div class="flex justify-end gap-1">
-            <span
-              v-if="data.alreadyInExercise"
-              class="rounded-full bg-gray-100 px-2 py-1 text-xs font-semibold text-gray-700"
-            >
-              {{ t("Already in test") }}
-            </span>
-            <span
-              v-else-if="!data.canReuse"
-              class="rounded-full bg-yellow-100 px-2 py-1 text-xs font-semibold text-yellow-800"
-              :title="t(data.blockedReason || 'This question cannot be reused here.')"
-            >
-              {{ t("Not compatible") }}
-            </span>
-            <BaseButton
-              v-else
-              :disabled="isSaving"
-              :label="t('Use this question in the test as a link (not a copy)')"
-              icon="plus"
-              only-icon
-              size="small"
-              type="success-text"
-              @click="addQuestion(data)"
-            />
+            <template v-if="isGlobalMode">
+              <BaseButton
+                v-if="data.canEdit"
+                :label="t('Edit')"
+                icon="edit"
+                only-icon
+                :route="{ name: 'ExerciseGlobalQuestionEdit', params: { node: route.params.node, questionId: data.id }, query: getContextParams() }"
+                size="small"
+                type="secondary-text"
+              />
+              <BaseButton
+                v-else
+                :disabled="true"
+                :label="getEditBlockedLabel(data)"
+                icon="edit"
+                only-icon
+                size="small"
+                type="secondary-text"
+              />
+              <BaseButton
+                v-if="data.canDelete"
+                :disabled="isSaving"
+                :label="t('Delete')"
+                icon="delete"
+                only-icon
+                size="small"
+                type="danger-text"
+                @click="confirmDeleteQuestion(data)"
+              />
+              <BaseButton
+                v-else
+                :disabled="true"
+                :label="getDeleteBlockedLabel(data)"
+                icon="delete"
+                only-icon
+                size="small"
+                type="danger-text"
+              />
+            </template>
+            <template v-else>
+              <BaseButton
+                v-if="data.canReuse"
+                :disabled="isSaving"
+                :label="t('Use this question in the test as a link (not a copy)')"
+                icon="plus"
+                only-icon
+                size="small"
+                type="success-text"
+                @click="addQuestion(data)"
+              />
+              <BaseButton
+                v-else
+                :disabled="true"
+                :label="getReuseBlockedLabel(data)"
+                icon="plus"
+                only-icon
+                size="small"
+                type="success-text"
+              />
+            </template>
           </div>
         </template>
       </Column>
     </BaseTable>
 
-    <div class="flex flex-wrap items-center justify-between gap-3 rounded-xl border border-gray-20 bg-white px-4 py-3 shadow-sm">
-      <BaseButton
-        :disabled="1 >= filters.page || isLoading"
-        :label="t('Previous')"
-        icon="back"
-        type="plain"
-        @click="changePage(filters.page - 1)"
-      />
-      <span class="text-sm text-gray-700">
-        {{ t("Page {0} of {1}", [filters.page, pageCount]) }}
-      </span>
-      <BaseButton
-        :disabled="filters.page >= pageCount || isLoading"
-        :label="t('Next')"
-        icon="next"
-        type="plain"
-        @click="changePage(filters.page + 1)"
-      />
-    </div>
   </section>
 </template>
 
@@ -271,13 +299,17 @@ import BaseButton from "../../components/basecomponents/BaseButton.vue"
 import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
 import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
 import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { useConfirmation } from "../../composables/useConfirmation"
 import exerciseService from "../../services/exerciseService"
 
 const { t } = useI18n()
 const route = useRoute()
+const { requireConfirmation } = useConfirmation()
 
 const exerciseId = Number(getQueryValue(route.params.exerciseId) || 0)
+const responseGlobalMode = ref(0 >= exerciseId)
 const questions = ref([])
+const tableKey = ref(0)
 const categoryOptions = ref([])
 const exerciseOptions = ref([])
 const difficultyOptions = ref([])
@@ -299,22 +331,38 @@ const filters = reactive({
   questionType: Number(getQueryValue(route.query.questionType) || -1),
 })
 
+const isGlobalMode = computed(() => responseGlobalMode.value)
+const backRoute = computed(() => {
+  if (isGlobalMode.value) {
+    return { name: "ExerciseList", params: { node: route.params.node }, query: getContextParams() }
+  }
+
+  return { name: "ExerciseQuestions", params: { ...route.params, exerciseId }, query: getContextParams() }
+})
 const reusableQuestionIds = computed(() => questions.value.filter((question) => question.canReuse).map((question) => Number(question.id)))
 const areAllReusableQuestionsSelected = computed(
   () => reusableQuestionIds.value.length > 0 && reusableQuestionIds.value.every((id) => selectedQuestionIds.value.includes(id)),
 )
-const pageCount = computed(() => Math.max(1, Math.ceil(totalItems.value / Math.max(1, filters.itemsPerPage))))
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
 }
 
 function getContextParams() {
-  return {
+  const params = {
     cid: getQueryValue(route.query.cid),
     sid: getQueryValue(route.query.sid),
     gid: getQueryValue(route.query.gid),
   }
+
+  for (const key of ["origin", "lp_id", "learnpath_id", "node", "type", "returnToLp", "isStudentView", "gradebook"]) {
+    const value = getQueryValue(route.query[key])
+    if (value !== undefined && value !== null && String(value) !== "") {
+      params[key] = value
+    }
+  }
+
+  return params
 }
 
 function getBankParams() {
@@ -364,8 +412,13 @@ function useFallbackIcon(event) {
   event.target.src = "/img/icons/64/new_question.png"
 }
 
+function resetTablePagination() {
+  tableKey.value += 1
+}
+
 function applyFilters() {
   filters.page = 1
+  resetTablePagination()
   loadQuestionBank()
 }
 
@@ -376,18 +429,51 @@ function clearFilters() {
   filters.sourceExerciseId = 0
   filters.difficulty = -1
   filters.questionType = -1
+  resetTablePagination()
   loadQuestionBank()
 }
 
-function changePage(page) {
-  filters.page = Math.max(1, Math.min(page, pageCount.value))
+function handleTablePage(event) {
+  filters.page = Number(event.page || 0) + 1
+  filters.itemsPerPage = Number(event.rows || filters.itemsPerPage || 20)
   loadQuestionBank()
 }
 
+function getEditBlockedLabel(question) {
+  if (question.usedInActiveTest) {
+    return t("This question is used in an active test and cannot be edited here.")
+  }
+
+  return t("This question cannot be edited here.")
+}
+
+function getDeleteBlockedLabel(question) {
+  if (question.usedInActiveTest) {
+    return t("This question is used in an active test and cannot be deleted here.")
+  }
+
+  return t("This question cannot be deleted because your access is limited by the platform settings.")
+}
+
+function getReuseBlockedLabel(question) {
+  if (question.alreadyInExercise) {
+    return t("Already in test")
+  }
+
+  return t(question.blockedReason || "This question cannot be reused here.")
+}
+
 function toggleAllQuestions(event) {
   selectedQuestionIds.value = event.target.checked ? [...reusableQuestionIds.value] : []
 }
 
+function confirmDeleteQuestion(question) {
+  requireConfirmation({
+    message: t("Are you sure you want to delete this question?"),
+    accept: () => deleteQuestion(question),
+  })
+}
+
 async function addQuestion(question) {
   await runReuseAction([Number(question.id)])
 }
@@ -396,7 +482,15 @@ async function addSelectedQuestions() {
   await runReuseAction(selectedQuestionIds.value)
 }
 
+async function deleteQuestion(question) {
+  await runBankAction("delete", [Number(question.id)])
+}
+
 async function runReuseAction(questionIds) {
+  await runBankAction("reuse", questionIds)
+}
+
+async function runBankAction(action, questionIds) {
   if (isSaving.value) {
     return
   }
@@ -415,14 +509,14 @@ async function runReuseAction(questionIds) {
     const response = await exerciseService.saveExerciseQuestionBankAction(
       {
         exerciseId,
-        action: "reuse",
+        action,
         questionIds: safeQuestionIds,
         submittedCsrfToken: csrfToken.value,
       },
       getContextParams(),
-      exerciseId,
+      isGlobalMode.value ? null : exerciseId,
     )
-    infoMessage.value = response?.message ? t(response.message) : t("Questions added to the test")
+    infoMessage.value = response?.message ? t(response.message) : t("Question bank updated")
     selectedQuestionIds.value = []
     await loadQuestionBank()
   } catch (error) {
@@ -434,16 +528,12 @@ async function runReuseAction(questionIds) {
 }
 
 async function loadQuestionBank() {
-  if (!exerciseId) {
-    errorMessage.value = t("A valid exercise id is required.")
-    return
-  }
-
   isLoading.value = true
   errorMessage.value = ""
 
   try {
-    const response = await exerciseService.getExerciseQuestionBank(getBankParams(), exerciseId)
+    const response = await exerciseService.getExerciseQuestionBank(getBankParams(), isGlobalMode.value ? null : exerciseId)
+    responseGlobalMode.value = true === response.globalMode || 0 >= exerciseId
     questions.value = Array.isArray(response.items) ? response.items : []
     categoryOptions.value = Array.isArray(response.categoryOptions) ? response.categoryOptions : []
     exerciseOptions.value = Array.isArray(response.exerciseOptions) ? response.exerciseOptions : []
diff --git a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
index 476ae91d29c..23c22133ba2 100644
--- a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
@@ -27,7 +27,10 @@
 
     <form
       v-if="!isLoading"
-      class="space-y-5"
+      :class="[
+        'space-y-5',
+        isReadOnlyFromLearningPath ? 'pointer-events-none opacity-75' : '',
+      ]"
       @submit.prevent="saveQuestion"
     >
       <div class="space-y-3 border-b border-gray-20 pb-4">
@@ -42,6 +45,13 @@
           {{ summaryText }}
         </div>
 
+        <div
+          v-if="isReadOnlyFromLearningPath"
+          class="rounded-lg border border-yellow-200 bg-yellow-50 px-4 py-3 text-sm font-medium text-yellow-800"
+        >
+          {{ t(learningPathReadOnlyMessage) }}
+        </div>
+
         <BaseInputText
           id="exercise-question-title"
           v-model="form.title"
@@ -1119,6 +1129,7 @@
             @click="addMatchingElement"
           />
           <BaseButton
+            v-if="!isReadOnlyFromLearningPath"
             :is-loading="isSaving"
             :label="t('Add this question to the test')"
             icon="check"
@@ -1217,6 +1228,7 @@
             @click="addDraggableItem"
           />
           <BaseButton
+            v-if="!isReadOnlyFromLearningPath"
             :is-loading="isSaving"
             :label="t('Add this question to the test')"
             icon="check"
@@ -1231,6 +1243,7 @@
         class="flex flex-wrap items-center gap-2"
       >
         <BaseButton
+          v-if="!isReadOnlyFromLearningPath"
           :is-loading="isSaving"
           :label="t('Save the question')"
           icon="check"
@@ -1537,6 +1550,10 @@ const showAdvancedSettings = ref(false)
 const allowQuestionFeedback = ref(false)
 const imageZoomEnabled = ref(false)
 const allowMandatoryQuestion = ref(false)
+const isReadOnlyFromLearningPath = ref(false)
+const learningPathReadOnlyMessage = ref(
+  "This exercise has been included in a learning path, so it cannot be accessed by students directly from here. If you want to put the same exercise available through the exercises tool, please make a copy of the current exercise using the copy icon.",
+)
 let answerCounter = 0
 let matchingOptionCounter = 0
 let matchingPairCounter = 0
@@ -1697,6 +1714,7 @@ const form = reactive({
 })
 
 const exerciseId = computed(() => Number(getQueryValue(route.params.exerciseId) || 0))
+const isGlobalQuestionMode = computed(() => ['ExerciseGlobalQuestionCreate', 'ExerciseGlobalQuestionEdit'].includes(String(route.name)))
 const questionId = computed(() => Number(getQueryValue(route.params.questionId) || 0))
 const questionType = computed(() => Number(getQueryValue(route.params.questionType) || UNIQUE_ANSWER))
 const isEditMode = computed(() => questionId.value > 0)
@@ -1751,13 +1769,21 @@ const dropdownOptionCount = computed(() => form.answers.length)
 const editorTitle = computed(() => {
   const label = typeLabel.value || getTypeLabel(Number(form.type))
 
-  return isEditMode.value
-    ? formatTranslatedText("Edit question: {0}", [t(label)])
+  if (isEditMode.value) {
+    return formatTranslatedText("Edit question: {0}", [t(label)])
+  }
+
+  return isGlobalQuestionMode.value
+    ? formatTranslatedText("Add a question: {0}", [t(label)])
     : formatTranslatedText("Add this question to the test: {0}", [t(label)])
 })
-const summaryText = computed(() =>
-  formatTranslatedText("{0} questions, for a total score (all questions) of {1}.", [questionCount.value, totalScore.value]),
-)
+const summaryText = computed(() => {
+  if (isGlobalQuestionMode.value) {
+    return ""
+  }
+
+  return formatTranslatedText("{0} questions, for a total score (all questions) of {1}.", [questionCount.value, totalScore.value])
+})
 const manualCorrectionHelpText = computed(() => {
   if (isUploadAnswerQuestion.value) {
     return t("This upload question has no answer options. Its score is assigned during correction/results review.")
@@ -1806,22 +1832,51 @@ const matchingOptionSelectOptions = computed(() =>
     value: option.localId,
   })),
 )
-const questionsRoute = computed(() => ({
-  name: "ExerciseQuestions",
-  params: { node: route.params.node, exerciseId: exerciseId.value },
-  query: getContextParams(),
-}))
+const questionsRoute = computed(() => {
+  if (isGlobalQuestionMode.value) {
+    return {
+      name: isEditMode.value ? "ExerciseQuestionPool" : "ExerciseList",
+      params: { node: route.params.node },
+      query: getContextParams(),
+    }
+  }
+
+  return {
+    name: "ExerciseQuestions",
+    params: { node: route.params.node, exerciseId: exerciseId.value },
+    query: getContextParams(),
+  }
+})
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
 }
 
 function getContextParams() {
-  return {
+  const params = {
     cid: getQueryValue(route.query.cid),
     sid: getQueryValue(route.query.sid),
     gid: getQueryValue(route.query.gid),
   }
+
+  for (const key of ["origin", "lp_id", "learnpath_id", "node", "type", "returnToLp", "isStudentView", "gradebook"]) {
+    const value = getQueryValue(route.query[key])
+    if (value !== undefined && value !== null && String(value) !== "") {
+      params[key] = value
+    }
+  }
+
+  return params
+}
+
+function getEditorParams() {
+  const params = { ...getContextParams() }
+
+  if (!isEditMode.value && route.query.isContent !== undefined) {
+    params.isContent = getQueryValue(route.query.isContent)
+  }
+
+  return params
 }
 
 function formatTranslatedText(key, replacements = []) {
@@ -2168,6 +2223,8 @@ function normalizeOption(option) {
 }
 
 function fillForm(data) {
+  isReadOnlyFromLearningPath.value = true === data.isReadOnlyFromLearningPath
+  learningPathReadOnlyMessage.value = data.learningPathReadOnlyMessage || learningPathReadOnlyMessage.value
   form.type = Number(data.type || questionType.value || UNIQUE_ANSWER)
   typeLabel.value = data.typeLabel || getTypeLabel(form.type)
   form.title = data.title || ""
@@ -3383,7 +3440,7 @@ function validateForm() {
 }
 
 async function loadQuestionEditor() {
-  if (!exerciseId.value) {
+  if (!isGlobalQuestionMode.value && !exerciseId.value) {
     errorMessage.value = t("A valid exercise id is required.")
     return
   }
@@ -3392,12 +3449,17 @@ async function loadQuestionEditor() {
   errorMessage.value = ""
 
   try {
-    const response = await exerciseService.getExerciseQuestionEditor(
-      getContextParams(),
-      exerciseId.value,
-      isEditMode.value ? questionId.value : null,
-      isEditMode.value ? null : questionType.value,
-    )
+    const response = isGlobalQuestionMode.value
+      ? await exerciseService.getExerciseGlobalQuestionEditor(
+          { ...getEditorParams(), questionId: isEditMode.value ? questionId.value : null },
+          isEditMode.value ? null : questionType.value,
+        )
+      : await exerciseService.getExerciseQuestionEditor(
+          getEditorParams(),
+          exerciseId.value,
+          isEditMode.value ? questionId.value : null,
+          isEditMode.value ? null : questionType.value,
+        )
     fillForm(response)
   } catch (error) {
     console.error("Error loading exercise question editor", error)
@@ -3410,6 +3472,11 @@ async function loadQuestionEditor() {
 async function saveQuestion() {
   errorMessage.value = ""
 
+  if (isReadOnlyFromLearningPath.value) {
+    errorMessage.value = t("This exercise is read-only because it is included in a learning path.")
+    return
+  }
+
   if (!validateForm()) {
     return
   }
@@ -3417,12 +3484,20 @@ async function saveQuestion() {
   isSaving.value = true
 
   try {
-    await exerciseService.saveExerciseQuestion(
-      buildPayload(),
-      getContextParams(),
-      exerciseId.value,
-      isEditMode.value ? questionId.value : null,
-    )
+    if (isGlobalQuestionMode.value) {
+      await exerciseService.saveExerciseGlobalQuestion(
+        buildPayload(),
+        getContextParams(),
+        isEditMode.value ? questionId.value : null,
+      )
+    } else {
+      await exerciseService.saveExerciseQuestion(
+        buildPayload(),
+        getContextParams(),
+        exerciseId.value,
+        isEditMode.value ? questionId.value : null,
+      )
+    }
     await router.push(questionsRoute.value)
   } catch (error) {
     console.error("Error saving exercise question", error)
diff --git a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
index 7a7a182e9da..f223ec1b9e9 100644
--- a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
@@ -3,14 +3,16 @@
     <div class="exercise-question-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
       <BaseButton
         class="exercise-question-toolbar__button"
-        :label="t('Back to exercises')"
-        :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        :label="backButtonLabel"
+        :route="learningPathContext ? null : { name: 'ExerciseList', params: route.params, query: getContextParams() }"
+        :to-url="learningPathContext ? learningPathBackUrl : null"
         icon="back"
         only-icon
         size="small"
         type="primary-text"
       />
       <BaseButton
+        v-if="!learningPathContext"
         class="exercise-question-toolbar__button"
         :label="t('Preview')"
         :route="{ name: 'ExercisePlayer', params: { ...route.params, exerciseId }, query: getContextParams() }"
@@ -20,6 +22,7 @@
         type="primary-text"
       />
       <BaseButton
+        v-if="!learningPathContext"
         class="exercise-question-toolbar__button"
         :label="t('Results')"
         :route="{ name: 'ExerciseReport', params: { ...route.params, exerciseId }, query: getContextParams() }"
@@ -63,15 +66,42 @@
               {{ displayText(title, t("Questions")) }}
             </h1>
             <p class="text-sm text-gray-600">
-              {{ t("Select a question type to create a question.") }}
+              {{
+                isReadOnlyFromLearningPath
+                  ? t("This exercise is read-only because it is included in a learning path.")
+                  : t("Select a question type to create a question.")
+              }}
             </p>
           </div>
-          <BaseButton
-            :label="t('Question bank')"
-            :route="{ name: 'ExerciseQuestionBank', params: { ...route.params, exerciseId }, query: getContextParams() }"
-            icon="table"
-            type="primary"
-          />
+          <div class="flex flex-wrap items-center gap-2">
+            <BaseButton
+              v-if="learningPathContext"
+              :disabled="questionCount <= 0"
+              :is-loading="isAttachingToLearningPath"
+              :label="t('Finish and return to learning path')"
+              icon="check"
+              type="success"
+              @click="finishLearningPathCreation"
+            />
+            <BaseButton
+              :disabled="isReadOnlyFromLearningPath"
+              :label="t('Recycle existing questions')"
+              :route="
+                isReadOnlyFromLearningPath
+                  ? null
+                  : { name: 'ExerciseQuestionBank', params: { ...route.params, exerciseId }, query: getContextParams() }
+              "
+              icon="table"
+              type="primary"
+            />
+          </div>
+        </div>
+
+        <div
+          v-if="isReadOnlyFromLearningPath"
+          class="rounded-lg border border-yellow-200 bg-yellow-50 px-4 py-3 text-sm font-medium text-yellow-800"
+        >
+          {{ t(learningPathReadOnlyMessage) }}
         </div>
 
         <div class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm font-medium text-support-4">
@@ -83,7 +113,7 @@
             <a
               v-for="questionType in questionTypes"
               :key="`question-type-${questionType.type}`"
-              :aria-disabled="!questionType.enabled"
+              :aria-disabled="isQuestionTypeDisabled(questionType)"
               :aria-label="questionTypeTitle(questionType)"
               :class="questionTypeCardClass(questionType)"
               :href="questionTypeHref(questionType)"
@@ -219,7 +249,7 @@
                         type="secondary-text"
                       />
                       <BaseButton
-                        v-else
+                        v-else-if="!learningPathContext"
                         :label="t('Edit')"
                         :to-url="legacyQuestionEditUrl(question.id)"
                         icon="edit"
@@ -228,7 +258,7 @@
                         type="secondary-text"
                       />
                       <BaseButton
-                        :disabled="isActionSaving"
+                        :disabled="isActionSaving || isReadOnlyFromLearningPath"
                         :label="t('Copy')"
                         icon="copy"
                         only-icon
@@ -237,7 +267,7 @@
                         @click="duplicateQuestion(question)"
                       />
                       <BaseButton
-                        :disabled="isActionSaving"
+                        :disabled="isActionSaving || isReadOnlyFromLearningPath"
                         :label="t('Delete')"
                         icon="delete"
                         only-icon
@@ -618,6 +648,7 @@ const { requireConfirmation } = useConfirmation()
 
 const isLoading = ref(false)
 const isActionSaving = ref(false)
+const isAttachingToLearningPath = ref(false)
 const errorMessage = ref("")
 const title = ref("")
 const questionCount = ref(0)
@@ -625,6 +656,10 @@ const totalScore = ref(0)
 const questionTypes = ref([])
 const questions = ref([])
 const csrfToken = ref("")
+const isReadOnlyFromLearningPath = ref(false)
+const learningPathReadOnlyMessage = ref(
+  "This exercise has been included in a learning path, so it cannot be accessed by students directly from here. If you want to put the same exercise available through the exercises tool, please make a copy of the current exercise using the copy icon.",
+)
 const expandedQuestionId = ref(null)
 const draggedQuestionId = ref(null)
 
@@ -632,17 +667,53 @@ const exerciseId = Number(getQueryValue(route.params.exerciseId) || 0)
 const summaryText = computed(() =>
   formatTranslatedText("{0} questions, for a total score (all questions) of {1}.", [questionCount.value, formatScore(totalScore.value)]),
 )
+const learningPathContext = computed(() => isLearningPathContext())
+const learningPathBackUrl = computed(() => buildLearningPathBackUrl())
+const backButtonLabel = computed(() => (learningPathContext.value ? t("Back to learning path") : t("Back to exercises")))
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
 }
 
 function getContextParams() {
-  return {
+  const params = {
     cid: getQueryValue(route.query.cid),
     sid: getQueryValue(route.query.sid),
     gid: getQueryValue(route.query.gid),
   }
+
+  for (const key of ["origin", "lp_id", "learnpath_id", "node", "type", "returnToLp", "isStudentView", "gradebook"]) {
+    const value = getQueryValue(route.query[key])
+    if (value !== undefined && value !== null && String(value) !== "") {
+      params[key] = value
+    }
+  }
+
+  return params
+}
+
+function isLearningPathContext() {
+  const origin = String(getQueryValue(route.query.origin) || "").toLowerCase()
+  const returnToLp = String(getQueryValue(route.query.returnToLp) || "").toLowerCase()
+  const lpId = Number(getQueryValue(route.query.lp_id) || getQueryValue(route.query.learnpath_id) || 0)
+
+  return lpId > 0 && (origin === "learnpath" || ["1", "true", "yes"].includes(returnToLp))
+}
+
+function buildLearningPathBackUrl() {
+  const params = new URLSearchParams()
+  params.set("action", "build")
+  params.set("type", getQueryValue(route.query.type) || "step")
+  params.set("lp_id", getQueryValue(route.query.lp_id) || getQueryValue(route.query.learnpath_id) || "0")
+
+  for (const key of ["cid", "sid", "gid", "gradebook", "origin", "node", "isStudentView"]) {
+    const value = getQueryValue(route.query[key])
+    if (value !== undefined && value !== null && String(value) !== "") {
+      params.set(key, String(value))
+    }
+  }
+
+  return `/main/lp/lp_controller.php?${params.toString()}#resource_tab-2`
 }
 
 function buildQueryString(params = {}) {
@@ -728,7 +799,7 @@ function questionTypeHelp(questionTypeOrId) {
 }
 
 function questionTypeHref(questionType) {
-  if (!questionType.enabled) {
+  if (isQuestionTypeDisabled(questionType)) {
     return undefined
   }
 
@@ -736,24 +807,43 @@ function questionTypeHref(questionType) {
     return router.resolve(questionCreateRoute(questionType)).href
   }
 
+  if (learningPathContext.value) {
+    return undefined
+  }
+
   return buildLegacyCreateQuestionUrl(questionType.type)
 }
 
 function questionTypeTitle(questionType) {
   const label = t(questionType.label)
 
+  if (isReadOnlyFromLearningPath.value) {
+    return `${label} - ${t("This exercise is read-only because it is included in a learning path.")}`
+  }
+
   if (!questionType.enabled) {
     return `${label} - ${t("Not available with the current exercise feedback mode")}`
   }
 
+  if (learningPathContext.value && !isVueQuestionType(questionType)) {
+    return `${label} - ${t("Not available in the learning path creation flow")}`
+  }
+
   return `${label} - ${t(questionTypeHelp(questionType))}`
 }
 
+function isQuestionTypeDisabled(questionType) {
+  return (
+    isReadOnlyFromLearningPath.value ||
+    !questionType.enabled ||
+    (learningPathContext.value && !isVueQuestionType(questionType))
+  )
+}
+
 function questionTypeCardClass(questionType) {
   return [
-    "group inline-flex h-20 w-20 items-center justify-center rounded-md border-2 text-center transition hover:bg-primary/5 focus:outline-none focus:ring-2 focus:ring-primary/30",
-    isVueQuestionType(questionType) ? "border-primary/60 bg-primary/5" : "border-transparent",
-    !questionType.enabled ? "pointer-events-none opacity-50" : "",
+    "group inline-flex h-20 w-20 items-center justify-center rounded-md border-2 border-transparent text-center transition hover:bg-primary/5 focus:outline-none focus:ring-2 focus:ring-primary/30",
+    isQuestionTypeDisabled(questionType) ? "pointer-events-none opacity-50" : "",
   ]
 }
 
@@ -830,12 +920,15 @@ function questionEditRoute(question) {
 }
 
 async function openQuestionType(questionType, event) {
-  if (!questionType.enabled) {
+  if (isQuestionTypeDisabled(questionType)) {
     event.preventDefault()
     return
   }
 
   if (!isVueQuestionType(questionType)) {
+    if (learningPathContext.value) {
+      event.preventDefault()
+    }
     return
   }
 
@@ -908,6 +1001,11 @@ function startDrag(question) {
 }
 
 async function dropQuestion(targetQuestion) {
+  if (isReadOnlyFromLearningPath.value) {
+    draggedQuestionId.value = null
+    return
+  }
+
   const draggedId = Number(draggedQuestionId.value || 0)
   const targetId = Number(targetQuestion.id || 0)
   draggedQuestionId.value = null
@@ -935,6 +1033,10 @@ async function dropQuestion(targetQuestion) {
 }
 
 function confirmDeleteQuestion(question) {
+  if (isReadOnlyFromLearningPath.value) {
+    return
+  }
+
   requireConfirmation({
     title: t("Delete question"),
     message: t("Are you sure you want to delete this question?"),
@@ -950,6 +1052,10 @@ async function deleteQuestion(question) {
 }
 
 async function duplicateQuestion(question) {
+  if (isReadOnlyFromLearningPath.value) {
+    return
+  }
+
   await runQuestionAction({
     action: "duplicate",
     questionId: Number(question.id),
@@ -984,6 +1090,38 @@ async function runQuestionAction(payload) {
   }
 }
 
+async function finishLearningPathCreation() {
+  errorMessage.value = ""
+
+  if (!learningPathContext.value) {
+    return
+  }
+
+  if (questionCount.value <= 0) {
+    errorMessage.value = t("Add at least one question before returning to the learning path.")
+    return
+  }
+
+  isAttachingToLearningPath.value = true
+
+  try {
+    await exerciseService.attachExerciseToLearningPath(
+      {
+        exerciseId,
+        submittedCsrfToken: csrfToken.value,
+      },
+      getContextParams(),
+      exerciseId,
+    )
+    window.location.href = learningPathBackUrl.value
+  } catch (error) {
+    console.error("Error adding exercise to learning path", error)
+    errorMessage.value = error?.response?.data?.detail || error?.response?.data?.["hydra:description"] || t("Could not add the exercise to the learning path")
+  } finally {
+    isAttachingToLearningPath.value = false
+  }
+}
+
 async function loadQuestionSelector() {
   if (!exerciseId) {
     errorMessage.value = t("A valid exercise id is required.")
@@ -996,6 +1134,8 @@ async function loadQuestionSelector() {
   try {
     const response = await exerciseService.getExerciseQuestions(getContextParams(), exerciseId)
     title.value = response.title || ""
+    isReadOnlyFromLearningPath.value = true === response.isReadOnlyFromLearningPath
+    learningPathReadOnlyMessage.value = response.learningPathReadOnlyMessage || learningPathReadOnlyMessage.value
     questionCount.value = Number(response.questionCount || 0)
     totalScore.value = Number(response.totalScore || 0)
     questionTypes.value = Array.isArray(response.questionTypes) ? response.questionTypes : []
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index c00ee77c73c..dc46980e96b 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -3,7 +3,10 @@
     class="exercise-result-page space-y-5"
     :class="{ 'exercise-result-print-mode': shouldAutoPrint() }"
   >
-    <div class="exercise-result-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
+    <div
+      v-if="!isLearnpathContext"
+      class="exercise-result-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm"
+    >
       <BaseButton
         :label="t('Back to exercises')"
         :route="{ name: 'ExerciseList', params: getBaseRouteParams(), query: getContextParams() }"
@@ -30,7 +33,7 @@
       />
     </div>
 
-    <div class="border-b border-gray-20" />
+    <div v-if="!isLearnpathContext" class="border-b border-gray-20" />
 
     <div
       v-if="isLoading"
@@ -188,7 +191,7 @@
         v-if="visibility.showRadar"
         class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
       >
-        {{ t("This exercise uses the radar/spiderweb result mode. The chart is not available in the Vue result page yet.") }}
+        {{ t("This exercise uses the radar/spiderweb result mode. The chart is not available on this page.") }}
       </div>
 
       <div
@@ -708,6 +711,88 @@
                     <BaseIcon icon="edit" size="small" />
                     {{ t("Teacher correction") }}
                   </div>
+                  <div
+                    v-if="canUseAiCorrection(question) && aiCorrectionForms[question.id]"
+                    class="mb-3 rounded-lg border border-info/30 bg-support-1 p-3"
+                  >
+                    <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-support-4">
+                      <BaseIcon icon="robot-outline" size="small" />
+                      {{ t("AI suggestion") }}
+                    </div>
+
+                    <div class="flex flex-wrap items-end gap-3">
+                      <label class="flex min-w-[220px] flex-col gap-1 text-sm font-semibold text-gray-700">
+                        {{ t("AI provider") }}
+                        <select
+                          v-model="aiCorrectionForms[question.id].provider"
+                          class="rounded border border-gray-30 bg-white px-3 py-2 text-sm font-normal text-gray-90"
+                          :disabled="aiCorrectionForms[question.id].isLoadingProviders || aiCorrectionForms[question.id].isGenerating"
+                          name="ai_provider"
+                          @change="saveAiCorrectionProvider(question)"
+                        >
+                          <option value="">{{ t("Default") }}</option>
+                          <option
+                            v-for="provider in aiCorrectionForms[question.id].providers"
+                            :key="provider.key"
+                            :value="provider.key"
+                          >
+                            {{ provider.label }}
+                          </option>
+                        </select>
+                      </label>
+
+                      <BaseButton
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :is-loading="aiCorrectionForms[question.id].isGenerating"
+                        :label="aiCorrectionForms[question.id].feedback ? t('Regenerate') : t('Generate')"
+                        icon="lightning-bolt"
+                        type="secondary"
+                        @click="generateAiCorrection(question)"
+                      />
+
+                      <BaseButton
+                        v-if="aiCorrectionForms[question.id].feedback"
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :label="t('Apply suggestion')"
+                        icon="arrow-down"
+                        type="primary"
+                        @click="applyAiCorrectionSuggestion(question)"
+                      />
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].providerHint"
+                      class="mt-2 text-xs text-gray-600"
+                    >
+                      {{ aiCorrectionForms[question.id].providerHint }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].error"
+                      class="mt-3 rounded-lg border border-danger/30 bg-danger/10 p-3 text-sm text-danger"
+                    >
+                      {{ aiCorrectionForms[question.id].error }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].feedback"
+                      class="mt-3 space-y-2"
+                    >
+                      <div
+                        v-if="aiCorrectionForms[question.id].score !== null"
+                        class="inline-flex items-center gap-2 rounded-full border border-info/30 bg-white px-3 py-1 text-xs font-semibold text-info"
+                      >
+                        {{ t("Suggested score") }}: {{ aiCorrectionForms[question.id].score }} / {{ formatNumber(question.maxScore || 0) }}
+                      </div>
+                      <BaseTextArea
+                        v-model="aiCorrectionForms[question.id].feedback"
+                        :id="aiCorrectionFeedbackInputId(question)"
+                        :label="t('Suggested feedback')"
+                        name="ai_feedback"
+                        rows="4"
+                      />
+                    </div>
+                  </div>
                   <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
                     <BaseInputNumber
                       v-model="correctionForms[question.id].marks"
@@ -807,6 +892,88 @@
                     <BaseIcon icon="edit" size="small" />
                     {{ t("Teacher correction") }}
                   </div>
+                  <div
+                    v-if="canUseAiCorrection(question) && aiCorrectionForms[question.id]"
+                    class="mb-3 rounded-lg border border-info/30 bg-support-1 p-3"
+                  >
+                    <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-support-4">
+                      <BaseIcon icon="robot-outline" size="small" />
+                      {{ t("AI suggestion") }}
+                    </div>
+
+                    <div class="flex flex-wrap items-end gap-3">
+                      <label class="flex min-w-[220px] flex-col gap-1 text-sm font-semibold text-gray-700">
+                        {{ t("AI provider") }}
+                        <select
+                          v-model="aiCorrectionForms[question.id].provider"
+                          class="rounded border border-gray-30 bg-white px-3 py-2 text-sm font-normal text-gray-90"
+                          :disabled="aiCorrectionForms[question.id].isLoadingProviders || aiCorrectionForms[question.id].isGenerating"
+                          name="ai_provider"
+                          @change="saveAiCorrectionProvider(question)"
+                        >
+                          <option value="">{{ t("Default") }}</option>
+                          <option
+                            v-for="provider in aiCorrectionForms[question.id].providers"
+                            :key="provider.key"
+                            :value="provider.key"
+                          >
+                            {{ provider.label }}
+                          </option>
+                        </select>
+                      </label>
+
+                      <BaseButton
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :is-loading="aiCorrectionForms[question.id].isGenerating"
+                        :label="aiCorrectionForms[question.id].feedback ? t('Regenerate') : t('Generate')"
+                        icon="lightning-bolt"
+                        type="secondary"
+                        @click="generateAiCorrection(question)"
+                      />
+
+                      <BaseButton
+                        v-if="aiCorrectionForms[question.id].feedback"
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :label="t('Apply suggestion')"
+                        icon="arrow-down"
+                        type="primary"
+                        @click="applyAiCorrectionSuggestion(question)"
+                      />
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].providerHint"
+                      class="mt-2 text-xs text-gray-600"
+                    >
+                      {{ aiCorrectionForms[question.id].providerHint }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].error"
+                      class="mt-3 rounded-lg border border-danger/30 bg-danger/10 p-3 text-sm text-danger"
+                    >
+                      {{ aiCorrectionForms[question.id].error }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].feedback"
+                      class="mt-3 space-y-2"
+                    >
+                      <div
+                        v-if="aiCorrectionForms[question.id].score !== null"
+                        class="inline-flex items-center gap-2 rounded-full border border-info/30 bg-white px-3 py-1 text-xs font-semibold text-info"
+                      >
+                        {{ t("Suggested score") }}: {{ aiCorrectionForms[question.id].score }} / {{ formatNumber(question.maxScore || 0) }}
+                      </div>
+                      <BaseTextArea
+                        v-model="aiCorrectionForms[question.id].feedback"
+                        :id="aiCorrectionFeedbackInputId(question)"
+                        :label="t('Suggested feedback')"
+                        name="ai_feedback"
+                        rows="4"
+                      />
+                    </div>
+                  </div>
                   <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
                     <BaseInputNumber
                       v-model="correctionForms[question.id].marks"
@@ -897,6 +1064,88 @@
                     <BaseIcon icon="edit" size="small" />
                     {{ t("Teacher correction") }}
                   </div>
+                  <div
+                    v-if="canUseAiCorrection(question) && aiCorrectionForms[question.id]"
+                    class="mb-3 rounded-lg border border-info/30 bg-support-1 p-3"
+                  >
+                    <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-support-4">
+                      <BaseIcon icon="robot-outline" size="small" />
+                      {{ t("AI suggestion") }}
+                    </div>
+
+                    <div class="flex flex-wrap items-end gap-3">
+                      <label class="flex min-w-[220px] flex-col gap-1 text-sm font-semibold text-gray-700">
+                        {{ t("AI provider") }}
+                        <select
+                          v-model="aiCorrectionForms[question.id].provider"
+                          class="rounded border border-gray-30 bg-white px-3 py-2 text-sm font-normal text-gray-90"
+                          :disabled="aiCorrectionForms[question.id].isLoadingProviders || aiCorrectionForms[question.id].isGenerating"
+                          name="ai_provider"
+                          @change="saveAiCorrectionProvider(question)"
+                        >
+                          <option value="">{{ t("Default") }}</option>
+                          <option
+                            v-for="provider in aiCorrectionForms[question.id].providers"
+                            :key="provider.key"
+                            :value="provider.key"
+                          >
+                            {{ provider.label }}
+                          </option>
+                        </select>
+                      </label>
+
+                      <BaseButton
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :is-loading="aiCorrectionForms[question.id].isGenerating"
+                        :label="aiCorrectionForms[question.id].feedback ? t('Regenerate') : t('Generate')"
+                        icon="lightning-bolt"
+                        type="secondary"
+                        @click="generateAiCorrection(question)"
+                      />
+
+                      <BaseButton
+                        v-if="aiCorrectionForms[question.id].feedback"
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :label="t('Apply suggestion')"
+                        icon="arrow-down"
+                        type="primary"
+                        @click="applyAiCorrectionSuggestion(question)"
+                      />
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].providerHint"
+                      class="mt-2 text-xs text-gray-600"
+                    >
+                      {{ aiCorrectionForms[question.id].providerHint }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].error"
+                      class="mt-3 rounded-lg border border-danger/30 bg-danger/10 p-3 text-sm text-danger"
+                    >
+                      {{ aiCorrectionForms[question.id].error }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].feedback"
+                      class="mt-3 space-y-2"
+                    >
+                      <div
+                        v-if="aiCorrectionForms[question.id].score !== null"
+                        class="inline-flex items-center gap-2 rounded-full border border-info/30 bg-white px-3 py-1 text-xs font-semibold text-info"
+                      >
+                        {{ t("Suggested score") }}: {{ aiCorrectionForms[question.id].score }} / {{ formatNumber(question.maxScore || 0) }}
+                      </div>
+                      <BaseTextArea
+                        v-model="aiCorrectionForms[question.id].feedback"
+                        :id="aiCorrectionFeedbackInputId(question)"
+                        :label="t('Suggested feedback')"
+                        name="ai_feedback"
+                        rows="4"
+                      />
+                    </div>
+                  </div>
                   <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
                     <BaseInputNumber
                       v-model="correctionForms[question.id].marks"
@@ -982,6 +1231,88 @@
                     <BaseIcon icon="edit" size="small" />
                     {{ t("Teacher correction") }}
                   </div>
+                  <div
+                    v-if="canUseAiCorrection(question) && aiCorrectionForms[question.id]"
+                    class="mb-3 rounded-lg border border-info/30 bg-support-1 p-3"
+                  >
+                    <div class="mb-3 flex items-center gap-2 text-sm font-semibold text-support-4">
+                      <BaseIcon icon="robot-outline" size="small" />
+                      {{ t("AI suggestion") }}
+                    </div>
+
+                    <div class="flex flex-wrap items-end gap-3">
+                      <label class="flex min-w-[220px] flex-col gap-1 text-sm font-semibold text-gray-700">
+                        {{ t("AI provider") }}
+                        <select
+                          v-model="aiCorrectionForms[question.id].provider"
+                          class="rounded border border-gray-30 bg-white px-3 py-2 text-sm font-normal text-gray-90"
+                          :disabled="aiCorrectionForms[question.id].isLoadingProviders || aiCorrectionForms[question.id].isGenerating"
+                          name="ai_provider"
+                          @change="saveAiCorrectionProvider(question)"
+                        >
+                          <option value="">{{ t("Default") }}</option>
+                          <option
+                            v-for="provider in aiCorrectionForms[question.id].providers"
+                            :key="provider.key"
+                            :value="provider.key"
+                          >
+                            {{ provider.label }}
+                          </option>
+                        </select>
+                      </label>
+
+                      <BaseButton
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :is-loading="aiCorrectionForms[question.id].isGenerating"
+                        :label="aiCorrectionForms[question.id].feedback ? t('Regenerate') : t('Generate')"
+                        icon="lightning-bolt"
+                        type="secondary"
+                        @click="generateAiCorrection(question)"
+                      />
+
+                      <BaseButton
+                        v-if="aiCorrectionForms[question.id].feedback"
+                        :disabled="aiCorrectionForms[question.id].isGenerating"
+                        :label="t('Apply suggestion')"
+                        icon="arrow-down"
+                        type="primary"
+                        @click="applyAiCorrectionSuggestion(question)"
+                      />
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].providerHint"
+                      class="mt-2 text-xs text-gray-600"
+                    >
+                      {{ aiCorrectionForms[question.id].providerHint }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].error"
+                      class="mt-3 rounded-lg border border-danger/30 bg-danger/10 p-3 text-sm text-danger"
+                    >
+                      {{ aiCorrectionForms[question.id].error }}
+                    </div>
+
+                    <div
+                      v-if="aiCorrectionForms[question.id].feedback"
+                      class="mt-3 space-y-2"
+                    >
+                      <div
+                        v-if="aiCorrectionForms[question.id].score !== null"
+                        class="inline-flex items-center gap-2 rounded-full border border-info/30 bg-white px-3 py-1 text-xs font-semibold text-info"
+                      >
+                        {{ t("Suggested score") }}: {{ aiCorrectionForms[question.id].score }} / {{ formatNumber(question.maxScore || 0) }}
+                      </div>
+                      <BaseTextArea
+                        v-model="aiCorrectionForms[question.id].feedback"
+                        :id="aiCorrectionFeedbackInputId(question)"
+                        :label="t('Suggested feedback')"
+                        name="ai_feedback"
+                        rows="4"
+                      />
+                    </div>
+                  </div>
                   <div class="grid gap-3 md:grid-cols-[220px_1fr_auto] md:items-start">
                     <BaseInputNumber
                       v-model="correctionForms[question.id].marks"
@@ -1016,7 +1347,7 @@
 
             <template v-else>
               <div class="rounded-lg border border-warning/30 bg-warning/10 p-3 text-sm text-warning">
-                {{ t("This question type is not available in the Vue result review yet.") }}
+                {{ t("This question type cannot be reviewed on this page.") }}
               </div>
             </template>
 
@@ -1028,14 +1359,52 @@
           </div>
         </article>
       </div>
+
+      <section
+        v-if="showStandaloneFinalActions"
+        class="exercise-result-final-actions rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
+      >
+        <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+          <div>
+            <h2 class="text-base font-semibold text-gray-90">{{ t("Exercise completed") }}</h2>
+            <p
+              v-if="finalActions.maxAttempt > 0"
+              class="mt-1 text-sm text-gray-600"
+            >
+              {{ t("Attempts") }}: {{ finalActions.attemptCount || 0 }} / {{ finalActions.maxAttempt }}
+            </p>
+          </div>
+          <div class="flex flex-wrap gap-2">
+            <BaseButton
+              v-if="finalActions.canTryAgain"
+              :disabled="isStartingAttempt"
+              :is-loading="isStartingAttempt"
+              :label="t('Try again')"
+              icon="replay"
+              type="success"
+              @click="startAnotherAttempt"
+            />
+            <BaseButton
+              :label="t('Return to Course Homepage')"
+              :route="{
+                name: 'CourseHome',
+                params: { id: getCourseId() },
+                query: getCourseHomeQuery(),
+              }"
+              icon="home"
+              type="primary"
+            />
+          </div>
+        </div>
+      </section>
     </template>
   </section>
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref, watch } from "vue"
+import { computed, nextTick, onMounted, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
-import { useRoute } from "vue-router"
+import { useRoute, useRouter } from "vue-router"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
 import BaseIcon from "../../components/basecomponents/BaseIcon.vue"
 import BaseInputNumber from "../../components/basecomponents/BaseInputNumber.vue"
@@ -1044,6 +1413,7 @@ import exerciseService from "../../services/exerciseService"
 
 const { t } = useI18n()
 const route = useRoute()
+const router = useRouter()
 
 const isLoading = ref(false)
 const errorMessage = ref("")
@@ -1053,12 +1423,17 @@ const attempt = ref({})
 const visibility = ref({})
 const questions = ref([])
 const ranking = ref([])
+const finalActions = ref({})
+const aiCorrection = ref({})
+const isStartingAttempt = ref(false)
 const correctionForms = ref({})
+const aiCorrectionForms = ref({})
 const correctionSavingQuestionId = ref(null)
 const correctionError = ref("")
 const correctionMessage = ref("")
 const resultHotspotImageSizes = ref({})
 const autoPrintDone = ref(false)
+const AI_CORRECTION_PROVIDER_STORAGE_KEY = "chamilo.ai.open_answer.provider"
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -1070,12 +1445,47 @@ function getContextParams() {
     sid: getQueryValue(route.query.sid),
     gid: getQueryValue(route.query.gid),
     origin: getQueryValue(route.query.origin),
+    lp_init: getQueryValue(route.query.lp_init),
     learnpath_id: getQueryValue(route.query.learnpath_id),
     learnpath_item_id: getQueryValue(route.query.learnpath_item_id),
     learnpath_item_view_id: getQueryValue(route.query.learnpath_item_view_id),
+    isStudentView: getQueryValue(route.query.isStudentView),
   }
 }
 
+
+function isEmbeddedInLearnpath() {
+  if (typeof window === "undefined") {
+    return false
+  }
+
+  try {
+    if (window.parent && window.parent !== window) {
+      const parentPath = window.parent.location?.pathname || ""
+      const referrer = document.referrer || ""
+
+      return parentPath.includes("/main/lp/")
+        || parentPath.includes("/main/newscorm/")
+        || referrer.includes("/main/lp/")
+        || referrer.includes("/main/newscorm/")
+    }
+  } catch (error) {
+    return (document.referrer || "").includes("/main/lp/")
+      || (document.referrer || "").includes("/main/newscorm/")
+  }
+
+  return false
+}
+
+const isLearnpathContext = computed(() => {
+  const origin = String(getQueryValue(route.query.origin) || "")
+
+  return origin === "learnpath"
+    || Boolean(getQueryValue(route.query.lp_init))
+    || Boolean(getQueryValue(route.query.learnpath_id))
+    || isEmbeddedInLearnpath()
+})
+
 function getBaseRouteParams() {
   return {
     node: route.params.node,
@@ -1097,6 +1507,87 @@ function getAttemptId() {
   return Number(route.params.attemptId || 0)
 }
 
+function getCourseId() {
+  return Number(getQueryValue(route.query.cid) || 0)
+}
+
+function getCourseHomeQuery() {
+  const query = {}
+  const sid = getQueryValue(route.query.sid)
+
+  if (
+    sid !== undefined
+    && sid !== null
+    && String(sid) !== ""
+    && Number(sid) > 0
+  ) {
+    query.sid = sid
+  }
+
+  return query
+}
+
+const showStandaloneFinalActions = computed(() => {
+  return finalActions.value?.showFinalActions === true && !isLearnpathContext.value && getCourseId() > 0
+})
+
+function buildPlayerQuery(startResponse = null) {
+  const query = { ...getContextParams() }
+  const attemptId = Number(startResponse?.attemptId || 0)
+
+  if (attemptId > 0) {
+    query.attemptId = attemptId
+  }
+
+  return query
+}
+
+function openLegacyRuntime(startResponse = null) {
+  const overviewUrl = startResponse?.legacyUrls?.overview || startResponse?.legacyUrls?.exercise || ""
+  if (overviewUrl && typeof window !== "undefined") {
+    window.location.href = overviewUrl
+
+    return true
+  }
+
+  return false
+}
+
+async function startAnotherAttempt() {
+  const exerciseId = getExerciseId()
+  if (exerciseId <= 0 || !finalActions.value?.canTryAgain) {
+    return
+  }
+
+  isStartingAttempt.value = true
+  errorMessage.value = ""
+
+  try {
+    const response = await exerciseService.startExerciseAttempt({ exerciseId }, getContextParams(), exerciseId)
+
+    if (response?.success) {
+      await router.push({
+        name: "ExercisePlayer",
+        params: getPlayerRouteParams(),
+        query: buildPlayerQuery(response),
+      })
+
+      return
+    }
+
+    if (true === response?.usesLegacyRuntime && openLegacyRuntime(response)) {
+      return
+    }
+
+    errorMessage.value = response?.message ? t(response.message) : t("Could not start the attempt")
+  } catch (error) {
+    console.error("Error starting another exercise attempt from result", error)
+    errorMessage.value = t("Could not start the attempt")
+  } finally {
+    isStartingAttempt.value = false
+  }
+}
+
 async function loadResult() {
   const exerciseId = getExerciseId()
   const attemptId = getAttemptId()
@@ -1116,7 +1607,10 @@ async function loadResult() {
     visibility.value = response.visibility || {}
     questions.value = Array.isArray(response.questions) ? response.questions : []
     ranking.value = Array.isArray(response.ranking) ? response.ranking : []
+    finalActions.value = response.finalActions || {}
+    aiCorrection.value = response.aiCorrection || {}
     initializeCorrectionForms()
+    initializeAiCorrectionForms()
     scheduleAutoPrintIfRequested()
   } catch (error) {
     console.error("Error loading exercise result", error)
@@ -1442,6 +1936,194 @@ function initializeCorrectionForms() {
   correctionForms.value = forms
 }
 
+function initializeAiCorrectionForms() {
+  const forms = {}
+  const savedProvider = getSavedAiCorrectionProvider()
+
+  for (const question of questions.value) {
+    if (!question.canCorrect) {
+      continue
+    }
+
+    forms[question.id] = {
+      provider: savedProvider,
+      providers: [],
+      providersLoaded: false,
+      isLoadingProviders: false,
+      isGenerating: false,
+      score: null,
+      feedback: "",
+      error: "",
+      providerHint: "",
+    }
+  }
+
+  aiCorrectionForms.value = forms
+}
+
+function canUseAiCorrection(question) {
+  return Boolean(aiCorrection.value?.enabled && question?.canCorrect && aiCorrectionForms.value[question.id])
+}
+
+function aiCorrectionFeedbackInputId(question) {
+  return `ai_feedback_${Number(question.id || 0)}`
+}
+
+function getSavedAiCorrectionProvider() {
+  if (typeof window === "undefined") {
+    return ""
+  }
+
+  try {
+    return window.localStorage.getItem(AI_CORRECTION_PROVIDER_STORAGE_KEY) || ""
+  } catch (error) {
+    return ""
+  }
+}
+
+function saveAiCorrectionProvider(question) {
+  const state = aiCorrectionForms.value[question.id]
+  if (!state || typeof window === "undefined") {
+    return
+  }
+
+  try {
+    window.localStorage.setItem(AI_CORRECTION_PROVIDER_STORAGE_KEY, state.provider || "")
+  } catch (error) {
+    // Ignore local storage failures.
+  }
+}
+
+async function loadAiCorrectionProviders(question) {
+  const state = aiCorrectionForms.value[question.id]
+  if (!state || state.providersLoaded || state.isLoadingProviders) {
+    return
+  }
+
+  state.isLoadingProviders = true
+  state.error = ""
+
+  try {
+    const response = await fetch("/ai/text_providers", {
+      credentials: "same-origin",
+      headers: {
+        Accept: "application/json",
+      },
+      method: "GET",
+    })
+    const data = await response.json().catch(() => ({}))
+
+    if (!response.ok) {
+      throw new Error(data?.error || data?.message || "Could not load AI providers")
+    }
+
+    state.providers = Array.isArray(data.providers)
+      ? data.providers.filter((provider) => provider?.key).map((provider) => ({
+          key: String(provider.key),
+          label: String(provider.label || provider.key),
+        }))
+      : []
+    state.providersLoaded = true
+  } catch (error) {
+    console.error("Error loading AI correction providers", error)
+    state.providers = []
+    state.providersLoaded = true
+    state.providerHint = t("Could not load AI providers")
+  } finally {
+    state.isLoadingProviders = false
+  }
+}
+
+async function generateAiCorrection(question) {
+  const state = aiCorrectionForms.value[question.id]
+  const questionId = Number(question?.id || 0)
+  const attemptId = getAttemptId()
+  const courseId = getCourseId()
+
+  if (!state || !canUseAiCorrection(question) || questionId <= 0 || attemptId <= 0 || courseId <= 0) {
+    return
+  }
+
+  await loadAiCorrectionProviders(question)
+
+  state.isGenerating = true
+  state.error = ""
+  state.providerHint = ""
+
+  const payload = new URLSearchParams({
+    exeId: String(attemptId),
+    questionId: String(questionId),
+    courseId: String(courseId),
+  })
+
+  if (state.provider) {
+    payload.set("ai_provider", state.provider)
+  }
+
+  try {
+    const response = await fetch("/ai/open_answer_grade", {
+      body: payload,
+      credentials: "same-origin",
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      method: "POST",
+    })
+    const text = await response.text()
+    let data = {}
+
+    try {
+      data = JSON.parse(text)
+    } catch (error) {
+      data = {}
+    }
+
+    if (!response.ok) {
+      throw new Error(data?.error || data?.text || data?.message || text || "Could not generate AI suggestion")
+    }
+
+    state.score = normalizeAiCorrectionScore(data?.score, question)
+    state.feedback = String(data?.feedback || "")
+    state.providerHint = data?.provider_used ? `${t("Provider used")}: ${data.provider_used}` : ""
+  } catch (error) {
+    console.error("Error generating AI correction suggestion", error)
+    state.error = error?.message || t("Could not generate AI suggestion")
+  } finally {
+    state.isGenerating = false
+  }
+}
+
+function normalizeAiCorrectionScore(value, question) {
+  const score = Number(value)
+  if (!Number.isFinite(score)) {
+    return null
+  }
+
+  const maxScore = Number(question?.maxScore || 0)
+  if (maxScore <= 0) {
+    return Math.max(0, score)
+  }
+
+  return Math.min(Math.max(0, score), maxScore)
+}
+
+function applyAiCorrectionSuggestion(question) {
+  const correctionForm = correctionForms.value[question.id]
+  const aiForm = aiCorrectionForms.value[question.id]
+  if (!correctionForm || !aiForm) {
+    return
+  }
+
+  if (aiForm.score !== null) {
+    correctionForm.marks = aiForm.score
+  }
+
+  if (aiForm.feedback) {
+    correctionForm.teacherComment = aiForm.feedback
+  }
+}
+
 function correctionScoreInputId(question) {
   return `correction_score_${Number(question.id || 0)}`
 }
@@ -1611,7 +2293,8 @@ watch(
 
 @media print {
   .exercise-result-toolbar,
-  .exercise-result-correction-form {
+  .exercise-result-correction-form,
+  .exercise-result-final-actions {
     display: none !important;
   }
 
@@ -1662,7 +2345,8 @@ watch(
   }
 
   body:has(.exercise-result-print-mode) .exercise-result-toolbar,
-  body:has(.exercise-result-print-mode) .exercise-result-correction-form {
+  body:has(.exercise-result-print-mode) .exercise-result-correction-form,
+  body:has(.exercise-result-print-mode) .exercise-result-final-actions {
     display: none !important;
   }
 }
diff --git a/public/main/gradebook/exercise_jump.php b/public/main/gradebook/exercise_jump.php
index 8d9983c1e46..cc7811b0c5f 100644
--- a/public/main/gradebook/exercise_jump.php
+++ b/public/main/gradebook/exercise_jump.php
@@ -12,6 +12,7 @@
  * @author Bert Steppé
  */
 require_once __DIR__.'/../inc/global.inc.php';
+require_once __DIR__.'/../inc/lib/exercise.lib.php';
 api_block_anonymous_users();
 $this_section = SECTION_COURSES;
 
@@ -68,17 +69,32 @@
                     }
                 }
             } else {
-                $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query(
+                $vueUrl = ExerciseLib::buildVueOverviewUrl(
+                    (int) $_GET['exerciseId'],
                     [
-                        'sid' => $session_id,
-                        'cid' => $courseId,
                         'gradebook' => $gradebook,
                         'origin' => '',
                         'learnpath_id' => '',
                         'learnpath_item_id' => '',
-                        'exerciseId' => (int) $_GET['exerciseId'],
-                    ]
+                    ],
+                    (int) $courseId,
+                    (int) $session_id
                 );
+                if (null !== $vueUrl) {
+                    $url = $vueUrl;
+                } else {
+                    $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query(
+                        [
+                            'sid' => $session_id,
+                            'cid' => $courseId,
+                            'gradebook' => $gradebook,
+                            'origin' => '',
+                            'learnpath_id' => '',
+                            'learnpath_item_id' => '',
+                            'exerciseId' => (int) $_GET['exerciseId'],
+                        ]
+                    );
+                }
             }
         }
     }
diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php
index bf920aceb42..60e18184c99 100644
--- a/public/main/inc/lib/exercise.lib.php
+++ b/public/main/inc/lib/exercise.lib.php
@@ -7281,4 +7281,94 @@ public static function updateAttemptDataTrackingIfNeeded(int $exeId, array $ques
 
         $exerciseStatInfo['data_tracking'] = $newTracking;
     }
+
+    /**
+     * Build the modern Vue create URL for an exercise when a legacy integration
+     * still needs to create a test without showing legacy exercise UI.
+     */
+    public static function buildVueCreateUrl(
+        array $extraParams = [],
+        ?int $courseId = null,
+        ?int $sessionId = null,
+        ?int $groupId = null
+    ): ?string {
+        $courseId = $courseId ?? (int) api_get_course_int_id();
+        if ($courseId <= 0) {
+            return null;
+        }
+
+        $courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
+        $sql = "SELECT resource_node_id FROM $courseTable WHERE id = $courseId LIMIT 1";
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
+        $nodeId = isset($row['resource_node_id']) ? (int) $row['resource_node_id'] : 0;
+        if ($nodeId <= 0) {
+            return null;
+        }
+
+        $sessionId = $sessionId ?? (int) api_get_session_id();
+        $groupId = $groupId ?? (int) api_get_group_id();
+        $params = [
+            'cid' => $courseId,
+            'sid' => max(0, $sessionId),
+            'gid' => max(0, $groupId),
+        ];
+
+        foreach ($extraParams as $key => $value) {
+            if (null === $value || '' === (string) $value) {
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        return rtrim(api_get_path(WEB_PATH), '/').'/resources/exercise/'.$nodeId.'/create?'.http_build_query($params);
+    }
+
+    /**
+     * Build the modern Vue overview URL for an exercise when a legacy integration
+     * still needs to point to a test.
+     */
+    public static function buildVueOverviewUrl(
+        int $exerciseId,
+        array $extraParams = [],
+        ?int $courseId = null,
+        ?int $sessionId = null,
+        ?int $groupId = null
+    ): ?string {
+        if ($exerciseId <= 0) {
+            return null;
+        }
+
+        $courseId = $courseId ?? (int) api_get_course_int_id();
+        if ($courseId <= 0) {
+            return null;
+        }
+
+        $courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
+        $sql = "SELECT resource_node_id FROM $courseTable WHERE id = $courseId LIMIT 1";
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
+        $nodeId = isset($row['resource_node_id']) ? (int) $row['resource_node_id'] : 0;
+        if ($nodeId <= 0) {
+            return null;
+        }
+
+        $sessionId = $sessionId ?? (int) api_get_session_id();
+        $groupId = $groupId ?? (int) api_get_group_id();
+        $params = [
+            'cid' => $courseId,
+            'sid' => max(0, $sessionId),
+            'gid' => max(0, $groupId),
+        ];
+
+        foreach ($extraParams as $key => $value) {
+            if (null === $value || '' === (string) $value) {
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        return rtrim(api_get_path(WEB_PATH), '/').'/resources/exercise/'.$nodeId.'/'.$exerciseId.'/overview?'.http_build_query($params);
+    }
+
 }
diff --git a/public/main/lp/learnpath.class.php b/public/main/lp/learnpath.class.php
index 84340893422..deb855c403e 100644
--- a/public/main/lp/learnpath.class.php
+++ b/public/main/lp/learnpath.class.php
@@ -5497,7 +5497,7 @@ public function display_item($lpItem, $msg = null, $show_actions = true)
                     $return .= $exercise->description.'<br />';
                     $return .= Display::url(
                         get_lang('Go to exercise'),
-                        api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$exercise->id,
+                        (ExerciseLib::buildVueOverviewUrl((int) $exercise->id) ?: api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$exercise->id),
                         ['class' => 'btn btn--primary']
                     );
                 }
@@ -7196,9 +7196,23 @@ public function get_exercises()
         $return = '<ul class="mt-2 bg-white list-group list-group-flush border border-gray-25 rounded lp_resource">';
         $return .= '<li class="list-group-item lp_resource_element border-gray-25 disable_drag">';
         $return .= Display::getMdiIcon('order-bool-ascending-variant', 'ch-tool-icon', null, 32, get_lang('New test'));
-        $return .= '<a
-            href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise_admin.php?'.api_get_cidreq().'&lp_id='.$this->lp_id.'">'.
-            get_lang('New test').'</a>';
+        $createExerciseParams = [
+            'origin' => 'learnpath',
+            'lp_id' => $this->lp_id,
+            'returnToLp' => 1,
+            'type' => 'step',
+            'isStudentView' => 'false',
+        ];
+        if (!empty($_REQUEST['node'])) {
+            $createExerciseParams['node'] = (int) $_REQUEST['node'];
+        }
+        $createExerciseUrl = ExerciseLib::buildVueCreateUrl($createExerciseParams)
+            ?: '#';
+        $return .= Display::url(
+            get_lang('New test'),
+            $createExerciseUrl,
+            ['class' => 'moved link_with_id', 'data_type' => 'quiz-new']
+        );
         $return .= '</li>';
 
         $previewIcon = Display::getMdiIcon('magnify-plus-outline', 'ch-tool-icon', null, 22, get_lang('Preview'));
@@ -7210,10 +7224,11 @@ public function get_exercises()
             $title = strip_tags(api_html_entity_decode($exercise->getTitle()));
             $visibility = $exercise->isVisible($course, $session);
 
+            $previewUrl = ExerciseLib::buildVueOverviewUrl((int) $exerciseId) ?: $exerciseUrl.'&exerciseId='.$exerciseId;
             $link = Display::url(
                 $previewIcon,
-                $exerciseUrl.'&exerciseId='.$exerciseId,
-                ['target' => '_blank']
+                $previewUrl,
+                ['target' => '_blank', 'rel' => 'noopener noreferrer']
             );
             $return .= '<li
                 class="list-group-item lp_resource_element border-gray-25"
@@ -9023,12 +9038,29 @@ public static function rl_get_resource_link_for_learnpath(
                 $learnpathItemViewData = current($learnpathItemViewResult);
                 $learnpathItemViewId = $learnpathItemViewData ? $learnpathItemViewData->getIid() : 0;
 
+                $vueUrl = ExerciseLib::buildVueOverviewUrl(
+                    (int) $id,
+                    [
+                        'origin' => 'learnpath',
+                        'lp_init' => 1,
+                        'learnpath_item_view_id' => $learnpathItemViewId,
+                        'learnpath_id' => $learningPathId,
+                        'learnpath_item_id' => $id_in_path,
+                        'isStudentView' => isset($_REQUEST['isStudentView']) ? Security::remove_XSS((string) $_REQUEST['isStudentView']) : 'true',
+                    ]
+                );
+                if (null !== $vueUrl) {
+                    return $vueUrl;
+                }
+
                 return $main_dir_path.'exercise/overview.php?'.$extraParams.'&'
                     .http_build_query([
+                        'origin' => 'learnpath',
                         'lp_init' => 1,
                         'learnpath_item_view_id' => $learnpathItemViewId,
                         'learnpath_id' => $learningPathId,
                         'learnpath_item_id' => $id_in_path,
+                        'isStudentView' => isset($_REQUEST['isStudentView']) ? Security::remove_XSS((string) $_REQUEST['isStudentView']) : 'true',
                         'exerciseId' => $id,
                     ]);
             case TOOL_HOTPOTATOES:
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseAiAikenGenerator.php b/src/CoreBundle/ApiResource/Exercise/ExerciseAiAikenGenerator.php
new file mode 100644
index 00000000000..7e58f4e9a65
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseAiAikenGenerator.php
@@ -0,0 +1,101 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseAiAikenGeneratorProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseAiAikenGenerator',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/ai-aiken-generator',
+            openapi: new Operation(
+                summary: 'Exercise AI Aiken generator data',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_ai_aiken_generator',
+            provider: ExerciseAiAikenGeneratorProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_ai_aiken_generator:read']],
+)]
+final class ExerciseAiAikenGenerator
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public string $id = 'exercise_ai_aiken_generator';
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public bool $canManage = false;
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public bool $enabled = false;
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public bool $courseExerciseGeneratorEnabled = false;
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public bool $aiHelpersEnabled = false;
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public string $language = 'en';
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public string $csrfToken = '';
+
+    /**
+     * @var array<int, array{value: string, label: string}>
+     */
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public array $textProviders = [];
+
+    /**
+     * @var array<int, array{value: string, label: string}>
+     */
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public array $documentProviders = [];
+
+    /**
+     * @var array<int, array{value: string, label: string}>
+     */
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public array $questionTypes = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public array $documents = [];
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public int $defaultNumberOfQuestions = 10;
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public int $maxNumberOfQuestions = 100;
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public int $defaultTotalWeight = 20;
+
+    #[Groups(['exercise_ai_aiken_generator:read'])]
+    public string $message = '';
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php b/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
index dbc447a3412..1080f1ce940 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseConfiguration.php
@@ -173,6 +173,18 @@ final class ExerciseConfiguration
     #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
     public bool $autoLaunch = false;
 
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $addToGradebook = false;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public ?int $gradebookCategoryId = null;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public int $gradebookWeight = 100;
+
+    #[Groups(['exercise_configuration:read', 'exercise_configuration:write'])]
+    public bool $gradebookVisible = true;
+
     /**
      * Legacy comma-separated notification ids stored as an array for Vue.
      *
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseGlobalQuestion.php b/src/CoreBundle/ApiResource/Exercise/ExerciseGlobalQuestion.php
new file mode 100644
index 00000000000..bb43dabd259
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseGlobalQuestion.php
@@ -0,0 +1,65 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseGlobalQuestionProvider;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseGlobalQuestion',
+    operations: [
+        new Get(
+            uriTemplate: '/exercise/questions/global',
+            openapi: new Operation(
+                summary: 'Global question type selector',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_global_question_types',
+            provider: ExerciseGlobalQuestionProvider::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_global_question:read']],
+)]
+final class ExerciseGlobalQuestion
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_global_question:read'])]
+    public string $id = 'global';
+
+    #[Groups(['exercise_global_question:read'])]
+    public string $title = '';
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_global_question:read'])]
+    public array $questionTypes = [];
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_global_question:read'])]
+    public array $exercises = [];
+
+    #[Groups(['exercise_global_question:read'])]
+    public bool $canManage = false;
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseLearningPathItem.php b/src/CoreBundle/ApiResource/Exercise/ExerciseLearningPathItem.php
new file mode 100644
index 00000000000..84ebe74ee71
--- /dev/null
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseLearningPathItem.php
@@ -0,0 +1,60 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\ApiResource\Exercise;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation;
+use ApiPlatform\OpenApi\Model\Parameter;
+use Chamilo\CoreBundle\State\Exercise\ExerciseLearningPathItemProcessor;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    shortName: 'ExerciseLearningPathItem',
+    operations: [
+        new Post(
+            uriTemplate: '/exercise/questions/{exerciseId}/learning-path-item',
+            requirements: ['exerciseId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Attach an exercise created from the LP flow as a learning path item',
+                parameters: [
+                    new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'origin', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'lp_id', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'node', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_learning_path_item',
+            processor: ExerciseLearningPathItemProcessor::class,
+        ),
+    ],
+    normalizationContext: ['groups' => ['exercise_learning_path_item:read']],
+    denormalizationContext: ['groups' => ['exercise_learning_path_item:write']],
+)]
+final class ExerciseLearningPathItem
+{
+    #[ApiProperty(identifier: true)]
+    #[Groups(['exercise_learning_path_item:read', 'exercise_learning_path_item:write'])]
+    public ?int $exerciseId = null;
+
+    #[Groups(['exercise_learning_path_item:write'])]
+    public string $submittedCsrfToken = '';
+
+    #[Groups(['exercise_learning_path_item:read'])]
+    public ?int $lpItemId = null;
+
+    #[Groups(['exercise_learning_path_item:read'])]
+    public bool $success = false;
+
+    #[Groups(['exercise_learning_path_item:read'])]
+    public string $message = '';
+}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseList.php b/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
index effcc1d173a..03f619fe1e2 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseList.php
@@ -92,6 +92,12 @@ final class ExerciseList
     #[Groups(['exercise_list:read', 'exercise_list:write'])]
     public int $exerciseId = 0;
 
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_list:read', 'exercise_list:write'])]
+    public array $exerciseIds = [];
+
     #[Groups(['exercise_list:read', 'exercise_list:write'])]
     public string $action = '';
 
@@ -101,6 +107,12 @@ final class ExerciseList
     #[Groups(['exercise_list:read'])]
     public string $message = '';
 
+    #[Groups(['exercise_list:read'])]
+    public int $processedCount = 0;
+
+    #[Groups(['exercise_list:read'])]
+    public int $skippedCount = 0;
+
     #[Groups(['exercise_list:read', 'exercise_list:write'])]
     public string $submittedCsrfToken = '';
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
index fb9182fa401..4036372c8f8 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
@@ -75,6 +75,15 @@ final class ExerciseQuestion
     #[Groups(['exercise_question:read'])]
     public bool $usesLegacyQuestionEditors = true;
 
+    #[Groups(['exercise_question:read'])]
+    public bool $isLinkedToLearningPath = false;
+
+    #[Groups(['exercise_question:read'])]
+    public bool $isReadOnlyFromLearningPath = false;
+
+    #[Groups(['exercise_question:read'])]
+    public string $learningPathReadOnlyMessage = '';
+
     #[Groups(['exercise_question:read'])]
     public string $csrfToken = '';
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php
index 16ce43d763c..7c9b4d029c8 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionBank.php
@@ -19,6 +19,27 @@
 #[ApiResource(
     shortName: 'ExerciseQuestionBank',
     operations: [
+        new Get(
+            uriTemplate: '/exercise/questions/bank',
+            openapi: new Operation(
+                summary: 'Global exercise question bank data',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'page', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'itemsPerPage', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'search', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'categoryId', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sourceExerciseId', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'difficulty', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'questionType', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_global_question_bank',
+            provider: ExerciseQuestionBankProvider::class,
+        ),
         new Get(
             uriTemplate: '/exercise/questions/{exerciseId}/bank',
             requirements: ['exerciseId' => '\\d+'],
@@ -42,6 +63,20 @@
             name: 'get_exercise_question_bank',
             provider: ExerciseQuestionBankProvider::class,
         ),
+        new Post(
+            uriTemplate: '/exercise/questions/bank/action',
+            openapi: new Operation(
+                summary: 'Run a global exercise question bank action',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_global_question_bank_action',
+            processor: ExerciseQuestionBankProcessor::class,
+        ),
         new Post(
             uriTemplate: '/exercise/questions/{exerciseId}/bank/action',
             requirements: ['exerciseId' => '\\d+'],
@@ -143,6 +178,12 @@ final class ExerciseQuestionBank
     #[Groups(['exercise_question_bank:read'])]
     public bool $canManage = false;
 
+    #[Groups(['exercise_question_bank:read'])]
+    public bool $globalMode = false;
+
+    #[Groups(['exercise_question_bank:read'])]
+    public bool $canDelete = false;
+
     #[Groups(['exercise_question_bank:read'])]
     public bool $success = false;
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
index 352637e2b39..5db11cb00e9 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
@@ -19,6 +19,37 @@
 #[ApiResource(
     shortName: 'ExerciseQuestionEditor',
     operations: [
+        new Get(
+            uriTemplate: '/exercise/questions/global/editor',
+            openapi: new Operation(
+                summary: 'Exercise question editor for a new global question',
+                parameters: [
+                    new Parameter(name: 'type', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_global_question_editor_create',
+            provider: ExerciseQuestionEditorProvider::class,
+        ),
+        new Get(
+            uriTemplate: '/exercise/questions/global/editor/{questionId}',
+            requirements: ['questionId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Exercise question editor for an existing global question',
+                parameters: [
+                    new Parameter(name: 'questionId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'get_exercise_global_question_editor_edit',
+            provider: ExerciseQuestionEditorProvider::class,
+        ),
         new Get(
             uriTemplate: '/exercise/questions/{exerciseId}/editor',
             requirements: ['exerciseId' => '\\d+'],
@@ -53,6 +84,36 @@
             name: 'get_exercise_question_editor_edit',
             provider: ExerciseQuestionEditorProvider::class,
         ),
+        new Post(
+            uriTemplate: '/exercise/questions/global/editor',
+            openapi: new Operation(
+                summary: 'Create a global exercise question',
+                parameters: [
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_global_question_editor_create',
+            processor: ExerciseQuestionEditorProcessor::class,
+        ),
+        new Post(
+            uriTemplate: '/exercise/questions/global/editor/{questionId}',
+            requirements: ['questionId' => '\\d+'],
+            openapi: new Operation(
+                summary: 'Update a global exercise question',
+                parameters: [
+                    new Parameter(name: 'questionId', in: 'path', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
+                    new Parameter(name: 'sid', in: 'query', required: false, schema: ['type' => 'integer']),
+                    new Parameter(name: 'gid', in: 'query', required: false, schema: ['type' => 'integer']),
+                ],
+            ),
+            security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
+            name: 'post_exercise_global_question_editor_update',
+            processor: ExerciseQuestionEditorProcessor::class,
+        ),
         new Post(
             uriTemplate: '/exercise/questions/{exerciseId}/editor',
             requirements: ['exerciseId' => '\\d+'],
@@ -306,6 +367,15 @@ final class ExerciseQuestionEditor
     #[Groups(['exercise_question_editor:read'])]
     public bool $allowMandatoryQuestion = false;
 
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $isLinkedToLearningPath = false;
+
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $isReadOnlyFromLearningPath = false;
+
+    #[Groups(['exercise_question_editor:read'])]
+    public string $learningPathReadOnlyMessage = '';
+
     #[Groups(['exercise_question_editor:write'])]
     public string $submittedCsrfToken = '';
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
index f183e0c40e6..1e36cdfcffb 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
@@ -60,6 +60,9 @@ final class ExerciseRuntimeAnswer
     #[Groups(['exercise_runtime_answer:read', 'exercise_runtime_answer:write'])]
     public int $secondsSpent = 0;
 
+    #[Groups(['exercise_runtime_answer:write'])]
+    public string $navigationAction = '';
+
     #[Groups(['exercise_runtime_answer:read'])]
     public bool $success = false;
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php
index 78830947e33..17c8131d27c 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAttempt.php
@@ -21,7 +21,7 @@
             uriTemplate: '/exercise/runtime/{exerciseId}/attempt',
             requirements: ['exerciseId' => '\\d+'],
             openapi: new Operation(
-                summary: 'Start or resume a Vue exercise runtime attempt',
+                summary: 'Start or resume an exercise runtime attempt',
                 parameters: [
                     new Parameter(name: 'exerciseId', in: 'path', required: true, schema: ['type' => 'integer']),
                     new Parameter(name: 'cid', in: 'query', required: true, schema: ['type' => 'integer']),
@@ -50,6 +50,9 @@ final class ExerciseRuntimeAttempt
     #[Groups(['exercise_runtime_attempt:read'])]
     public ?int $attemptId = null;
 
+    #[Groups(['exercise_runtime_attempt:read'])]
+    public ?int $attemptNumber = null;
+
     #[Groups(['exercise_runtime_attempt:read'])]
     public string $status = '';
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php
index ca96b43f938..ddc084ec483 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeFinish.php
@@ -76,6 +76,17 @@ final class ExerciseRuntimeFinish
     #[Groups(['exercise_runtime_finish:read'])]
     public string $resultUrl = '';
 
+    /**
+     * Runtime data used by the embedded learning path page to update its TOC and progress bar without reloading.
+     *
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_finish:read'])]
+    public array $learnpathTracking = [];
+
+    #[Groups(['exercise_runtime_finish:write'])]
+    public bool $confirmedSavedAnswers = false;
+
     public function getExerciseId(): ?int
     {
         return $this->exerciseId;
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
index 8fa730fcdb4..a23e74b457b 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
@@ -86,6 +86,18 @@ final class ExerciseRuntimeResult
     #[Groups(['exercise_runtime_result:read'])]
     public array $legacyUrls = [];
 
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $finalActions = [];
+
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $aiCorrection = [];
+
     #[Groups(['exercise_runtime_result:read'])]
     public bool $canManage = false;
 
diff --git a/src/CoreBundle/Controller/AiController.php b/src/CoreBundle/Controller/AiController.php
index 108e12d0c74..f330860337c 100644
--- a/src/CoreBundle/Controller/AiController.php
+++ b/src/CoreBundle/Controller/AiController.php
@@ -1489,6 +1489,12 @@ public function generateAikenFromDocument(Request $request): JsonResponse
     #[Route('/open_answer_grade', name: 'chamilo_core_ai_open_answer_grade', methods: ['POST'])]
     public function openAnswerGrade(Request $request): JsonResponse
     {
+        if ('true' !== api_get_setting('ai_helpers.enable_ai_helpers')
+            || 'true' !== api_get_setting('ai_helpers.open_answers_grader')
+        ) {
+            return $this->json(['error' => 'AI open answer grading is disabled.'], 403);
+        }
+
         $exeId = $request->request->getInt('exeId', 0);
         $questionId = $request->request->getInt('questionId', 0);
         $courseId = $request->request->getInt('courseId', 0);
diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php
index 6b3eddeb311..c11f3b2592d 100644
--- a/src/CoreBundle/Controller/CourseController.php
+++ b/src/CoreBundle/Controller/CourseController.php
@@ -727,6 +727,10 @@ public function redirectTool(
         CToolRepository $repo,
         ToolChain $toolChain
     ): RedirectResponse {
+        if (null === $this->getCourse()) {
+            throw new NotFoundHttpException($this->trans('Course not found'));
+        }
+
         /** @var CTool|null $tool */
         $tool = $repo->findOneBy([
             'title' => $toolName,
@@ -736,12 +740,16 @@ public function redirectTool(
             throw new NotFoundHttpException($this->trans('Tool not found'));
         }
 
-        $tool = $toolChain->getToolFromName($tool->getTool()->getTitle());
-        $link = $tool->getLink();
+        $toolDefinition = $toolChain->getToolFromName($tool->getTool()->getTitle());
+        $link = $toolDefinition->getLink();
 
-        if (null === $this->getCourse()) {
-            throw new NotFoundHttpException($this->trans('Course not found'));
+        if ($this->isExerciseToolEntry($toolName, $tool->getTool()->getTitle(), $link)) {
+            $exerciseUrl = $this->buildExerciseVueToolUrl();
+            if (null !== $exerciseUrl) {
+                return $this->redirect($exerciseUrl);
+            }
         }
+
         $optionalParams = '';
 
         $optionalParams = $request->query->get('cert') ? '&cert='.$request->query->get('cert') : '';
@@ -1903,8 +1911,11 @@ private function autoLaunch(): void
                     );
                 }
             } else {
-                // Redirecting to the document
-                $url = api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq();
+                $url = $this->buildExerciseVueToolUrl();
+                if (null === $url) {
+                    $url = api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq();
+                }
+
                 header(\sprintf('Location: %s', $url));
 
                 exit;
@@ -1939,8 +1950,12 @@ private function autoLaunch(): void
                 if (Database::num_rows($result) > 0) {
                     $row = Database::fetch_array($result);
                     $exerciseId = $row['iid'];
-                    $url = api_get_path(WEB_CODE_PATH).
-                        'exercise/overview.php?exerciseId='.$exerciseId.'&'.api_get_cidreq();
+                    $url = $this->buildExerciseVueToolUrl((int) $exerciseId);
+                    if (null === $url) {
+                        $url = api_get_path(WEB_CODE_PATH).
+                            'exercise/overview.php?exerciseId='.$exerciseId.'&'.api_get_cidreq();
+                    }
+
                     header(\sprintf('Location: %s', $url));
 
                     exit;
@@ -1979,6 +1994,50 @@ private function autoLaunch(): void
         }
     }
 
+    private function buildExerciseVueToolUrl(?int $exerciseId = null): ?string
+    {
+        $course = $this->getCourse();
+        if (!$course instanceof Course) {
+            $course = api_get_course_entity();
+        }
+
+        if (!$course instanceof Course || null === $course->getResourceNode()) {
+            return null;
+        }
+
+        $nodeId = $course->getResourceNode()->getId();
+        if (null === $nodeId) {
+            return null;
+        }
+
+        $path = '/resources/exercise/'.(int) $nodeId.'/';
+        if (null !== $exerciseId && 0 < $exerciseId) {
+            $path .= $exerciseId.'/overview';
+        }
+
+        $query = http_build_query([
+            'cid' => (int) api_get_course_int_id(),
+            'sid' => (int) api_get_session_id(),
+            'gid' => (int) api_get_group_id(),
+        ]);
+
+        return rtrim(api_get_path(WEB_PATH), '/').$path.'?'.$query;
+    }
+
+    private function isExerciseToolEntry(string $toolName, string $toolTitle, string $link): bool
+    {
+        $toolCandidates = array_map('strtolower', [$toolName, $toolTitle]);
+
+        foreach ($toolCandidates as $candidate) {
+            if (\in_array($candidate, ['quiz', 'exercise', 'exercises', 'tests'], true)) {
+                return true;
+            }
+        }
+
+        return str_contains($link, 'exercise/exercise.php')
+            || str_contains($link, '/main/exercise/exercise.php');
+    }
+
     /**
      * Ensure a "course_homepage" CTool exists for the given course + session context.
      * - If $session is null, it creates/returns the base tool.
diff --git a/src/CoreBundle/Entity/TrackEExercise.php b/src/CoreBundle/Entity/TrackEExercise.php
index 186bd01c36e..cff1b5a84d6 100644
--- a/src/CoreBundle/Entity/TrackEExercise.php
+++ b/src/CoreBundle/Entity/TrackEExercise.php
@@ -354,6 +354,18 @@ public function setQuestionsToCheck(string $questionsToCheck): self
         return $this;
     }
 
+    public function getBlockedCategories(): ?string
+    {
+        return $this->blockedCategories;
+    }
+
+    public function setBlockedCategories(?string $blockedCategories): self
+    {
+        $this->blockedCategories = $blockedCategories;
+
+        return $this;
+    }
+
     public function getExeId(): int
     {
         return $this->exeId;
diff --git a/src/CoreBundle/Repository/ResourceLinkRepository.php b/src/CoreBundle/Repository/ResourceLinkRepository.php
index f114d6764ac..56729363f61 100644
--- a/src/CoreBundle/Repository/ResourceLinkRepository.php
+++ b/src/CoreBundle/Repository/ResourceLinkRepository.php
@@ -29,7 +29,7 @@ class ResourceLinkRepository extends SortableRepository
         'document' => '/resources/document/%resource_node_id%/',
         'learnpath' => '/main/lp/lp_controller.php',
         'link' => '/resources/links/%resource_node_id%/',
-        'quiz' => '/main/exercise/exercise.php',
+        'quiz' => '/resources/exercise/%resource_node_id%/',
         'announcement' => '/main/announcements/announcements.php',
         'glossary' => '/resources/glossary/%resource_node_id%/',
         'attendance' => '/main/attendance/index.php',
diff --git a/src/CoreBundle/State/Exercise/ExerciseAiAikenGeneratorProvider.php b/src/CoreBundle/State/Exercise/ExerciseAiAikenGeneratorProvider.php
new file mode 100644
index 00000000000..47e7478fba8
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseAiAikenGeneratorProvider.php
@@ -0,0 +1,312 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseAiAikenGenerator;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CDocument;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProviderInterface<ExerciseAiAikenGenerator>
+ */
+final readonly class ExerciseAiAikenGeneratorProvider implements ProviderInterface
+{
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+        private SettingsManager $settingsManager,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseAiAikenGenerator
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to use the AI Aiken generator in this context.');
+        }
+
+        $course = $this->getCourse($request);
+        $textProviders = $this->getTextProviderOptions();
+        $documentProviders = $this->getDocumentProviderOptions();
+        $courseGeneratorEnabled = $this->isCourseSettingEnabled($course, 'exercise_generator');
+        $aiHelpersEnabled = $this->isSettingEnabled('ai_helpers.enable_ai_helpers');
+
+        $response = new ExerciseAiAikenGenerator();
+        $response->canManage = true;
+        $response->courseExerciseGeneratorEnabled = $courseGeneratorEnabled;
+        $response->aiHelpersEnabled = $aiHelpersEnabled;
+        $response->enabled = $courseGeneratorEnabled && $aiHelpersEnabled && [] !== $textProviders;
+        $response->language = $this->getCourseLanguage($course);
+        $response->csrfToken = $this->csrfTokenManager->getToken(ExerciseQuestionImportProvider::CSRF_TOKEN_ID)->getValue();
+        $response->textProviders = $this->toOptionList($textProviders);
+        $response->documentProviders = $this->toOptionList($documentProviders);
+        $response->questionTypes = [
+            ['value' => 'multiple_choice', 'label' => 'Multiple answer'],
+        ];
+        $response->documents = [] !== $documentProviders ? $this->getDocumentItems($course) : [];
+        $response->message = $this->getStatusMessage($courseGeneratorEnabled, $aiHelpersEnabled, $textProviders);
+
+        return $response;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function isSettingEnabled(string $settingName): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($settingName, true);
+    }
+
+    private function isCourseSettingEnabled(Course $course, string $settingName): bool
+    {
+        if (!\function_exists('api_get_course_setting')) {
+            return false;
+        }
+
+        $value = api_get_course_setting($settingName, $course);
+
+        return \in_array(strtolower((string) $value), ['1', 'true', 'yes', 'on'], true);
+    }
+
+    private function getCourseLanguage(Course $course): string
+    {
+        if (!\function_exists('api_get_course_info_by_id')) {
+            return 'en';
+        }
+
+        $courseInfo = api_get_course_info_by_id((int) $course->getId());
+        if (!\is_array($courseInfo)) {
+            return 'en';
+        }
+
+        $language = trim((string) ($courseInfo['language'] ?? ''));
+
+        return '' !== $language ? $language : 'en';
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getAiProviderConfig(): array
+    {
+        $providers = json_decode((string) $this->settingsManager->getSetting('ai_helpers.ai_providers', true), true);
+
+        return \is_array($providers) ? $providers : [];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getTextProviderOptions(): array
+    {
+        $providerOptions = [];
+
+        foreach ($this->getAiProviderConfig() as $key => $config) {
+            if (!\is_array($config)) {
+                continue;
+            }
+
+            $supportsText = false;
+            if ((!isset($config['document']) || !\is_array($config['document']))
+                && (!isset($config['document_process']) || !\is_array($config['document_process']))
+            ) {
+                continue;
+            }
+
+            $model = '';
+            if (isset($config['document']['model'])) {
+                $model = (string) $config['document']['model'];
+            } elseif (isset($config['document_process']['model'])) {
+                $model = (string) $config['document_process']['model'];
+            }
+
+            if (isset($config['text']) && \is_array($config['text'])) {
+                $supportsText = true;
+                $model = (string) ($config['text']['model'] ?? '');
+            } elseif (isset($config['model']) || isset($config['url'])) {
+                $supportsText = true;
+                $model = (string) ($config['model'] ?? '');
+            }
+
+            if (!$supportsText) {
+                continue;
+            }
+
+            $label = (string) $key;
+            if ('' !== trim($model)) {
+                $label .= ' ('.$model.')';
+            }
+
+            $providerOptions[(string) $key] = $label;
+        }
+
+        return $providerOptions;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getDocumentProviderOptions(): array
+    {
+        $providerOptions = [];
+
+        foreach ($this->getAiProviderConfig() as $key => $config) {
+            if (!\is_array($config) || !isset($config['document_process']) || !\is_array($config['document_process'])) {
+                continue;
+            }
+
+            $label = (string) $key;
+            $model = (string) ($config['document_process']['model'] ?? '');
+            if ('' !== trim($model)) {
+                $label .= ' ('.$model.')';
+            }
+
+            $providerOptions[(string) $key] = $label;
+        }
+
+        return $providerOptions;
+    }
+
+    /**
+     * @param array<string, string> $items
+     *
+     * @return array<int, array{value: string, label: string}>
+     */
+    private function toOptionList(array $items): array
+    {
+        $options = [];
+        foreach ($items as $value => $label) {
+            $options[] = [
+                'value' => (string) $value,
+                'label' => $label,
+            ];
+        }
+
+        return $options;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getDocumentItems(Course $course): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('DISTINCT document')
+            ->from(CDocument::class, 'document')
+            ->innerJoin('document.resourceNode', 'node')
+            ->innerJoin('node.resourceFiles', 'file')
+            ->innerJoin('node.resourceLinks', 'resourceLink')
+            ->where('document.filetype = :fileType')
+            ->andWhere('IDENTITY(resourceLink.course) = :courseId')
+            ->andWhere('resourceLink.deletedAt IS NULL')
+            ->andWhere('resourceLink.endVisibilityAt IS NULL')
+            ->setParameter('fileType', 'file', Types::STRING)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('document.iid', 'DESC')
+        ;
+
+        $documents = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $document) {
+            if (!$document instanceof CDocument) {
+                continue;
+            }
+
+            $node = $document->getResourceNode();
+            if (null === $node || $node->getResourceFiles()->isEmpty()) {
+                continue;
+            }
+
+            $file = $node->getResourceFiles()->first();
+            if (!$file instanceof ResourceFile) {
+                continue;
+            }
+
+            $filename = (string) $file->getOriginalName();
+            $extension = strtolower((string) pathinfo($filename, PATHINFO_EXTENSION));
+            if (!\in_array($extension, ['pdf', 'txt'], true)) {
+                continue;
+            }
+
+            $title = trim((string) $node->getTitle());
+            if ('' === $title) {
+                $title = $filename;
+            }
+
+            $documents[] = [
+                'documentId' => (int) $document->getIid(),
+                'resourceFileId' => (int) $file->getId(),
+                'resourceNodeId' => (int) $node->getId(),
+                'title' => $title,
+                'filename' => $filename,
+                'mimeType' => (string) $file->getMimeType(),
+                'extension' => $extension,
+                'size' => null,
+            ];
+        }
+
+        return $documents;
+    }
+
+    /**
+     * @param array<string, string> $textProviders
+     */
+    private function getStatusMessage(bool $courseGeneratorEnabled, bool $aiHelpersEnabled, array $textProviders): string
+    {
+        if (!$courseGeneratorEnabled) {
+            return 'The AI Aiken generator is disabled in this course.';
+        }
+
+        if (!$aiHelpersEnabled) {
+            return 'The AI helper tool is disabled on the platform.';
+        }
+
+        if ([] === $textProviders) {
+            return 'No AI text providers configured.';
+        }
+
+        return '';
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php
index d16d827ea82..8e2293de723 100644
--- a/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProcessor.php
@@ -436,7 +436,7 @@ private function getQuestionCategory(int $categoryId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php
index 4eabc46649e..39da31c23bf 100644
--- a/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseCategoryManagementProvider.php
@@ -72,7 +72,6 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->items = self::TYPE_EXERCISE === $categoryType
             ? $this->getExerciseCategories($course)
             : $this->getQuestionCategories($course, $session);
-        $response->legacyUrls = $this->getLegacyUrls($categoryType, $request);
         $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
         $response->canManage = true;
 
@@ -219,7 +218,7 @@ private function getQuestionCategories(Course $course, ?Session $session): array
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -243,30 +242,6 @@ private function getQuestionCategories(Course $course, ?Session $session): array
         return $items;
     }
 
-    /**
-     * @return array<string, string>
-     */
-    private function getLegacyUrls(string $categoryType, Request $request): array
-    {
-        $baseParams = [
-            'cid' => $request->query->getInt('cid'),
-            'sid' => $request->query->getInt('sid'),
-            'gid' => $request->query->getInt('gid'),
-        ];
-        $queryString = http_build_query(array_filter($baseParams, static fn (int $value): bool => 0 < $value));
-
-        if (self::TYPE_QUESTION === $categoryType) {
-            return [
-                'export' => '/main/exercise/tests_category.php?action=export_category&'.$queryString,
-                'import' => '/main/exercise/tests_category.php?action=import_category&'.$queryString,
-            ];
-        }
-
-        return [
-            'legacy' => '/main/exercise/category.php?'.$queryString,
-        ];
-    }
-
     private function isSettingEnabled(string $name): bool
     {
         return 'true' === $this->settingsManager->getSetting($name, true);
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
index 9301edef9f6..dbf1845d21d 100644
--- a/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
@@ -13,6 +13,8 @@
 use Chamilo\CoreBundle\Entity\ExtraField;
 use Chamilo\CoreBundle\Entity\ExtraFieldOptions;
 use Chamilo\CoreBundle\Entity\ExtraFieldValues;
+use Chamilo\CoreBundle\Entity\GradebookCategory;
+use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Language;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\Skill;
@@ -97,6 +99,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $this->saveCategoryMatrix($quiz, $data);
         $this->saveExerciseSkills($quiz, $data, $course, $session);
         $this->saveExerciseExtraFields($quiz, $data);
+        $this->saveExerciseGradebookLink($quiz, $data, $course);
         $this->entityManager->flush();
 
         return $this->buildResponse($quiz, $course, $session);
@@ -371,7 +374,7 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -552,6 +555,84 @@ private function getLanguageFromCode(string $rawLanguage): ?Language
         return $language;
     }
 
+    private function saveExerciseGradebookLink(CQuiz $quiz, ExerciseConfiguration $data, Course $course): void
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return;
+        }
+
+        $link = $this->getExerciseGradebookLink($exerciseId, $course);
+        if (!$data->addToGradebook) {
+            if ($link instanceof GradebookLink && 1 !== (int) $link->getLocked()) {
+                $this->entityManager->remove($link);
+            }
+
+            return;
+        }
+
+        if (null === $data->gradebookCategoryId || 0 >= $data->gradebookCategoryId) {
+            return;
+        }
+
+        $category = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(GradebookCategory::class, 'category')
+            ->andWhere('category.id = :categoryId')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('categoryId', (int) $data->gradebookCategoryId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$category instanceof GradebookCategory) {
+            return;
+        }
+
+        if (!$link instanceof GradebookLink) {
+            $link = new GradebookLink();
+            $link->setType(1);
+            $link->setRefId($exerciseId);
+            $link->setUserScoreList([]);
+            $link->setCourse($course);
+            $link->setCreatedAt(new DateTime());
+            $link->setLocked(0);
+        }
+
+        if (1 === (int) $link->getLocked()) {
+            return;
+        }
+
+        $link
+            ->setCategory($category)
+            ->setWeight((float) max(0, $data->gradebookWeight))
+            ->setVisible($data->gradebookVisible ? 1 : 0)
+        ;
+
+        $this->entityManager->persist($link);
+    }
+
+    private function getExerciseGradebookLink(int $exerciseId, Course $course): ?GradebookLink
+    {
+        $link = $this->entityManager->createQueryBuilder()
+            ->select('link')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.type = :type')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('type', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $link instanceof GradebookLink ? $link : null;
+    }
+
     private function updateLearningPathTitles(CQuiz $quiz, ExerciseConfiguration $data): void
     {
         if (!$data->updateTitleInLearningPaths || null === $quiz->getIid()) {
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
index cd3f7554b5e..597ed807fe6 100644
--- a/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
@@ -13,6 +13,8 @@
 use Chamilo\CoreBundle\Entity\ExtraField;
 use Chamilo\CoreBundle\Entity\ExtraFieldOptions;
 use Chamilo\CoreBundle\Entity\ExtraFieldValues;
+use Chamilo\CoreBundle\Entity\GradebookCategory;
+use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Language;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\Skill;
@@ -109,6 +111,10 @@ private function buildCreateConfiguration(Course $course, ?Session $session): Ex
         $configuration->lockedFields = [];
         $configuration->displayCategoryName = true;
         $configuration->pageResultConfiguration = $this->getDefaultPageResultConfiguration();
+        $configuration->addToGradebook = false;
+        $configuration->gradebookCategoryId = null;
+        $configuration->gradebookWeight = 100;
+        $configuration->gradebookVisible = true;
         $configuration->notifications = [];
         $configuration->accessCondition = '';
         $configuration->sound = '';
@@ -145,6 +151,11 @@ private function buildEditConfiguration(CQuiz $quiz, Course $course, ?Session $s
         $configuration->preventBackwards = 1 === $quiz->getPreventBackwards();
         $configuration->hideAttemptsTable = $quiz->isHideAttemptsTable();
         $configuration->autoLaunch = $quiz->isAutoLaunch();
+        $gradebookLink = $this->getExerciseGradebookLink($quiz, $course);
+        $configuration->addToGradebook = $gradebookLink instanceof GradebookLink;
+        $configuration->gradebookCategoryId = $gradebookLink instanceof GradebookLink ? (int) $gradebookLink->getCategory()->getId() : null;
+        $configuration->gradebookWeight = $gradebookLink instanceof GradebookLink ? (int) round($gradebookLink->getWeight()) : 100;
+        $configuration->gradebookVisible = !$gradebookLink instanceof GradebookLink || 1 === (int) $gradebookLink->getVisible();
         $configuration->notifications = $this->normalizeNotifications($quiz->getNotifications());
         $configuration->accessCondition = (string) $quiz->getAccessCondition();
         $configuration->sound = (string) ($quiz->getSound() ?? '');
@@ -209,7 +220,7 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -248,6 +259,7 @@ private function getOptions(Course $course, ?CQuiz $quiz): array
                 ['value' => CQuiz::ONE_PER_PAGE, 'label' => 'One question per page'],
             ],
             'categoryOptions' => $this->getCategoryOptions($course),
+            'gradebookCategoryOptions' => $this->getGradebookCategoryOptions($course),
             'languageOptions' => $this->getResourceLanguageOptions(),
             'skillOptions' => $this->getSkillOptions(),
             'extraFieldDefinitions' => $this->getExtraFieldDefinitions(),
@@ -867,6 +879,61 @@ private function getCategoryOptions(Course $course): array
         return $items;
     }
 
+    private function getExerciseGradebookLink(CQuiz $quiz, Course $course): ?GradebookLink
+    {
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return null;
+        }
+
+        $link = $this->entityManager->createQueryBuilder()
+            ->select('link', 'category')
+            ->from(GradebookLink::class, 'link')
+            ->innerJoin('link.category', 'category')
+            ->andWhere('link.type = :type')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('type', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $link instanceof GradebookLink ? $link : null;
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getGradebookCategoryOptions(Course $course): array
+    {
+        $categories = $this->entityManager->createQueryBuilder()
+            ->select('category')
+            ->from(GradebookCategory::class, 'category')
+            ->andWhere('IDENTITY(category.course) = :courseId')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('category.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $items = [];
+        foreach ($categories as $category) {
+            if (!$category instanceof GradebookCategory || null === $category->getId()) {
+                continue;
+            }
+
+            $items[] = [
+                'value' => (int) $category->getId(),
+                'label' => $category->getTitle(),
+            ];
+        }
+
+        return $items;
+    }
+
     /**
      * @return array<int, int>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseGlobalQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseGlobalQuestionProvider.php
new file mode 100644
index 00000000000..45895c9f360
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseGlobalQuestionProvider.php
@@ -0,0 +1,213 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseGlobalQuestion;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * @implements ProviderInterface<ExerciseGlobalQuestion>
+ */
+final readonly class ExerciseGlobalQuestionProvider implements ProviderInterface
+{
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ExerciseGlobalQuestion
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to create exercise questions in this context.');
+        }
+
+        $response = new ExerciseGlobalQuestion();
+        $response->title = 'Add a question';
+        $response->questionTypes = $this->getQuestionTypes();
+        $response->exercises = $this->getExercises($course, $session);
+        $response->canManage = true;
+
+        return $response;
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getExercises(Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('quiz.title', 'ASC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $items = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $quiz) {
+            if (!$quiz instanceof CQuiz || null === $quiz->getIid()) {
+                continue;
+            }
+
+            $quizId = (int) $quiz->getIid();
+            $items[$quizId] = [
+                'id' => $quizId,
+                'title' => $this->formatTitle((string) $quiz->getTitle()),
+                'feedbackType' => (int) $quiz->getFeedbackType(),
+            ];
+        }
+
+        return array_values($items);
+    }
+
+    private function formatTitle(string $title): string
+    {
+        $plainTitle = trim(html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8'));
+
+        return '' !== $plainTitle ? mb_substr($plainTitle, 0, 80) : 'Untitled';
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getQuestionTypes(): array
+    {
+        $types = [];
+        foreach ($this->getLegacyQuestionTypeDefinitions() as $definition) {
+            $type = (int) $definition['type'];
+            if (!$this->isQuestionTypeVisibleInSelector($type)) {
+                continue;
+            }
+
+            $types[] = [
+                'type' => $type,
+                'label' => $definition['label'],
+                'icon' => $definition['icon'],
+                'enabled' => true,
+                'requiresImmediateFeedback' => false,
+                'migratedToVue' => true,
+                'editor' => 'vue',
+            ];
+        }
+
+        return $types;
+    }
+
+    /**
+     * @return array<int, array{type: int, label: string, icon: string}>
+     */
+    private function getLegacyQuestionTypeDefinitions(): array
+    {
+        return [
+            ['type' => 1, 'label' => 'Multiple choice', 'icon' => 'mcua.png'],
+            ['type' => 2, 'label' => 'Multiple answer', 'icon' => 'mcma.png'],
+            ['type' => 3, 'label' => 'Fill blanks or form', 'icon' => 'fill_in_blanks.png'],
+            ['type' => 4, 'label' => 'Matching', 'icon' => 'matching.png'],
+            ['type' => 5, 'label' => 'Open question', 'icon' => 'open_answer.png'],
+            ['type' => 6, 'label' => 'Image zones', 'icon' => 'hotspot.png'],
+            ['type' => 9, 'label' => 'Exact Selection', 'icon' => 'mcmac.png'],
+            ['type' => 10, 'label' => 'Unique answer with unknown', 'icon' => 'mcuao.png'],
+            ['type' => 11, 'label' => "Multiple answer true/false/don't know", 'icon' => 'mcmao.png'],
+            ['type' => 12, 'label' => "Combination true/false/don't-know", 'icon' => 'mcmaco.png'],
+            ['type' => 13, 'label' => 'Oral expression', 'icon' => 'audio_question.png'],
+            ['type' => 14, 'label' => 'Global multiple answer', 'icon' => 'mcmagl.png'],
+            ['type' => 15, 'label' => 'Media question', 'icon' => 'media.png'],
+            ['type' => 16, 'label' => 'Calculated answer', 'icon' => 'calculated_answer.png'],
+            ['type' => 17, 'label' => 'Unique answer with images', 'icon' => 'uaimg.png'],
+            ['type' => 18, 'label' => 'Sequence ordering', 'icon' => 'ordering.png'],
+            ['type' => 19, 'label' => 'Match by dragging', 'icon' => 'matchingdrag.png'],
+            ['type' => 20, 'label' => 'Annotation', 'icon' => 'annotation.png'],
+            ['type' => 21, 'label' => 'Reading comprehension', 'icon' => 'reading_comprehension.png'],
+            ['type' => 22, 'label' => 'Multiple answer true/false with degree of certainty', 'icon' => 'mccert.png'],
+            ['type' => 23, 'label' => 'Upload Answer', 'icon' => 'file_upload_question.png'],
+            ['type' => 24, 'label' => 'Matching combination', 'icon' => 'matching_co.png'],
+            ['type' => 25, 'label' => 'Matching draggable combination', 'icon' => 'matchingdrag_co.png'],
+            ['type' => 26, 'label' => 'Hotspot combination', 'icon' => 'hotspot_co.png'],
+            ['type' => 27, 'label' => 'Fill in blanks combination', 'icon' => 'fill_in_blanks_co.png'],
+            ['type' => 28, 'label' => 'Multiple Answer Dropdown Combination', 'icon' => 'mcma_dropdown_co.png'],
+            ['type' => 29, 'label' => 'Multiple Answer Dropdown', 'icon' => 'mcma_dropdown.png'],
+            ['type' => 31, 'label' => 'Page break', 'icon' => 'page_end.png'],
+        ];
+    }
+
+    private function isQuestionTypeVisibleInSelector(int $type): bool
+    {
+        return 8 !== $type;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseLearningPathItemProcessor.php b/src/CoreBundle/State/Exercise/ExerciseLearningPathItemProcessor.php
new file mode 100644
index 00000000000..9776fcd9352
--- /dev/null
+++ b/src/CoreBundle/State/Exercise/ExerciseLearningPathItemProcessor.php
@@ -0,0 +1,356 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\State\Exercise;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseLearningPathItem;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CLp;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Csrf\CsrfToken;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @implements ProcessorInterface<ExerciseLearningPathItem, ExerciseLearningPathItem>
+ */
+final readonly class ExerciseLearningPathItemProcessor implements ProcessorInterface
+{
+    private const CSRF_TOKEN_ID = 'exercise_question_action';
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
+    private const LP_ITEM_TYPE_DIR = 'dir';
+
+    public function __construct(
+        private RequestStack $requestStack,
+        private EntityManagerInterface $entityManager,
+        private CQuizRepository $quizRepository,
+        private Security $security,
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {}
+
+    /**
+     * @param array<string, mixed> $uriVariables
+     * @param array<string, mixed> $context
+     */
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ExerciseLearningPathItem
+    {
+        if (!$data instanceof ExerciseLearningPathItem) {
+            throw new BadRequestHttpException('Invalid learning path item payload.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            throw new BadRequestHttpException('The current request is required.');
+        }
+
+        $this->validateCsrfToken($data->submittedCsrfToken);
+
+        $course = $this->getCourse($request);
+        $session = $this->getSession($request);
+        if (!$this->canManageExercises()) {
+            throw new AccessDeniedHttpException('You are not allowed to manage exercises in this context.');
+        }
+
+        if (!$this->isLearningPathCreationContext($request)) {
+            throw new BadRequestHttpException('This action is only available from a learning path creation context.');
+        }
+
+        $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
+        if (0 >= $exerciseId) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $lp = $this->getLearningPathFromCurrentContext($request, $course, $session);
+        $parent = $this->resolveParentItem($request, $lp) ?? $this->getLearningPathRootItem($lp);
+        $lpItem = $this->getExistingLearningPathExerciseItem($lp, $exerciseId);
+
+        if (!$lpItem instanceof CLpItem) {
+            $lpItem = $this->createLearningPathExerciseItem($lp, $quiz, $exerciseId, $parent);
+        } elseif (null === $lpItem->getParent()) {
+            $lpItem->setParent($parent);
+        }
+
+        $this->quizRepository->setVisibilityDraft($quiz, $course, $session);
+        $lp->setModifiedOn(new DateTime());
+
+        $this->entityManager->flush();
+
+        $response = new ExerciseLearningPathItem();
+        $response->exerciseId = $exerciseId;
+        $response->lpItemId = (int) $lpItem->getIid();
+        $response->success = true;
+        $response->message = 'Exercise added to learning path.';
+
+        return $response;
+    }
+
+    private function validateCsrfToken(string $token): void
+    {
+        if (!$this->csrfTokenManager->isTokenValid(new CsrfToken(self::CSRF_TOKEN_ID, $token))) {
+            throw new AccessDeniedHttpException('Invalid CSRF token.');
+        }
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
+    }
+
+    private function isLearningPathCreationContext(Request $request): bool
+    {
+        $origin = strtolower((string) $request->query->get('origin', ''));
+        $returnToLp = strtolower((string) $request->query->get('returnToLp', ''));
+
+        return 'learnpath' === $origin || \in_array($returnToLp, ['1', 'true', 'yes'], true);
+    }
+
+    private function getCourse(Request $request): Course
+    {
+        $courseId = $request->query->getInt('cid');
+        if (0 >= $courseId) {
+            throw new BadRequestHttpException('A valid course id is required.');
+        }
+
+        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        if (!$course instanceof Course) {
+            throw new BadRequestHttpException('The requested course was not found.');
+        }
+
+        return $course;
+    }
+
+    private function getSession(Request $request): ?Session
+    {
+        $sessionId = $request->query->getInt('sid');
+        if (0 >= $sessionId) {
+            return null;
+        }
+
+        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
+        if (!$session instanceof Session) {
+            throw new BadRequestHttpException('The requested session was not found.');
+        }
+
+        return $session;
+    }
+
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    {
+        $quiz = $this->quizRepository->find($exerciseId);
+        if (!$quiz instanceof CQuiz) {
+            throw new NotFoundHttpException('The requested exercise was not found.');
+        }
+
+        if ($this->isExerciseInContext($exerciseId, $course, $session)) {
+            return $quiz;
+        }
+
+        throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
+    }
+
+    private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('quiz.iid = :exerciseId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function getLearningPathFromCurrentContext(Request $request, Course $course, ?Session $session): CLp
+    {
+        $lpId = $request->query->getInt('lp_id', $request->query->getInt('learnpath_id'));
+        if (0 >= $lpId) {
+            throw new BadRequestHttpException('A valid learning path id is required.');
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('lp')
+            ->from(CLp::class, 'lp')
+            ->innerJoin('lp.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('lp.iid = :lpId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('lpId', $lpId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        $lp = $queryBuilder->getQuery()->getOneOrNullResult();
+        if (!$lp instanceof CLp) {
+            throw new AccessDeniedHttpException('The requested learning path does not belong to the current course context.');
+        }
+
+        return $lp;
+    }
+
+    private function getExistingLearningPathExerciseItem(CLp $lp, int $exerciseId): ?CLpItem
+    {
+        $item = $this->entityManager->createQueryBuilder()
+            ->select('item')
+            ->from(CLpItem::class, 'item')
+            ->andWhere('item.lp = :lp')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('item.path = :path')
+            ->setParameter('lp', $lp)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('path', (string) $exerciseId)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $item instanceof CLpItem ? $item : null;
+    }
+
+    private function createLearningPathExerciseItem(CLp $lp, CQuiz $quiz, int $exerciseId, CLpItem $parent): CLpItem
+    {
+        $lpItem = (new CLpItem())
+            ->setTitle($quiz->getTitle())
+            ->setDescription('')
+            ->setPath((string) $exerciseId)
+            ->setRef('')
+            ->setLp($lp)
+            ->setItemType(self::LP_ITEM_TYPE_QUIZ)
+            ->setMaxScore($this->getExerciseMaxScore($quiz))
+            ->setMaxTimeAllowed('0')
+            ->setPrerequisite('0')
+            ->setDisplayOrder($this->getNextDisplayOrder($lp, $parent))
+            ->setParent($parent)
+        ;
+
+        $this->entityManager->persist($lpItem);
+        $this->entityManager->flush();
+
+        return $lpItem;
+    }
+
+    private function getExerciseMaxScore(CQuiz $quiz): float
+    {
+        $maxScore = 0.0;
+        foreach ($quiz->getQuestions() as $relQuestion) {
+            $maxScore += (float) $relQuestion->getQuestion()->getPonderation();
+        }
+
+        return $maxScore;
+    }
+
+    private function getLearningPathRootItem(CLp $lp): CLpItem
+    {
+        $root = $this->entityManager->createQueryBuilder()
+            ->select('item')
+            ->from(CLpItem::class, 'item')
+            ->andWhere('item.lp = :lp')
+            ->andWhere('item.path = :path')
+            ->setParameter('lp', $lp)
+            ->setParameter('path', 'root')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$root instanceof CLpItem) {
+            throw new BadRequestHttpException('The learning path root item was not found.');
+        }
+
+        return $root;
+    }
+
+    private function getNextDisplayOrder(CLp $lp, CLpItem $parent): int
+    {
+        $maxDisplayOrder = $this->entityManager->createQueryBuilder()
+            ->select('COALESCE(MAX(item.displayOrder), 0)')
+            ->from(CLpItem::class, 'item')
+            ->andWhere('item.lp = :lp')
+            ->andWhere('item.parent = :parent')
+            ->setParameter('lp', $lp)
+            ->setParameter('parent', $parent)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return ((int) $maxDisplayOrder) + 1;
+    }
+
+    private function resolveParentItem(Request $request, CLp $lp): ?CLpItem
+    {
+        foreach (['lp_parent_id', 'parent'] as $parameterName) {
+            $candidateId = $request->query->getInt($parameterName);
+            if (0 >= $candidateId) {
+                continue;
+            }
+
+            $candidate = $this->entityManager->createQueryBuilder()
+                ->select('item')
+                ->from(CLpItem::class, 'item')
+                ->andWhere('item.iid = :itemId')
+                ->andWhere('item.lp = :lp')
+                ->setParameter('itemId', $candidateId, Types::INTEGER)
+                ->setParameter('lp', $lp)
+                ->setMaxResults(1)
+                ->getQuery()
+                ->getOneOrNullResult()
+            ;
+
+            if (!$candidate instanceof CLpItem) {
+                continue;
+            }
+
+            if (self::LP_ITEM_TYPE_DIR === $candidate->getItemType()) {
+                return $candidate;
+            }
+
+            return $candidate->getParent();
+        }
+
+        return null;
+    }
+}
diff --git a/src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php
index f2181675194..dc55df8c3f3 100644
--- a/src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseListActionProcessor.php
@@ -10,7 +10,9 @@
 use ApiPlatform\State\ProcessorInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseList;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Repository\ResourceLinkRepository;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
@@ -18,9 +20,11 @@
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
+use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -41,7 +45,15 @@
     private const ACTION_COPY = 'copy';
     private const ACTION_DELETE = 'delete';
     private const ACTION_TOGGLE_VISIBILITY = 'toggle_visibility';
+    private const ACTION_TOGGLE_AUTO_LAUNCH = 'toggle_auto_launch';
+    private const ACTION_CLEAN_RESULTS = 'clean_results';
+    private const ACTION_CLEAN_ALL_RESULTS = 'clean_all_results';
+    private const ACTION_BULK_ACTIVATE = 'bulk_activate';
+    private const ACTION_BULK_DEACTIVATE = 'bulk_deactivate';
+    private const ACTION_BULK_DELETE = 'bulk_delete';
     private const VISIBILITY_PUBLISHED = 2;
+    private const LINK_TYPE_EXERCISE = 1;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const MATCHING = 4;
     private const MATCHING_DRAGGABLE = 19;
     private const MATCHING_DRAGGABLE_COMBINATION = 25;
@@ -80,18 +92,41 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
 
         $course = $this->getCourse($request);
         $session = $this->getSession($request);
+        $action = strtolower(trim($data->action));
+
+        if (self::ACTION_CLEAN_ALL_RESULTS === $action) {
+            $message = $this->cleanAllResults($course, $session);
+            $this->entityManager->flush();
+
+            $response = new ExerciseList();
+            $response->exerciseId = 0;
+            $response->action = $action;
+            $response->success = true;
+            $response->message = $message;
+
+            return $response;
+        }
+
+        if ($this->isBulkAction($action)) {
+            $response = $this->runBulkAction($action, $data->exerciseIds, $course, $session);
+            $this->entityManager->flush();
+
+            return $response;
+        }
+
         $exerciseId = (int) $data->exerciseId;
         if (0 >= $exerciseId) {
             throw new BadRequestHttpException('A valid exercise id is required.');
         }
 
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
-        $action = strtolower(trim($data->action));
 
         $message = match ($action) {
             self::ACTION_COPY => $this->copyExercise($quiz, $course, $session),
             self::ACTION_DELETE => $this->deleteExercise($quiz, $course, $session),
             self::ACTION_TOGGLE_VISIBILITY => $this->toggleVisibility($quiz, $course, $session),
+            self::ACTION_TOGGLE_AUTO_LAUNCH => $this->toggleAutoLaunch($quiz, $course, $session),
+            self::ACTION_CLEAN_RESULTS => $this->cleanExerciseResults($quiz, $course, $session),
             default => throw new BadRequestHttpException('Unsupported exercise action.'),
         };
 
@@ -106,6 +141,111 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         return $response;
     }
 
+    private function isBulkAction(string $action): bool
+    {
+        return \in_array(
+            $action,
+            [
+                self::ACTION_BULK_ACTIVATE,
+                self::ACTION_BULK_DEACTIVATE,
+                self::ACTION_BULK_DELETE,
+            ],
+            true,
+        );
+    }
+
+    /**
+     * @param array<int, int|string> $exerciseIds
+     */
+    private function runBulkAction(string $action, array $exerciseIds, Course $course, ?Session $session): ExerciseList
+    {
+        $ids = $this->normalizeExerciseIds($exerciseIds);
+        if ([] === $ids) {
+            throw new BadRequestHttpException('At least one exercise must be selected.');
+        }
+
+        $processed = 0;
+        $skipped = 0;
+
+        foreach ($ids as $exerciseId) {
+            try {
+                $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+                $this->runBulkActionForExercise($action, $quiz, $course, $session);
+                ++$processed;
+            } catch (AccessDeniedHttpException|BadRequestHttpException|NotFoundHttpException) {
+                ++$skipped;
+            }
+        }
+
+        $response = new ExerciseList();
+        $response->exerciseId = 0;
+        $response->exerciseIds = $ids;
+        $response->action = $action;
+        $response->success = true;
+        $response->processedCount = $processed;
+        $response->skippedCount = $skipped;
+        $response->message = $this->buildBulkActionMessage($action, $processed, $skipped);
+
+        return $response;
+    }
+
+    private function runBulkActionForExercise(string $action, CQuiz $quiz, Course $course, ?Session $session): void
+    {
+        match ($action) {
+            self::ACTION_BULK_ACTIVATE => $this->setExerciseVisibility($quiz, $course, $session, true),
+            self::ACTION_BULK_DEACTIVATE => $this->setExerciseVisibility($quiz, $course, $session, false),
+            self::ACTION_BULK_DELETE => $this->deleteExercise($quiz, $course, $session),
+            default => throw new BadRequestHttpException('Unsupported bulk exercise action.'),
+        };
+    }
+
+    /**
+     * @param array<int, int|string> $exerciseIds
+     *
+     * @return array<int, int>
+     */
+    private function normalizeExerciseIds(array $exerciseIds): array
+    {
+        $ids = [];
+        foreach ($exerciseIds as $exerciseId) {
+            $id = (int) $exerciseId;
+            if (0 < $id) {
+                $ids[$id] = $id;
+            }
+        }
+
+        return array_values($ids);
+    }
+
+    private function buildBulkActionMessage(string $action, int $processed, int $skipped): string
+    {
+        $label = match ($action) {
+            self::ACTION_BULK_DELETE => 'exercises deleted',
+            default => 'exercises updated',
+        };
+
+        return \sprintf('%d %s (%d skipped)', $processed, $label, $skipped);
+    }
+
+    private function setExerciseVisibility(CQuiz $quiz, Course $course, ?Session $session, bool $visible): void
+    {
+        if (!$this->canRunRestrictedAction()) {
+            throw new AccessDeniedHttpException('You are not allowed to change this exercise visibility.');
+        }
+
+        if ($this->isExerciseReadOnlyFromLearningPath((int) $quiz->getIid())) {
+            throw new AccessDeniedHttpException('This exercise visibility is managed from the learning path.');
+        }
+
+        if ($visible) {
+            $this->quizRepository->setVisibilityPublished($quiz, $course, $session);
+
+            return;
+        }
+
+        $this->quizRepository->setVisibilityDraft($quiz, $course, $session);
+    }
+
     private function getCourse(Request $request): Course
     {
         $courseId = $request->query->getInt('cid');
@@ -151,6 +291,16 @@ private function canRunRestrictedAction(): bool
         return $this->security->isGranted('ROLE_ADMIN');
     }
 
+    private function canCleanResults(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access')
+            && !$this->isSettingEnabled('exercise.disable_clean_exercise_results_for_teachers');
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -168,7 +318,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
     private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
-            ->select('quiz.iid')
+            ->select('quiz.iid AS exerciseId')
             ->from(CQuiz::class, 'quiz')
             ->innerJoin('quiz.resourceNode', 'node')
             ->innerJoin('node.resourceLinks', 'links')
@@ -183,7 +333,7 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -280,6 +430,10 @@ private function deleteExercise(CQuiz $quiz, Course $course, ?Session $session):
             throw new AccessDeniedHttpException('You are not allowed to delete this exercise.');
         }
 
+        if ($this->isGradebookLocked((int) $quiz->getIid(), $course)) {
+            throw new AccessDeniedHttpException('This exercise is locked by the gradebook.');
+        }
+
         $this->resourceLinkRepository->removeByResourceInContext($quiz, $course, $session);
 
         return 'Exercise deleted';
@@ -291,6 +445,10 @@ private function toggleVisibility(CQuiz $quiz, Course $course, ?Session $session
             throw new AccessDeniedHttpException('You are not allowed to change this exercise visibility.');
         }
 
+        if ($this->isExerciseReadOnlyFromLearningPath((int) $quiz->getIid())) {
+            throw new AccessDeniedHttpException('This exercise visibility is managed from the learning path.');
+        }
+
         if ($this->isExerciseVisible($quiz, $course, $session)) {
             $this->quizRepository->setVisibilityDraft($quiz, $course, $session);
 
@@ -302,6 +460,45 @@ private function toggleVisibility(CQuiz $quiz, Course $course, ?Session $session
         return 'Exercise visible';
     }
 
+    private function toggleAutoLaunch(CQuiz $quiz, Course $course, ?Session $session): string
+    {
+        if ($quiz->isAutoLaunch()) {
+            $quiz->setAutoLaunch(false);
+            $this->entityManager->persist($quiz);
+
+            return 'Autolaunch disabled';
+        }
+
+        foreach ($this->getExercisesFromCurrentContext($course, $session) as $currentQuiz) {
+            $currentQuiz->setAutoLaunch(false);
+            $this->entityManager->persist($currentQuiz);
+        }
+
+        $quiz->setAutoLaunch(true);
+        $this->entityManager->persist($quiz);
+
+        return 'Autolaunch enabled';
+    }
+
+    private function cleanExerciseResults(CQuiz $quiz, Course $course, ?Session $session): string
+    {
+        if (!$this->canCleanResults()) {
+            throw new AccessDeniedHttpException('Cleaning exercise results is not allowed.');
+        }
+
+        $exerciseId = (int) $quiz->getIid();
+        if ($this->isGradebookLocked($exerciseId, $course)) {
+            throw new AccessDeniedHttpException('This exercise is locked by the gradebook.');
+        }
+
+        $attempts = $this->getAttemptsForExercises([$exerciseId], $course, $session);
+        foreach ($attempts as $attempt) {
+            $this->entityManager->remove($attempt);
+        }
+
+        return trim($quiz->getTitle()).': '.\count($attempts).' results cleaned';
+    }
+
     private function isExerciseVisible(CQuiz $quiz, Course $course, ?Session $session): bool
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
@@ -320,7 +517,7 @@ private function isExerciseVisible(CQuiz $quiz, Course $course, ?Session $sessio
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -330,6 +527,151 @@ private function isExerciseVisible(CQuiz $quiz, Course $course, ?Session $sessio
         return self::VISIBILITY_PUBLISHED === (int) $queryBuilder->getQuery()->getSingleScalarResult();
     }
 
+    private function cleanAllResults(Course $course, ?Session $session): string
+    {
+        if (!$this->canCleanResults()) {
+            throw new AccessDeniedHttpException('Cleaning exercise results is not allowed.');
+        }
+
+        $exerciseIds = array_values(array_filter(
+            $this->getExerciseIdsFromCurrentContext($course, $session),
+            fn (int $exerciseId): bool => !$this->isGradebookLocked($exerciseId, $course),
+        ));
+
+        if ([] === $exerciseIds) {
+            return '0 results cleaned';
+        }
+
+        $attempts = $this->getAttemptsForExercises($exerciseIds, $course, $session);
+        foreach ($attempts as $attempt) {
+            $this->entityManager->remove($attempt);
+        }
+
+        return \count($attempts).' results cleaned';
+    }
+
+    /**
+     * @return array<int, CQuiz>
+     */
+    private function getExercisesFromCurrentContext(Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return array_values(array_filter(
+            $queryBuilder->getQuery()->getResult(),
+            static fn (mixed $quiz): bool => $quiz instanceof CQuiz,
+        ));
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getExerciseIdsFromCurrentContext(Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('quiz.iid AS exerciseId')
+            ->from(CQuiz::class, 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('links.session IS NULL');
+        }
+
+        return array_values(array_unique(array_map(
+            static fn (mixed $exerciseId): int => (int) $exerciseId,
+            array_column($queryBuilder->getQuery()->getScalarResult(), 'exerciseId'),
+        )));
+    }
+
+    /**
+     * @param array<int, int> $exerciseIds
+     *
+     * @return array<int, TrackEExercise>
+     */
+    private function getAttemptsForExercises(array $exerciseIds, Course $course, ?Session $session): array
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) IN (:exerciseIds)')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->setParameter('exerciseIds', $exerciseIds, ArrayParameterType::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        return array_values(array_filter(
+            $queryBuilder->getQuery()->getResult(),
+            static fn (mixed $attempt): bool => $attempt instanceof TrackEExercise,
+        ));
+    }
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
     private function duplicateQuestion(CQuizQuestion $sourceQuestion, Course $course, ?Session $session, int $position): CQuizQuestion
     {
         $newQuestion = new CQuizQuestion();
@@ -496,6 +838,28 @@ private function getAnswers(CQuizQuestion $question): array
         ;
     }
 
+    private function isExerciseReadOnlyFromLearningPath(int $exerciseId): bool
+    {
+        if ($this->isSettingEnabled('lp.force_edit_exercise_in_lp')) {
+            return false;
+        }
+
+        $exerciseIdAsString = (string) $exerciseId;
+        $lpItem = $this->entityManager->createQueryBuilder()
+            ->select('lpItem.iid')
+            ->from(CLpItem::class, 'lpItem')
+            ->andWhere('lpItem.itemType = :itemType')
+            ->andWhere('lpItem.path = :exerciseId OR lpItem.ref = :exerciseId')
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ, Types::STRING)
+            ->setParameter('exerciseId', $exerciseIdAsString, Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lpItem;
+    }
+
     private function isSettingEnabled(string $name): bool
     {
         return 'true' === $this->settingsManager->getSetting($name, true);
diff --git a/src/CoreBundle/State/Exercise/ExerciseListProvider.php b/src/CoreBundle/State/Exercise/ExerciseListProvider.php
index 5bd725ca3ff..f1f0c7f2e6a 100644
--- a/src/CoreBundle/State/Exercise/ExerciseListProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseListProvider.php
@@ -10,10 +10,13 @@
 use ApiPlatform\State\ProviderInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseList;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CQuizCategory;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use DateTimeImmutable;
@@ -35,6 +38,9 @@
 {
     private const VISIBILITY_PUBLISHED = 2;
     private const CSRF_TOKEN_ID = 'exercise_list_action';
+    private const LINK_TYPE_EXERCISE = 1;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
+    private const LP_READ_ONLY_MESSAGE = 'This exercise has been included in a learning path, so it cannot be accessed by students directly from here. If you want to put the same exercise available through the exercises tool, please make a copy of the current exercise using the copy icon.';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -69,7 +75,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response = new ExerciseList();
         $response->items = $items;
         $response->categories = $this->getCategories($course);
-        $response->settings = $this->getSettings();
+        $response->settings = $this->getSettings($course);
         $response->submittedCsrfToken = (string) $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID);
         $response->totalItems = \count($items);
         $response->canManage = $canManage;
@@ -144,7 +150,7 @@ private function getItems(Request $request, Course $course, ?Session $session, b
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -211,9 +217,17 @@ private function getItems(Request $request, Course $course, ?Session $session, b
         $quizIds = array_keys($quizzes);
         $questionCounts = $this->getQuestionCounts($quizIds);
         $attemptCounts = $this->getAttemptCounts($quizIds, $course, $session);
+        $learningPathUsage = $this->getLearningPathUsage($quizIds);
+        $latestAttempts = $canManage ? [] : $this->getLatestAttempts($quizIds, $course, $session);
+        $forceEditLearningPathExercises = $this->isSettingEnabled('lp.force_edit_exercise_in_lp');
         $items = [];
 
         foreach ($quizzes as $quizId => $quiz) {
+            $isLinkedToLearningPath = 0 < ($learningPathUsage[$quizId]['count'] ?? 0);
+            if (!$canManage && $isLinkedToLearningPath) {
+                continue;
+            }
+
             $visible = self::VISIBILITY_PUBLISHED === ($linkVisibilityByQuiz[$quizId] ?? self::VISIBILITY_PUBLISHED);
             $items[] = $this->normalizeQuiz(
                 $quiz,
@@ -221,12 +235,59 @@ private function getItems(Request $request, Course $course, ?Session $session, b
                 $questionCounts[$quizId] ?? 0,
                 $attemptCounts[$quizId] ?? 0,
                 $canManage,
+                $course,
+                $latestAttempts[$quizId] ?? null,
+                $isLinkedToLearningPath,
+                $forceEditLearningPathExercises,
+                (int) ($learningPathUsage[$quizId]['count'] ?? 0),
             );
         }
 
         return $items;
     }
 
+    /**
+     * @param array<int, int> $quizIds
+     *
+     * @return array<int, array{count: int}>
+     */
+    private function getLearningPathUsage(array $quizIds): array
+    {
+        if ([] === $quizIds) {
+            return [];
+        }
+
+        $exerciseIds = array_map(static fn (int $quizId): string => (string) $quizId, $quizIds);
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('lpItem.path AS exercisePath')
+            ->addSelect('lpItem.ref AS exerciseRef')
+            ->addSelect('COUNT(lpItem.iid) AS itemCount')
+            ->from(CLpItem::class, 'lpItem')
+            ->andWhere('lpItem.itemType = :itemType')
+            ->andWhere('lpItem.path IN (:exerciseIds) OR lpItem.ref IN (:exerciseIds)')
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ, Types::STRING)
+            ->setParameter('exerciseIds', $exerciseIds, ArrayParameterType::STRING)
+            ->groupBy('lpItem.path')
+            ->addGroupBy('lpItem.ref')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $usage = [];
+        foreach ($rows as $row) {
+            $exerciseId = (int) ($row['exercisePath'] ?: $row['exerciseRef']);
+            if (0 >= $exerciseId) {
+                continue;
+            }
+
+            $usage[$exerciseId] = [
+                'count' => ($usage[$exerciseId]['count'] ?? 0) + (int) $row['itemCount'],
+            ];
+        }
+
+        return $usage;
+    }
+
     /**
      * @param array<int, int> $quizIds
      *
@@ -297,6 +358,65 @@ private function getAttemptCounts(array $quizIds, Course $course, ?Session $sess
         return $counts;
     }
 
+    /**
+     * @param array<int, int> $quizIds
+     *
+     * @return array<int, TrackEExercise>
+     */
+    private function getLatestAttempts(array $quizIds, Course $course, ?Session $session): array
+    {
+        if ([] === $quizIds) {
+            return [];
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User || null === $user->getId()) {
+            return [];
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) IN (:quizIds)')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->setParameter('quizIds', $quizIds, ArrayParameterType::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->orderBy('attempt.exeDate', 'DESC')
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempts = $queryBuilder->getQuery()->getResult();
+        $latestAttempts = [];
+
+        foreach ($attempts as $attempt) {
+            if (!$attempt instanceof TrackEExercise) {
+                continue;
+            }
+
+            $quiz = $attempt->getQuiz();
+            if (!$quiz instanceof CQuiz || null === $quiz->getIid()) {
+                continue;
+            }
+
+            $quizId = (int) $quiz->getIid();
+            if (!isset($latestAttempts[$quizId])) {
+                $latestAttempts[$quizId] = $attempt;
+            }
+        }
+
+        return $latestAttempts;
+    }
+
     /**
      * @return array<int, array<string, mixed>>
      */
@@ -335,7 +455,7 @@ private function getCategories(Course $course): array
     /**
      * @return array<string, mixed>
      */
-    private function getSettings(): array
+    private function getSettings(Course $course): array
     {
         return [
             'allowExerciseCategories' => $this->isSettingEnabled('exercise.allow_exercise_categories'),
@@ -343,8 +463,8 @@ private function getSettings(): array
             'disableNewAttempts' => $this->isSettingEnabled('exercise.exercises_disable_new_attempts'),
             'hideAttemptsTableOnStartPage' => $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page'),
             'limitTeacherAccess' => $this->isSettingEnabled('exercise.limit_exercise_teacher_access'),
-            'exerciseGeneratorEnabled' => $this->isSettingEnabled('ai_helpers.enable_ai_helpers')
-                && $this->isSettingEnabled('ai_helpers.exercise_generator'),
+            'exerciseGeneratorEnabled' => $this->isCourseSettingEnabled($course, 'exercise_generator'),
+            'canCleanAllResults' => $this->canCleanResults(),
         ];
     }
 
@@ -357,12 +477,21 @@ private function normalizeQuiz(
         int $questionCount,
         int $attemptCount,
         bool $canManage,
+        Course $course,
+        ?TrackEExercise $latestAttempt = null,
+        bool $isLinkedToLearningPath = false,
+        bool $forceEditLearningPathExercises = false,
+        int $learningPathUsageCount = 0,
     ): array {
         $category = $quiz->getQuizCategory();
         $startTime = $quiz->getStartTime();
         $endTime = $quiz->getEndTime();
         $availabilityStatus = $this->getAvailabilityStatus($startTime, $endTime);
         $canRunRestrictedActions = $this->canRunRestrictedActions();
+        $canCleanResults = $this->canCleanResults();
+        $isGradebookLocked = $this->isGradebookLocked((int) $quiz->getIid(), $course);
+        $isLimitTeacherAccess = $this->isSettingEnabled('exercise.limit_exercise_teacher_access');
+        $isReadOnlyFromLearningPath = $isLinkedToLearningPath && !$forceEditLearningPathExercises;
 
         return [
             'iid' => (int) $quiz->getIid(),
@@ -379,15 +508,54 @@ private function normalizeQuiz(
             'passPercentage' => $quiz->getPassPercentage(),
             'questionCount' => $questionCount,
             'attemptCount' => $attemptCount,
+            'latestAttempt' => $this->normalizeLatestAttempt($latestAttempt),
+            'isLinkedToLearningPath' => $isLinkedToLearningPath,
+            'isReadOnlyFromLearningPath' => $isReadOnlyFromLearningPath,
+            'learningPathUsageCount' => $learningPathUsageCount,
+            'learningPathReadOnlyMessage' => $isLinkedToLearningPath ? self::LP_READ_ONLY_MESSAGE : '',
             'canOpen' => $visible || $canManage,
             'canOverview' => $visible || $canManage,
             'canEdit' => $canManage,
-            'canConfigure' => $canManage,
-            'canReport' => $canManage,
-            'canExport' => $canManage,
+            'autoLaunch' => $quiz->isAutoLaunch(),
+            'isGradebookLocked' => $isGradebookLocked,
+            'canConfigure' => $canManage && (!$isLimitTeacherAccess || $this->security->isGranted('ROLE_ADMIN')),
+            'canReport' => $canManage && (!$isLimitTeacherAccess || $this->security->isGranted('ROLE_ADMIN')),
+            'canExport' => $canManage && $canRunRestrictedActions,
             'canCopy' => $canManage,
-            'canDelete' => $canManage && $canRunRestrictedActions,
-            'canToggleVisibility' => $canManage && $canRunRestrictedActions,
+            'canDelete' => $canManage && $canRunRestrictedActions && !$isGradebookLocked,
+            'canDeleteDisabled' => $canManage && $canRunRestrictedActions && $isGradebookLocked,
+            'canCleanResults' => $canManage && $canCleanResults && !$isGradebookLocked,
+            'canCleanResultsDisabled' => $canManage && $canCleanResults && $isGradebookLocked,
+            'canToggleAutoLaunch' => $canManage,
+            'canToggleVisibility' => $canManage && $canRunRestrictedActions && !$isLinkedToLearningPath,
+            'canToggleVisibilityDisabled' => $canManage && $canRunRestrictedActions && $isLinkedToLearningPath,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function normalizeLatestAttempt(?TrackEExercise $attempt): ?array
+    {
+        if (null === $attempt) {
+            return null;
+        }
+
+        $maxScore = $attempt->getMaxScore();
+        $score = $attempt->getScore();
+        $percentage = 0.0;
+
+        if (0.0 < $maxScore) {
+            $percentage = ($score * 100) / $maxScore;
+        }
+
+        return [
+            'id' => $attempt->getExeId(),
+            'score' => $score,
+            'maxScore' => $maxScore,
+            'percentage' => $percentage,
+            'date' => $this->formatDate($attempt->getExeDate()),
+            'status' => $attempt->getStatus(),
         ];
     }
 
@@ -406,7 +574,6 @@ private function getAvailabilityStatus(?DateTimeInterface $startTime, ?DateTimeI
         return 'open';
     }
 
-
     private function canRunRestrictedActions(): bool
     {
         if (!$this->isSettingEnabled('exercise.limit_exercise_teacher_access')) {
@@ -416,6 +583,45 @@ private function canRunRestrictedActions(): bool
         return $this->security->isGranted('ROLE_ADMIN');
     }
 
+    private function canCleanResults(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access')
+            && !$this->isSettingEnabled('exercise.disable_clean_exercise_results_for_teachers');
+    }
+
+    private function isGradebookLocked(int $exerciseId, Course $course): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return false;
+        }
+
+        if (!$this->isSettingEnabled('gradebook.gradebook_locking_enabled')) {
+            return false;
+        }
+
+        $lockedLink = $this->entityManager->createQueryBuilder()
+            ->select('link.id')
+            ->from(GradebookLink::class, 'link')
+            ->andWhere('link.locked = :locked')
+            ->andWhere('link.refId = :exerciseId')
+            ->andWhere('link.type = :linkType')
+            ->andWhere('IDENTITY(link.course) = :courseId')
+            ->setParameter('locked', 1, Types::INTEGER)
+            ->setParameter('exerciseId', $exerciseId, Types::INTEGER)
+            ->setParameter('linkType', self::LINK_TYPE_EXERCISE, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $lockedLink;
+    }
+
     private function formatDate(?DateTimeInterface $date): ?string
     {
         if (null === $date) {
@@ -425,6 +631,17 @@ private function formatDate(?DateTimeInterface $date): ?string
         return $date->format(DateTimeInterface::ATOM);
     }
 
+    private function isCourseSettingEnabled(Course $course, string $name): bool
+    {
+        if (!\function_exists('api_get_course_setting')) {
+            return false;
+        }
+
+        $value = api_get_course_setting($name, $course);
+
+        return \in_array(strtolower((string) $value), ['1', 'true', 'yes', 'on'], true);
+    }
+
     private function isSettingEnabled(string $name): bool
     {
         return 'true' === $this->settingsManager->getSetting($name, true);
diff --git a/src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php b/src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php
index 4ffcf4cbf51..753b1a4073b 100644
--- a/src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseLiveResultsProvider.php
@@ -158,7 +158,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
index 0f79c383656..6ff5c9d1d95 100644
--- a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
@@ -209,7 +209,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -263,7 +263,7 @@ private function getAverageScore(CQuiz $quiz, Course $course, ?Session $session)
             ->from(TrackEExercise::class, 'attempt')
             ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
             ->andWhere('IDENTITY(attempt.course) = :courseId')
-            ->andWhere("attempt.status = ''")
+            ->andWhere("(attempt.status = '' OR attempt.status = 'completed')")
             ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
             ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
         ;
@@ -294,7 +294,7 @@ private function getCurrentUserAttempts(
         $queryBuilder = $this->entityManager->createQueryBuilder()
             ->select('attempt')
             ->from(TrackEExercise::class, 'attempt')
-            ->andWhere("attempt.status = ''")
+            ->andWhere("(attempt.status = '' OR attempt.status = 'completed')")
             ->andWhere('IDENTITY(attempt.user) = :userId')
             ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
             ->andWhere('IDENTITY(attempt.course) = :courseId')
@@ -327,6 +327,7 @@ private function getCurrentUserAttempts(
             }
 
             $maxScore = $attempt->getMaxScore();
+            $revised = $this->isAttemptRevised((int) $attempt->getExeId());
             $items[] = [
                 'attemptId' => (int) $attempt->getExeId(),
                 'number' => $total - $index,
@@ -335,7 +336,8 @@ private function getCurrentUserAttempts(
                 'score' => round($attempt->getScore(), 2),
                 'maxScore' => round($maxScore, 2),
                 'percentage' => 0 < $maxScore ? round(($attempt->getScore() / $maxScore) * 100, 2) : 0.0,
-                'revised' => $this->isAttemptRevised((int) $attempt->getExeId()),
+                'revised' => $revised,
+                'showValidationStatus' => $revised || $this->hasPendingManualCorrection($attempt),
             ];
         }
 
@@ -357,6 +359,12 @@ private function isAttemptRevised(int $attemptId): bool
         return 0 < (int) $total;
     }
 
+
+    private function hasPendingManualCorrection(TrackEExercise $attempt): bool
+    {
+        return '' !== trim($attempt->getQuestionsToCheck(), " \t\n\r\0\x0B,");
+    }
+
     private function shouldShowScoreColumn(CQuiz $quiz, int $attemptCount): bool
     {
         $resultMode = (int) $quiz->getResultsDisabled();
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php
index 6e55c1fa876..93ad3259912 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionActionProcessor.php
@@ -11,6 +11,7 @@
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionAction;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
@@ -42,6 +43,7 @@
     private const MATCHING = 4;
     private const MATCHING_DRAGGABLE = 19;
     private const MATCHING_DRAGGABLE_COMBINATION = 25;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -81,6 +83,10 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        if ($this->isExerciseReadOnlyFromLearningPath((int) $quiz->getIid())) {
+            throw new AccessDeniedHttpException('This exercise is read-only because it is included in a learning path.');
+        }
+
         $action = strtolower(trim($data->action));
 
         $message = match ($action) {
@@ -153,6 +159,32 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
         throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
     }
 
+    private function isExerciseReadOnlyFromLearningPath(int $exerciseId): bool
+    {
+        if ($this->isSettingEnabled('lp.force_edit_exercise_in_lp')) {
+            return false;
+        }
+
+        return null !== $this->entityManager->createQueryBuilder()
+            ->select('lpItem.iid')
+            ->from(CLpItem::class, 'lpItem')
+            ->andWhere('lpItem.itemType = :itemType')
+            ->andWhere('lpItem.path = :exerciseId OR lpItem.ref = :exerciseId')
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ, Types::STRING)
+            ->setParameter('exerciseId', (string) $exerciseId, Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+
+    private function isSettingEnabled(string $settingName): bool
+    {
+        $value = api_get_setting($settingName);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
     private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
@@ -171,7 +203,7 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
index 14ba1175649..998cb62b62b 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
@@ -12,7 +12,10 @@
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
@@ -34,12 +37,15 @@
 final readonly class ExerciseQuestionBankProcessor implements ProcessorInterface
 {
     private const ACTION_REUSE = 'reuse';
+    private const ACTION_DELETE = 'delete';
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
 
     public function __construct(
         private RequestStack $requestStack,
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
         private CsrfTokenManagerInterface $csrfTokenManager,
     ) {}
 
@@ -66,17 +72,22 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $course = $this->getCourse($request);
         $session = $this->getSession($request);
         $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
-        if (0 >= $exerciseId) {
-            throw new BadRequestHttpException('A valid exercise id is required.');
+        $quiz = 0 < $exerciseId ? $this->getExerciseFromCurrentContext($exerciseId, $course, $session) : null;
+        if ($quiz instanceof CQuiz && $this->isExerciseReadOnlyFromLearningPath((int) $quiz->getIid())) {
+            throw new AccessDeniedHttpException('This exercise is read-only because it is included in a learning path.');
         }
 
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
         $action = strtolower(trim($data->action));
-        if (self::ACTION_REUSE !== $action) {
+        if (!\in_array($action, [self::ACTION_REUSE, self::ACTION_DELETE], true)) {
             throw new BadRequestHttpException('Unsupported question bank action.');
         }
 
-        [$addedCount, $skippedCount] = $this->reuseQuestions($quiz, $data, $course, $session);
+        if (self::ACTION_REUSE === $action) {
+            [$addedCount, $skippedCount] = $this->reuseQuestions($quiz, $data, $course, $session);
+        } else {
+            $addedCount = $this->deleteQuestions($data, $course, $session);
+            $skippedCount = 0;
+        }
         $this->entityManager->flush();
 
         $response = new ExerciseQuestionBank();
@@ -87,6 +98,12 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $response->success = true;
         $response->addedCount = $addedCount;
         $response->skippedCount = $skippedCount;
+        if (self::ACTION_DELETE === $action) {
+            $response->message = 1 === $addedCount ? 'Question deleted' : 'Questions deleted';
+
+            return $response;
+        }
+
         $response->message = 1 === $addedCount ? 'Question added to the test' : 'Questions added to the test';
 
         return $response;
@@ -138,7 +155,7 @@ private function validateCsrfToken(string $submittedCsrfToken): void
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
-        if (!$quiz instanceof CQuiz) {
+        if (!($quiz instanceof CQuiz)) {
             throw new NotFoundHttpException('The requested exercise was not found.');
         }
 
@@ -149,6 +166,25 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
         throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
     }
 
+    private function isExerciseReadOnlyFromLearningPath(int $exerciseId): bool
+    {
+        if ($this->isSettingEnabled('lp.force_edit_exercise_in_lp')) {
+            return false;
+        }
+
+        return null !== $this->entityManager->createQueryBuilder()
+            ->select('lpItem.iid')
+            ->from(CLpItem::class, 'lpItem')
+            ->andWhere('lpItem.itemType = :itemType')
+            ->andWhere('lpItem.path = :exerciseId OR lpItem.ref = :exerciseId')
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ, Types::STRING)
+            ->setParameter('exerciseId', (string) $exerciseId, Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+
     private function isExerciseInContext(int $exerciseId, Course $course, ?Session $session): bool
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
@@ -173,8 +209,12 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
     /**
      * @return array{0: int, 1: int}
      */
-    private function reuseQuestions(CQuiz $quiz, ExerciseQuestionBank $data, Course $course, ?Session $session): array
+    private function reuseQuestions(?CQuiz $quiz, ExerciseQuestionBank $data, Course $course, ?Session $session): array
     {
+        if (!($quiz instanceof CQuiz)) {
+            throw new BadRequestHttpException('A valid exercise id is required.');
+        }
+
         $questionIds = $this->getSubmittedQuestionIds($data);
         if ([] === $questionIds) {
             throw new BadRequestHttpException('Select at least one question.');
@@ -213,6 +253,38 @@ private function reuseQuestions(CQuiz $quiz, ExerciseQuestionBank $data, Course
         return [$addedCount, $skippedCount];
     }
 
+    private function deleteQuestions(ExerciseQuestionBank $data, Course $course, ?Session $session): int
+    {
+        if (!$this->canRunRestrictedAction()) {
+            throw new AccessDeniedHttpException('You are not allowed to delete questions in this context.');
+        }
+
+        $questionIds = $this->getSubmittedQuestionIds($data);
+        if ([] === $questionIds) {
+            throw new BadRequestHttpException('Select at least one question.');
+        }
+
+        $deletedCount = 0;
+        foreach ($questionIds as $questionId) {
+            $question = $this->getQuestionFromCurrentContext($questionId, $course, $session);
+            if ($this->isQuestionUsedInActiveQuiz($question, $course, $session)) {
+                continue;
+            }
+
+            foreach ($this->getAnswers($question) as $answer) {
+                $this->entityManager->remove($answer);
+            }
+            $this->entityManager->remove($question);
+            $deletedCount++;
+        }
+
+        if (0 === $deletedCount) {
+            throw new BadRequestHttpException('No question was deleted.');
+        }
+
+        return $deletedCount;
+    }
+
     /**
      * @return array<int, int>
      */
@@ -329,6 +401,65 @@ private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType):
         return true;
     }
 
+    /**
+     * @return array<int, CQuizAnswer>
+     */
+    private function getAnswers(CQuizQuestion $question): array
+    {
+        return $this->entityManager->createQueryBuilder()
+            ->select('answer')
+            ->from(CQuizAnswer::class, 'answer')
+            ->andWhere('IDENTITY(answer.question) = :questionId')
+            ->setParameter('questionId', (int) $question->getIid(), Types::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
+    private function canRunRestrictedAction(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access');
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
+    private function isQuestionUsedInActiveQuiz(CQuizQuestion $question, Course $course, ?Session $session): bool
+    {
+        $questionId = (int) ($question->getIid() ?? 0);
+        if (0 >= $questionId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion.iid')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.quiz', 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        $this->applySessionFilter($queryBuilder, 'links', $session, true);
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
     private function applyActiveLinkConstraints(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected): void
     {
         $queryBuilder
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
index 6d6961d9fd8..aab4f604c96 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
@@ -12,6 +12,7 @@
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
@@ -41,6 +42,7 @@ public function __construct(
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
         private CsrfTokenManagerInterface $csrfTokenManager,
     ) {}
 
@@ -62,26 +64,22 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $course = $this->getCourse($request);
         $session = $this->getSession($request);
         $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
-        if (0 >= $exerciseId) {
-            throw new BadRequestHttpException('A valid exercise id is required.');
-        }
-
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $quiz = 0 < $exerciseId ? $this->getExerciseFromCurrentContext($exerciseId, $course, $session) : null;
         $filters = $this->getFilters($request);
         $page = max(1, (int) $filters['page']);
         $itemsPerPage = min(100, max(5, (int) $filters['itemsPerPage']));
-        $existingQuestionIds = $this->getExistingQuestionIds($quiz);
+        $existingQuestionIds = $quiz instanceof CQuiz ? $this->getExistingQuestionIds($quiz) : [];
         $totalItems = $this->countQuestions($quiz, $course, $session, $filters);
         $items = $this->getQuestions($quiz, $course, $session, $filters, $existingQuestionIds, $page, $itemsPerPage);
 
         $response = new ExerciseQuestionBank();
         $response->exerciseId = $exerciseId;
-        $response->title = $quiz->getTitle();
+        $response->title = $quiz instanceof CQuiz ? $quiz->getTitle() : 'Recycle existing questions';
         $response->items = $items;
         $response->categoryOptions = $this->getCategoryOptions($course, $session);
         $response->exerciseOptions = $this->getExerciseOptions($quiz, $course, $session);
         $response->difficultyOptions = $this->getDifficultyOptions();
-        $response->questionTypeOptions = $this->getQuestionTypeOptions((int) $quiz->getFeedbackType());
+        $response->questionTypeOptions = $this->getQuestionTypeOptions($quiz instanceof CQuiz ? (int) $quiz->getFeedbackType() : 0);
         $response->filters = $filters;
         $response->legacyUrls = [];
         $response->page = $page;
@@ -89,6 +87,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->totalItems = $totalItems;
         $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
         $response->canManage = true;
+        $response->globalMode = !($quiz instanceof CQuiz);
+        $response->canDelete = $this->canRunRestrictedAction();
 
         return $response;
     }
@@ -132,7 +132,7 @@ private function canManageExercises(): bool
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
-        if (!$quiz instanceof CQuiz) {
+        if (!($quiz instanceof CQuiz)) {
             throw new NotFoundHttpException('The requested exercise was not found.');
         }
 
@@ -200,7 +200,7 @@ private function getExistingQuestionIds(CQuiz $quiz): array
     /**
      * @param array<string, mixed> $filters
      */
-    private function countQuestions(CQuiz $quiz, Course $course, ?Session $session, array $filters): int
+    private function countQuestions(?CQuiz $quiz, Course $course, ?Session $session, array $filters): int
     {
         $queryBuilder = $this->createQuestionQueryBuilder($quiz, $course, $session, $filters);
         $queryBuilder->select('COUNT(DISTINCT question.iid)');
@@ -215,7 +215,7 @@ private function countQuestions(CQuiz $quiz, Course $course, ?Session $session,
      * @return array<int, array<string, mixed>>
      */
     private function getQuestions(
-        CQuiz $quiz,
+        ?CQuiz $quiz,
         Course $course,
         ?Session $session,
         array $filters,
@@ -240,7 +240,8 @@ private function getQuestions(
             $questionId = (int) $question->getIid();
             $type = (int) $question->getType();
             $alreadyInExercise = \in_array($questionId, $existingQuestionIds, true);
-            $allowedByFeedback = $this->isQuestionTypeAllowedByFeedback($type, (int) $quiz->getFeedbackType());
+            $allowedByFeedback = $quiz instanceof CQuiz ? $this->isQuestionTypeAllowedByFeedback($type, (int) $quiz->getFeedbackType()) : true;
+            $usedInActiveQuiz = $this->isQuestionUsedInActiveQuiz($question, $course, $session);
             $items[] = [
                 'id' => $questionId,
                 'title' => $question->getQuestion(),
@@ -252,7 +253,10 @@ private function getQuestions(
                 'difficulty' => max(1, (int) $question->getLevel()),
                 'score' => (float) $question->getPonderation(),
                 'alreadyInExercise' => $alreadyInExercise,
-                'canReuse' => !$alreadyInExercise && $allowedByFeedback,
+                'usedInActiveTest' => $usedInActiveQuiz,
+                'canReuse' => $quiz instanceof CQuiz && !$alreadyInExercise && $allowedByFeedback,
+                'canEdit' => !($quiz instanceof CQuiz) && !$usedInActiveQuiz,
+                'canDelete' => !($quiz instanceof CQuiz) && !$usedInActiveQuiz && $this->canRunRestrictedAction(),
                 'blockedReason' => $allowedByFeedback ? '' : 'This question type is not compatible with the current feedback mode.',
             ];
         }
@@ -263,7 +267,7 @@ private function getQuestions(
     /**
      * @param array<string, mixed> $filters
      */
-    private function createQuestionQueryBuilder(CQuiz $quiz, Course $course, ?Session $session, array $filters): QueryBuilder
+    private function createQuestionQueryBuilder(?CQuiz $quiz, Course $course, ?Session $session, array $filters): QueryBuilder
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
             ->from(CQuizQuestion::class, 'question')
@@ -309,7 +313,7 @@ private function createQuestionQueryBuilder(CQuiz $quiz, Course $course, ?Sessio
     /**
      * @param array<string, mixed> $filters
      */
-    private function applyQuestionFilters(QueryBuilder $queryBuilder, CQuiz $quiz, Course $course, ?Session $session, array $filters): void
+    private function applyQuestionFilters(QueryBuilder $queryBuilder, ?CQuiz $quiz, Course $course, ?Session $session, array $filters): void
     {
         $categoryId = (int) ($filters['categoryId'] ?? 0);
         if (0 < $categoryId) {
@@ -460,7 +464,7 @@ private function getCategoryOptions(Course $course, ?Session $session): array
     /**
      * @return array<int, array<string, mixed>>
      */
-    private function getExerciseOptions(CQuiz $currentQuiz, Course $course, ?Session $session): array
+    private function getExerciseOptions(?CQuiz $currentQuiz, Course $course, ?Session $session): array
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
             ->select('quiz')
@@ -486,7 +490,7 @@ private function getExerciseOptions(CQuiz $currentQuiz, Course $course, ?Session
         foreach ($queryBuilder->getQuery()->getResult() as $quiz) {
             if ($quiz instanceof CQuiz && null !== $quiz->getIid()) {
                 $label = $quiz->getTitle();
-                if ((int) $quiz->getIid() === (int) $currentQuiz->getIid()) {
+                if ($currentQuiz instanceof CQuiz && (int) $quiz->getIid() === (int) $currentQuiz->getIid()) {
                     $label = '> '.$label;
                 }
                 $items[] = ['value' => (int) $quiz->getIid(), 'label' => $label];
@@ -551,6 +555,51 @@ private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType):
         return true;
     }
 
+
+    private function canRunRestrictedAction(): bool
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            return true;
+        }
+
+        return !$this->isSettingEnabled('exercise.limit_exercise_teacher_access');
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
+    private function isQuestionUsedInActiveQuiz(CQuizQuestion $question, Course $course, ?Session $session): bool
+    {
+        $questionId = (int) ($question->getIid() ?? 0);
+        if (0 >= $questionId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion.iid')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.quiz', 'quiz')
+            ->innerJoin('quiz.resourceNode', 'node')
+            ->innerJoin('node.resourceLinks', 'links')
+            ->andWhere('IDENTITY(relQuestion.question) = :questionId')
+            ->andWhere('IDENTITY(links.course) = :courseId')
+            ->andWhere('links.deletedAt IS NULL')
+            ->andWhere('links.endVisibilityAt IS NULL')
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        $this->applySessionFilter($queryBuilder, 'links', $session, true);
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
     private function getQuestionTypeLabel(int $type): string
     {
         foreach ($this->getQuestionTypeDefinitions() as $definition) {
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
index d7ffae8a8ba..c38ed375077 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
@@ -11,8 +11,10 @@
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionEditor;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
@@ -23,6 +25,7 @@
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -69,6 +72,7 @@
     private const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28;
     private const MULTIPLE_ANSWER_DROPDOWN = 29;
     private const UNKNOWN_ANSWER_POSITION = 666;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -104,26 +108,60 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : (int) ($data->exerciseId ?? 0);
-        if (0 >= $exerciseId) {
-            throw new BadRequestHttpException('A valid exercise id is required.');
+        $quiz = 0 < $exerciseId ? $this->getExerciseFromCurrentContext($exerciseId, $course, $session) : null;
+        if ($quiz instanceof CQuiz && $this->isExerciseReadOnlyFromLearningPath((int) $quiz->getIid())) {
+            throw new AccessDeniedHttpException('This exercise is read-only because it is included in a learning path.');
         }
 
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
         $questionId = isset($uriVariables['questionId']) ? (int) $uriVariables['questionId'] : (int) ($data->questionId ?? 0);
         $this->validatePayload($data);
         $this->validateAnnotationImageOnCreate($data, 0 >= $questionId);
         $this->validateHotspotImageOnCreate($data, 0 >= $questionId);
 
         if (0 < $questionId) {
-            $question = $this->updateQuestion($quiz, $questionId, $data, $course, $session);
-        } else {
+            $question = $quiz instanceof CQuiz
+                ? $this->updateQuestion($quiz, $questionId, $data, $course, $session)
+                : $this->updateGlobalQuestion($questionId, $data, $course, $session);
+        } elseif ($quiz instanceof CQuiz) {
             $question = $this->createQuestion($quiz, $data, $course, $session);
+        } else {
+            $question = $this->createGlobalQuestion($data, $course, $session);
         }
 
         $this->entityManager->flush();
-        $this->syncQuestionCategoryMandatory($quiz, $question, $data);
+        if ($quiz instanceof CQuiz) {
+            $this->syncQuestionCategoryMandatory($quiz, $question, $data);
+
+            return $this->buildResponse($quiz, $question, $course, $session);
+        }
 
-        return $this->buildResponse($quiz, $question, $course, $session);
+        return $this->buildGlobalResponse($question, $course, $session);
+    }
+
+    private function isExerciseReadOnlyFromLearningPath(int $exerciseId): bool
+    {
+        if ($this->isSettingEnabled('lp.force_edit_exercise_in_lp')) {
+            return false;
+        }
+
+        return null !== $this->entityManager->createQueryBuilder()
+            ->select('lpItem.iid')
+            ->from(CLpItem::class, 'lpItem')
+            ->andWhere('lpItem.itemType = :itemType')
+            ->andWhere('lpItem.path = :exerciseId OR lpItem.ref = :exerciseId')
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ, Types::STRING)
+            ->setParameter('exerciseId', (string) $exerciseId, Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+
+    private function isSettingEnabled(string $settingName): bool
+    {
+        $value = $this->settingsManager->getSetting($settingName, true);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
     }
 
     private function createQuestion(CQuiz $quiz, ExerciseQuestionEditor $data, Course $course, ?Session $session): CQuizQuestion
@@ -153,6 +191,35 @@ private function createQuestion(CQuiz $quiz, ExerciseQuestionEditor $data, Cours
         return $question;
     }
 
+    private function createGlobalQuestion(ExerciseQuestionEditor $data, Course $course, ?Session $session): CQuizQuestion
+    {
+        $question = new CQuizQuestion();
+        $this->applyQuestionFields(null, $question, $data, 0);
+        $question
+            ->setParent($course)
+            ->addCourseLink($course, $session)
+        ;
+
+        $this->questionRepository->create($question);
+        $this->addAnnotationImageOnCreate($question, $data);
+        $this->addHotspotImageOnCreate($question, $data);
+        $this->replaceAnswers($question, $data);
+        $this->updateQuestionCategory($question, $data, $course, $session);
+
+        return $question;
+    }
+
+    private function updateGlobalQuestion(int $questionId, ExerciseQuestionEditor $data, Course $course, ?Session $session): CQuizQuestion
+    {
+        $question = $this->getQuestionFromCurrentContext($questionId, $course, $session);
+        $this->applyQuestionFields(null, $question, $data, (int) $question->getPosition());
+        $this->replaceAnswers($question, $data);
+        $this->updateQuestionCategory($question, $data, $course, $session);
+        $this->entityManager->persist($question);
+
+        return $question;
+    }
+
     private function updateQuestion(CQuiz $quiz, int $questionId, ExerciseQuestionEditor $data, Course $course, ?Session $session): CQuizQuestion
     {
         $question = $this->getQuestionFromExercise($quiz, $questionId);
@@ -168,7 +235,7 @@ private function updateQuestion(CQuiz $quiz, int $questionId, ExerciseQuestionEd
         return $question;
     }
 
-    private function applyQuestionFields(CQuiz $quiz, CQuizQuestion $question, ExerciseQuestionEditor $data, int $position): void
+    private function applyQuestionFields(?CQuiz $quiz, CQuizQuestion $question, ExerciseQuestionEditor $data, int $position): void
     {
         $type = (int) $data->type;
         if (!$this->isVueSupportedQuestionType($type)) {
@@ -185,9 +252,9 @@ private function applyQuestionFields(CQuiz $quiz, CQuizQuestion $question, Exerc
             ->setLevel($this->normalizeDifficulty($data->difficulty))
             ->setPosition($position)
             ->setPonderation($score)
-            ->setMandatory($this->isStructuralQuestionType($type) ? 0 : ($this->isMandatoryQuestionInCategoryEnabled($quiz) && $data->mandatory ? 1 : 0))
+            ->setMandatory($this->isStructuralQuestionType($type) || null === $quiz ? 0 : ($this->isMandatoryQuestionInCategoryEnabled($quiz) && $data->mandatory ? 1 : 0))
             ->setDuration($this->isStructuralQuestionType($type) ? null : $this->normalizeNullablePositiveInteger($data->duration))
-            ->setParentMediaId($this->isStructuralQuestionType($type) ? null : $this->normalizeParentMediaId($quiz, $data, $question))
+            ->setParentMediaId($this->isStructuralQuestionType($type) || null === $quiz ? null : $this->normalizeParentMediaId($quiz, $data, $question))
         ;
     }
 
@@ -566,7 +633,7 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -598,6 +665,65 @@ private function getQuestionFromExercise(CQuiz $quiz, int $questionId): CQuizQue
         return $relation->getQuestion();
     }
 
+    private function getQuestionFromCurrentContext(int $questionId, Course $course, ?Session $session): CQuizQuestion
+    {
+        $question = $this->entityManager->getRepository(CQuizQuestion::class)->find($questionId);
+        if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+            throw new NotFoundHttpException('The requested question was not found.');
+        }
+
+        if ($this->isQuestionInContext($question, $course, $session)) {
+            return $question;
+        }
+
+        throw new AccessDeniedHttpException('The requested question does not belong to the current course context.');
+    }
+
+    private function isQuestionInContext(CQuizQuestion $question, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('question.iid')
+            ->from(CQuizQuestion::class, 'question')
+            ->leftJoin('question.resourceNode', 'questionNode')
+            ->andWhere('question = :question')
+            ->setParameter('question', $question)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        $existsQuestionLink = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(ResourceLink::class, 'questionLink')
+            ->where('questionLink.resourceNode = questionNode')
+            ->andWhere('IDENTITY(questionLink.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsQuestionLink, 'questionLink', $session, true);
+
+        $existsViaQuiz = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(CQuizRelQuestion::class, 'scopeRelation')
+            ->innerJoin('scopeRelation.quiz', 'scopeQuiz')
+            ->innerJoin('scopeQuiz.resourceNode', 'scopeNode')
+            ->innerJoin('scopeNode.resourceLinks', 'scopeLinks')
+            ->where('scopeRelation.question = question')
+            ->andWhere('IDENTITY(scopeLinks.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsViaQuiz, 'scopeLinks', $session, true);
+
+        $queryBuilder->andWhere(
+            $queryBuilder->expr()->orX(
+                $queryBuilder->expr()->exists($existsQuestionLink->getDQL()),
+                $queryBuilder->expr()->exists($existsViaQuiz->getDQL())
+            )
+        );
+
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
     /**
      * @return array<int, CQuizAnswer>
      */
@@ -763,7 +889,7 @@ private function isQuestionCategoryInContext(int $categoryId, Course $course, ?S
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -2546,6 +2672,47 @@ private function buildDropdownListText(CQuizQuestion $question): string
         return implode(PHP_EOL, array_values(array_filter($lines, static fn (string $line): bool => '' !== $line)));
     }
 
+    private function buildGlobalResponse(CQuizQuestion $question, Course $course, ?Session $session): ExerciseQuestionEditor
+    {
+        $response = new ExerciseQuestionEditor();
+        $response->exerciseId = 0;
+        $response->questionId = (int) $question->getIid();
+        $response->type = (int) $question->getType();
+        $response->typeLabel = $this->getQuestionTypeLabel((int) $question->getType());
+        $response->title = $question->getQuestion();
+        $response->description = (string) $question->getDescription();
+        $response->feedback = (string) $question->getFeedback();
+        $response->dropdownListText = $this->buildDropdownListText($question);
+        $response->score = (float) $question->getPonderation();
+        $response->globalScore = $this->usesGlobalScore((int) $question->getType()) ? (float) $question->getPonderation() : 0.0;
+        [$response->correctScore, $response->wrongScore, $response->unknownScore] = $this->getTrueFalseScores($question);
+        $response->usesGlobalScore = $this->usesGlobalScore((int) $question->getType());
+        $response->hasFixedUnknownAnswer = self::UNIQUE_ANSWER_NO_OPTION === (int) $question->getType();
+        $response->mandatory = false;
+        $response->duration = $question->getDuration();
+        $response->difficulty = max(1, (int) $question->getLevel());
+        $response->categoryId = $this->getFirstCategoryId($question);
+        $response->parentMediaId = 0;
+        $response->answers = $this->getResponseAnswers($question);
+        $this->addAnnotationData($response, $question, $course, $session);
+        $this->addCalculatedData($response, $question);
+        $this->addFillBlanksData($response, $question);
+        $this->addMatchingData($response, $question);
+        $this->addDraggableData($response, $question);
+        $response->noNegativeScore = self::GLOBAL_MULTIPLE_ANSWER === (int) $question->getType() && $this->hasNoNegativeScore($response->answers);
+        $response->questionCount = 0;
+        $response->totalScore = 0.0;
+        $response->categoryOptions = $this->getCategoryOptions($course, $session);
+        $response->mediaOptions = [];
+        $response->legacyUrls = [];
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+        $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
+        $response->imageZoomEnabled = $this->isImageZoomEnabled();
+        $response->allowMandatoryQuestion = false;
+
+        return $response;
+    }
+
     private function buildResponse(CQuiz $quiz, CQuizQuestion $question, Course $course, ?Session $session): ExerciseQuestionEditor
     {
         $response = new ExerciseQuestionEditor();
@@ -2592,6 +2759,34 @@ private function buildResponse(CQuiz $quiz, CQuizQuestion $question, Course $cou
         return $response;
     }
 
+    private function applyActiveLinkConstraints(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected): void
+    {
+        $queryBuilder
+            ->andWhere($alias.'.deletedAt IS NULL')
+            ->andWhere($alias.'.endVisibilityAt IS NULL')
+            ->andWhere($alias.'.visibility IN (0,2)')
+        ;
+
+        $this->applySessionFilter($queryBuilder, $alias, $session, $includeCourseWhenSessionSelected);
+    }
+
+    private function applySessionFilter(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected = false): void
+    {
+        if (null !== $session) {
+            if ($includeCourseWhenSessionSelected) {
+                $queryBuilder->andWhere('(IDENTITY('.$alias.'.session) = :sessionId OR '.$alias.'.session IS NULL)');
+
+                return;
+            }
+
+            $queryBuilder->andWhere('IDENTITY('.$alias.'.session) = :sessionId');
+
+            return;
+        }
+
+        $queryBuilder->andWhere($alias.'.session IS NULL');
+    }
+
     private function isQuestionMandatoryInCategory(CQuizQuestion $question): bool
     {
         $questionId = (int) ($question->getIid() ?? 0);
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
index 012abe5d83d..98f7a54da13 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
@@ -11,8 +11,10 @@
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseQuestionEditor;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
@@ -23,6 +25,7 @@
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -67,6 +70,8 @@
     private const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28;
     private const MULTIPLE_ANSWER_DROPDOWN = 29;
     private const UNKNOWN_ANSWER_POSITION = 666;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
+    private const LP_READ_ONLY_MESSAGE = 'This exercise has been included in a learning path, so it cannot be accessed by students directly from here. If you want to put the same exercise available through the exercises tool, please make a copy of the current exercise using the copy icon.';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -96,15 +101,15 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
-        if (0 >= $exerciseId) {
-            throw new BadRequestHttpException('A valid exercise id is required.');
-        }
-
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
         $questionId = isset($uriVariables['questionId']) ? (int) $uriVariables['questionId'] : 0;
+        $quiz = 0 < $exerciseId ? $this->getExerciseFromCurrentContext($exerciseId, $course, $session) : null;
 
         if (0 < $questionId) {
-            return $this->buildExistingQuestionResponse($quiz, $questionId, $course, $session);
+            if ($quiz instanceof CQuiz) {
+                return $this->buildExistingQuestionResponse($quiz, $questionId, $course, $session);
+            }
+
+            return $this->buildGlobalExistingQuestionResponse($questionId, $course, $session);
         }
 
         $type = $request->query->getInt('type', self::UNIQUE_ANSWER);
@@ -112,13 +117,46 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             throw new BadRequestHttpException('This question type is still managed by the legacy exercise tool.');
         }
 
-        return $this->buildNewQuestionResponse($quiz, $type, $course, $session);
+        $response = $this->buildNewQuestionResponse($quiz, $type, $course, $session);
+        if (!$this->shouldGenerateDefaultContent($request)) {
+            $this->clearDefaultContent($response);
+        }
+
+        return $response;
+    }
+
+    private function shouldGenerateDefaultContent(Request $request): bool
+    {
+        $value = $request->query->get('isContent');
+        if (null === $value) {
+            return true;
+        }
+
+        return !\in_array((string) $value, ['0', 'false', 'off', ''], true);
+    }
+
+    private function clearDefaultContent(ExerciseQuestionEditor $response): void
+    {
+        $response->description = '';
+        $response->feedback = '';
+        $response->fillBlanksText = '';
+        $response->fillBlankItems = [];
+        $response->fillBlanksComment = '';
+        $response->calculatedText = '';
+        $response->calculatedFormula = '';
+        $response->calculatedRanges = [];
+        $response->calculatedComment = '';
+        $response->matchingOptions = [];
+        $response->matchingPairs = [];
+        $response->draggableItems = [];
+        $response->hotspotItems = [];
+        $response->dropdownListText = '';
     }
 
-    private function buildNewQuestionResponse(CQuiz $quiz, int $type, Course $course, ?Session $session): ExerciseQuestionEditor
+    private function buildNewQuestionResponse(?CQuiz $quiz, int $type, Course $course, ?Session $session): ExerciseQuestionEditor
     {
         $response = new ExerciseQuestionEditor();
-        $response->exerciseId = (int) $quiz->getIid();
+        $response->exerciseId = (int) ($quiz?->getIid() ?? 0);
         $response->questionId = null;
         $response->type = $type;
         $response->typeLabel = $this->getQuestionTypeLabel($type);
@@ -147,7 +185,7 @@ private function buildNewQuestionResponse(CQuiz $quiz, int $type, Course $course
             $response->score = self::HOT_SPOT_COMBINATION === $type ? 0.0 : 10.0;
             $response->globalScore = self::HOT_SPOT_COMBINATION === $type ? 10.0 : 0.0;
             $response->hotspotItems = $this->getDefaultHotspotItems($type);
-            if (self::HOT_SPOT_DELINEATION === $type) {
+            if (self::HOT_SPOT_DELINEATION === $type && $quiz instanceof CQuiz) {
                 $this->addHotspotScenarioOptions($response, $quiz, null);
             }
             $response->answers = [];
@@ -192,7 +230,11 @@ private function buildNewQuestionResponse(CQuiz $quiz, int $type, Course $course
         if ($this->usesMatching($type) || $this->usesDraggableOrdering($type) || $this->usesHotspot($type) || $this->isStructuralQuestionType($type)) {
             $response->answers = [];
         }
-        $this->addSharedEditorData($response, $quiz, null, $course, $session);
+        if ($quiz instanceof CQuiz) {
+            $this->addSharedEditorData($response, $quiz, null, $course, $session);
+        } else {
+            $this->addGlobalSharedEditorData($response, $course, $session);
+        }
 
         return $response;
     }
@@ -254,6 +296,50 @@ private function addSharedEditorData(
         $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
         $response->imageZoomEnabled = $this->isImageZoomEnabled();
         $response->allowMandatoryQuestion = $this->isMandatoryQuestionInCategoryEnabled($quiz);
+        $response->isLinkedToLearningPath = $this->isExerciseLinkedToLearningPath((int) $quiz->getIid());
+        $response->isReadOnlyFromLearningPath = $response->isLinkedToLearningPath && !$this->isSettingEnabled('lp.force_edit_exercise_in_lp');
+        $response->learningPathReadOnlyMessage = $response->isLinkedToLearningPath ? self::LP_READ_ONLY_MESSAGE : '';
+    }
+
+    private function addGlobalSharedEditorData(
+        ExerciseQuestionEditor $response,
+        Course $course,
+        ?Session $session,
+    ): void {
+        $response->questionCount = 0;
+        $response->totalScore = 0.0;
+        $response->categoryOptions = $this->getCategoryOptions($course, $session);
+        $response->mediaOptions = [];
+        $response->legacyUrls = [];
+        $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
+        $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
+        $response->imageZoomEnabled = $this->isImageZoomEnabled();
+        $response->allowMandatoryQuestion = false;
+        $response->isLinkedToLearningPath = false;
+        $response->isReadOnlyFromLearningPath = false;
+        $response->learningPathReadOnlyMessage = '';
+    }
+
+    private function isExerciseLinkedToLearningPath(int $exerciseId): bool
+    {
+        return null !== $this->entityManager->createQueryBuilder()
+            ->select('lpItem.iid')
+            ->from(CLpItem::class, 'lpItem')
+            ->andWhere('lpItem.itemType = :itemType')
+            ->andWhere('lpItem.path = :exerciseId OR lpItem.ref = :exerciseId')
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ, Types::STRING)
+            ->setParameter('exerciseId', (string) $exerciseId, Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+
+    private function isSettingEnabled(string $settingName): bool
+    {
+        $value = $this->settingsManager->getSetting($settingName, true);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
     }
 
     private function isMandatoryQuestionInCategoryEnabled(CQuiz $quiz): bool
@@ -344,7 +430,7 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -377,6 +463,93 @@ private function getQuestionFromExercise(CQuiz $quiz, int $questionId): CQuizQue
     }
 
 
+    private function getQuestionFromCurrentContext(int $questionId, Course $course, ?Session $session): CQuizQuestion
+    {
+        $question = $this->entityManager->getRepository(CQuizQuestion::class)->find($questionId);
+        if (!$question instanceof CQuizQuestion || null === $question->getIid()) {
+            throw new NotFoundHttpException('The requested question was not found.');
+        }
+
+        if ($this->isQuestionInContext($question, $course, $session)) {
+            return $question;
+        }
+
+        throw new AccessDeniedHttpException('The requested question does not belong to the current course context.');
+    }
+
+    private function isQuestionInContext(CQuizQuestion $question, Course $course, ?Session $session): bool
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('question.iid')
+            ->from(CQuizQuestion::class, 'question')
+            ->leftJoin('question.resourceNode', 'questionNode')
+            ->andWhere('question = :question')
+            ->setParameter('question', $question)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        $existsQuestionLink = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(ResourceLink::class, 'questionLink')
+            ->where('questionLink.resourceNode = questionNode')
+            ->andWhere('IDENTITY(questionLink.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsQuestionLink, 'questionLink', $session, true);
+
+        $existsViaQuiz = $this->entityManager->createQueryBuilder()
+            ->select('1')
+            ->from(CQuizRelQuestion::class, 'scopeRelation')
+            ->innerJoin('scopeRelation.quiz', 'scopeQuiz')
+            ->innerJoin('scopeQuiz.resourceNode', 'scopeNode')
+            ->innerJoin('scopeNode.resourceLinks', 'scopeLinks')
+            ->where('scopeRelation.question = question')
+            ->andWhere('IDENTITY(scopeLinks.course) = :courseId')
+        ;
+        $this->applyActiveLinkConstraints($existsViaQuiz, 'scopeLinks', $session, true);
+
+        $queryBuilder->andWhere(
+            $queryBuilder->expr()->orX(
+                $queryBuilder->expr()->exists($existsQuestionLink->getDQL()),
+                $queryBuilder->expr()->exists($existsViaQuiz->getDQL())
+            )
+        );
+
+        if (null !== $session) {
+            $queryBuilder->setParameter('sessionId', (int) $session->getId(), Types::INTEGER);
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    private function applyActiveLinkConstraints(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected): void
+    {
+        $queryBuilder
+            ->andWhere($alias.'.deletedAt IS NULL')
+            ->andWhere($alias.'.endVisibilityAt IS NULL')
+            ->andWhere($alias.'.visibility IN (0,2)')
+        ;
+
+        $this->applySessionFilter($queryBuilder, $alias, $session, $includeCourseWhenSessionSelected);
+    }
+
+    private function applySessionFilter(QueryBuilder $queryBuilder, string $alias, ?Session $session, bool $includeCourseWhenSessionSelected = false): void
+    {
+        if (null !== $session) {
+            if ($includeCourseWhenSessionSelected) {
+                $queryBuilder->andWhere('(IDENTITY('.$alias.'.session) = :sessionId OR '.$alias.'.session IS NULL)');
+
+                return;
+            }
+
+            $queryBuilder->andWhere('IDENTITY('.$alias.'.session) = :sessionId');
+
+            return;
+        }
+
+        $queryBuilder->andWhere($alias.'.session IS NULL');
+    }
+
     private function buildDropdownListText(CQuizQuestion $question): string
     {
         $type = (int) $question->getType();
@@ -533,7 +706,7 @@ private function getCategoryOptions(Course $course, ?Session $session): array
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -1464,7 +1637,6 @@ private function getLegacyUrls(CQuiz $quiz, Course $course, ?Session $session):
 
         return [
             'questions' => '/main/exercise/admin.php?'.http_build_query($baseParams),
-            'questionPool' => '/main/exercise/question_pool.php?'.http_build_query($baseParams),
         ];
     }
 }
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php
index a08be31c0e0..dcc4e319457 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionImportProcessor.php
@@ -175,7 +175,7 @@ private function processAikenImport(UploadedFile $uploadedFile, Request $request
             throw new BadRequestHttpException('No valid Aiken questions were found in the uploaded file.');
         }
 
-        $exerciseTitle = $this->buildAikenExerciseTitle($uploadedFile);
+        $exerciseTitle = $this->buildAikenExerciseTitle($uploadedFile, $request);
         $quiz = $this->createExercise($exerciseTitle, $course, $session);
         $importedQuestionCount = $this->createAikenQuestions($quiz, $parsedQuestions['questions'], $course, $session);
 
@@ -466,8 +466,15 @@ private function stripLeadingQuestionNumber(string $line): string
         return '' !== $normalized ? $normalized : $line;
     }
 
-    private function buildAikenExerciseTitle(UploadedFile $uploadedFile): string
+    private function buildAikenExerciseTitle(UploadedFile $uploadedFile, Request $request): string
     {
+        foreach (['exerciseTitle', 'exercise_title', 'quiz_name'] as $fieldName) {
+            $title = trim((string) $request->request->get($fieldName, ''));
+            if ('' !== $title) {
+                return $title;
+            }
+        }
+
         $name = $uploadedFile->getClientOriginalName();
         $title = preg_replace('/\.(zip|txt)$/i', '', $name) ?? $name;
         $title = trim($title);
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
index 859c7ecbcd6..118f062f1c7 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
@@ -12,6 +12,7 @@
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceFile;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
@@ -36,6 +37,8 @@
 final readonly class ExerciseQuestionProvider implements ProviderInterface
 {
     private const CSRF_TOKEN_ID = 'exercise_question_action';
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
+    private const LP_READ_ONLY_MESSAGE = 'This exercise has been included in a learning path, so it cannot be accessed by students directly from here. If you want to put the same exercise available through the exercises tool, please make a copy of the current exercise using the copy icon.';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -70,6 +73,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
         $questions = $this->getQuestions($quiz, $course, $session);
+        $isLinkedToLearningPath = $this->isExerciseLinkedToLearningPath((int) $quiz->getIid());
+        $isReadOnlyFromLearningPath = $isLinkedToLearningPath && !$this->isSettingEnabled('lp.force_edit_exercise_in_lp');
 
         $response = new ExerciseQuestion();
         $response->exerciseId = $exerciseId;
@@ -80,6 +85,9 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->totalScore = $this->getTotalScore($questions);
         $response->legacyUrls = [];
         $response->canManage = true;
+        $response->isLinkedToLearningPath = $isLinkedToLearningPath;
+        $response->isReadOnlyFromLearningPath = $isReadOnlyFromLearningPath;
+        $response->learningPathReadOnlyMessage = $isLinkedToLearningPath ? self::LP_READ_ONLY_MESSAGE : '';
         $response->csrfToken = $this->csrfTokenManager->getToken(self::CSRF_TOKEN_ID)->getValue();
 
         return $response;
@@ -121,6 +129,28 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function isExerciseLinkedToLearningPath(int $exerciseId): bool
+    {
+        return null !== $this->entityManager->createQueryBuilder()
+            ->select('lpItem.iid')
+            ->from(CLpItem::class, 'lpItem')
+            ->andWhere('lpItem.itemType = :itemType')
+            ->andWhere('lpItem.path = :exerciseId OR lpItem.ref = :exerciseId')
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ, Types::STRING)
+            ->setParameter('exerciseId', (string) $exerciseId, Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+
+    private function isSettingEnabled(string $settingName): bool
+    {
+        $value = api_get_setting($settingName);
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -153,7 +183,7 @@ private function isExerciseInContext(int $exerciseId, Course $course, ?Session $
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php
index f004d3e765a..a0a08be8750 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionStatsProvider.php
@@ -175,7 +175,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php
index eb78bc9b5f3..ccb1883c160 100644
--- a/src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseReportByQuestionProvider.php
@@ -194,7 +194,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index 7ca8c64fb40..f9848909b22 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -10,13 +10,17 @@
 use ApiPlatform\State\ProcessorInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAnswer;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Entity\ExtraFieldValues;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
@@ -63,6 +67,7 @@ public function __construct(
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     /**
@@ -99,7 +104,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new BadRequestHttpException('A valid exercise, attempt and question are required.');
         }
 
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $this->canManageExercises());
         $attempt = $this->getIncompleteAttempt($attemptId, $quiz, $course, $session, $user);
         $question = $this->getQuestionFromExercise($questionId, $quiz);
 
@@ -131,6 +136,8 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $this->entityManager->persist($attemptRow);
         }
 
+        $this->blockCategoryIfNeeded($attempt, $quiz, $question, (string) $data->navigationAction);
+
         $this->entityManager->flush();
 
         $response = new ExerciseRuntimeAnswer();
@@ -148,10 +155,118 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         return $response;
     }
 
+    private function blockCategoryIfNeeded(TrackEExercise $attempt, CQuiz $quiz, CQuizQuestion $question, string $navigationAction): void
+    {
+        if (!\in_array($navigationAction, ['next', 'finish'], true) || !$this->isBlockCategoryRuntimeEnabled($quiz)) {
+            return;
+        }
+
+        $categoryId = $this->getPrimaryCategoryId($question);
+        if (!$this->isLastQuestionInCategory($attempt, $question, $categoryId)) {
+            return;
+        }
+
+        $blockedCategories = $this->parseBlockedCategories((string) $attempt->getBlockedCategories());
+        if (\in_array($categoryId, $blockedCategories, true)) {
+            return;
+        }
+
+        $blockedCategories[] = $categoryId;
+        $attempt->setBlockedCategories(implode(',', $blockedCategories));
+    }
+
+    private function isBlockCategoryRuntimeEnabled(CQuiz $quiz): bool
+    {
+        if ('true' !== $this->settingsManager->getSetting('exercise.block_category_questions', true)) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $row = $this->entityManager->createQueryBuilder()
+            ->select('value')
+            ->from(ExtraFieldValues::class, 'value')
+            ->innerJoin('value.field', 'field')
+            ->andWhere('value.itemId = :itemId')
+            ->andWhere('field.itemType = :itemType')
+            ->andWhere('field.variable = :variable')
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->setParameter('variable', 'block_category', Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$row instanceof ExtraFieldValues) {
+            return false;
+        }
+
+        return \in_array(strtolower((string) ($row->getFieldValue() ?? '')), ['1', 'true', 'yes', 'on'], true);
+    }
+
+    private function isLastQuestionInCategory(TrackEExercise $attempt, CQuizQuestion $question, int $categoryId): bool
+    {
+        $questionId = (int) ($question->getIid() ?? 0);
+        if (0 >= $questionId) {
+            return false;
+        }
+
+        $lastQuestionId = 0;
+        foreach ($this->parseQuestionIds((string) $attempt->getDataTracking()) as $attemptQuestionId) {
+            $attemptQuestion = $this->entityManager->getRepository(CQuizQuestion::class)->find($attemptQuestionId);
+            if (!$attemptQuestion instanceof CQuizQuestion) {
+                continue;
+            }
+
+            if ($this->getPrimaryCategoryId($attemptQuestion) === $categoryId) {
+                $lastQuestionId = (int) ($attemptQuestion->getIid() ?? 0);
+            }
+        }
+
+        return $questionId === $lastQuestionId;
+    }
+
+    private function getPrimaryCategoryId(CQuizQuestion $question): int
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory && null !== $category->getIid()) {
+                return (int) $category->getIid();
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function parseBlockedCategories(string $value): array
+    {
+        if ('' === trim($value)) {
+            return [];
+        }
+
+        return array_values(array_unique(array_filter(
+            array_map(static fn (string $id): int => (int) trim($id), explode(',', $value)),
+            static fn (int $id): bool => 0 <= $id
+        )));
+    }
+
     private function canSaveDraftAnswers(): bool
     {
         return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
-            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT');
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
     private function getCourse(Request $request): Course
@@ -184,7 +299,7 @@ private function getSession(Request $request): ?Session
         return $session;
     }
 
-    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
         if (!$quiz instanceof CQuiz) {
@@ -208,7 +323,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -220,18 +335,20 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
             throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
         }
 
-        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
-        $now = new DateTimeImmutable();
-        if (self::VISIBILITY_PUBLISHED !== $visibility) {
-            throw new AccessDeniedHttpException('The requested exercise is not visible.');
-        }
+        if (!$canManage) {
+            $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+            $now = new DateTimeImmutable();
+            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+                throw new AccessDeniedHttpException('The requested exercise is not visible.');
+            }
 
-        if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
-            throw new AccessDeniedHttpException('The requested exercise is not available yet.');
-        }
+            if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+                throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+            }
 
-        if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
-            throw new AccessDeniedHttpException('The requested exercise is closed.');
+            if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+                throw new AccessDeniedHttpException('The requested exercise is closed.');
+            }
         }
 
         return $quiz;
@@ -1509,13 +1626,14 @@ private function deletePreviousDraftRows(TrackEExercise $attempt, int $questionI
     }
 
     /**
-     * @return array<int, array{answer: string, position: int|null}>
+     * @return array<int, array{answer: string, position: int|null, secondsSpent: int}>
      */
     private function getSavedAnswerRows(int $attemptId, int $questionId): array
     {
         $rows = $this->entityManager->createQueryBuilder()
             ->select('saved.answer AS answer')
             ->addSelect('saved.position AS position')
+            ->addSelect('saved.secondsSpent AS secondsSpent')
             ->from(TrackEAttempt::class, 'saved')
             ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
             ->andWhere('saved.questionId = :questionId')
@@ -1535,6 +1653,7 @@ private function getSavedAnswerRows(int $attemptId, int $questionId): array
             $result[] = [
                 'answer' => (string) ($row['answer'] ?? ''),
                 'position' => null !== ($row['position'] ?? null) ? (int) $row['position'] : null,
+                'secondsSpent' => (int) ($row['secondsSpent'] ?? 0),
             ];
         }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php
index 823f9000040..37683cb9d01 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptCloseProcessor.php
@@ -149,7 +149,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
index 2523465ab21..bb0ad754808 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptDeleteProcessor.php
@@ -150,7 +150,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index f6ac264fa3a..acd4c072d93 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -33,7 +33,7 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Starts or resumes a Vue runtime attempt without submitting answers yet.
+ * Starts or resumes an exercise runtime attempt without submitting answers yet.
  *
  * The goal of this batch is to create the same legacy-compatible attempt shell
  * used by exercise_submit.php: one incomplete row in track_e_exercises with
@@ -51,8 +51,23 @@
     private const QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_ORDERED = 4;
     private const QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_RANDOM = 5;
     private const QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM = 6;
+    private const UNIQUE_TYPES = [1, 10, 17, 21];
+    private const MULTIPLE_TYPES = [2, 9, 14];
+    private const TRUE_FALSE_TYPES = [11, 12, 22];
+    private const FILL_BLANK_TYPES = [3, 27];
+    private const MATCHING_TYPES = [4, 19, 24, 25];
+    private const DRAGGABLE_TYPES = [18];
+    private const DROPDOWN_TYPES = [28, 29];
+    private const CALCULATED_TYPES = [16];
+    private const FREE_ANSWER_TYPES = [5];
+    private const ORAL_EXPRESSION_TYPES = [13];
+    private const UPLOAD_ANSWER_TYPES = [23];
+    private const ANNOTATION_TYPES = [20];
+    private const HOTSPOT_TYPES = [6, 26];
     private const PAGE_BREAK = 31;
     private const MEDIA_QUESTION = 15;
+    private const STRUCTURAL_CONTENT_TYPES = [self::MEDIA_QUESTION, self::PAGE_BREAK];
+    private const LEGACY_RUNTIME_REASON_UNSUPPORTED_QUESTION = 'This exercise contains a question type that requires a different test player.';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -79,9 +94,10 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
 
         $course = $this->getCourse($request);
         $session = $this->getSession($request);
-        $canManage = $this->canManageExercises();
+        $canManagePermission = $this->canManageExercises();
+        $runsAsLearner = !$canManagePermission || $this->isLearnerRuntimeRequest($request);
 
-        if (!$canManage && !$this->canViewExercises()) {
+        if (!$canManagePermission && !$this->canViewExercises()) {
             throw new AccessDeniedHttpException('You are not allowed to start this exercise.');
         }
 
@@ -90,9 +106,9 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new BadRequestHttpException('A valid exercise id is required.');
         }
 
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManage);
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManagePermission);
 
-        if ($canManage) {
+        if ($canManagePermission && !$runsAsLearner) {
             return $this->createTeacherPreviewResponse($quiz, $course, $session, $request);
         }
 
@@ -107,7 +123,17 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                 $course,
                 $session,
                 $request,
-                'This exercise uses a question selection mode that is not supported by the Vue runtime yet.'
+                'This exercise uses a question selection mode that requires a different test player.'
+            );
+        }
+
+        if ($this->hasUnsupportedRuntimeQuestionType($quiz)) {
+            return $this->createLegacyRequiredResponse(
+                $quiz,
+                $course,
+                $session,
+                $request,
+                self::LEGACY_RUNTIME_REASON_UNSUPPORTED_QUESTION
             );
         }
 
@@ -137,6 +163,20 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $questionIds = $this->buildQuestionList($quiz);
+        if ($this->isQuestionLimitPerDayReached($questionIds, $course, $session, $user)) {
+            return $this->createBlockedResponse(
+                $quiz,
+                $course,
+                $session,
+                $request,
+                sprintf(
+                    'Sorry, you have reached the maximum number of questions (%d) for the day. Please try again tomorrow.',
+                    $this->getCourseSettingInt($course, 'quiz_question_limit_per_day')
+                ),
+                $questionIds
+            );
+        }
+
         $expiredAt = $this->buildExpiredAt($quiz);
         $attempt = (new TrackEExercise())
             ->setSession($session)
@@ -201,6 +241,21 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function isLearnerRuntimeRequest(Request $request): bool
+    {
+        $origin = (string) $request->query->get('origin', '');
+        $isStudentView = strtolower(trim((string) $request->query->get('isStudentView', '')));
+        $preview = strtolower(trim((string) $request->query->get('preview', '')));
+
+        return 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || $request->query->has('learnpath_id')
+            || in_array($isStudentView, ['1', 'true', 'yes'], true)
+            || str_starts_with($isStudentView, 'true')
+            || in_array($preview, ['1', 'true', 'yes'], true)
+            || str_starts_with($preview, 'true');
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -225,7 +280,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -262,6 +317,67 @@ private function requiresLegacyQuestionSelection(CQuiz $quiz): bool
         return (int) ($quiz->getQuestionSelectionType() ?? 0) > self::QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM;
     }
 
+    private function hasUnsupportedRuntimeQuestionType(CQuiz $quiz): bool
+    {
+        foreach ($this->getOrderedQuestionRelations($quiz) as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $type = (int) $question->getType();
+            if (\in_array($type, self::STRUCTURAL_CONTENT_TYPES, true)) {
+                continue;
+            }
+
+            if (!$this->isFinishSupportedQuestionType($type)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function isFinishSupportedQuestionType(int $type): bool
+    {
+        return \in_array($type, self::UNIQUE_TYPES, true)
+            || \in_array($type, self::MULTIPLE_TYPES, true)
+            || \in_array($type, self::TRUE_FALSE_TYPES, true)
+            || \in_array($type, self::FILL_BLANK_TYPES, true)
+            || \in_array($type, self::MATCHING_TYPES, true)
+            || \in_array($type, self::DRAGGABLE_TYPES, true)
+            || \in_array($type, self::DROPDOWN_TYPES, true)
+            || \in_array($type, self::CALCULATED_TYPES, true)
+            || \in_array($type, self::FREE_ANSWER_TYPES, true)
+            || \in_array($type, self::ORAL_EXPRESSION_TYPES, true)
+            || \in_array($type, self::UPLOAD_ANSWER_TYPES, true)
+            || \in_array($type, self::ANNOTATION_TYPES, true)
+            || \in_array($type, self::HOTSPOT_TYPES, true);
+    }
+
+    /**
+     * @return array<int, CQuizRelQuestion>
+     */
+    private function getOrderedQuestionRelations(CQuiz $quiz): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        return array_values(array_filter($relations, static fn (mixed $relation): bool => $relation instanceof CQuizRelQuestion));
+    }
+
     private function findIncompleteAttempt(CQuiz $quiz, Course $course, ?Session $session, User $user, Request $request): ?TrackEExercise
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
@@ -736,6 +852,61 @@ private function getTotalWeight(array $questionIds): float
         return (float) ($rows[0]['totalScore'] ?? 0.0);
     }
 
+    /**
+     * @param array<int, int> $questionIds
+     */
+    private function isQuestionLimitPerDayReached(array $questionIds, Course $course, ?Session $session, User $user): bool
+    {
+        $limit = $this->getCourseSettingInt($course, 'quiz_question_limit_per_day');
+        if (0 >= $limit || [] === $questionIds) {
+            return false;
+        }
+
+        if (null !== $session) {
+            $answeredQuestionsCount = (int) $this->entityManager->createQueryBuilder()
+                ->select('COUNT(attempt.id)')
+                ->from(TrackEAttempt::class, 'attempt')
+                ->innerJoin('attempt.trackExercise', 'track')
+                ->andWhere('IDENTITY(attempt.user) = :userId')
+                ->andWhere('IDENTITY(track.course) = :courseId')
+                ->andWhere('IDENTITY(track.session) = :sessionId')
+                ->andWhere('attempt.tms > :midnight')
+                ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+                ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+                ->setParameter('midnight', new DateTime('today'), Types::DATETIME_MUTABLE)
+                ->getQuery()
+                ->getSingleScalarResult()
+            ;
+        } else {
+            $answeredQuestionsCount = (int) $this->entityManager->createQueryBuilder()
+                ->select('COUNT(attempt.id)')
+                ->from(TrackEAttempt::class, 'attempt')
+                ->innerJoin('attempt.trackExercise', 'track')
+                ->andWhere('IDENTITY(attempt.user) = :userId')
+                ->andWhere('IDENTITY(track.course) = :courseId')
+                ->andWhere('track.session IS NULL')
+                ->andWhere('attempt.tms > :midnight')
+                ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+                ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+                ->setParameter('midnight', new DateTime('today'), Types::DATETIME_MUTABLE)
+                ->getQuery()
+                ->getSingleScalarResult()
+            ;
+        }
+
+        return ($answeredQuestionsCount + \count($questionIds)) > $limit;
+    }
+
+    private function getCourseSettingInt(Course $course, string $settingName): int
+    {
+        if (!\function_exists('api_get_course_setting')) {
+            return 0;
+        }
+
+        return (int) api_get_course_setting($settingName, $course);
+    }
+
     private function buildExpiredAt(CQuiz $quiz): ?DateTime
     {
         $expiredMinutes = (int) $quiz->getExpiredTime();
@@ -769,6 +940,21 @@ private function createLegacyRequiredResponse(CQuiz $quiz, Course $course, ?Sess
         return $response;
     }
 
+    /**
+     * @param array<int, int> $questionIds
+     */
+    private function createBlockedResponse(CQuiz $quiz, Course $course, ?Session $session, Request $request, string $message, array $questionIds): ExerciseRuntimeAttempt
+    {
+        $response = $this->createBaseResponse($quiz, $course, $session, $request, $questionIds);
+        $response->success = false;
+        $response->usesLegacyRuntime = false;
+        $response->message = $message;
+        $response->status = 'blocked';
+        $response->canFinish = false;
+
+        return $response;
+    }
+
     private function normalizeAttemptResponse(CQuiz $quiz, Course $course, ?Session $session, Request $request, TrackEExercise $attempt, string $message): ExerciseRuntimeAttempt
     {
         $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
@@ -779,6 +965,7 @@ private function normalizeAttemptResponse(CQuiz $quiz, Course $course, ?Session
         $response = $this->createBaseResponse($quiz, $course, $session, $request, $questionIds);
         $response->success = true;
         $response->attemptId = (int) $attempt->getExeId();
+        $response->attemptNumber = $this->getAttemptNumber($attempt);
         $response->status = method_exists($attempt, 'getStatus') ? (string) $attempt->getStatus() : self::STATUS_INCOMPLETE;
         $response->message = $message;
         $response->savedAnswers = $this->getSavedAnswers((int) $attempt->getExeId());
@@ -799,6 +986,46 @@ private function normalizeAttemptResponse(CQuiz $quiz, Course $course, ?Session
         return $response;
     }
 
+    private function getAttemptNumber(TrackEExercise $attempt): int
+    {
+        $quiz = $attempt->getQuiz();
+        $attemptId = (int) $attempt->getExeId();
+        if (null === $quiz || null === $quiz->getIid() || 0 >= $attemptId) {
+            return 0;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('COUNT(previousAttempt.exeId)')
+            ->from(TrackEExercise::class, 'previousAttempt')
+            ->andWhere('IDENTITY(previousAttempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(previousAttempt.course) = :courseId')
+            ->andWhere('IDENTITY(previousAttempt.user) = :userId')
+            ->andWhere('previousAttempt.exeId <= :attemptId')
+            ->andWhere('previousAttempt.origLpId = :lpId')
+            ->andWhere('previousAttempt.origLpItemId = :lpItemId')
+            ->andWhere('previousAttempt.origLpItemViewId = :lpItemViewId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $attempt->getCourse()->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $attempt->getUser()->getId(), Types::INTEGER)
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('lpId', (int) $attempt->getOrigLpId(), Types::INTEGER)
+            ->setParameter('lpItemId', (int) $attempt->getOrigLpItemId(), Types::INTEGER)
+            ->setParameter('lpItemViewId', (int) $attempt->getOrigLpItemViewId(), Types::INTEGER)
+        ;
+
+        $session = $attempt->getSession();
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(previousAttempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('previousAttempt.session IS NULL');
+        }
+
+        return (int) $queryBuilder->getQuery()->getSingleScalarResult();
+    }
+
     /**
      * @param array<int, int> $questionIds
      */
@@ -831,7 +1058,7 @@ private function parseQuestionIds(string $value): array
     }
 
     /**
-     * @return array<int|string, array<int, array{answer: string, position: int|null}>>
+     * @return array<int|string, array<int, array{answer: string, position: int|null, secondsSpent: int}>>
      */
     private function getSavedAnswers(int $attemptId): array
     {
@@ -839,6 +1066,7 @@ private function getSavedAnswers(int $attemptId): array
             ->select('saved.questionId AS questionId')
             ->addSelect('saved.answer AS answer')
             ->addSelect('saved.position AS position')
+            ->addSelect('saved.secondsSpent AS secondsSpent')
             ->from(TrackEAttempt::class, 'saved')
             ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
             ->setParameter('attemptId', $attemptId, Types::INTEGER)
@@ -862,6 +1090,7 @@ private function getSavedAnswers(int $attemptId): array
             $savedAnswers[$questionId][] = [
                 'answer' => (string) ($row['answer'] ?? ''),
                 'position' => null !== ($row['position'] ?? null) ? (int) $row['position'] : null,
+                'secondsSpent' => (int) ($row['secondsSpent'] ?? 0),
             ];
         }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
index 822c6c94942..3fad24a6bde 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
@@ -150,7 +150,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
index 1c6df15d2a9..b058e223fec 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
@@ -205,7 +205,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
index 7a690311546..6bda9717433 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -13,7 +13,12 @@
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\TrackEExerciseConfirmation;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
+use Chamilo\CourseBundle\Entity\CLpView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
@@ -42,6 +47,10 @@
     private const VISIBILITY_PUBLISHED = 2;
     private const STATUS_INCOMPLETE = 'incomplete';
     private const STATUS_COMPLETED = 'completed';
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
+    private const LP_STATUS_FAILED = 'failed';
+    private const LP_STATUS_PASSED = 'passed';
+    private const FEEDBACK_TYPE_DIRECT = 1;
     private const UNIQUE_ANSWER = 1;
     private const MULTIPLE_ANSWER = 2;
     private const FILL_IN_BLANKS = 3;
@@ -110,6 +119,7 @@ public function __construct(
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     /**
@@ -145,7 +155,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new BadRequestHttpException('A valid exercise and attempt are required.');
         }
 
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $this->canManageExercises());
         $attempt = $this->getIncompleteAttempt($attemptId, $quiz, $course, $session, $user);
         $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
         if ([] === $questionIds) {
@@ -204,6 +214,9 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             ->setQuestionsToCheck(implode(',', $questionsToCheck))
         ;
 
+        $this->recordSavedAnswersConfirmation($data, $attempt, $quiz, $course, $session, $user, \count($questionIds));
+        $learnpathTracking = $this->synchronizeLearnpathTracking($request, $attempt, $quiz, $course, $session, $user);
+
         $this->entityManager->flush();
 
         $response = new ExerciseRuntimeFinish();
@@ -216,14 +229,297 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $response->maxScore = $totalWeight;
         $response->completedAt = $finishedAt->format(DateTimeInterface::ATOM);
         $response->resultUrl = '';
+        $response->learnpathTracking = $learnpathTracking;
 
         return $response;
     }
 
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function synchronizeLearnpathTracking(
+        Request $request,
+        TrackEExercise $attempt,
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): array {
+        if (!$this->isLearnpathRuntimeRequest($request, $attempt)) {
+            return [];
+        }
+
+        $lpId = $this->getPositiveQueryInt($request, 'learnpath_id', $attempt->getOrigLpId());
+        $lpItemId = $this->getPositiveQueryInt($request, 'learnpath_item_id', $attempt->getOrigLpItemId());
+        $lpItemViewId = $this->getPositiveQueryInt($request, 'learnpath_item_view_id', $attempt->getOrigLpItemViewId());
+
+        if (0 >= $lpId || 0 >= $lpItemId) {
+            return [];
+        }
+
+        $lpItem = $this->getValidExerciseLpItem($lpItemId, $lpId, $quiz);
+        if (!$lpItem instanceof CLpItem) {
+            return [];
+        }
+
+        $lpItemView = $this->getLpItemViewForCurrentUser($lpItem, $lpItemViewId, $lpId, $course, $session, $user);
+        if (!$lpItemView instanceof CLpItemView) {
+            return [];
+        }
+
+        $lpView = $lpItemView->getView();
+        $status = $this->getLearnpathExerciseStatus($quiz, $attempt->getScore(), $attempt->getMaxScore());
+
+        $lpItem->setMaxScore((float) $attempt->getMaxScore());
+        $lpItemView
+            ->setStatus($status)
+            ->setScore((float) $attempt->getScore())
+            ->setTotalTime((int) $attempt->getExeDuration())
+        ;
+
+        $attempt
+            ->setOrigLpId($lpId)
+            ->setOrigLpItemId($lpItemId)
+            ->setOrigLpItemViewId((int) $lpItemView->getIid())
+        ;
+
+        $lpView->setLastItem($lpItemId);
+        $progressData = $this->updateLearnpathProgress($lpView);
+
+        return [
+            'enabled' => true,
+            'lpId' => $lpId,
+            'lpItemId' => $lpItemId,
+            'lpItemViewId' => (int) $lpItemView->getIid(),
+            'lpViewId' => (int) $lpView->getIid(),
+            'status' => $status,
+            'completedItems' => $progressData['completedItems'],
+            'totalItems' => $progressData['totalItems'],
+            'progress' => $progressData['progress'],
+            'progressMode' => $progressData['progressMode'],
+        ];
+    }
+
+    private function isLearnpathRuntimeRequest(Request $request, TrackEExercise $attempt): bool
+    {
+        $origin = (string) $request->query->get('origin', '');
+
+        return 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || $request->query->has('learnpath_id')
+            || $request->query->has('learnpath_item_id')
+            || $request->query->has('learnpath_item_view_id')
+            || 0 < (int) $attempt->getOrigLpId()
+            || 0 < (int) $attempt->getOrigLpItemId()
+            || 0 < (int) $attempt->getOrigLpItemViewId();
+    }
+
+    private function getPositiveQueryInt(Request $request, string $name, int $fallback = 0): int
+    {
+        $value = $request->query->get($name);
+        if (null !== $value) {
+            $value = \is_array($value) ? reset($value) : $value;
+            if (is_numeric($value)) {
+                $intValue = (int) $value;
+                if (0 < $intValue) {
+                    return $intValue;
+                }
+            }
+        }
+
+        return 0 < $fallback ? $fallback : 0;
+    }
+
+    private function getValidExerciseLpItem(int $lpItemId, int $lpId, CQuiz $quiz): ?CLpItem
+    {
+        $lpItem = $this->entityManager->getRepository(CLpItem::class)->find($lpItemId);
+        if (!$lpItem instanceof CLpItem) {
+            return null;
+        }
+
+        if ((int) ($lpItem->getLp()->getIid() ?? 0) !== $lpId) {
+            return null;
+        }
+
+        if (self::LP_ITEM_TYPE_QUIZ !== (string) $lpItem->getItemType()) {
+            return null;
+        }
+
+        if ((int) $lpItem->getPath() !== (int) ($quiz->getIid() ?? 0)) {
+            return null;
+        }
+
+        return $lpItem;
+    }
+
+    private function getLpItemViewForCurrentUser(
+        CLpItem $lpItem,
+        int $lpItemViewId,
+        int $lpId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): ?CLpItemView {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView')
+            ->addSelect('lpView')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('IDENTITY(itemView.item) = :lpItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :lpId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('lpItemId', (int) $lpItem->getIid(), Types::INTEGER)
+            ->setParameter('lpId', $lpId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (0 < $lpItemViewId) {
+            $queryBuilder
+                ->andWhere('itemView.iid = :lpItemViewId')
+                ->setParameter('lpItemViewId', $lpItemViewId, Types::INTEGER)
+            ;
+        }
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        $queryBuilder->orderBy('itemView.iid', 'DESC');
+
+        $lpItemView = $queryBuilder->getQuery()->getOneOrNullResult();
+
+        return $lpItemView instanceof CLpItemView ? $lpItemView : null;
+    }
+
+    private function getLearnpathExerciseStatus(CQuiz $quiz, float $score, float $maxScore): string
+    {
+        $status = self::STATUS_COMPLETED;
+        $passPercentage = $quiz->getPassPercentage();
+
+        if (self::FEEDBACK_TYPE_DIRECT !== (int) $quiz->getFeedbackType() && null !== $passPercentage && 0 < $passPercentage) {
+            $status = self::LP_STATUS_FAILED;
+            $percentage = 0.0 < $maxScore ? ($score / $maxScore) * 100 : 0.0;
+            if ($percentage >= (float) $passPercentage) {
+                $status = self::LP_STATUS_PASSED;
+            }
+        }
+
+        return $status;
+    }
+
+    /**
+     * @return array{completedItems: int, totalItems: int, progress: int, progressMode: string}
+     */
+    private function updateLearnpathProgress(CLpView $lpView): array
+    {
+        $lpId = (int) ($lpView->getLp()->getIid() ?? 0);
+        if (0 >= $lpId) {
+            return ['completedItems' => 0, 'totalItems' => 0, 'progress' => 0, 'progressMode' => '%'];
+        }
+
+        $totalItems = (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(item.iid)')
+            ->from(CLpItem::class, 'item')
+            ->andWhere('IDENTITY(item.lp) = :lpId')
+            ->andWhere('item.itemType != :directoryType')
+            ->setParameter('lpId', $lpId, Types::INTEGER)
+            ->setParameter('directoryType', 'dir')
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        if (0 >= $totalItems) {
+            $lpView->setProgress(0);
+
+            return ['completedItems' => 0, 'totalItems' => 0, 'progress' => 0, 'progressMode' => '%'];
+        }
+
+        $completedItems = (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(DISTINCT item.iid)')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.item', 'item')
+            ->andWhere('IDENTITY(itemView.view) = :lpViewId')
+            ->andWhere('item.itemType != :directoryType')
+            ->andWhere('itemView.status IN (:completedStatuses)')
+            ->setParameter('lpViewId', (int) $lpView->getIid(), Types::INTEGER)
+            ->setParameter('directoryType', 'dir')
+            ->setParameter('completedStatuses', [self::STATUS_COMPLETED, self::LP_STATUS_PASSED, 'succeeded', 'browsed', self::LP_STATUS_FAILED], ArrayParameterType::STRING)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        $progress = max(0, min(100, (int) round(($completedItems / $totalItems) * 100)));
+        $lpView->setProgress($progress);
+
+        return [
+            'completedItems' => $completedItems,
+            'totalItems' => $totalItems,
+            'progress' => $progress,
+            'progressMode' => '%',
+        ];
+    }
+
+    private function recordSavedAnswersConfirmation(
+        ExerciseRuntimeFinish $data,
+        TrackEExercise $attempt,
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        User $user,
+        int $questionsCount,
+    ): void {
+        if ('true' !== $this->settingsManager->getSetting('exercise.quiz_confirm_saved_answers', true)) {
+            return;
+        }
+
+        $attemptId = (int) $attempt->getExeId();
+        if (0 >= $attemptId) {
+            return;
+        }
+
+        $savedAnswersCount = (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(DISTINCT answer.questionId)')
+            ->from(TrackEAttempt::class, 'answer')
+            ->andWhere('IDENTITY(answer.trackExercise) = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        $confirmation = (new TrackEExerciseConfirmation())
+            ->setUser($user)
+            ->setQuizId((int) ($quiz->getIid() ?? 0))
+            ->setAttemptId($attemptId)
+            ->setQuestionsCount($questionsCount)
+            ->setSavedAnswersCount($savedAnswersCount)
+            ->setCourseId((int) $course->getId())
+            ->setSessionId((int) ($session?->getId() ?? 0))
+            ->setConfirmed(true === $data->confirmedSavedAnswers)
+        ;
+
+        $this->entityManager->persist($confirmation);
+    }
+
     private function canFinishAttempt(): bool
     {
         return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
-            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT');
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
     private function getCourse(Request $request): Course
@@ -256,7 +552,7 @@ private function getSession(Request $request): ?Session
         return $session;
     }
 
-    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
         if (!$quiz instanceof CQuiz) {
@@ -280,7 +576,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -292,18 +588,20 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
             throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
         }
 
-        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
-        $now = new DateTime();
-        if (self::VISIBILITY_PUBLISHED !== $visibility) {
-            throw new AccessDeniedHttpException('The requested exercise is not visible.');
-        }
+        if (!$canManage) {
+            $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+            $now = new DateTime();
+            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+                throw new AccessDeniedHttpException('The requested exercise is not visible.');
+            }
 
-        if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
-            throw new AccessDeniedHttpException('The requested exercise is not available yet.');
-        }
+            if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+                throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+            }
 
-        if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
-            throw new AccessDeniedHttpException('The requested exercise is closed.');
+            if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+                throw new AccessDeniedHttpException('The requested exercise is closed.');
+            }
         }
 
         return $quiz;
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index 781c7b84175..3ec0cc79e55 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -11,15 +11,19 @@
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntime;
 use Chamilo\CoreBundle\Entity\AttemptFile;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Entity\ExtraFieldValues;
 use Chamilo\CoreBundle\Entity\ResourceFile;
 use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
@@ -41,7 +45,7 @@
  *
  * This provider intentionally exposes only the data required to render the attempt UI.
  * Correct answers, scores per answer and feedback comments remain hidden for learners.
- * Submission, scoring and tracking are still handled by the legacy runtime in this batch.
+ * Submission, scoring and tracking are handled by the runtime processors.
  *
  * @implements ProviderInterface<ExerciseRuntime>
  */
@@ -68,6 +72,7 @@
     private const QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_ORDERED = 3;
     private const QUESTION_SELECTION_CATEGORIES_RANDOM_QUESTIONS_RANDOM = 6;
     private const STRUCTURAL_CONTENT_TYPES = [self::MEDIA_QUESTION, self::PAGE_BREAK];
+    private const LEGACY_RUNTIME_REASON_UNSUPPORTED_QUESTION = 'This exercise contains a question type that requires a different test player.';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -75,6 +80,7 @@ public function __construct(
         private CQuizRepository $quizRepository,
         private CQuizQuestionRepository $questionRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     /**
@@ -90,9 +96,11 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         $course = $this->getCourse($request);
         $session = $this->getSession($request);
-        $canManage = $this->canManageExercises();
+        $canManagePermission = $this->canManageExercises();
+        $runsAsLearner = !$canManagePermission || $this->isLearnerRuntimeRequest($request);
+        $canManage = $canManagePermission && !$runsAsLearner;
 
-        if (!$canManage && !$this->canViewExercises()) {
+        if (!$canManagePermission && !$this->canViewExercises()) {
             throw new AccessDeniedHttpException('You are not allowed to open this exercise.');
         }
 
@@ -101,16 +109,19 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             throw new BadRequestHttpException('A valid exercise id is required.');
         }
 
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManage);
-        $attempt = $this->getRuntimeAttempt($request, $quiz, $course, $session, $canManage);
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $canManagePermission);
+        $attempt = $this->getRuntimeAttempt($request, $quiz, $course, $session, !$runsAsLearner);
         $attemptQuestionIds = $attempt instanceof TrackEExercise ? $this->parseQuestionIds((string) $attempt->getDataTracking()) : null;
         $questions = $this->getRuntimeQuestions($quiz, $course, $session, $canManage, $attemptQuestionIds, $attempt);
         $runtimePages = $this->buildRuntimePages($quiz, $questions);
         $settings = $this->getRuntimeSettings($quiz);
+        $legacyRuntimeReasons = $this->getLegacyRuntimeReasons($quiz);
         $settings['runtimePages'] = $runtimePages['pages'];
         $settings['usesStructuralPages'] = $runtimePages['usesStructuralPages'];
         $settings['forceGroupedByMedia'] = $runtimePages['forceGroupedByMedia'];
         $settings['effectiveOneQuestionPerPage'] = $runtimePages['effectiveOneQuestionPerPage'];
+        $settings['requiresLegacyRuntime'] = [] !== $legacyRuntimeReasons;
+        $settings['legacyRuntimeReasons'] = $legacyRuntimeReasons;
 
         $response = new ExerciseRuntime();
         $response->exerciseId = $exerciseId;
@@ -121,16 +132,18 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->legacyUrls = $this->getLegacyUrls($quiz, $course, $session);
         $response->questionCount = $this->countAnswerableQuestions($questions);
         $response->totalScore = $this->getTotalScore($questions);
-        $canSubmit = !$canManage
+        $requiresLegacyRuntime = true === ($settings['requiresLegacyRuntime'] ?? false);
+        $canSubmit = $runsAsLearner
+            && !$requiresLegacyRuntime
             && $attempt instanceof TrackEExercise
             && self::STATUS_INCOMPLETE === (string) $attempt->getStatus()
             && $this->canFinishWithVue($questions);
 
         $response->canManage = $canManage;
         $response->attempt = $attempt instanceof TrackEExercise ? $this->normalizeAttempt($attempt, $questions) : null;
-        $response->canStartAttempt = !$canManage;
+        $response->canStartAttempt = $runsAsLearner;
         $response->canSubmit = $canSubmit;
-        $response->usesLegacySubmit = !$canSubmit;
+        $response->usesLegacySubmit = $requiresLegacyRuntime || !$canSubmit;
 
         return $response;
     }
@@ -237,6 +250,7 @@ private function normalizeAttempt(TrackEExercise $attempt, array $questions): ar
 
         return [
             'attemptId' => (int) $attempt->getExeId(),
+            'attemptNumber' => $this->getAttemptNumber($attempt),
             'status' => method_exists($attempt, 'getStatus') ? (string) $attempt->getStatus() : 'incomplete',
             'questionIds' => $questionIds,
             'currentQuestionIndex' => 0,
@@ -248,6 +262,46 @@ private function normalizeAttempt(TrackEExercise $attempt, array $questions): ar
         ];
     }
 
+    private function getAttemptNumber(TrackEExercise $attempt): int
+    {
+        $quiz = $attempt->getQuiz();
+        $attemptId = (int) $attempt->getExeId();
+        if (null === $quiz || null === $quiz->getIid() || 0 >= $attemptId) {
+            return 0;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('COUNT(previousAttempt.exeId)')
+            ->from(TrackEExercise::class, 'previousAttempt')
+            ->andWhere('IDENTITY(previousAttempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(previousAttempt.course) = :courseId')
+            ->andWhere('IDENTITY(previousAttempt.user) = :userId')
+            ->andWhere('previousAttempt.exeId <= :attemptId')
+            ->andWhere('previousAttempt.origLpId = :lpId')
+            ->andWhere('previousAttempt.origLpItemId = :lpItemId')
+            ->andWhere('previousAttempt.origLpItemViewId = :lpItemViewId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $attempt->getCourse()->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $attempt->getUser()->getId(), Types::INTEGER)
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('lpId', (int) $attempt->getOrigLpId(), Types::INTEGER)
+            ->setParameter('lpItemId', (int) $attempt->getOrigLpItemId(), Types::INTEGER)
+            ->setParameter('lpItemViewId', (int) $attempt->getOrigLpItemViewId(), Types::INTEGER)
+        ;
+
+        $session = $attempt->getSession();
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(previousAttempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('previousAttempt.session IS NULL');
+        }
+
+        return (int) $queryBuilder->getQuery()->getSingleScalarResult();
+    }
+
     /**
      * @return array<int|string, array<int, array<string, mixed>>>
      */
@@ -282,6 +336,7 @@ private function getSavedAnswers(int $attemptId, Course $course, ?Session $sessi
             $savedRow = [
                 'answer' => $row->getAnswer(),
                 'position' => null !== $row->getPosition() ? (int) $row->getPosition() : null,
+                'secondsSpent' => method_exists($row, 'getSecondsSpent') ? (int) $row->getSecondsSpent() : 0,
             ];
 
             $files = $this->normalizeSavedAttemptFiles($row, $course, $session);
@@ -433,6 +488,21 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function isLearnerRuntimeRequest(Request $request): bool
+    {
+        $origin = (string) $request->query->get('origin', '');
+        $isStudentView = strtolower(trim((string) $request->query->get('isStudentView', '')));
+        $preview = strtolower(trim((string) $request->query->get('preview', '')));
+
+        return 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || $request->query->has('learnpath_id')
+            || in_array($isStudentView, ['1', 'true', 'yes'], true)
+            || str_starts_with($isStudentView, 'true')
+            || in_array($preview, ['1', 'true', 'yes'], true)
+            || str_starts_with($preview, 'true');
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -457,7 +527,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -531,12 +601,115 @@ private function getRuntimeSettings(CQuiz $quiz): array
             'endTime' => $this->formatDate($quiz->getEndTime()),
             'textWhenFinished' => (string) $quiz->getTextWhenFinished(),
             'textWhenFinishedFailure' => (string) $quiz->getTextWhenFinishedFailure(),
+            'preventCopyPaste' => $this->isSettingEnabled('exercise.quiz_prevent_copy_paste'),
+            'keepAlivePingInterval' => $this->getKeepAlivePingInterval(),
+            'confirmSavedAnswers' => $this->isSettingEnabled('exercise.quiz_confirm_saved_answers'),
+            'allowTimePerQuestion' => $this->isSettingEnabled('exercise.allow_time_per_question'),
+            'hasTimedQuestions' => $this->hasTimedQuestions($quiz),
+            'blockCategoryQuestions' => $this->isBlockCategoryRuntimeEnabled($quiz),
         ];
     }
 
     /**
-     * @return array<int, array<string, mixed>>
+     * @return array<int, string>
      */
+    private function getLegacyRuntimeReasons(CQuiz $quiz): array
+    {
+        $reasons = [];
+
+        foreach ($this->getOrderedQuestionRelations($quiz) as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $type = (int) $question->getType();
+            if (\in_array($type, self::STRUCTURAL_CONTENT_TYPES, true)) {
+                continue;
+            }
+
+            if (!$this->isFinishSupportedQuestionType($type)) {
+                $reasons[] = self::LEGACY_RUNTIME_REASON_UNSUPPORTED_QUESTION;
+
+                break;
+            }
+        }
+
+        return array_values(array_unique($reasons));
+    }
+
+    private function hasTimedQuestions(CQuiz $quiz): bool
+    {
+        foreach ($this->getOrderedQuestionRelations($quiz) as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if (!$question instanceof CQuizQuestion || \in_array((int) $question->getType(), self::STRUCTURAL_CONTENT_TYPES, true)) {
+                continue;
+            }
+
+            if (0 < (int) $question->getDuration()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function isBlockCategoryRuntimeEnabled(CQuiz $quiz): bool
+    {
+        if (!$this->isSettingEnabled('exercise.block_category_questions')) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $row = $this->entityManager->createQueryBuilder()
+            ->select('value')
+            ->from(ExtraFieldValues::class, 'value')
+            ->innerJoin('value.field', 'field')
+            ->andWhere('value.itemId = :itemId')
+            ->andWhere('field.itemType = :itemType')
+            ->andWhere('field.variable = :variable')
+            ->setParameter('itemId', $exerciseId, Types::INTEGER)
+            ->setParameter('itemType', ExtraField::EXERCISE_FIELD_TYPE, Types::INTEGER)
+            ->setParameter('variable', 'block_category', Types::STRING)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!$row instanceof ExtraFieldValues) {
+            return false;
+        }
+
+        return \in_array(strtolower((string) ($row->getFieldValue() ?? '')), ['1', 'true', 'yes', 'on'], true);
+    }
+
+    private function getKeepAlivePingInterval(): int
+    {
+        $interval = (int) $this->settingsManager->getSetting('exercise.quiz_keep_alive_ping_interval', true);
+        if (0 >= $interval) {
+            return 0;
+        }
+
+        return max(60, $interval);
+    }
+
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
     /**
      * @param array<int, int>|null $questionIds
      *
@@ -668,6 +841,8 @@ private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $re
     {
         $type = (int) $question->getType();
 
+        $categorySummary = $this->getQuestionCategorySummary($question);
+
         return [
             'id' => (int) $question->getIid(),
             'title' => $question->getQuestion(),
@@ -681,6 +856,9 @@ private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $re
             'mandatory' => 1 === (int) $question->getMandatory(),
             'duration' => $question->getDuration(),
             'difficulty' => max(1, (int) $question->getLevel()),
+            'categoryIds' => $categorySummary['ids'],
+            'primaryCategoryId' => $categorySummary['primaryId'],
+            'primaryCategoryTitle' => $categorySummary['primaryTitle'],
             'canRevealTeacherData' => $canManage,
             'choices' => $this->getChoiceItems($question, $shuffleAnswers, $answerShuffleSeed),
             'trueFalseOptions' => $this->getQuestionOptions($question),
@@ -1287,8 +1465,8 @@ private function getCalculatedRuntime(CQuizQuestion $question, ?TrackEExercise $
     }
 
     /**
-     * Legacy stores the random calculated-answer variation in session for the current attempt.
-     * The Vue runtime must keep the same variation stable for an attempt without relying on session state.
+     * The previous runtime stores the random calculated-answer variation in session for the current attempt.
+     * The current runtime must keep the same variation stable for an attempt without relying on session state.
      *
      * @param array<int, array{id: int, text: string, position: int}> $variations
      *
@@ -1354,6 +1532,35 @@ private function getSavedCalculatedRuntimeAnswerId(CQuizQuestion $question, ?Tra
         return max(0, (int) $parts[0]);
     }
 
+    /**
+     * @return array{ids: array<int, int>, primaryId: int, primaryTitle: string}
+     */
+    private function getQuestionCategorySummary(CQuizQuestion $question): array
+    {
+        $ids = [];
+        $primaryId = 0;
+        $primaryTitle = 'General';
+
+        foreach ($question->getCategories() as $category) {
+            if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+                continue;
+            }
+
+            $categoryId = (int) $category->getIid();
+            $ids[] = $categoryId;
+            if (0 === $primaryId) {
+                $primaryId = $categoryId;
+                $primaryTitle = $category->getTitle();
+            }
+        }
+
+        return [
+            'ids' => array_values(array_unique($ids)),
+            'primaryId' => $primaryId,
+            'primaryTitle' => $primaryTitle,
+        ];
+    }
+
     /**
      * @return array<string, mixed>|null
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
index 2759f3632e8..e69b8cc764c 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
@@ -162,7 +162,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
index 67fbad15d0d..9aded5d66d9 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
@@ -162,7 +162,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index a2c225d2770..c9c50f05bea 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -23,7 +23,9 @@
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
+use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
@@ -65,6 +67,7 @@ public function __construct(
         private CQuizRepository $quizRepository,
         private ResourceNodeRepository $resourceNodeRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     /**
@@ -135,6 +138,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->ranking = true === ($visibility['showRanking'] ?? false)
             ? $this->getRanking($quiz, $course, $session, $attempt)
             : [];
+        $response->finalActions = $this->getFinalActions($quiz, $attempt, $course, $session);
+        $response->aiCorrection = $this->getAiCorrectionConfiguration($canManage);
         $response->canManage = $canManage;
 
         return $response;
@@ -183,6 +188,34 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    /**
+     * @return array<string, mixed>
+     */
+    private function getAiCorrectionConfiguration(bool $canManage): array
+    {
+        $helpersEnabled = $this->isSettingEnabled('ai_helpers.enable_ai_helpers');
+        $openAnswersGraderEnabled = $this->isSettingEnabled('ai_helpers.open_answers_grader');
+
+        return [
+            'enabled' => $canManage && $helpersEnabled && $openAnswersGraderEnabled,
+            'helpersEnabled' => $helpersEnabled,
+            'openAnswersGraderEnabled' => $openAnswersGraderEnabled,
+        ];
+    }
+
+    private function isSettingEnabled(string $settingName): bool
+    {
+        $value = $this->settingsManager->getSetting($settingName, true);
+
+        if (true === $value || 1 === $value) {
+            return true;
+        }
+
+        $normalized = strtolower(trim((string) $value));
+
+        return \in_array($normalized, ['1', 'true', 'yes', 'on'], true);
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -207,7 +240,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -1812,6 +1845,87 @@ private function getQuestionTypeLabel(int $type): string
         };
     }
 
+    /**
+     * @return array<string, mixed>
+     */
+    private function getFinalActions(CQuiz $quiz, TrackEExercise $attempt, Course $course, ?Session $session): array
+    {
+        $currentUser = $this->security->getUser();
+        $currentUserId = $currentUser instanceof User ? (int) $currentUser->getId() : 0;
+        $attemptUserId = (int) $attempt->getUser()->getId();
+        $isLearningPathAttempt = 0 < (int) $attempt->getOrigLpId()
+            || 0 < (int) $attempt->getOrigLpItemId()
+            || 0 < (int) $attempt->getOrigLpItemViewId();
+        $isOwnAttempt = $currentUserId > 0 && $currentUserId === $attemptUserId;
+        $showFinalActions = !$isLearningPathAttempt && $isOwnAttempt;
+        $attemptCount = $this->getAttemptCountForResultContext($quiz, $attempt, $course, $session);
+        $maxAttempt = (int) $quiz->getMaxAttempt();
+        $attemptLimitReached = 0 < $maxAttempt && $attemptCount >= $maxAttempt;
+        $canTryAgain = $showFinalActions
+            && $this->isExerciseOpenForRetry($quiz)
+            && !$attemptLimitReached;
+
+        return [
+            'isLearningPathAttempt' => $isLearningPathAttempt,
+            'isOwnAttempt' => $isOwnAttempt,
+            'showFinalActions' => $showFinalActions,
+            'canTryAgain' => $canTryAgain,
+            'attemptCount' => $attemptCount,
+            'maxAttempt' => $maxAttempt,
+            'remainingAttempts' => 0 < $maxAttempt ? max(0, $maxAttempt - $attemptCount) : null,
+        ];
+    }
+
+    private function getAttemptCountForResultContext(CQuiz $quiz, TrackEExercise $attempt, Course $course, ?Session $session): int
+    {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('COUNT(resultAttempt.exeId)')
+            ->from(TrackEExercise::class, 'resultAttempt')
+            ->andWhere('IDENTITY(resultAttempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(resultAttempt.course) = :courseId')
+            ->andWhere('IDENTITY(resultAttempt.user) = :userId')
+            ->andWhere('(resultAttempt.status = :emptyStatus OR resultAttempt.status = :completedStatus)')
+            ->andWhere('resultAttempt.origLpId = :learnpathId')
+            ->andWhere('resultAttempt.origLpItemId = :learnpathItemId')
+            ->andWhere('resultAttempt.origLpItemViewId = :learnpathItemViewId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $attempt->getUser()->getId(), Types::INTEGER)
+            ->setParameter('emptyStatus', '')
+            ->setParameter('completedStatus', self::STATUS_COMPLETED)
+            ->setParameter('learnpathId', (int) $attempt->getOrigLpId(), Types::INTEGER)
+            ->setParameter('learnpathItemId', (int) $attempt->getOrigLpItemId(), Types::INTEGER)
+            ->setParameter('learnpathItemViewId', (int) $attempt->getOrigLpItemViewId(), Types::INTEGER)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(resultAttempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('resultAttempt.session IS NULL');
+        }
+
+        return (int) $queryBuilder->getQuery()->getSingleScalarResult();
+    }
+
+    private function isExerciseOpenForRetry(CQuiz $quiz): bool
+    {
+        $now = new DateTimeImmutable();
+        $startTime = $quiz->getStartTime();
+        if ($startTime instanceof DateTimeInterface && $startTime > $now) {
+            return false;
+        }
+
+        $endTime = $quiz->getEndTime();
+        if ($endTime instanceof DateTimeInterface && $endTime < $now) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * @return array<int, array<string, mixed>>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index 7e7440698bf..6f28f9887ad 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -88,7 +88,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new BadRequestHttpException('A valid exercise, attempt and question are required.');
         }
 
-        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
+        $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session, $this->canManageExercises());
         $attempt = $this->getIncompleteAttempt($attemptId, $quiz, $course, $session, $user);
         $question = $this->getQuestionFromExercise($questionId, $quiz);
         if (!$question instanceof CQuizQuestion) {
@@ -160,7 +160,14 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
     private function canUploadAnswer(): bool
     {
         return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
-            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT');
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
+            || $this->canManageExercises();
+    }
+
+    private function canManageExercises(): bool
+    {
+        return $this->security->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
     private function getCourse(Request $request): Course
@@ -193,7 +200,7 @@ private function getSession(Request $request): ?Session
         return $session;
     }
 
-    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session): CQuiz
+    private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
         if (!$quiz instanceof CQuiz) {
@@ -217,7 +224,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -229,18 +236,20 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
             throw new AccessDeniedHttpException('The requested exercise does not belong to the current course context.');
         }
 
-        $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
-        $now = new DateTimeImmutable();
-        if (self::VISIBILITY_PUBLISHED !== $visibility) {
-            throw new AccessDeniedHttpException('The requested exercise is not visible.');
-        }
+        if (!$canManage) {
+            $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
+            $now = new DateTimeImmutable();
+            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+                throw new AccessDeniedHttpException('The requested exercise is not visible.');
+            }
 
-        if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
-            throw new AccessDeniedHttpException('The requested exercise is not available yet.');
-        }
+            if (null !== $quiz->getStartTime() && $quiz->getStartTime() > $now) {
+                throw new AccessDeniedHttpException('The requested exercise is not available yet.');
+            }
 
-        if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
-            throw new AccessDeniedHttpException('The requested exercise is closed.');
+            if (null !== $quiz->getEndTime() && $quiz->getEndTime() < $now) {
+                throw new AccessDeniedHttpException('The requested exercise is closed.');
+            }
         }
 
         return $quiz;

From e947d9c78b02e19b5bc4b9de934ab7f5692b9310 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 00:53:35 -0500
Subject: [PATCH 05/21] Fix exercise runtime review and uploads

---
 .../views/exercise/ExerciseOverviewView.vue   |  7 +++
 .../vue/views/exercise/ExercisePlayerView.vue | 42 +++++++++++----
 .../vue/views/exercise/ExerciseReportView.vue | 10 +++-
 .../vue/views/exercise/ExerciseResultView.vue |  7 ++-
 .../ApiResource/Exercise/ExerciseOverview.php |  3 ++
 .../Exercise/ExerciseOverviewProvider.php     |  1 +
 .../ExerciseRuntimeResultProvider.php         | 52 +++++++++++++++----
 .../ExerciseRuntimeUploadAnswerProcessor.php  | 31 +++++++++--
 8 files changed, 128 insertions(+), 25 deletions(-)

diff --git a/assets/vue/views/exercise/ExerciseOverviewView.vue b/assets/vue/views/exercise/ExerciseOverviewView.vue
index 8415ab56ce7..70669351b16 100644
--- a/assets/vue/views/exercise/ExerciseOverviewView.vue
+++ b/assets/vue/views/exercise/ExerciseOverviewView.vue
@@ -68,6 +68,12 @@
             >
               {{ displayText(overview.description) }}
             </div>
+            <div class="flex flex-wrap gap-3 text-xs font-medium text-gray-700">
+              <span>{{ t("Questions") }}: {{ overview.questionCount || 0 }}</span>
+              <span>{{ t("Total score") }}: {{ formatScore(overview.maxScore) }}</span>
+              <span v-if="overview.oneQuestionPerPage">{{ t("One question per page") }}</span>
+              <span v-if="overview.duration">{{ t("Duration") }}: {{ t("{0} min", [overview.duration]) }}</span>
+            </div>
           </div>
           <div class="flex flex-wrap gap-2">
             <span :class="['rounded-full px-3 py-1 text-xs font-semibold', availabilityBadgeClass(overview.availabilityStatus)]">
@@ -218,6 +224,7 @@ const overview = reactive({
   maxAttempt: 0,
   feedbackType: 0,
   resultsDisabled: 0,
+  oneQuestionPerPage: false,
   randomAnswers: false,
   random: 0,
   randomByCategory: 0,
diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index 203cb87e9aa..d984f077607 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -1587,21 +1587,35 @@ function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
 }
 
+function addOptionalQueryParam(params, key) {
+  const value = getQueryValue(route.query[key])
+  if (value !== undefined && value !== null && value !== "") {
+    params[key] = value
+  }
+}
+
 function getContextParams() {
-  return {
+  const params = {
     cid: getQueryValue(route.query.cid),
     sid: getQueryValue(route.query.sid),
     gid: getQueryValue(route.query.gid),
-    origin: getQueryValue(route.query.origin),
-    lp_init: getQueryValue(route.query.lp_init),
-    learnpath_id: getQueryValue(route.query.learnpath_id),
-    learnpath_item_id: getQueryValue(route.query.learnpath_item_id),
-    learnpath_item_view_id: getQueryValue(route.query.learnpath_item_view_id),
-    isStudentView: getQueryValue(route.query.isStudentView),
-    preview: getQueryValue(route.query.preview),
   }
-}
 
+  addOptionalQueryParam(params, "origin")
+  addOptionalQueryParam(params, "lp_init")
+  addOptionalQueryParam(params, "learnpath_id")
+  addOptionalQueryParam(params, "learnpath_item_id")
+  addOptionalQueryParam(params, "learnpath_item_view_id")
+  addOptionalQueryParam(params, "lp_id")
+  addOptionalQueryParam(params, "node")
+  addOptionalQueryParam(params, "type")
+  addOptionalQueryParam(params, "returnToLp")
+  addOptionalQueryParam(params, "isStudentView")
+  addOptionalQueryParam(params, "preview")
+  addOptionalQueryParam(params, "attemptId")
+
+  return params
+}
 
 function isEmbeddedInLearnpath() {
   if (typeof window === "undefined") {
@@ -3372,7 +3386,15 @@ onBeforeUnmount(() => {
 onMounted(loadRuntime)
 
 watch(
-  () => [route.params.exerciseId, route.query.cid, route.query.sid, route.query.gid],
+  () => [
+    route.params.exerciseId,
+    route.query.cid,
+    route.query.sid,
+    route.query.gid,
+    route.query.attemptId,
+    route.query.preview,
+    route.query.isStudentView,
+  ],
   () => loadRuntime(),
 )
 
diff --git a/assets/vue/views/exercise/ExerciseReportView.vue b/assets/vue/views/exercise/ExerciseReportView.vue
index f5a25c77b7c..d82ed8b4c98 100644
--- a/assets/vue/views/exercise/ExerciseReportView.vue
+++ b/assets/vue/views/exercise/ExerciseReportView.vue
@@ -333,7 +333,7 @@
               class="exercise-report-row-action"
               :label="data.pendingCorrection ? t('Correct') : t('Review')"
               only-icon
-              :route="{ name: 'ExerciseResult', params: { ...getExerciseRouteParams(), attemptId: data.attemptId }, query: getContextParams() }"
+              :route="{ name: 'ExerciseResult', params: { ...getExerciseRouteParams(), attemptId: data.attemptId }, query: getReviewContextParams() }"
               :icon="data.pendingCorrection ? safeIcon('edit') : safeIcon('eye-on', 'information')"
               size="small"
               :type="data.pendingCorrection ? 'secondary-text' : 'primary-text'"
@@ -475,6 +475,14 @@ function getContextParams() {
   }
 }
 
+function getReviewContextParams() {
+  return {
+    ...getContextParams(),
+    review: "1",
+    mode: "review",
+  }
+}
+
 function getBaseRouteParams() {
   return {
     node: route.params.node,
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index dc46980e96b..4c0280594e6 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -1450,6 +1450,8 @@ function getContextParams() {
     learnpath_item_id: getQueryValue(route.query.learnpath_item_id),
     learnpath_item_view_id: getQueryValue(route.query.learnpath_item_view_id),
     isStudentView: getQueryValue(route.query.isStudentView),
+    review: getQueryValue(route.query.review),
+    mode: getQueryValue(route.query.mode),
   }
 }
 
@@ -1528,7 +1530,10 @@ function getCourseHomeQuery() {
 }
 
 const showStandaloneFinalActions = computed(() => {
-  return finalActions.value?.showFinalActions === true && !isLearnpathContext.value && getCourseId() > 0
+  return finalActions.value?.showFinalActions === true
+    && visibility.value?.isReviewMode !== true
+    && !isLearnpathContext.value
+    && getCourseId() > 0
 })
 
 function buildPlayerQuery(startResponse = null) {
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php b/src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php
index 4f8df4607c9..96dcf5a3b14 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseOverview.php
@@ -87,6 +87,9 @@ final class ExerciseOverview
     #[Groups(['exercise_overview:read'])]
     public int $resultsDisabled = 0;
 
+    #[Groups(['exercise_overview:read'])]
+    public bool $oneQuestionPerPage = false;
+
     #[Groups(['exercise_overview:read'])]
     public bool $randomAnswers = false;
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
index 6ff5c9d1d95..e3bf651bfb9 100644
--- a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
@@ -115,6 +115,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $overview->maxAttempt = $maxAttempt;
         $overview->feedbackType = $quiz->getFeedbackType();
         $overview->resultsDisabled = $quiz->getResultsDisabled();
+        $overview->oneQuestionPerPage = CQuiz::ONE_PER_PAGE === (int) $quiz->getType();
         $overview->randomAnswers = $quiz->getRandomAnswers();
         $overview->random = (int) $quiz->getRandom();
         $overview->randomByCategory = (int) $quiz->getRandomByCategory();
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index c9c50f05bea..d8acfbcc790 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -107,15 +107,17 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         $rowsByQuestion = $this->getAttemptRowsByQuestion((int) $attempt->getExeId());
         $pendingQuestionIds = $this->parseQuestionIds((string) $attempt->getQuestionsToCheck());
+        $isReviewMode = $this->isReviewMode($attempt, $canManage, $request);
         $isLastAllowedAttempt = $this->isLastAllowedAttempt($quiz, $attempt, $course, $session);
         $visibility = $this->getResultVisibility($quiz, $isLastAllowedAttempt);
         if ($canManage) {
             $visibility = $this->getManagerResultVisibility($visibility);
         }
+        $visibility['isReviewMode'] = $isReviewMode;
 
         $questions = [];
         if ($canManage || true === ($visibility['showQuestionDetails'] ?? false)) {
-            $questions = $this->getQuestions($quiz, $questionIds, $rowsByQuestion, $visibility, $pendingQuestionIds, $canManage);
+            $questions = $this->getQuestions($quiz, $questionIds, $rowsByQuestion, $visibility, $pendingQuestionIds, $canManage, $isReviewMode);
             if (
                 true === ($visibility['hideCorrectAnsweredQuestions'] ?? false)
                 && true === ($visibility['showQuestionScore'] ?? false)
@@ -138,8 +140,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->ranking = true === ($visibility['showRanking'] ?? false)
             ? $this->getRanking($quiz, $course, $session, $attempt)
             : [];
-        $response->finalActions = $this->getFinalActions($quiz, $attempt, $course, $session);
-        $response->aiCorrection = $this->getAiCorrectionConfiguration($canManage);
+        $response->finalActions = $this->getFinalActions($quiz, $attempt, $course, $session, $isReviewMode);
+        $response->aiCorrection = $this->getAiCorrectionConfiguration($canManage && $isReviewMode);
         $response->canManage = $canManage;
 
         return $response;
@@ -188,6 +190,24 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function isReviewMode(TrackEExercise $attempt, bool $canManage, Request $request): bool
+    {
+        if (!$canManage) {
+            return false;
+        }
+
+        if ('1' === (string) $request->query->get('review', '') || 'review' === strtolower((string) $request->query->get('mode', ''))) {
+            return true;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        return (int) $attempt->getUser()->getId() !== (int) $user->getId();
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -589,7 +609,7 @@ private function getFinishedText(CQuiz $quiz, ?bool $passed): string
      *
      * @return array<int, array<string, mixed>>
      */
-    private function getQuestions(CQuiz $quiz, array $questionIds, array $rowsByQuestion, array $visibility, array $pendingQuestionIds, bool $canManage): array
+    private function getQuestions(CQuiz $quiz, array $questionIds, array $rowsByQuestion, array $visibility, array $pendingQuestionIds, bool $canManage, bool $isReviewMode): array
     {
         $relations = $this->entityManager->createQueryBuilder()
             ->select('relQuestion')
@@ -622,6 +642,7 @@ private function getQuestions(CQuiz $quiz, array $questionIds, array $rowsByQues
                 $visibility,
                 \in_array($questionId, $pendingQuestionIds, true),
                 $canManage,
+                $isReviewMode,
             );
         }
 
@@ -645,7 +666,7 @@ private function getQuestions(CQuiz $quiz, array $questionIds, array $rowsByQues
      *
      * @return array<string, mixed>
      */
-    private function normalizeQuestion(CQuizQuestion $question, array $rows, array $visibility, bool $pendingCorrection, bool $canManage): array
+    private function normalizeQuestion(CQuizQuestion $question, array $rows, array $visibility, bool $pendingCorrection, bool $canManage, bool $isReviewMode): array
     {
         $questionScore = $this->getQuestionScore($rows);
         $maxScore = $this->getQuestionMaxScore($question);
@@ -656,6 +677,10 @@ private function normalizeQuestion(CQuizQuestion $question, array $rows, array $
             $isCorrect = null;
         }
         $showQuestionCorrection = $this->shouldShowQuestionCorrection($rows, $visibility, true === $isCorrect);
+        $feedback = $this->getQuestionFeedback($question, $visibility, $showQuestionCorrection);
+        if ($this->shouldHideManualCorrectionFeedback($requiresManualCorrection, $pendingCorrection, $questionScore)) {
+            $feedback = null;
+        }
 
         return [
             'id' => (int) $question->getIid(),
@@ -671,8 +696,8 @@ private function normalizeQuestion(CQuizQuestion $question, array $rows, array $
             'isCorrect' => !$isStructuralContent && true === ($visibility['showQuestionStatus'] ?? false) ? $isCorrect : null,
             'requiresManualCorrection' => $requiresManualCorrection,
             'pendingCorrection' => $pendingCorrection,
-            'canCorrect' => $canManage && $requiresManualCorrection,
-            'feedback' => $this->getQuestionFeedback($question, $visibility, $showQuestionCorrection),
+            'canCorrect' => $isReviewMode && $canManage && $requiresManualCorrection,
+            'feedback' => $feedback,
             'answer' => $this->normalizeQuestionAnswer($question, $rows, $visibility, $showQuestionCorrection),
         ];
     }
@@ -762,6 +787,15 @@ private function getQuestionFeedback(CQuizQuestion $question, array $visibility,
         return '' !== (string) $question->getFeedback() ? (string) $question->getFeedback() : null;
     }
 
+    private function shouldHideManualCorrectionFeedback(bool $requiresManualCorrection, bool $pendingCorrection, float $questionScore): bool
+    {
+        if (!$requiresManualCorrection || $pendingCorrection) {
+            return false;
+        }
+
+        return 0.0 < $questionScore;
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      * @param array<string, mixed>      $visibility
@@ -1848,7 +1882,7 @@ private function getQuestionTypeLabel(int $type): string
     /**
      * @return array<string, mixed>
      */
-    private function getFinalActions(CQuiz $quiz, TrackEExercise $attempt, Course $course, ?Session $session): array
+    private function getFinalActions(CQuiz $quiz, TrackEExercise $attempt, Course $course, ?Session $session, bool $isReviewMode): array
     {
         $currentUser = $this->security->getUser();
         $currentUserId = $currentUser instanceof User ? (int) $currentUser->getId() : 0;
@@ -1857,7 +1891,7 @@ private function getFinalActions(CQuiz $quiz, TrackEExercise $attempt, Course $c
             || 0 < (int) $attempt->getOrigLpItemId()
             || 0 < (int) $attempt->getOrigLpItemViewId();
         $isOwnAttempt = $currentUserId > 0 && $currentUserId === $attemptUserId;
-        $showFinalActions = !$isLearningPathAttempt && $isOwnAttempt;
+        $showFinalActions = !$isReviewMode && !$isLearningPathAttempt && $isOwnAttempt;
         $attemptCount = $this->getAttemptCountForResultContext($quiz, $attempt, $course, $session);
         $maxAttempt = (int) $quiz->getMaxAttempt();
         $attemptLimitReached = 0 < $maxAttempt && $attemptCount >= $maxAttempt;
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index 6f28f9887ad..2ba74413661 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -15,6 +15,7 @@
 use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Entity\ResourceType;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\Tool;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
@@ -372,10 +373,7 @@ private function validateUploadedFileForQuestion(UploadedFile $uploadedFile, CQu
 
     private function createAttemptFileResourceNode(UploadedFile $uploadedFile, User $user): ResourceNode
     {
-        $resourceType = $this->entityManager->getRepository(ResourceType::class)->findOneBy(['title' => self::ATTEMPT_FILE_RESOURCE_TYPE]);
-        if (!$resourceType instanceof ResourceType) {
-            throw new BadRequestHttpException('Missing ResourceType "attempt_file".');
-        }
+        $resourceType = $this->getOrCreateAttemptFileResourceType();
 
         $originalName = $this->sanitizeFileName($uploadedFile->getClientOriginalName());
         $node = new ResourceNode();
@@ -392,6 +390,31 @@ private function createAttemptFileResourceNode(UploadedFile $uploadedFile, User
         return $node;
     }
 
+    private function getOrCreateAttemptFileResourceType(): ResourceType
+    {
+        $resourceType = $this->entityManager->getRepository(ResourceType::class)->findOneBy([
+            'title' => self::ATTEMPT_FILE_RESOURCE_TYPE,
+        ]);
+        if ($resourceType instanceof ResourceType) {
+            return $resourceType;
+        }
+
+        $tool = $this->entityManager->getRepository(Tool::class)->findOneBy([
+            'title' => 'quiz',
+        ]);
+        if (!$tool instanceof Tool) {
+            throw new BadRequestHttpException('Missing Tool "quiz" for attempt file uploads.');
+        }
+
+        $resourceType = new ResourceType();
+        $resourceType->setTitle(self::ATTEMPT_FILE_RESOURCE_TYPE);
+        $resourceType->setTool($tool);
+
+        $this->entityManager->persist($resourceType);
+
+        return $resourceType;
+    }
+
     private function sanitizeFileName(string $fileName): string
     {
         $safeName = preg_replace('/[^A-Za-z0-9._-]+/', '_', $fileName);

From c9ff06892e2ad611b618fef4e971b3c03223097d Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 07:21:35 -0500
Subject: [PATCH 06/21] Restore exercise review answers flow

---
 .../vue/views/exercise/ExercisePlayerView.vue | 436 +++++++++++++++++-
 .../Exercise/ExerciseRuntimeAnswer.php        |  12 +
 .../Exercise/ExerciseRuntimeUploadAnswer.php  |   7 +
 .../ExerciseRuntimeAnswerProcessor.php        |  77 +++-
 .../Exercise/ExerciseRuntimeProvider.php      |   1 +
 .../ExerciseRuntimeUploadAnswerProcessor.php  |  53 +++
 6 files changed, 570 insertions(+), 16 deletions(-)

diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index d984f077607..f1ed4696865 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -207,7 +207,87 @@
         </div>
       </div>
 
-      <form v-if="canManage || activeAttempt" class="space-y-4" @submit.prevent="submitDisabled">
+      <div
+        v-if="showReviewReminderScreen"
+        class="space-y-4 rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
+      >
+        <div class="space-y-2">
+          <h2 class="text-xl font-semibold text-gray-90">
+            {{ t("Questions to be reviewed") }}
+          </h2>
+          <p class="text-sm text-gray-700">
+            {{ t("Review selected questions") }}
+          </p>
+          <div
+            v-if="reviewFlagError"
+            class="text-sm text-danger"
+          >
+            {{ reviewFlagError }}
+          </div>
+        </div>
+
+        <div class="space-y-2">
+          <label
+            v-for="question in reviewQuestionList"
+            :key="`review-question-${question.id}`"
+            class="flex items-start gap-3 rounded-lg border border-gray-20 p-3 text-sm text-gray-700"
+            :class="question.isAnswered ? 'bg-white' : 'border-danger/30 bg-danger/10 text-danger'"
+          >
+            <input
+              :checked="question.isMarked"
+              class="mt-1"
+              :disabled="isReviewFlagSaving"
+              :name="`remind_list_${question.id}`"
+              type="checkbox"
+              @change="toggleReviewQuestion(question.id, $event.target.checked)"
+            />
+            <span class="min-w-0 flex-1">
+              <span class="block font-semibold text-gray-90">
+                {{ question.position }}. {{ displayText(question.title, t("Untitled")) }}
+              </span>
+              <span
+                v-if="!question.isAnswered"
+                class="mt-1 inline-block rounded bg-danger/10 px-2 py-0.5 text-xs text-danger"
+              >
+                {{ t("Questions without answer") }}
+              </span>
+            </span>
+          </label>
+        </div>
+
+        <div class="flex flex-wrap gap-2">
+          <BaseButton
+            :disabled="isReviewFlagSaving || selectedReviewQuestionIds.length === 0"
+            :label="t('Review selected questions')"
+            icon="eye"
+            type="primary"
+            @click="reviewSelectedQuestions"
+          />
+          <BaseButton
+            :disabled="isReviewFlagSaving"
+            :label="t('Select all')"
+            icon="checkbox-marked-outline"
+            type="plain"
+            @click="setAllReviewQuestions(true)"
+          />
+          <BaseButton
+            :disabled="isReviewFlagSaving"
+            :label="t('Unselect all')"
+            icon="checkbox-blank-outline"
+            type="plain"
+            @click="setAllReviewQuestions(false)"
+          />
+          <BaseButton
+            :disabled="isReviewFlagSaving || isFinishingAttempt || isAutoFinishingExpiredAttempt"
+            :label="isFinishingAttempt ? t('Finishing') : t('End test')"
+            icon="check"
+            type="primary"
+            @click="finishAttempt({ skipDraftSave: true, skipReviewAnswers: true })"
+          />
+        </div>
+      </div>
+
+      <form v-if="!showReviewReminderScreen && (canManage || activeAttempt)" class="space-y-4" @submit.prevent="submitDisabled">
         <div
           v-if="currentRuntimePage?.pageBreak || currentRuntimePage?.media"
           class="space-y-4 rounded-xl border border-gray-20 bg-white p-5 shadow-sm"
@@ -1017,6 +1097,22 @@
             </div>
           </div>
 
+          <div
+            v-if="showReviewLaterOption(question)"
+            class="mt-4 rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
+          >
+            <label class="flex items-center gap-2">
+              <input
+                v-model="answers[question.id].reviewLater"
+                :disabled="isReviewFlagSaving"
+                :name="`remind_list_${question.id}`"
+                type="checkbox"
+                @change="onReviewLaterChange(question)"
+              />
+              <span>{{ t("Revise question later") }}</span>
+            </label>
+          </div>
+
           <div
             v-if="directFeedbackForQuestion(question)"
             class="mt-4 space-y-3 rounded-lg border p-4 text-sm"
@@ -1114,9 +1210,17 @@
               @click="goToNextQuestion"
             />
             <BaseButton
-              v-if="!canManage && activeAttempt && canFinishCurrentPage"
+              v-if="isReviewingMarkedQuestions && canFinishCurrentPage"
+              :disabled="isSavingAnswer || isQuestionTimeExpired || isAutoAdvancingTimedQuestion"
+              :label="t('Questions to be reviewed')"
+              icon="back"
+              type="primary"
+              @click="returnToReviewReminder"
+            />
+            <BaseButton
+              v-if="!isReviewingMarkedQuestions && !canManage && activeAttempt && canFinishCurrentPage"
               :disabled="!canSubmit || !canFinishWithConfirmation || isSavingAnswer || isFinishingAttempt || isAutoFinishingExpiredAttempt || isQuestionTimeExpired || isAutoAdvancingTimedQuestion"
-              :label="isFinishingAttempt ? t('Finishing') : t('Finish test')"
+              :label="finishButtonLabel"
               icon="check"
               type="primary"
               @click="finishAttempt"
@@ -1223,6 +1327,12 @@ const isFinishingAttempt = ref(false)
 const finishError = ref("")
 const finishMessage = ref("")
 const savedQuestionIds = ref(new Set())
+const reviewQuestionIds = ref(new Set())
+const isReviewReminderVisible = ref(false)
+const reviewQueue = ref([])
+const reviewQueueIndex = ref(0)
+const isReviewFlagSaving = ref(false)
+const reviewFlagError = ref("")
 const draggedMatchingOptionId = ref(null)
 const selectedMatchingOptions = ref({})
 const draggedDraggableItemId = ref(null)
@@ -1270,6 +1380,10 @@ const showLegacyRuntimeFallback = computed(() => {
 })
 
 const currentRuntimePage = computed(() => {
+  if (isReviewingMarkedQuestions.value) {
+    return null
+  }
+
   if (runtimePages.value.length === 0) {
     return null
   }
@@ -1278,6 +1392,13 @@ const currentRuntimePage = computed(() => {
 })
 
 const visibleQuestions = computed(() => {
+  if (isReviewingMarkedQuestions.value) {
+    const questionId = Number(reviewQueue.value[reviewQueueIndex.value] || 0)
+    const question = questionMap.value.get(questionId)
+
+    return question ? [question] : []
+  }
+
   if (currentRuntimePage.value && usesPagedNavigation.value) {
     return (currentRuntimePage.value.questionIds || [])
       .map((questionId) => questionMap.value.get(Number(questionId)))
@@ -1294,11 +1415,26 @@ const visibleQuestions = computed(() => {
 })
 
 const visibleQuestionTotal = computed(() => answerableQuestions.value.length)
-const navigationTotal = computed(() => usesPagedNavigation.value ? Math.max(1, runtimePages.value.length || visibleQuestionTotal.value) : visibleQuestionTotal.value)
+const isReviewAnswersEnabled = computed(() => Number(settings.value.reviewAnswers || 0) > 0)
+const isReviewingMarkedQuestions = computed(() => reviewQueue.value.length > 0)
+const showReviewReminderScreen = computed(() => {
+  return !canManage.value
+    && Boolean(activeAttempt.value?.attemptId)
+    && isReviewAnswersEnabled.value
+    && isReviewReminderVisible.value
+    && !isReviewingMarkedQuestions.value
+})
+const navigationTotal = computed(() => {
+  if (isReviewingMarkedQuestions.value) {
+    return Math.max(1, reviewQueue.value.length)
+  }
+
+  return usesPagedNavigation.value ? Math.max(1, runtimePages.value.length || visibleQuestionTotal.value) : visibleQuestionTotal.value
+})
 const previousNavigationAllowed = computed(() => !settings.value.preventBackwards && true !== settings.value.blockCategoryQuestions && settings.value.showPreviousButton !== false)
-const showPreviousNavigationButton = computed(() => usesPagedNavigation.value && previousNavigationAllowed.value)
-const canMovePrevious = computed(() => showPreviousNavigationButton.value && currentQuestionIndex.value > 0)
-const canMoveNext = computed(() => usesPagedNavigation.value && currentQuestionIndex.value < navigationTotal.value - 1)
+const showPreviousNavigationButton = computed(() => isReviewingMarkedQuestions.value || (usesPagedNavigation.value && previousNavigationAllowed.value))
+const canMovePrevious = computed(() => isReviewingMarkedQuestions.value ? reviewQueueIndex.value > 0 : showPreviousNavigationButton.value && currentQuestionIndex.value > 0)
+const canMoveNext = computed(() => isReviewingMarkedQuestions.value ? reviewQueueIndex.value < reviewQueue.value.length - 1 : usesPagedNavigation.value && currentQuestionIndex.value < navigationTotal.value - 1)
 const canFinishCurrentPage = computed(() => !usesPagedNavigation.value || !canMoveNext.value)
 const currentTimedQuestion = computed(() => {
   if (!activeAttempt.value || canManage.value || true !== settings.value.allowTimePerQuestion) {
@@ -1322,7 +1458,11 @@ const displayedRemainingSeconds = computed(() => hasQuestionTimeControl.value ?
 const isDisplayedTimeExpired = computed(() => isTimeExpired.value || isQuestionTimeExpired.value)
 const timeControlLabel = computed(() => hasQuestionTimeControl.value ? t("Question time left") : t("Time left"))
 const answerableQuestions = computed(() => questions.value.filter((question) => !isStructuralQuestion(question)))
-const currentNavigationIndex = computed(() => Math.min(Math.max(0, currentQuestionIndex.value), Math.max(0, navigationTotal.value - 1)))
+const currentNavigationIndex = computed(() => {
+  const index = isReviewingMarkedQuestions.value ? reviewQueueIndex.value : currentQuestionIndex.value
+
+  return Math.min(Math.max(0, index), Math.max(0, navigationTotal.value - 1))
+})
 const progressLabel = computed(() => {
   if (usesPagedNavigation.value && currentRuntimePage.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1)) {
     return `${t("Page")} ${currentNavigationIndex.value + 1} / ${navigationTotal.value}`
@@ -1352,8 +1492,22 @@ const currentCategoryLabel = computed(() => {
   const question = visibleQuestions.value.find((item) => !isStructuralQuestion(item))
   return displayText(question?.primaryCategoryTitle || "")
 })
-const previousNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Previous page") : t("Previous question"))
-const nextNavigationLabel = computed(() => usesPagedNavigation.value && (settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Next page") : t("Next question"))
+const previousNavigationLabel = computed(() => isReviewingMarkedQuestions.value || !(settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Previous question") : t("Previous page"))
+const nextNavigationLabel = computed(() => isReviewingMarkedQuestions.value || !(settings.value.usesStructuralPages || visibleQuestions.value.length > 1) ? t("Next question") : t("Next page"))
+const finishButtonLabel = computed(() => {
+  if (isFinishingAttempt.value) {
+    return t("Finishing")
+  }
+
+  return isReviewAnswersEnabled.value ? t("Review my answers") : t("Finish test")
+})
+const selectedReviewQuestionIds = computed(() => Array.from(reviewQuestionIds.value).map(Number).filter((questionId) => questionId > 0))
+const reviewQuestionList = computed(() => answerableQuestions.value.map((question, index) => ({
+  ...question,
+  position: Number(question.position || index + 1),
+  isAnswered: savedQuestionIds.value.has(Number(question.id || 0)),
+  isMarked: reviewQuestionIds.value.has(Number(question.id || 0)),
+})))
 const feedbackDialogTitle = computed(() => t(feedbackDialog.value?.title || "Feedback"))
 const requiresSavedAnswerConfirmation = computed(() => {
   return !canManage.value && Boolean(activeAttempt.value?.attemptId) && true === settings.value.confirmSavedAnswers
@@ -1377,6 +1531,220 @@ watch(navigationTotal, (total) => {
   }
 })
 
+function isQuestionMarkedForReview(questionId) {
+  return reviewQuestionIds.value.has(Number(questionId || 0))
+}
+
+function showReviewLaterOption(question) {
+  return !canManage.value
+    && Boolean(activeAttempt.value?.attemptId)
+    && isReviewAnswersEnabled.value
+    && !isStructuralQuestion(question)
+}
+
+function syncReviewQuestionIds(questionIds = []) {
+  if (!Array.isArray(questionIds)) {
+    reviewQuestionIds.value = new Set()
+    return
+  }
+
+  reviewQuestionIds.value = new Set(questionIds.map(Number).filter((questionId) => questionId > 0))
+  syncReviewLaterAnswerState()
+}
+
+function syncReviewQuestionIdsFromAttempt(attempt) {
+  syncReviewQuestionIds(attempt?.reviewQuestionIds || [])
+}
+
+function syncReviewQuestionIdsFromResponse(response) {
+  if (Array.isArray(response?.reviewQuestionIds)) {
+    syncReviewQuestionIds(response.reviewQuestionIds)
+  }
+}
+
+function syncReviewLaterAnswerState() {
+  for (const [questionId, questionAnswer] of Object.entries(answers.value || {})) {
+    if (questionAnswer && typeof questionAnswer === "object") {
+      questionAnswer.reviewLater = reviewQuestionIds.value.has(Number(questionId))
+    }
+  }
+}
+
+function setQuestionReviewState(questionId, checked) {
+  const safeQuestionId = Number(questionId || 0)
+  if (safeQuestionId <= 0) {
+    return
+  }
+
+  const nextReviewQuestionIds = new Set(reviewQuestionIds.value)
+  if (checked) {
+    nextReviewQuestionIds.add(safeQuestionId)
+  } else {
+    nextReviewQuestionIds.delete(safeQuestionId)
+  }
+
+  reviewQuestionIds.value = nextReviewQuestionIds
+  if (answers.value[safeQuestionId]) {
+    answers.value[safeQuestionId].reviewLater = checked
+  }
+}
+
+async function toggleReviewQuestion(questionId, checked) {
+  setQuestionReviewState(questionId, checked)
+  await saveQuestionReviewLater(questionId, checked)
+}
+
+async function onReviewLaterChange(question) {
+  const questionId = Number(question?.id || 0)
+  const checked = true === answers.value[questionId]?.reviewLater
+  setQuestionReviewState(questionId, checked)
+  await saveQuestionReviewLater(questionId, checked)
+}
+
+async function saveQuestionReviewLater(questionId, checked) {
+  const exerciseId = getExerciseId()
+  const attemptId = Number(activeAttempt.value?.attemptId || 0)
+  const safeQuestionId = Number(questionId || 0)
+
+  if (!exerciseId || !attemptId || safeQuestionId <= 0 || !isReviewAnswersEnabled.value) {
+    return
+  }
+
+  isReviewFlagSaving.value = true
+  reviewFlagError.value = ""
+
+  try {
+    const response = await exerciseService.saveExerciseRuntimeAnswer(
+      {
+        exerciseId,
+        attemptId,
+        questionId: safeQuestionId,
+        reviewLater: checked,
+        reviewLaterOnly: true,
+      },
+      getContextParams(),
+      exerciseId,
+      attemptId,
+    )
+
+    if (!response?.success) {
+      throw new Error(response?.message || "Could not save draft answer")
+    }
+
+    syncReviewQuestionIdsFromResponse(response)
+  } catch (error) {
+    console.error("Error saving exercise review flag", error)
+    setQuestionReviewState(safeQuestionId, !checked)
+    reviewFlagError.value = t("Could not save draft answer")
+  } finally {
+    isReviewFlagSaving.value = false
+  }
+}
+
+async function setAllReviewQuestions(checked) {
+  if (!activeAttempt.value?.attemptId || isReviewFlagSaving.value) {
+    return
+  }
+
+  isReviewFlagSaving.value = true
+  reviewFlagError.value = ""
+
+  const previousQuestionIds = new Set(reviewQuestionIds.value)
+
+  try {
+    for (const question of answerableQuestions.value) {
+      const questionId = Number(question.id || 0)
+      if (questionId <= 0) {
+        continue
+      }
+
+      setQuestionReviewState(questionId, checked)
+      const exerciseId = getExerciseId()
+      const attemptId = Number(activeAttempt.value?.attemptId || 0)
+      const response = await exerciseService.saveExerciseRuntimeAnswer(
+        {
+          exerciseId,
+          attemptId,
+          questionId,
+          reviewLater: checked,
+          reviewLaterOnly: true,
+        },
+        getContextParams(),
+        exerciseId,
+        attemptId,
+      )
+
+      if (!response?.success) {
+        throw new Error(response?.message || "Could not save draft answer")
+      }
+
+      syncReviewQuestionIdsFromResponse(response)
+    }
+  } catch (error) {
+    console.error("Error saving exercise review list", error)
+    reviewQuestionIds.value = previousQuestionIds
+    syncReviewLaterAnswerState()
+    reviewFlagError.value = t("Could not save draft answer")
+  } finally {
+    isReviewFlagSaving.value = false
+  }
+}
+
+function showReviewReminder() {
+  if (!isReviewAnswersEnabled.value || canManage.value || !activeAttempt.value?.attemptId) {
+    return false
+  }
+
+  isReviewReminderVisible.value = true
+  reviewQueue.value = []
+  reviewQueueIndex.value = 0
+
+  return true
+}
+
+function reviewSelectedQuestions() {
+  const orderedSelectedIds = answerableQuestions.value
+    .map((question) => Number(question.id || 0))
+    .filter((questionId) => reviewQuestionIds.value.has(questionId))
+
+  if (orderedSelectedIds.length === 0) {
+    return
+  }
+
+  reviewQueue.value = orderedSelectedIds
+  reviewQueueIndex.value = 0
+  isReviewReminderVisible.value = false
+  setCurrentQuestionById(orderedSelectedIds[0])
+  syncQuestionCountdown()
+}
+
+function returnToReviewReminder() {
+  reviewQueue.value = []
+  reviewQueueIndex.value = 0
+  isReviewReminderVisible.value = true
+  syncQuestionCountdown()
+}
+
+function setCurrentQuestionById(questionId) {
+  const navigationIndex = findNavigationIndexForQuestion(questionId)
+  if (navigationIndex >= 0) {
+    currentQuestionIndex.value = navigationIndex
+  }
+}
+
+function findNavigationIndexForQuestion(questionId) {
+  const safeQuestionId = Number(questionId || 0)
+  if (safeQuestionId <= 0) {
+    return -1
+  }
+
+  if (runtimePages.value.length > 0) {
+    return runtimePages.value.findIndex((page) => (page.questionIds || []).map(Number).includes(safeQuestionId))
+  }
+
+  return answerableQuestions.value.findIndex((question) => Number(question.id || 0) === safeQuestionId)
+}
+
 function normalizeRuntimePages(pages = []) {
   const normalizedPages = []
 
@@ -1728,6 +2096,10 @@ async function loadRuntime() {
     applyAttemptState(activeAttempt.value)
     initializeAnswerState()
     applySavedAnswers(activeAttempt.value?.savedAnswers || {})
+    syncReviewQuestionIdsFromAttempt(activeAttempt.value)
+    isReviewReminderVisible.value = false
+    reviewQueue.value = []
+    reviewQueueIndex.value = 0
     directFeedbackByQuestion.value = {}
     feedbackDialog.value = null
     isFeedbackDialogVisible.value = false
@@ -1766,6 +2138,10 @@ async function startAttempt() {
       reorderQuestionsFromAttempt(response.questionIds || [])
       initializeAnswerState()
       applySavedAnswers(response.savedAnswers || {})
+      syncReviewQuestionIdsFromAttempt(response)
+      isReviewReminderVisible.value = false
+      reviewQueue.value = []
+      reviewQueueIndex.value = 0
       syncCountdownFromAttempt(response)
       syncRuntimeSettingsEffects()
       syncQuestionCountdown()
@@ -1790,6 +2166,10 @@ async function startAttempt() {
 function applyAttemptState(attempt) {
   if (!attempt) {
     currentQuestionIndex.value = 0
+    syncReviewQuestionIds([])
+    isReviewReminderVisible.value = false
+    reviewQueue.value = []
+    reviewQueueIndex.value = 0
     syncCountdownFromAttempt(null)
     syncQuestionCountdown()
     return
@@ -1851,10 +2231,19 @@ async function goToPreviousQuestion() {
   }
 
   if (await saveVisibleAnswers({ afterFeedback: "previous" })) {
-    if (!feedbackShownOnLastSave.value) {
-      currentQuestionIndex.value -= 1
+    if (feedbackShownOnLastSave.value) {
+      return
+    }
+
+    if (isReviewingMarkedQuestions.value) {
+      reviewQueueIndex.value = Math.max(0, reviewQueueIndex.value - 1)
+      setCurrentQuestionById(reviewQueue.value[reviewQueueIndex.value])
       syncQuestionCountdown()
+      return
     }
+
+    currentQuestionIndex.value -= 1
+    syncQuestionCountdown()
   }
 }
 
@@ -1864,10 +2253,19 @@ async function goToNextQuestion() {
   }
 
   if (await saveVisibleAnswers({ afterFeedback: "next" })) {
-    if (!feedbackShownOnLastSave.value) {
-      currentQuestionIndex.value += 1
+    if (feedbackShownOnLastSave.value) {
+      return
+    }
+
+    if (isReviewingMarkedQuestions.value) {
+      reviewQueueIndex.value = Math.min(reviewQueue.value.length - 1, reviewQueueIndex.value + 1)
+      setCurrentQuestionById(reviewQueue.value[reviewQueueIndex.value])
       syncQuestionCountdown()
+      return
     }
+
+    currentQuestionIndex.value += 1
+    syncQuestionCountdown()
   }
 }
 
@@ -1921,6 +2319,10 @@ async function finishAttempt(options = {}) {
     return
   }
 
+  if (true !== options.skipReviewAnswers && !options.expiredByTimer && showReviewReminder()) {
+    return
+  }
+
   isFinishingAttempt.value = true
   finishError.value = ""
   finishMessage.value = ""
@@ -1983,6 +2385,7 @@ async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
         attemptId,
         questionId: Number(question.id),
         answer: buildAnswerPayload(question),
+        reviewLater: isQuestionMarkedForReview(question.id),
         secondsSpent: getQuestionSecondsSpent(question),
         navigationAction: afterFeedback,
       },
@@ -1999,6 +2402,8 @@ async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
     throw new Error(response?.message || "Could not save draft answer")
   }
 
+  syncReviewQuestionIdsFromResponse(response)
+
   if (Array.isArray(response.answeredQuestionIds)) {
     savedQuestionIds.value = new Set(response.answeredQuestionIds.map(Number))
   } else if (Array.isArray(response.savedAnswer) && response.savedAnswer.length > 0) {
@@ -2028,6 +2433,7 @@ async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
   const formData = new FormData()
   formData.append("questionId", String(Number(question.id)))
   formData.append("secondsSpent", String(getQuestionSecondsSpent(question)))
+  formData.append("reviewLater", isQuestionMarkedForReview(question.id) ? "1" : "0")
   formData.append("file", questionAnswer.uploadFile || questionAnswer.oralFile)
 
   const response = await exerciseService.uploadExerciseRuntimeAnswer(
@@ -2038,6 +2444,7 @@ async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
   )
 
   if (response?.success) {
+    syncReviewQuestionIdsFromResponse(response)
     questionAnswer.uploadFile = null
     questionAnswer.uploadFileName = ""
     questionAnswer.oralFile = null
@@ -2586,6 +2993,7 @@ function initializeAnswerState() {
       hotspotPoints: [],
       hotspotImageSize: null,
       selectedHotspotAnswerId: hotspotZones(question)[0]?.id || null,
+      reviewLater: reviewQuestionIds.value.has(Number(question.id || 0)),
     }
 
     if (isMatchingDraggableQuestion(question)) {
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
index 1e36cdfcffb..1b017df1878 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeAnswer.php
@@ -57,6 +57,12 @@ final class ExerciseRuntimeAnswer
     #[Groups(['exercise_runtime_answer:write'])]
     public mixed $answer = null;
 
+    #[Groups(['exercise_runtime_answer:read', 'exercise_runtime_answer:write'])]
+    public ?bool $reviewLater = null;
+
+    #[Groups(['exercise_runtime_answer:write'])]
+    public bool $reviewLaterOnly = false;
+
     #[Groups(['exercise_runtime_answer:read', 'exercise_runtime_answer:write'])]
     public int $secondsSpent = 0;
 
@@ -81,6 +87,12 @@ final class ExerciseRuntimeAnswer
     #[Groups(['exercise_runtime_answer:read'])]
     public array $answeredQuestionIds = [];
 
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_runtime_answer:read'])]
+    public array $reviewQuestionIds = [];
+
     #[Groups(['exercise_runtime_answer:read'])]
     public int $answeredCount = 0;
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
index 042e2a856c0..c37ac0aba10 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeUploadAnswer.php
@@ -42,6 +42,7 @@
                                 'properties' => [
                                     'questionId' => ['type' => 'integer'],
                                     'secondsSpent' => ['type' => 'integer'],
+                                    'reviewLater' => ['type' => 'boolean'],
                                     'file' => [
                                         'type' => 'string',
                                         'format' => 'binary',
@@ -98,6 +99,12 @@ final class ExerciseRuntimeUploadAnswer
     #[Groups(['exercise_runtime_upload_answer:read'])]
     public array $answeredQuestionIds = [];
 
+    /**
+     * @var array<int, int>
+     */
+    #[Groups(['exercise_runtime_upload_answer:read'])]
+    public array $reviewQuestionIds = [];
+
     #[Groups(['exercise_runtime_upload_answer:read'])]
     public int $answeredCount = 0;
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index f9848909b22..fd5e9309f48 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -116,6 +116,19 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new AccessDeniedHttpException('The requested question does not belong to this attempt.');
         }
 
+        if (true === $data->reviewLaterOnly) {
+            if (null !== $data->reviewLater) {
+                $this->syncReviewQuestion($attempt, $questionId, true === $data->reviewLater);
+            }
+
+            $this->entityManager->flush();
+
+            $response = $this->createResponse($exerciseId, $attemptId, $questionId);
+            $response->message = 'Review list updated';
+
+            return $response;
+        }
+
         $rows = $this->buildDraftRows($question, $data->answer, max(0, (int) $data->secondsSpent));
         $feedback = $this->buildFeedback($quiz, $question, $rows);
         $marks = [] !== $feedback ? (float) ($feedback['score'] ?? 0.0) : 0.0;
@@ -136,25 +149,64 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $this->entityManager->persist($attemptRow);
         }
 
+        if (null !== $data->reviewLater) {
+            $this->syncReviewQuestion($attempt, $questionId, true === $data->reviewLater);
+        }
+
         $this->blockCategoryIfNeeded($attempt, $quiz, $question, (string) $data->navigationAction);
 
         $this->entityManager->flush();
 
+        $response = $this->createResponse($exerciseId, $attemptId, $questionId);
+        $response->message = [] === $rows ? 'Draft answer cleared' : 'Draft answer saved';
+        $response->feedback = $feedback;
+
+        return $response;
+    }
+
+
+    private function createResponse(int $exerciseId, int $attemptId, int $questionId): ExerciseRuntimeAnswer
+    {
         $response = new ExerciseRuntimeAnswer();
         $response->exerciseId = $exerciseId;
         $response->attemptId = $attemptId;
         $response->questionId = $questionId;
         $response->success = true;
-        $response->message = [] === $rows ? 'Draft answer cleared' : 'Draft answer saved';
         $response->savedAnswer = $this->getSavedAnswerRows($attemptId, $questionId);
         $response->answeredQuestionIds = $this->getAnsweredQuestionIds($attemptId);
+        $response->reviewQuestionIds = $this->getReviewQuestionIds($attemptId);
         $response->answeredCount = \count($response->answeredQuestionIds);
         $response->canFinish = false;
-        $response->feedback = $feedback;
 
         return $response;
     }
 
+    private function syncReviewQuestion(TrackEExercise $attempt, int $questionId, bool $reviewLater): void
+    {
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if (!\in_array($questionId, $questionIds, true)) {
+            return;
+        }
+
+        $reviewQuestionIds = $this->parseQuestionIds((string) $attempt->getQuestionsToCheck());
+        $reviewQuestionMap = array_fill_keys($reviewQuestionIds, true);
+
+        if ($reviewLater) {
+            $reviewQuestionMap[$questionId] = true;
+        } else {
+            unset($reviewQuestionMap[$questionId]);
+        }
+
+        $orderedReviewQuestionIds = [];
+        foreach ($questionIds as $orderedQuestionId) {
+            if (isset($reviewQuestionMap[$orderedQuestionId])) {
+                $orderedReviewQuestionIds[] = $orderedQuestionId;
+            }
+        }
+
+        $attempt->setQuestionsToCheck(implode(',', $orderedReviewQuestionIds));
+    }
+
     private function blockCategoryIfNeeded(TrackEExercise $attempt, CQuiz $quiz, CQuizQuestion $question, string $navigationAction): void
     {
         if (!\in_array($navigationAction, ['next', 'finish'], true) || !$this->isBlockCategoryRuntimeEnabled($quiz)) {
@@ -1660,6 +1712,27 @@ private function getSavedAnswerRows(int $attemptId, int $questionId): array
         return $result;
     }
 
+    /**
+     * @return array<int, int>
+     */
+    private function getReviewQuestionIds(int $attemptId): array
+    {
+        $attempt = $this->entityManager->createQueryBuilder()
+            ->select('attempt.questionsToCheck')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!\is_array($attempt)) {
+            return [];
+        }
+
+        return $this->parseQuestionIds((string) ($attempt['questionsToCheck'] ?? ''));
+    }
+
     /**
      * @return array<int, int>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index 3ec0cc79e55..ff7edd9f204 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -259,6 +259,7 @@ private function normalizeAttempt(TrackEExercise $attempt, array $questions): ar
             'expiredAt' => $expiredAt,
             'remainingSeconds' => $remainingSeconds,
             'savedAnswers' => $this->getSavedAnswers((int) $attempt->getExeId(), $attempt->getCourse(), $attempt->getSession()),
+            'reviewQuestionIds' => $this->parseQuestionIds((string) $attempt->getQuestionsToCheck()),
         ];
     }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index 2ba74413661..2fefaec5709 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -84,6 +84,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : $request->request->getInt('attemptId');
         $questionId = $request->request->getInt('questionId');
         $secondsSpent = max(0, $request->request->getInt('secondsSpent'));
+        $reviewLater = $request->request->has('reviewLater') ? $request->request->getBoolean('reviewLater') : null;
 
         if (0 >= $exerciseId || 0 >= $attemptId || 0 >= $questionId) {
             throw new BadRequestHttpException('A valid exercise, attempt and question are required.');
@@ -141,6 +142,10 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $this->entityManager->persist($attemptFile);
         }
 
+        if (null !== $reviewLater) {
+            $this->syncReviewQuestion($attempt, $questionId, true === $reviewLater);
+        }
+
         $this->entityManager->flush();
 
         $response = new ExerciseRuntimeUploadAnswer();
@@ -152,12 +157,39 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $response->files = $this->normalizeAttemptFiles($attemptRow);
         $response->savedAnswer = $this->getSavedAnswerRows($attemptId, $questionId);
         $response->answeredQuestionIds = $this->getAnsweredQuestionIds($attemptId);
+        $response->reviewQuestionIds = $this->getReviewQuestionIds($attemptId);
         $response->answeredCount = \count($response->answeredQuestionIds);
         $response->canFinish = false;
 
         return $response;
     }
 
+    private function syncReviewQuestion(TrackEExercise $attempt, int $questionId, bool $reviewLater): void
+    {
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        if (!\in_array($questionId, $questionIds, true)) {
+            return;
+        }
+
+        $reviewQuestionIds = $this->parseQuestionIds((string) $attempt->getQuestionsToCheck());
+        $reviewQuestionMap = array_fill_keys($reviewQuestionIds, true);
+
+        if ($reviewLater) {
+            $reviewQuestionMap[$questionId] = true;
+        } else {
+            unset($reviewQuestionMap[$questionId]);
+        }
+
+        $orderedReviewQuestionIds = [];
+        foreach ($questionIds as $orderedQuestionId) {
+            if (isset($reviewQuestionMap[$orderedQuestionId])) {
+                $orderedReviewQuestionIds[] = $orderedQuestionId;
+            }
+        }
+
+        $attempt->setQuestionsToCheck(implode(',', $orderedReviewQuestionIds));
+    }
+
     private function canUploadAnswer(): bool
     {
         return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
@@ -544,6 +576,27 @@ private function getSavedAnswerRows(int $attemptId, int $questionId): array
         return $result;
     }
 
+    /**
+     * @return array<int, int>
+     */
+    private function getReviewQuestionIds(int $attemptId): array
+    {
+        $attempt = $this->entityManager->createQueryBuilder()
+            ->select('attempt.questionsToCheck')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('attempt.exeId = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        if (!\is_array($attempt)) {
+            return [];
+        }
+
+        return $this->parseQuestionIds((string) ($attempt['questionsToCheck'] ?? ''));
+    }
+
     /**
      * @return array<int, int>
      */

From a7c6e5d19cdfe519b27340c261d3c00e52d0fa72 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 07:52:19 -0500
Subject: [PATCH 07/21] Fix LP exercise scoring and visibility

---
 .../views/exercise/ExerciseOverviewView.vue   |   8 +-
 .../vue/views/exercise/ExercisePlayerView.vue |   8 +-
 public/main/lp/learnpath.class.php            |   2 +-
 .../Exercise/ExerciseOverviewProvider.php     | 143 ++++++++++++-
 .../ExerciseRuntimeAnswerProcessor.php        | 138 ++++++++++++-
 .../ExerciseRuntimeAttemptProcessor.php       | 138 ++++++++++++-
 .../ExerciseRuntimeCorrectionProcessor.php    | 191 +++++++++++++++++-
 .../ExerciseRuntimeFinishProcessor.php        | 135 ++++++++++++-
 .../Exercise/ExerciseRuntimeProvider.php      | 138 ++++++++++++-
 .../ExerciseRuntimeResultProvider.php         | 137 ++++++++++++-
 .../ExerciseRuntimeUploadAnswerProcessor.php  | 138 ++++++++++++-
 11 files changed, 1163 insertions(+), 13 deletions(-)

diff --git a/assets/vue/views/exercise/ExerciseOverviewView.vue b/assets/vue/views/exercise/ExerciseOverviewView.vue
index 70669351b16..244d68bda25 100644
--- a/assets/vue/views/exercise/ExerciseOverviewView.vue
+++ b/assets/vue/views/exercise/ExerciseOverviewView.vue
@@ -242,7 +242,13 @@ const overview = reactive({
 })
 
 function getQueryValue(value) {
-  return Array.isArray(value) ? value[0] : value
+  const normalizedValue = Array.isArray(value) ? value[0] : value
+
+  if (typeof normalizedValue === "string" && normalizedValue.includes("¬_multiple_attempt=")) {
+    return normalizedValue.split("¬_multiple_attempt=")[0]
+  }
+
+  return normalizedValue
 }
 
 function addOptionalQueryParam(params, key) {
diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index f1ed4696865..cecbe999085 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -1952,7 +1952,13 @@ function rememberQuestionSecondsSpent(question) {
 }
 
 function getQueryValue(value) {
-  return Array.isArray(value) ? value[0] : value
+  const normalizedValue = Array.isArray(value) ? value[0] : value
+
+  if (typeof normalizedValue === "string" && normalizedValue.includes("¬_multiple_attempt=")) {
+    return normalizedValue.split("¬_multiple_attempt=")[0]
+  }
+
+  return normalizedValue
 }
 
 function addOptionalQueryParam(params, key) {
diff --git a/public/main/lp/learnpath.class.php b/public/main/lp/learnpath.class.php
index deb855c403e..d94bc22a96b 100644
--- a/public/main/lp/learnpath.class.php
+++ b/public/main/lp/learnpath.class.php
@@ -3186,7 +3186,7 @@ public function get_link(string $type = 'http', $item_id = 0, $provided_toc = fa
                                 if (1 === $prevent_reinit && $count_item_view > 0) {
                                     $not_multiple_attempt = 1;
                                 }
-                                $file .= '&not_multiple_attempt='.$not_multiple_attempt;
+                                $file .= '&amp;not_multiple_attempt='.$not_multiple_attempt;
                             }
                             break;
                     }
diff --git a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
index e3bf651bfb9..b893f61d253 100644
--- a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
@@ -15,6 +15,8 @@
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use DateTimeImmutable;
@@ -36,6 +38,7 @@
 final readonly class ExerciseOverviewProvider implements ProviderInterface
 {
     private const VISIBILITY_PUBLISHED = 2;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS = 0;
     private const RESULT_DISABLE_NO_SCORE_AND_EXPECTED_ANSWERS = 1;
     private const RESULT_DISABLE_SHOW_SCORE_ONLY = 2;
@@ -82,7 +85,9 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         [$quiz, $linkVisibility] = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
         $visible = self::VISIBILITY_PUBLISHED === $linkVisibility;
-        if (!$canManage && !$visible) {
+        $visibleThroughLearnpath = $this->isVisibleThroughLearnpath($quiz, $course, $session);
+        $effectiveVisible = $visible || $visibleThroughLearnpath;
+        if (!$canManage && !$effectiveVisible) {
             throw new AccessDeniedHttpException('The requested exercise is not visible.');
         }
 
@@ -95,13 +100,13 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $hideAttemptsTable = $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page');
 
         $availabilityStatus = $this->getAvailabilityStatus($quiz->getStartTime(), $quiz->getEndTime());
-        $canOpen = $canManage || ($visible && 'open' === $availabilityStatus);
+        $canOpen = $canManage || ($effectiveVisible && 'open' === $availabilityStatus);
 
         $overview = new ExerciseOverview();
         $overview->exerciseId = (int) $quiz->getIid();
         $overview->title = $quiz->getTitle();
         $overview->description = (string) $quiz->getDescription();
-        $overview->visible = $visible;
+        $overview->visible = $effectiveVisible;
         $overview->categoryTitle = null !== $quiz->getQuizCategory() ? $quiz->getQuizCategory()->getTitle() : '';
         $overview->questionCount = $this->getQuestionCount($quiz);
         $overview->attemptCount = $currentUserAttemptCount;
@@ -188,6 +193,138 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function isVisibleThroughLearnpath(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        $learnpathId = $this->getQueryPositiveInt($request, ['learnpath_id', 'lp_id']);
+        $learnpathItemId = $this->getQueryPositiveInt($request, ['learnpath_item_id', 'lp_item_id']);
+        $learnpathItemViewId = $this->getQueryPositiveInt($request, ['learnpath_item_view_id']);
+        $origin = strtolower(trim((string) $request->query->get('origin', '')));
+        $hasLearnpathContext = 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || 0 < $learnpathId
+            || 0 < $learnpathItemId
+            || 0 < $learnpathItemViewId;
+
+        if (!$hasLearnpathContext || 0 >= $learnpathId || 0 >= $learnpathItemId) {
+            return false;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('item.iid')
+            ->from(CLpItem::class, 'item')
+            ->innerJoin('item.lp', 'lp')
+            ->innerJoin('lp.resourceNode', 'lpNode')
+            ->innerJoin('lpNode.resourceLinks', 'lpLinks')
+            ->andWhere('item.iid = :learnpathItemId')
+            ->andWhere('IDENTITY(item.lp) = :learnpathId')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('(item.path = :exerciseIdString OR item.ref = :exerciseIdString)')
+            ->andWhere('IDENTITY(lpLinks.course) = :courseId')
+            ->andWhere('lpLinks.visibility = :publishedVisibility')
+            ->andWhere('lpLinks.deletedAt IS NULL')
+            ->andWhere('lpLinks.endVisibilityAt IS NULL')
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('exerciseIdString', (string) $exerciseId)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('publishedVisibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(lpLinks.session) = :sessionId OR lpLinks.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpLinks.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            return false;
+        }
+
+        if (0 >= $learnpathItemViewId) {
+            return true;
+        }
+
+        return $this->hasValidLearnpathItemView($learnpathItemViewId, $learnpathItemId, $learnpathId, $course, $session, $user);
+    }
+
+    private function hasValidLearnpathItemView(
+        int $learnpathItemViewId,
+        int $learnpathItemId,
+        int $learnpathId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): bool {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView.iid')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :learnpathItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :learnpathItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :learnpathId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('learnpathItemViewId', $learnpathItemViewId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param array<int, string> $names
+     */
+    private function getQueryPositiveInt(Request $request, array $names): int
+    {
+        foreach ($names as $name) {
+            $value = $request->query->get($name);
+            if (\is_array($value)) {
+                $value = $value[0] ?? null;
+            }
+
+            if (null === $value || '' === (string) $value || !is_numeric((string) $value)) {
+                continue;
+            }
+
+            return max(0, (int) $value);
+        }
+
+        return 0;
+    }
+
     /**
      * @return array{0: CQuiz, 1: int}
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index fd5e9309f48..09bd9d833d7 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -17,6 +17,8 @@
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
@@ -46,6 +48,7 @@
 final readonly class ExerciseRuntimeAnswerProcessor implements ProcessorInterface
 {
     private const VISIBILITY_PUBLISHED = 2;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const STATUS_INCOMPLETE = 'incomplete';
     private const FEEDBACK_TYPE_DIRECT = 1;
     private const FEEDBACK_TYPE_POPUP = 3;
@@ -351,6 +354,139 @@ private function getSession(Request $request): ?Session
         return $session;
     }
 
+
+    private function isVisibleThroughLearnpath(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        $learnpathId = $this->getQueryPositiveInt($request, ['learnpath_id', 'lp_id']);
+        $learnpathItemId = $this->getQueryPositiveInt($request, ['learnpath_item_id', 'lp_item_id']);
+        $learnpathItemViewId = $this->getQueryPositiveInt($request, ['learnpath_item_view_id']);
+        $origin = strtolower(trim((string) $request->query->get('origin', '')));
+        $hasLearnpathContext = 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || 0 < $learnpathId
+            || 0 < $learnpathItemId
+            || 0 < $learnpathItemViewId;
+
+        if (!$hasLearnpathContext || 0 >= $learnpathId || 0 >= $learnpathItemId) {
+            return false;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('item.iid')
+            ->from(CLpItem::class, 'item')
+            ->innerJoin('item.lp', 'lp')
+            ->innerJoin('lp.resourceNode', 'lpNode')
+            ->innerJoin('lpNode.resourceLinks', 'lpLinks')
+            ->andWhere('item.iid = :learnpathItemId')
+            ->andWhere('IDENTITY(item.lp) = :learnpathId')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('(item.path = :exerciseIdString OR item.ref = :exerciseIdString)')
+            ->andWhere('IDENTITY(lpLinks.course) = :courseId')
+            ->andWhere('lpLinks.visibility = :publishedVisibility')
+            ->andWhere('lpLinks.deletedAt IS NULL')
+            ->andWhere('lpLinks.endVisibilityAt IS NULL')
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('exerciseIdString', (string) $exerciseId)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('publishedVisibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(lpLinks.session) = :sessionId OR lpLinks.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpLinks.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            return false;
+        }
+
+        if (0 >= $learnpathItemViewId) {
+            return true;
+        }
+
+        return $this->hasValidLearnpathItemView($learnpathItemViewId, $learnpathItemId, $learnpathId, $course, $session, $user);
+    }
+
+    private function hasValidLearnpathItemView(
+        int $learnpathItemViewId,
+        int $learnpathItemId,
+        int $learnpathId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): bool {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView.iid')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :learnpathItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :learnpathItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :learnpathId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('learnpathItemViewId', $learnpathItemViewId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param array<int, string> $names
+     */
+    private function getQueryPositiveInt(Request $request, array $names): int
+    {
+        foreach ($names as $name) {
+            $value = $request->query->get($name);
+            if (\is_array($value)) {
+                $value = $value[0] ?? null;
+            }
+
+            if (null === $value || '' === (string) $value || !is_numeric((string) $value)) {
+                continue;
+            }
+
+            return max(0, (int) $value);
+        }
+
+        return 0;
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -390,7 +526,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
         if (!$canManage) {
             $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
             $now = new DateTimeImmutable();
-            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            if (self::VISIBILITY_PUBLISHED !== $visibility && !$this->isVisibleThroughLearnpath($quiz, $course, $session)) {
                 throw new AccessDeniedHttpException('The requested exercise is not visible.');
             }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index acd4c072d93..204eeef02ae 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -15,6 +15,8 @@
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
@@ -45,6 +47,7 @@
 final readonly class ExerciseRuntimeAttemptProcessor implements ProcessorInterface
 {
     private const VISIBILITY_PUBLISHED = 2;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const STATUS_INCOMPLETE = 'incomplete';
     private const QUESTION_SELECTION_RANDOM = 2;
     private const QUESTION_SELECTION_CATEGORIES_ORDERED_QUESTIONS_ORDERED = 3;
@@ -256,6 +259,139 @@ private function isLearnerRuntimeRequest(Request $request): bool
             || str_starts_with($preview, 'true');
     }
 
+
+    private function isVisibleThroughLearnpath(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        $learnpathId = $this->getQueryPositiveInt($request, ['learnpath_id', 'lp_id']);
+        $learnpathItemId = $this->getQueryPositiveInt($request, ['learnpath_item_id', 'lp_item_id']);
+        $learnpathItemViewId = $this->getQueryPositiveInt($request, ['learnpath_item_view_id']);
+        $origin = strtolower(trim((string) $request->query->get('origin', '')));
+        $hasLearnpathContext = 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || 0 < $learnpathId
+            || 0 < $learnpathItemId
+            || 0 < $learnpathItemViewId;
+
+        if (!$hasLearnpathContext || 0 >= $learnpathId || 0 >= $learnpathItemId) {
+            return false;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('item.iid')
+            ->from(CLpItem::class, 'item')
+            ->innerJoin('item.lp', 'lp')
+            ->innerJoin('lp.resourceNode', 'lpNode')
+            ->innerJoin('lpNode.resourceLinks', 'lpLinks')
+            ->andWhere('item.iid = :learnpathItemId')
+            ->andWhere('IDENTITY(item.lp) = :learnpathId')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('(item.path = :exerciseIdString OR item.ref = :exerciseIdString)')
+            ->andWhere('IDENTITY(lpLinks.course) = :courseId')
+            ->andWhere('lpLinks.visibility = :publishedVisibility')
+            ->andWhere('lpLinks.deletedAt IS NULL')
+            ->andWhere('lpLinks.endVisibilityAt IS NULL')
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('exerciseIdString', (string) $exerciseId)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('publishedVisibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(lpLinks.session) = :sessionId OR lpLinks.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpLinks.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            return false;
+        }
+
+        if (0 >= $learnpathItemViewId) {
+            return true;
+        }
+
+        return $this->hasValidLearnpathItemView($learnpathItemViewId, $learnpathItemId, $learnpathId, $course, $session, $user);
+    }
+
+    private function hasValidLearnpathItemView(
+        int $learnpathItemViewId,
+        int $learnpathItemId,
+        int $learnpathId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): bool {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView.iid')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :learnpathItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :learnpathItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :learnpathId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('learnpathItemViewId', $learnpathItemViewId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param array<int, string> $names
+     */
+    private function getQueryPositiveInt(Request $request, array $names): int
+    {
+        foreach ($names as $name) {
+            $value = $request->query->get($name);
+            if (\is_array($value)) {
+                $value = $value[0] ?? null;
+            }
+
+            if (null === $value || '' === (string) $value || !is_numeric((string) $value)) {
+                continue;
+            }
+
+            return max(0, (int) $value);
+        }
+
+        return 0;
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -296,7 +432,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
             $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
             $now = new DateTimeImmutable();
 
-            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            if (self::VISIBILITY_PUBLISHED !== $visibility && !$this->isVisibleThroughLearnpath($quiz, $course, $session)) {
                 throw new AccessDeniedHttpException('The requested exercise is not visible.');
             }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
index b058e223fec..df0172adbda 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
@@ -16,12 +16,16 @@
 use Chamilo\CoreBundle\Entity\TrackEAttemptQualify;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
+use Chamilo\CourseBundle\Entity\CLpView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
-use Chamilo\CoreBundle\Settings\SettingsManager;
 use DateTime;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -44,6 +48,11 @@
     private const UPLOAD_ANSWER = 23;
     private const ANNOTATION = 20;
     private const LINK_TYPE_EXERCISE = 1;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
+    private const LP_ITEM_TYPE_DIR = 'dir';
+    private const LP_STATUS_FAILED = 'failed';
+    private const LP_STATUS_PASSED = 'passed';
+    private const FEEDBACK_TYPE_DIRECT = 1;
 
     public function __construct(
         private RequestStack $requestStack,
@@ -123,6 +132,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $this->recordCorrectionHistory($attempt, $questionId, $marks, (string) $data->teacherComment, (int) ($session?->getId() ?? 0));
         $this->removeQuestionToCheck($attempt, $questionId);
         $this->recalculateAttemptScore($attempt, $quiz);
+        $this->synchronizeLearnpathTrackingAfterCorrection($attempt, $quiz, $course, $session);
         $this->entityManager->flush();
 
         $response = new ExerciseRuntimeCorrection();
@@ -415,6 +425,185 @@ private function recalculateAttemptScore(TrackEExercise $attempt, CQuiz $quiz):
         $attempt->setScore($score);
     }
 
+    private function synchronizeLearnpathTrackingAfterCorrection(
+        TrackEExercise $attempt,
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+    ): void {
+        $lpId = (int) $attempt->getOrigLpId();
+        $lpItemId = (int) $attempt->getOrigLpItemId();
+        $lpItemViewId = (int) $attempt->getOrigLpItemViewId();
+
+        if (0 >= $lpId || 0 >= $lpItemId || 0 >= $lpItemViewId) {
+            return;
+        }
+
+        $lpItem = $this->getValidExerciseLpItem($lpItemId, $lpId, $quiz);
+        if (!$lpItem instanceof CLpItem) {
+            return;
+        }
+
+        $lpItemView = $this->getLpItemViewForAttempt(
+            $lpItem,
+            $lpItemViewId,
+            $lpId,
+            $course,
+            $session,
+            $attempt->getUser(),
+        );
+        if (!$lpItemView instanceof CLpItemView) {
+            return;
+        }
+
+        $lpView = $lpItemView->getView();
+        $status = $this->getLearnpathExerciseStatus($quiz, $attempt->getScore(), $attempt->getMaxScore());
+
+        $lpItem->setMaxScore((float) $attempt->getMaxScore());
+        $lpItemView
+            ->setStatus($status)
+            ->setScore((float) $attempt->getScore())
+            ->setTotalTime((int) $attempt->getExeDuration())
+        ;
+
+        $lpView->setLastItem($lpItemId);
+        $this->updateLearnpathProgress($lpView);
+    }
+
+    private function getValidExerciseLpItem(int $lpItemId, int $lpId, CQuiz $quiz): ?CLpItem
+    {
+        $lpItem = $this->entityManager->getRepository(CLpItem::class)->find($lpItemId);
+        if (!$lpItem instanceof CLpItem) {
+            return null;
+        }
+
+        if ((int) ($lpItem->getLp()->getIid() ?? 0) !== $lpId) {
+            return null;
+        }
+
+        if (self::LP_ITEM_TYPE_QUIZ !== (string) $lpItem->getItemType()) {
+            return null;
+        }
+
+        if ((int) $lpItem->getPath() !== (int) ($quiz->getIid() ?? 0)) {
+            return null;
+        }
+
+        return $lpItem;
+    }
+
+    private function getLpItemViewForAttempt(
+        CLpItem $lpItem,
+        int $lpItemViewId,
+        int $lpId,
+        Course $course,
+        ?Session $session,
+        User $attemptUser,
+    ): ?CLpItemView {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView')
+            ->addSelect('lpView')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :lpItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :lpItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :lpId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('lpItemViewId', $lpItemViewId, Types::INTEGER)
+            ->setParameter('lpItemId', (int) $lpItem->getIid(), Types::INTEGER)
+            ->setParameter('lpId', $lpId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $attemptUser->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        $lpItemView = $queryBuilder->getQuery()->getOneOrNullResult();
+
+        return $lpItemView instanceof CLpItemView ? $lpItemView : null;
+    }
+
+    private function getLearnpathExerciseStatus(CQuiz $quiz, float $score, float $maxScore): string
+    {
+        $status = self::STATUS_COMPLETED;
+        $passPercentage = $quiz->getPassPercentage();
+
+        if (self::FEEDBACK_TYPE_DIRECT !== (int) $quiz->getFeedbackType() && null !== $passPercentage && 0 < $passPercentage) {
+            $status = self::LP_STATUS_FAILED;
+            $percentage = 0.0 < $maxScore ? ($score / $maxScore) * 100 : 0.0;
+            if ($percentage >= (float) $passPercentage) {
+                $status = self::LP_STATUS_PASSED;
+            }
+        }
+
+        return $status;
+    }
+
+    /**
+     * @return array{completedItems: int, totalItems: int, progress: int, progressMode: string}
+     */
+    private function updateLearnpathProgress(CLpView $lpView): array
+    {
+        $lpId = (int) ($lpView->getLp()->getIid() ?? 0);
+        if (0 >= $lpId) {
+            return ['completedItems' => 0, 'totalItems' => 0, 'progress' => 0, 'progressMode' => '%'];
+        }
+
+        $totalItems = (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(item.iid)')
+            ->from(CLpItem::class, 'item')
+            ->andWhere('IDENTITY(item.lp) = :lpId')
+            ->andWhere('item.itemType != :directoryType')
+            ->setParameter('lpId', $lpId, Types::INTEGER)
+            ->setParameter('directoryType', self::LP_ITEM_TYPE_DIR)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        if (0 >= $totalItems) {
+            $lpView->setProgress(0);
+
+            return ['completedItems' => 0, 'totalItems' => 0, 'progress' => 0, 'progressMode' => '%'];
+        }
+
+        $completedItems = (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(DISTINCT item.iid)')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.item', 'item')
+            ->andWhere('IDENTITY(itemView.view) = :lpViewId')
+            ->andWhere('item.itemType != :directoryType')
+            ->andWhere('itemView.status IN (:completedStatuses)')
+            ->setParameter('lpViewId', (int) $lpView->getIid(), Types::INTEGER)
+            ->setParameter('directoryType', self::LP_ITEM_TYPE_DIR)
+            ->setParameter(
+                'completedStatuses',
+                [self::STATUS_COMPLETED, self::LP_STATUS_PASSED, 'succeeded', 'browsed', self::LP_STATUS_FAILED],
+                ArrayParameterType::STRING,
+            )
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        $progress = max(0, min(100, (int) round(($completedItems / $totalItems) * 100)));
+        $lpView->setProgress($progress);
+
+        return [
+            'completedItems' => $completedItems,
+            'totalItems' => $totalItems,
+            'progress' => $progress,
+            'progressMode' => '%',
+        ];
+    }
+
     /**
      * @return array<int, int>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
index 6bda9717433..43b0d8c2271 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -552,6 +552,139 @@ private function getSession(Request $request): ?Session
         return $session;
     }
 
+
+    private function isVisibleThroughLearnpath(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        $learnpathId = $this->getQueryPositiveInt($request, ['learnpath_id', 'lp_id']);
+        $learnpathItemId = $this->getQueryPositiveInt($request, ['learnpath_item_id', 'lp_item_id']);
+        $learnpathItemViewId = $this->getQueryPositiveInt($request, ['learnpath_item_view_id']);
+        $origin = strtolower(trim((string) $request->query->get('origin', '')));
+        $hasLearnpathContext = 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || 0 < $learnpathId
+            || 0 < $learnpathItemId
+            || 0 < $learnpathItemViewId;
+
+        if (!$hasLearnpathContext || 0 >= $learnpathId || 0 >= $learnpathItemId) {
+            return false;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('item.iid')
+            ->from(CLpItem::class, 'item')
+            ->innerJoin('item.lp', 'lp')
+            ->innerJoin('lp.resourceNode', 'lpNode')
+            ->innerJoin('lpNode.resourceLinks', 'lpLinks')
+            ->andWhere('item.iid = :learnpathItemId')
+            ->andWhere('IDENTITY(item.lp) = :learnpathId')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('(item.path = :exerciseIdString OR item.ref = :exerciseIdString)')
+            ->andWhere('IDENTITY(lpLinks.course) = :courseId')
+            ->andWhere('lpLinks.visibility = :publishedVisibility')
+            ->andWhere('lpLinks.deletedAt IS NULL')
+            ->andWhere('lpLinks.endVisibilityAt IS NULL')
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('exerciseIdString', (string) $exerciseId)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('publishedVisibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(lpLinks.session) = :sessionId OR lpLinks.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpLinks.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            return false;
+        }
+
+        if (0 >= $learnpathItemViewId) {
+            return true;
+        }
+
+        return $this->hasValidLearnpathItemView($learnpathItemViewId, $learnpathItemId, $learnpathId, $course, $session, $user);
+    }
+
+    private function hasValidLearnpathItemView(
+        int $learnpathItemViewId,
+        int $learnpathItemId,
+        int $learnpathId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): bool {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView.iid')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :learnpathItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :learnpathItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :learnpathId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('learnpathItemViewId', $learnpathItemViewId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param array<int, string> $names
+     */
+    private function getQueryPositiveInt(Request $request, array $names): int
+    {
+        foreach ($names as $name) {
+            $value = $request->query->get($name);
+            if (\is_array($value)) {
+                $value = $value[0] ?? null;
+            }
+
+            if (null === $value || '' === (string) $value || !is_numeric((string) $value)) {
+                continue;
+            }
+
+            return max(0, (int) $value);
+        }
+
+        return 0;
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -591,7 +724,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
         if (!$canManage) {
             $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
             $now = new DateTime();
-            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            if (self::VISIBILITY_PUBLISHED !== $visibility && !$this->isVisibleThroughLearnpath($quiz, $course, $session)) {
                 throw new AccessDeniedHttpException('The requested exercise is not visible.');
             }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index ff7edd9f204..370c3bd55fa 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -20,6 +20,8 @@
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
@@ -52,6 +54,7 @@
 final readonly class ExerciseRuntimeProvider implements ProviderInterface
 {
     private const VISIBILITY_PUBLISHED = 2;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const STATUS_INCOMPLETE = 'incomplete';
     private const UNIQUE_TYPES = [1, 10, 17, 21];
     private const MULTIPLE_TYPES = [2, 9, 14];
@@ -504,6 +507,139 @@ private function isLearnerRuntimeRequest(Request $request): bool
             || str_starts_with($preview, 'true');
     }
 
+
+    private function isVisibleThroughLearnpath(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        $learnpathId = $this->getQueryPositiveInt($request, ['learnpath_id', 'lp_id']);
+        $learnpathItemId = $this->getQueryPositiveInt($request, ['learnpath_item_id', 'lp_item_id']);
+        $learnpathItemViewId = $this->getQueryPositiveInt($request, ['learnpath_item_view_id']);
+        $origin = strtolower(trim((string) $request->query->get('origin', '')));
+        $hasLearnpathContext = 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || 0 < $learnpathId
+            || 0 < $learnpathItemId
+            || 0 < $learnpathItemViewId;
+
+        if (!$hasLearnpathContext || 0 >= $learnpathId || 0 >= $learnpathItemId) {
+            return false;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('item.iid')
+            ->from(CLpItem::class, 'item')
+            ->innerJoin('item.lp', 'lp')
+            ->innerJoin('lp.resourceNode', 'lpNode')
+            ->innerJoin('lpNode.resourceLinks', 'lpLinks')
+            ->andWhere('item.iid = :learnpathItemId')
+            ->andWhere('IDENTITY(item.lp) = :learnpathId')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('(item.path = :exerciseIdString OR item.ref = :exerciseIdString)')
+            ->andWhere('IDENTITY(lpLinks.course) = :courseId')
+            ->andWhere('lpLinks.visibility = :publishedVisibility')
+            ->andWhere('lpLinks.deletedAt IS NULL')
+            ->andWhere('lpLinks.endVisibilityAt IS NULL')
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('exerciseIdString', (string) $exerciseId)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('publishedVisibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(lpLinks.session) = :sessionId OR lpLinks.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpLinks.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            return false;
+        }
+
+        if (0 >= $learnpathItemViewId) {
+            return true;
+        }
+
+        return $this->hasValidLearnpathItemView($learnpathItemViewId, $learnpathItemId, $learnpathId, $course, $session, $user);
+    }
+
+    private function hasValidLearnpathItemView(
+        int $learnpathItemViewId,
+        int $learnpathItemId,
+        int $learnpathId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): bool {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView.iid')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :learnpathItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :learnpathItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :learnpathId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('learnpathItemViewId', $learnpathItemViewId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param array<int, string> $names
+     */
+    private function getQueryPositiveInt(Request $request, array $names): int
+    {
+        foreach ($names as $name) {
+            $value = $request->query->get($name);
+            if (\is_array($value)) {
+                $value = $value[0] ?? null;
+            }
+
+            if (null === $value || '' === (string) $value || !is_numeric((string) $value)) {
+                continue;
+            }
+
+            return max(0, (int) $value);
+        }
+
+        return 0;
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -544,7 +680,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
             $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
             $now = new DateTimeImmutable();
 
-            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            if (self::VISIBILITY_PUBLISHED !== $visibility && !$this->isVisibleThroughLearnpath($quiz, $course, $session)) {
                 throw new AccessDeniedHttpException('The requested exercise is not visible.');
             }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index d8acfbcc790..736670ba245 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -22,6 +22,8 @@
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
@@ -48,6 +50,7 @@
     private const ANNOTATION = 20;
     private const DRAGGABLE = 18;
     private const VISIBILITY_PUBLISHED = 2;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const FEEDBACK_TYPE_EXAM = 2;
     private const RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS = 0;
     private const RESULT_NO_SCORE_AND_EXPECTED_ANSWERS = 1;
@@ -274,7 +277,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (!$canManage) {
             $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
-            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            if (self::VISIBILITY_PUBLISHED !== $visibility && !$this->isVisibleThroughLearnpath($quiz, $course, $session)) {
                 throw new AccessDeniedHttpException('The requested exercise is not visible.');
             }
         }
@@ -282,6 +285,138 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
         return $quiz;
     }
 
+    private function isVisibleThroughLearnpath(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        $learnpathId = $this->getQueryPositiveInt($request, ['learnpath_id', 'lp_id']);
+        $learnpathItemId = $this->getQueryPositiveInt($request, ['learnpath_item_id', 'lp_item_id']);
+        $learnpathItemViewId = $this->getQueryPositiveInt($request, ['learnpath_item_view_id']);
+        $origin = strtolower(trim((string) $request->query->get('origin', '')));
+        $hasLearnpathContext = 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || 0 < $learnpathId
+            || 0 < $learnpathItemId
+            || 0 < $learnpathItemViewId;
+
+        if (!$hasLearnpathContext || 0 >= $learnpathId || 0 >= $learnpathItemId) {
+            return false;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('item.iid')
+            ->from(CLpItem::class, 'item')
+            ->innerJoin('item.lp', 'lp')
+            ->innerJoin('lp.resourceNode', 'lpNode')
+            ->innerJoin('lpNode.resourceLinks', 'lpLinks')
+            ->andWhere('item.iid = :learnpathItemId')
+            ->andWhere('IDENTITY(item.lp) = :learnpathId')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('(item.path = :exerciseIdString OR item.ref = :exerciseIdString)')
+            ->andWhere('IDENTITY(lpLinks.course) = :courseId')
+            ->andWhere('lpLinks.visibility = :publishedVisibility')
+            ->andWhere('lpLinks.deletedAt IS NULL')
+            ->andWhere('lpLinks.endVisibilityAt IS NULL')
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('exerciseIdString', (string) $exerciseId)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('publishedVisibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(lpLinks.session) = :sessionId OR lpLinks.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpLinks.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            return false;
+        }
+
+        if (0 >= $learnpathItemViewId) {
+            return true;
+        }
+
+        return $this->hasValidLearnpathItemView($learnpathItemViewId, $learnpathItemId, $learnpathId, $course, $session, $user);
+    }
+
+    private function hasValidLearnpathItemView(
+        int $learnpathItemViewId,
+        int $learnpathItemId,
+        int $learnpathId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): bool {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView.iid')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :learnpathItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :learnpathItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :learnpathId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('learnpathItemViewId', $learnpathItemViewId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param array<int, string> $names
+     */
+    private function getQueryPositiveInt(Request $request, array $names): int
+    {
+        foreach ($names as $name) {
+            $value = $request->query->get($name);
+            if (\is_array($value)) {
+                $value = $value[0] ?? null;
+            }
+
+            if (null === $value || '' === (string) $value || !is_numeric((string) $value)) {
+                continue;
+            }
+
+            return max(0, (int) $value);
+        }
+
+        return 0;
+    }
+
     private function getAttempt(int $attemptId, CQuiz $quiz, Course $course, ?Session $session, bool $canManage): TrackEExercise
     {
         $queryBuilder = $this->entityManager->createQueryBuilder()
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index 2fefaec5709..265afb5fde2 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -20,6 +20,8 @@
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
+use Chamilo\CourseBundle\Entity\CLpItem;
+use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
@@ -44,6 +46,7 @@
 final readonly class ExerciseRuntimeUploadAnswerProcessor implements ProcessorInterface
 {
     private const VISIBILITY_PUBLISHED = 2;
+    private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const STATUS_INCOMPLETE = 'incomplete';
     private const ORAL_EXPRESSION = 13;
     private const UPLOAD_ANSWER = 23;
@@ -233,6 +236,139 @@ private function getSession(Request $request): ?Session
         return $session;
     }
 
+
+    private function isVisibleThroughLearnpath(CQuiz $quiz, Course $course, ?Session $session): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        $learnpathId = $this->getQueryPositiveInt($request, ['learnpath_id', 'lp_id']);
+        $learnpathItemId = $this->getQueryPositiveInt($request, ['learnpath_item_id', 'lp_item_id']);
+        $learnpathItemViewId = $this->getQueryPositiveInt($request, ['learnpath_item_view_id']);
+        $origin = strtolower(trim((string) $request->query->get('origin', '')));
+        $hasLearnpathContext = 'learnpath' === $origin
+            || $request->query->has('lp_init')
+            || 0 < $learnpathId
+            || 0 < $learnpathItemId
+            || 0 < $learnpathItemViewId;
+
+        if (!$hasLearnpathContext || 0 >= $learnpathId || 0 >= $learnpathItemId) {
+            return false;
+        }
+
+        $user = $this->security->getUser();
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $exerciseId = (int) ($quiz->getIid() ?? 0);
+        if (0 >= $exerciseId) {
+            return false;
+        }
+
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('item.iid')
+            ->from(CLpItem::class, 'item')
+            ->innerJoin('item.lp', 'lp')
+            ->innerJoin('lp.resourceNode', 'lpNode')
+            ->innerJoin('lpNode.resourceLinks', 'lpLinks')
+            ->andWhere('item.iid = :learnpathItemId')
+            ->andWhere('IDENTITY(item.lp) = :learnpathId')
+            ->andWhere('item.itemType = :itemType')
+            ->andWhere('(item.path = :exerciseIdString OR item.ref = :exerciseIdString)')
+            ->andWhere('IDENTITY(lpLinks.course) = :courseId')
+            ->andWhere('lpLinks.visibility = :publishedVisibility')
+            ->andWhere('lpLinks.deletedAt IS NULL')
+            ->andWhere('lpLinks.endVisibilityAt IS NULL')
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('itemType', self::LP_ITEM_TYPE_QUIZ)
+            ->setParameter('exerciseIdString', (string) $exerciseId)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('publishedVisibility', self::VISIBILITY_PUBLISHED, Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('(IDENTITY(lpLinks.session) = :sessionId OR lpLinks.session IS NULL)')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpLinks.session IS NULL');
+        }
+
+        if (null === $queryBuilder->getQuery()->getOneOrNullResult()) {
+            return false;
+        }
+
+        if (0 >= $learnpathItemViewId) {
+            return true;
+        }
+
+        return $this->hasValidLearnpathItemView($learnpathItemViewId, $learnpathItemId, $learnpathId, $course, $session, $user);
+    }
+
+    private function hasValidLearnpathItemView(
+        int $learnpathItemViewId,
+        int $learnpathItemId,
+        int $learnpathId,
+        Course $course,
+        ?Session $session,
+        User $user,
+    ): bool {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('itemView.iid')
+            ->from(CLpItemView::class, 'itemView')
+            ->innerJoin('itemView.view', 'lpView')
+            ->andWhere('itemView.iid = :learnpathItemViewId')
+            ->andWhere('IDENTITY(itemView.item) = :learnpathItemId')
+            ->andWhere('IDENTITY(lpView.lp) = :learnpathId')
+            ->andWhere('IDENTITY(lpView.course) = :courseId')
+            ->andWhere('IDENTITY(lpView.user) = :userId')
+            ->setParameter('learnpathItemViewId', $learnpathItemViewId, Types::INTEGER)
+            ->setParameter('learnpathItemId', $learnpathItemId, Types::INTEGER)
+            ->setParameter('learnpathId', $learnpathId, Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(lpView.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('lpView.session IS NULL');
+        }
+
+        return null !== $queryBuilder->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param array<int, string> $names
+     */
+    private function getQueryPositiveInt(Request $request, array $names): int
+    {
+        foreach ($names as $name) {
+            $value = $request->query->get($name);
+            if (\is_array($value)) {
+                $value = $value[0] ?? null;
+            }
+
+            if (null === $value || '' === (string) $value || !is_numeric((string) $value)) {
+                continue;
+            }
+
+            return max(0, (int) $value);
+        }
+
+        return 0;
+    }
+
     private function getExerciseFromCurrentContext(int $exerciseId, Course $course, ?Session $session, bool $canManage): CQuiz
     {
         $quiz = $this->quizRepository->find($exerciseId);
@@ -272,7 +408,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
         if (!$canManage) {
             $visibility = \is_array($row) ? (int) ($row['linkVisibility'] ?? 0) : 0;
             $now = new DateTimeImmutable();
-            if (self::VISIBILITY_PUBLISHED !== $visibility) {
+            if (self::VISIBILITY_PUBLISHED !== $visibility && !$this->isVisibleThroughLearnpath($quiz, $course, $session)) {
                 throw new AccessDeniedHttpException('The requested exercise is not visible.');
             }
 

From 8ca43c1d9bb0f736e43a048f40fde8a2c0b47a21 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 08:12:26 -0500
Subject: [PATCH 08/21] Restore exercise correction notifications

---
 .../vue/views/exercise/ExerciseResultView.vue | 111 +++++++++++++++++-
 .../Exercise/ExerciseRuntimeCorrection.php    |   9 ++
 .../ExerciseRuntimeCorrectionProcessor.php    | 101 +++++++++++++++-
 3 files changed, 217 insertions(+), 4 deletions(-)

diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index 4c0280594e6..92ec74e5355 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -821,6 +821,29 @@
                       @click="saveManualCorrection(question)"
                     />
                   </div>
+                  <div class="mt-3 rounded-lg border border-gray-20 bg-gray-10 p-3">
+                    <label class="flex items-center gap-2 text-sm font-semibold text-gray-700">
+                      <input
+                        v-model="correctionForms[question.id].sendNotification"
+                        :disabled="correctionSavingQuestionId === question.id"
+                        class="h-4 w-4 rounded border-gray-30 text-primary focus:ring-primary"
+                        name="send_notification"
+                        type="checkbox"
+                        @change="prepareCorrectionNotificationContent(question)"
+                      />
+                      {{ t("Send email") }}
+                    </label>
+                    <BaseTextArea
+                      v-if="correctionForms[question.id].sendNotification"
+                      v-model="correctionForms[question.id].notificationContent"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionNotificationInputId(question)"
+                      :label="t('Content')"
+                      class="mt-3"
+                      name="notification_content"
+                      rows="3"
+                    />
+                  </div>
                 </div>
               </div>
             </template>
@@ -1002,6 +1025,29 @@
                       @click="saveManualCorrection(question)"
                     />
                   </div>
+                  <div class="mt-3 rounded-lg border border-gray-20 bg-gray-10 p-3">
+                    <label class="flex items-center gap-2 text-sm font-semibold text-gray-700">
+                      <input
+                        v-model="correctionForms[question.id].sendNotification"
+                        :disabled="correctionSavingQuestionId === question.id"
+                        class="h-4 w-4 rounded border-gray-30 text-primary focus:ring-primary"
+                        name="send_notification"
+                        type="checkbox"
+                        @change="prepareCorrectionNotificationContent(question)"
+                      />
+                      {{ t("Send email") }}
+                    </label>
+                    <BaseTextArea
+                      v-if="correctionForms[question.id].sendNotification"
+                      v-model="correctionForms[question.id].notificationContent"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionNotificationInputId(question)"
+                      :label="t('Content')"
+                      class="mt-3"
+                      name="notification_content"
+                      rows="3"
+                    />
+                  </div>
                 </div>
               </div>
             </template>
@@ -1174,6 +1220,29 @@
                       @click="saveManualCorrection(question)"
                     />
                   </div>
+                  <div class="mt-3 rounded-lg border border-gray-20 bg-gray-10 p-3">
+                    <label class="flex items-center gap-2 text-sm font-semibold text-gray-700">
+                      <input
+                        v-model="correctionForms[question.id].sendNotification"
+                        :disabled="correctionSavingQuestionId === question.id"
+                        class="h-4 w-4 rounded border-gray-30 text-primary focus:ring-primary"
+                        name="send_notification"
+                        type="checkbox"
+                        @change="prepareCorrectionNotificationContent(question)"
+                      />
+                      {{ t("Send email") }}
+                    </label>
+                    <BaseTextArea
+                      v-if="correctionForms[question.id].sendNotification"
+                      v-model="correctionForms[question.id].notificationContent"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionNotificationInputId(question)"
+                      :label="t('Content')"
+                      class="mt-3"
+                      name="notification_content"
+                      rows="3"
+                    />
+                  </div>
                 </div>
               </div>
             </template>
@@ -1341,6 +1410,29 @@
                       @click="saveManualCorrection(question)"
                     />
                   </div>
+                  <div class="mt-3 rounded-lg border border-gray-20 bg-gray-10 p-3">
+                    <label class="flex items-center gap-2 text-sm font-semibold text-gray-700">
+                      <input
+                        v-model="correctionForms[question.id].sendNotification"
+                        :disabled="correctionSavingQuestionId === question.id"
+                        class="h-4 w-4 rounded border-gray-30 text-primary focus:ring-primary"
+                        name="send_notification"
+                        type="checkbox"
+                        @change="prepareCorrectionNotificationContent(question)"
+                      />
+                      {{ t("Send email") }}
+                    </label>
+                    <BaseTextArea
+                      v-if="correctionForms[question.id].sendNotification"
+                      v-model="correctionForms[question.id].notificationContent"
+                      :disabled="correctionSavingQuestionId === question.id"
+                      :id="correctionNotificationInputId(question)"
+                      :label="t('Content')"
+                      class="mt-3"
+                      name="notification_content"
+                      rows="3"
+                    />
+                  </div>
                 </div>
               </div>
             </template>
@@ -1935,6 +2027,8 @@ function initializeCorrectionForms() {
     forms[question.id] = {
       marks: Number(question.score ?? question.answer?.marks ?? 0),
       teacherComment: question.answer?.teacherComment || "",
+      sendNotification: false,
+      notificationContent: "",
     }
   }
 
@@ -2137,6 +2231,19 @@ function correctionCommentInputId(question) {
   return `teacher_comment_${Number(question.id || 0)}`
 }
 
+function correctionNotificationInputId(question) {
+  return `notification_content_${Number(question.id || 0)}`
+}
+
+function prepareCorrectionNotificationContent(question) {
+  const form = correctionForms.value[question.id]
+  if (!form?.sendNotification || form.notificationContent) {
+    return
+  }
+
+  form.notificationContent = form.teacherComment || ""
+}
+
 async function saveManualCorrection(question) {
   const form = correctionForms.value[question.id]
   const exerciseId = getExerciseId()
@@ -2158,6 +2265,8 @@ async function saveManualCorrection(question) {
         questionId,
         marks: Number(form.marks || 0),
         teacherComment: form.teacherComment || "",
+        sendNotification: Boolean(form.sendNotification),
+        notificationContent: form.notificationContent || form.teacherComment || "",
       },
       getContextParams(),
       exerciseId,
@@ -2168,7 +2277,7 @@ async function saveManualCorrection(question) {
       throw new Error(response?.message || "Could not save correction")
     }
 
-    correctionMessage.value = t("Correction saved")
+    correctionMessage.value = response?.notificationSent ? t("Message Sent") : t("Correction saved")
     await loadResult()
   } catch (error) {
     console.error("Error saving exercise correction", error)
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php
index 9d6a0fbe427..f6026174c02 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeCorrection.php
@@ -60,9 +60,18 @@ final class ExerciseRuntimeCorrection
     #[Groups(['exercise_runtime_correction:read', 'exercise_runtime_correction:write'])]
     public string $teacherComment = '';
 
+    #[Groups(['exercise_runtime_correction:write'])]
+    public bool $sendNotification = false;
+
+    #[Groups(['exercise_runtime_correction:write'])]
+    public string $notificationContent = '';
+
     #[Groups(['exercise_runtime_correction:read'])]
     public bool $success = false;
 
+    #[Groups(['exercise_runtime_correction:read'])]
+    public bool $notificationSent = false;
+
     #[Groups(['exercise_runtime_correction:read'])]
     public string $message = '';
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
index df0172adbda..5dd9041173a 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeCorrectionProcessor.php
@@ -28,6 +28,8 @@
 use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
+use Event;
+use MessageManager;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -121,15 +123,28 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $rows[] = $this->createEmptyAttemptRow($attempt, $questionId);
         }
 
+        $teacherComment = (string) $data->teacherComment;
+        $previousMarks = $this->getCurrentQuestionMarks($rows);
+        $correctionChanged = $this->hasCorrectionChanged($rows, $marks, $teacherComment);
+
         foreach ($rows as $row) {
             $row
                 ->setMarks($marks)
-                ->setTeacherComment((string) $data->teacherComment)
+                ->setTeacherComment($teacherComment)
                 ->setTms(new DateTime())
             ;
         }
 
-        $this->recordCorrectionHistory($attempt, $questionId, $marks, (string) $data->teacherComment, (int) ($session?->getId() ?? 0));
+        if ($correctionChanged && $this->hasScoreChanged($previousMarks, $marks)) {
+            $this->recordQuestionScoreUpdateEvent($attempt, $questionId, $previousMarks, $marks);
+        }
+
+        $notificationSent = false;
+        if ($correctionChanged && $data->sendNotification) {
+            $notificationSent = $this->sendCorrectionNotification($attempt, $teacherComment, (string) $data->notificationContent);
+        }
+
+        $this->recordCorrectionHistory($attempt, $questionId, $marks, $teacherComment, (int) ($session?->getId() ?? 0));
         $this->removeQuestionToCheck($attempt, $questionId);
         $this->recalculateAttemptScore($attempt, $quiz);
         $this->synchronizeLearnpathTrackingAfterCorrection($attempt, $quiz, $course, $session);
@@ -140,8 +155,9 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $response->attemptId = $attemptId;
         $response->questionId = $questionId;
         $response->marks = $marks;
-        $response->teacherComment = (string) $data->teacherComment;
+        $response->teacherComment = $teacherComment;
         $response->success = true;
+        $response->notificationSent = $notificationSent;
         $response->message = 'Correction saved';
         $response->score = (float) $attempt->getScore();
         $response->maxScore = (float) $attempt->getMaxScore();
@@ -377,6 +393,85 @@ private function recordCorrectionHistory(TrackEExercise $attempt, int $questionI
         $this->entityManager->persist($recording);
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function getCurrentQuestionMarks(array $rows): float
+    {
+        foreach ($rows as $row) {
+            return (float) $row->getMarks();
+        }
+
+        return 0.0;
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function hasCorrectionChanged(array $rows, float $newMarks, string $newTeacherComment): bool
+    {
+        foreach ($rows as $row) {
+            return $this->hasScoreChanged((float) $row->getMarks(), $newMarks)
+                || $row->getTeacherComment() !== $newTeacherComment;
+        }
+
+        return 0.0 !== $newMarks || '' !== $newTeacherComment;
+    }
+
+    private function hasScoreChanged(float $oldMarks, float $newMarks): bool
+    {
+        return 0.00001 < abs($oldMarks - $newMarks);
+    }
+
+    private function recordQuestionScoreUpdateEvent(TrackEExercise $attempt, int $questionId, float $oldMarks, float $newMarks): void
+    {
+        if (!class_exists(Event::class) || !defined('LOG_QUESTION_SCORE_UPDATE') || !defined('LOG_EXERCISE_ATTEMPT_QUESTION_ID')) {
+            return;
+        }
+
+        Event::addEvent(
+            LOG_QUESTION_SCORE_UPDATE,
+            LOG_EXERCISE_ATTEMPT_QUESTION_ID,
+            [
+                'exe_id' => (int) $attempt->getExeId(),
+                'question_id' => $questionId,
+                'old_marks' => $oldMarks,
+                'new_marks' => $newMarks,
+            ],
+        );
+    }
+
+    private function sendCorrectionNotification(TrackEExercise $attempt, string $teacherComment, string $notificationContent): bool
+    {
+        $teacher = $this->security->getUser();
+        if (!$teacher instanceof User || !class_exists(MessageManager::class)) {
+            return false;
+        }
+
+        $content = trim($notificationContent);
+        if ('' === $content) {
+            $content = trim($teacherComment);
+        }
+
+        if ('' === $content) {
+            return false;
+        }
+
+        $subject = 'Examsheet viewed/corrected/commented by the trainer';
+        if (function_exists('get_lang')) {
+            $subject = get_lang('Examsheet viewed/corrected/commented by the trainer');
+        }
+
+        MessageManager::send_message_simple(
+            (int) $attempt->getUser()->getId(),
+            $subject,
+            $content,
+            (int) $teacher->getId(),
+        );
+
+        return true;
+    }
+
     private function removeQuestionToCheck(TrackEExercise $attempt, int $questionId): void
     {
         $pendingQuestions = array_values(array_filter(

From ee4b9855ed946b639e68e94db5bed1d8cf7e7f5e Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 08:26:31 -0500
Subject: [PATCH 09/21] Restore exercise recalculate all

---
 .../vue/views/exercise/ExerciseReportView.vue  | 18 +++++++++---------
 ...rciseRuntimeAttemptRecalculateProcessor.php |  2 +-
 ...xerciseRuntimeReportBulkActionProcessor.php |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/assets/vue/views/exercise/ExerciseReportView.vue b/assets/vue/views/exercise/ExerciseReportView.vue
index d82ed8b4c98..15daed0f425 100644
--- a/assets/vue/views/exercise/ExerciseReportView.vue
+++ b/assets/vue/views/exercise/ExerciseReportView.vue
@@ -81,7 +81,7 @@
       <BaseButton
         v-if="canBulkRecalculate"
         class="exercise-report-toolbar__button"
-        :label="t('Recalculate all results')"
+        :label="t('Recalculate results')"
         :icon="safeIcon('refresh', 'information')"
         only-icon
         size="small"
@@ -341,7 +341,7 @@
             <BaseButton
               v-if="data.canRecalculate"
               class="exercise-report-row-action"
-              :label="t('Recalculate')"
+              :label="t('Recalculate results')"
               only-icon
               :icon="safeIcon('refresh', 'information')"
               size="small"
@@ -620,7 +620,7 @@ function confirmCleanBeforeDate() {
 
 function confirmRecalculateAll() {
   requireConfirmation({
-    message: t("Recalculate all results?"),
+    message: t("Please confirm your choice"),
     accept: () => runBulkAction("recalculate_all"),
   })
 }
@@ -694,7 +694,7 @@ async function runBulkAction(action, extraPayload = {}) {
       exerciseId,
     )
     if (!response?.success) {
-      throw new Error(response?.message || "Could not run bulk action")
+      throw new Error(response?.message || "Could not load data")
     }
 
     successMessage.value = getBulkActionMessage(response)
@@ -704,7 +704,7 @@ async function runBulkAction(action, extraPayload = {}) {
     await loadReport()
   } catch (error) {
     console.error("Error running exercise report bulk action", error)
-    errorMessage.value = t("Could not run bulk action")
+    errorMessage.value = t("Could not load data")
   } finally {
     isBulkActionLoading.value = false
   }
@@ -752,7 +752,7 @@ async function closeAttempt(attempt) {
 
 function confirmRecalculateAttempt(attempt) {
   requireConfirmation({
-    message: t("Recalculate attempt?"),
+    message: t("Please confirm your choice"),
     accept: () => recalculateAttempt(attempt),
   })
 }
@@ -769,14 +769,14 @@ async function recalculateAttempt(attempt) {
   try {
     const response = await exerciseService.recalculateExerciseRuntimeAttempt({}, getContextParams(), exerciseId, attemptId)
     if (!response?.success) {
-      throw new Error(response?.message || "Could not recalculate attempt")
+      throw new Error(response?.message || "Could not load data")
     }
 
-    successMessage.value = t("Attempt recalculated")
+    successMessage.value = t("Results recalculated")
     await loadReport()
   } catch (error) {
     console.error("Error recalculating exercise attempt", error)
-    errorMessage.value = t("Could not recalculate attempt")
+    errorMessage.value = t("Could not load data")
   }
 }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
index 3fad24a6bde..a779d7e2310 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptRecalculateProcessor.php
@@ -84,7 +84,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $response->exerciseId = $exerciseId;
         $response->attemptId = $attemptId;
         $response->success = true;
-        $response->message = 'Attempt recalculated';
+        $response->message = 'Results recalculated';
         $response->score = (float) $result['score'];
         $response->maxScore = (float) $result['maxScore'];
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
index e69b8cc764c..5143ce782a2 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportBulkActionProcessor.php
@@ -232,7 +232,7 @@ private function recalculateAll(ExerciseRuntimeReportBulkAction $data, CQuiz $qu
 
         $this->entityManager->flush();
 
-        return $this->buildResponse($data, true, 'Attempts recalculated', $processedCount, $failedCount);
+        return $this->buildResponse($data, true, 'Results recalculated', $processedCount, $failedCount);
     }
 
     /**

From b22557707db50e555d518c9a6d1cb7cf2d1643e4 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 08:57:09 -0500
Subject: [PATCH 10/21] Restore exercise report export options

---
 .../vue/views/exercise/ExerciseReportView.vue | 124 ++++-
 .../Exercise/ExerciseRuntimeReport.php        |   9 +
 .../ExerciseRuntimeReportExportService.php    | 479 +++++++++++++++---
 .../ExerciseRuntimeReportProvider.php         |  50 ++
 4 files changed, 599 insertions(+), 63 deletions(-)

diff --git a/assets/vue/views/exercise/ExerciseReportView.vue b/assets/vue/views/exercise/ExerciseReportView.vue
index 15daed0f425..932b848de9c 100644
--- a/assets/vue/views/exercise/ExerciseReportView.vue
+++ b/assets/vue/views/exercise/ExerciseReportView.vue
@@ -50,13 +50,22 @@
       <BaseButton
         v-if="actionUrls.exportXlsx"
         class="exercise-report-toolbar__button"
-        :label="t('Export XLSX')"
+        :label="t('Excel export')"
         :to-url="actionUrls.exportXlsx"
         :icon="safeIcon('file-excel', 'information')"
         only-icon
         size="small"
         type="primary-text"
       />
+      <BaseButton
+        class="exercise-report-toolbar__button"
+        :label="t('Download')"
+        :icon="safeIcon('download', 'file-excel')"
+        only-icon
+        size="small"
+        type="primary-text"
+        @click="toggleExportForm"
+      />
       <BaseButton
         v-if="canBulkDelete"
         class="exercise-report-toolbar__button"
@@ -157,6 +166,66 @@
       />
     </form>
 
+    <form
+      v-if="isExportFormVisible"
+      class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+      @submit.prevent="downloadReport"
+    >
+      <div class="flex flex-col gap-4">
+        <div class="flex flex-col gap-4 lg:flex-row lg:items-end lg:justify-between">
+          <div class="w-full sm:max-w-56">
+            <BaseSelect
+              id="exercise-report-export-format"
+              v-model="exportForm.format"
+              :label="t('Format')"
+              name="exportFormat"
+              :options="exportFormatOptions"
+              option-label="label"
+              option-value="value"
+            />
+          </div>
+
+          <BaseButton
+            class="w-full sm:w-auto"
+            :label="t('Download')"
+            :icon="safeIcon('download', 'file-excel')"
+            :is-submit="true"
+            type="primary"
+          />
+        </div>
+
+        <div class="flex flex-wrap items-center gap-x-5 gap-y-2 text-sm text-gray-700">
+          <label class="inline-flex items-center gap-2">
+            <input
+              v-model="exportForm.extraData"
+              class="h-4 w-4 rounded border-gray-30"
+              name="extraData"
+              type="checkbox"
+            />
+            <span>{{ t('Extra fields') }}</span>
+          </label>
+          <label class="inline-flex items-center gap-2">
+            <input
+              v-model="exportForm.includeAllUsers"
+              class="h-4 w-4 rounded border-gray-30"
+              name="includeAllUsers"
+              type="checkbox"
+            />
+            <span>{{ t('Include all users') }}</span>
+          </label>
+          <label class="inline-flex items-center gap-2">
+            <input
+              v-model="exportForm.onlyBestAttempts"
+              class="h-4 w-4 rounded border-gray-30"
+              name="onlyBestAttempts"
+              type="checkbox"
+            />
+            <span>{{ t('Only best attempts') }}</span>
+          </label>
+        </div>
+      </div>
+    </form>
+
     <div class="border-b border-gray-20" />
 
     <header class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm">
@@ -267,6 +336,16 @@
         selection-mode="multiple"
         header-style="width: 3rem"
       />
+      <Column
+        v-if="showOfficialCode"
+        :header="t('Official code')"
+        field="officialCode"
+        sortable
+      >
+        <template #body="{ data }">
+          {{ displayText(data.officialCode, '-') }}
+        </template>
+      </Column>
       <Column :header="t('First name')" field="firstName" sortable>
         <template #body="{ data }">
           <div class="font-semibold text-gray-90">{{ displayText(data.firstName, '-') }}</div>
@@ -422,6 +501,7 @@ const description = ref("")
 const attempts = ref([])
 const selectedAttempts = ref([])
 const actionUrls = ref({})
+const showOfficialCode = ref(false)
 const lockedByGradebook = ref(false)
 const canBulkDelete = ref(false)
 const canCleanResults = ref(false)
@@ -429,7 +509,14 @@ const canBulkRecalculate = ref(false)
 const bulkActionToken = ref("")
 const emailActionToken = ref("")
 const isCleanFormVisible = ref(false)
+const isExportFormVisible = ref(false)
 const cleanBeforeDateValue = ref("")
+const exportForm = reactive({
+  format: "csv",
+  extraData: false,
+  includeAllUsers: false,
+  onlyBestAttempts: false,
+})
 const filterForm = reactive({
   firstName: getQueryValue(route.query.firstName) || "",
   lastName: getQueryValue(route.query.lastName) || "",
@@ -443,6 +530,10 @@ const statusOptions = computed(() => [
   { label: t("Pending correction"), value: "pending_correction" },
   { label: t("Ongoing"), value: "incomplete" },
 ])
+const exportFormatOptions = computed(() => [
+  { label: t("CSV export"), value: "csv" },
+  { label: t("Excel export"), value: "xlsx" },
+])
 const pendingCorrectionCount = computed(() => attempts.value.filter((attempt) => attempt.pendingCorrection).length)
 const selectedAttemptIds = computed(() =>
   selectedAttempts.value.map((attempt) => Number(attempt.attemptId || attempt.id || 0)).filter((attemptId) => attemptId > 0),
@@ -537,6 +628,7 @@ async function loadReport() {
     attempts.value = Array.isArray(response.attempts) ? response.attempts : []
     selectedAttempts.value = []
     actionUrls.value = response.actionUrls || {}
+    showOfficialCode.value = true === response.showOfficialCode
     lockedByGradebook.value = true === response.lockedByGradebook
     canBulkDelete.value = true === response.canBulkDelete
     canCleanResults.value = true === response.canCleanResults
@@ -594,6 +686,36 @@ function toggleCleanForm() {
   isCleanFormVisible.value = !isCleanFormVisible.value
 }
 
+function toggleExportForm() {
+  isExportFormVisible.value = !isExportFormVisible.value
+}
+
+function downloadReport() {
+  window.location.href = getReportExportUrl()
+}
+
+function getReportExportUrl() {
+  const exerciseId = getExerciseId()
+  const format = exportForm.format === "xlsx" ? "xlsx" : "csv"
+  const query = new URLSearchParams()
+  const params = {
+    ...getReportParams(),
+    extraData: exportForm.extraData ? 1 : 0,
+    includeAllUsers: exportForm.includeAllUsers ? 1 : 0,
+    onlyBestAttempts: exportForm.onlyBestAttempts ? 1 : 0,
+  }
+
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== undefined && value !== null && String(value) !== "") {
+      query.set(key, String(value))
+    }
+  }
+
+  const queryString = query.toString()
+
+  return `/api/exercise/runtime/${exerciseId}/attempts/export.${format}${queryString ? `?${queryString}` : ""}`
+}
+
 function confirmDeleteSelected() {
   if (!hasSelectedAttempts.value) {
     errorMessage.value = t("Select at least one attempt")
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
index 25c95609bb8..1a4be416515 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
@@ -87,6 +87,15 @@ final class ExerciseRuntimeReport
     #[Groups(['exercise_runtime_report:read'])]
     public bool $canBulkRecalculate = false;
 
+    #[Groups(['exercise_runtime_report:read'])]
+    public bool $showOfficialCode = false;
+
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_runtime_report:read'])]
+    public array $extraFields = [];
+
     #[Groups(['exercise_runtime_report:read'])]
     public string $bulkActionToken = '';
 
diff --git a/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php b/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
index c0419509ba1..0cf3ff014da 100644
--- a/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
+++ b/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
@@ -7,13 +7,21 @@
 namespace Chamilo\CoreBundle\Service\Exercise;
 
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\CourseRelUser;
+use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Entity\ExtraFieldValues;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTimeInterface;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -32,27 +40,29 @@
     private const STATUS_INCOMPLETE = 'incomplete';
     private const STATUS_PENDING_CORRECTION = 'pending_correction';
     private const STATUS_COMPLETED = 'completed';
+    private const STATUS_NOT_ATTEMPTED = 'not_attempted';
 
     public function __construct(
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private Security $security,
+        private SettingsManager $settingsManager,
     ) {}
 
     public function exportCsv(int $exerciseId, Request $request): StreamedResponse
     {
         $quiz = $this->getValidatedExercise($exerciseId, $request);
-        $rows = $this->buildExportRows($quiz, $request);
+        $exportData = $this->buildExportData($quiz, $request);
         $fileName = $this->buildFileName($quiz, 'csv');
 
-        $response = new StreamedResponse(static function () use ($rows): void {
+        $response = new StreamedResponse(static function () use ($exportData): void {
             $handle = fopen('php://output', 'w');
             if (!\is_resource($handle)) {
                 return;
             }
 
-            fputcsv($handle, self::getHeaders());
-            foreach ($rows as $row) {
+            fputcsv($handle, $exportData['headers']);
+            foreach ($exportData['rows'] as $row) {
                 fputcsv($handle, $row);
             }
             fclose($handle);
@@ -70,22 +80,23 @@ public function exportCsv(int $exerciseId, Request $request): StreamedResponse
     public function exportXlsx(int $exerciseId, Request $request): BinaryFileResponse
     {
         $quiz = $this->getValidatedExercise($exerciseId, $request);
-        $rows = $this->buildExportRows($quiz, $request);
+        $exportData = $this->buildExportData($quiz, $request);
         $fileName = $this->buildFileName($quiz, 'xlsx');
 
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
         $sheet->setTitle('Learner score');
-        $sheet->fromArray(self::getHeaders(), null, 'A1');
+        $sheet->fromArray($exportData['headers'], null, 'A1');
 
         $rowNumber = 2;
-        foreach ($rows as $row) {
+        foreach ($exportData['rows'] as $row) {
             $sheet->fromArray($row, null, 'A'.$rowNumber);
             ++$rowNumber;
         }
 
-        foreach (range('A', 'M') as $column) {
-            $sheet->getColumnDimension($column)->setAutoSize(true);
+        $columnCount = \count($exportData['headers']);
+        for ($columnIndex = 1; $columnIndex <= $columnCount; ++$columnIndex) {
+            $sheet->getColumnDimensionByColumn($columnIndex)->setAutoSize(true);
         }
 
         $filePath = tempnam(sys_get_temp_dir(), 'exercise-report-');
@@ -107,28 +118,6 @@ public function exportXlsx(int $exerciseId, Request $request): BinaryFileRespons
         return $response;
     }
 
-    /**
-     * @return array<int, string>
-     */
-    private static function getHeaders(): array
-    {
-        return [
-            'First name',
-            'Last name',
-            'Username',
-            'Group',
-            'Duration',
-            'Started at',
-            'Completed at',
-            'Score',
-            'Max score',
-            'Percentage',
-            'IP',
-            'Status',
-            'Learning path',
-        ];
-    }
-
     private function getValidatedExercise(int $exerciseId, Request $request): CQuiz
     {
         if (0 >= $exerciseId) {
@@ -199,7 +188,7 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
 
         if (null !== $session) {
             $queryBuilder
-                ->andWhere('IDENTITY(links.session) = :sessionId')
+                ->andWhere('(IDENTITY(links.session) = :sessionId OR links.session IS NULL)')
                 ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
             ;
         } else {
@@ -220,38 +209,174 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
     }
 
     /**
-     * @return array<int, array<int, int|float|string>>
+     * @return array{headers: array<int, string>, rows: array<int, array<int, int|float|string>>}
      */
-    private function buildExportRows(CQuiz $quiz, Request $request): array
+    private function buildExportData(CQuiz $quiz, Request $request): array
     {
         $course = $this->getCourse($request);
         $session = $this->getSession($request);
+        $showOfficialCode = $this->shouldShowOfficialCode();
+        $loadExtraData = $this->getBooleanQuery($request, 'extraData', 'extra_data');
+        $includeAllUsers = $this->getBooleanQuery($request, 'includeAllUsers', 'include_all_users');
+        $extraFields = $loadExtraData ? $this->getFilterableUserExtraFields() : [];
         $attempts = $this->getAttempts($quiz, $course, $session, $request);
-        $rows = [];
 
+        if ($this->getBooleanQuery($request, 'onlyBestAttempts', 'only_best_attempts')) {
+            $attempts = $this->filterBestAttempts($attempts);
+        }
+
+        $users = $includeAllUsers ? $this->getSubscribedUsers($course, $session, $request) : [];
+        $userIds = $this->collectUserIds($attempts, $users);
+        $extraFieldValues = [] !== $extraFields ? $this->getExtraFieldValues($extraFields, $userIds) : [];
+
+        $rows = [];
+        $attemptedUserIds = [];
         foreach ($attempts as $attempt) {
-            $score = $attempt->getScore();
-            $maxScore = $attempt->getMaxScore();
-            $percentage = 0.0 < $maxScore ? round(($score * 100) / $maxScore, 2) : 0.0;
-
-            $rows[] = [
-                (string) $attempt->getUser()->getFirstname(),
-                (string) $attempt->getUser()->getLastname(),
-                (string) $attempt->getUser()->getUsername(),
-                '-',
-                $this->formatDuration($attempt->getExeDuration()),
-                $this->formatDate($attempt->getStartDate()),
-                $this->formatDate($attempt->getExeDate()),
-                round($score, 2),
-                round($maxScore, 2),
-                $percentage,
-                $attempt->getUserIp(),
-                $this->getAttemptStatusLabel($attempt),
-                $this->formatLearningPath($attempt),
-            ];
+            $userId = (int) $attempt->getUser()->getId();
+            $attemptedUserIds[$userId] = true;
+            $rows[] = $this->buildAttemptRow($attempt, $showOfficialCode, $extraFields, $extraFieldValues);
+        }
+
+        if ($includeAllUsers && $this->shouldAppendNotAttemptedUsers($request)) {
+            foreach ($users as $user) {
+                $userId = (int) $user->getId();
+                if (isset($attemptedUserIds[$userId])) {
+                    continue;
+                }
+
+                $rows[] = $this->buildNotAttemptedUserRow($user, $showOfficialCode, $extraFields, $extraFieldValues);
+            }
         }
 
-        return $rows;
+        return [
+            'headers' => $this->getHeaders($showOfficialCode, $extraFields),
+            'rows' => $rows,
+        ];
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    private function getHeaders(bool $showOfficialCode, array $extraFields): array
+    {
+        $headers = [
+            'First name',
+            'Last name',
+            'Username',
+            'Group',
+            'Duration',
+            'Started at',
+            'Completed at',
+            'Score',
+            'Max score',
+            'Percentage',
+            'IP',
+            'Status',
+            'Learning path',
+        ];
+
+        if ($showOfficialCode) {
+            array_unshift($headers, 'Official code');
+        }
+
+        foreach ($extraFields as $field) {
+            $headers[] = (string) ($field['label'] ?? $field['variable'] ?? '');
+        }
+
+        return $headers;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $extraFields
+     * @param array<int, array<int, string>>  $extraFieldValues
+     *
+     * @return array<int, int|float|string>
+     */
+    private function buildAttemptRow(
+        TrackEExercise $attempt,
+        bool $showOfficialCode,
+        array $extraFields,
+        array $extraFieldValues,
+    ): array {
+        $user = $attempt->getUser();
+        $score = $attempt->getScore();
+        $maxScore = $attempt->getMaxScore();
+        $percentage = 0.0 < $maxScore ? round(($score * 100) / $maxScore, 2) : 0.0;
+
+        $row = [
+            (string) $user->getFirstname(),
+            (string) $user->getLastname(),
+            (string) $user->getUsername(),
+            '-',
+            $this->formatDuration($attempt->getExeDuration()),
+            $this->formatDate($attempt->getStartDate()),
+            $this->formatDate($attempt->getExeDate()),
+            round($score, 2),
+            round($maxScore, 2),
+            $percentage,
+            $attempt->getUserIp(),
+            $this->getAttemptStatusLabel($attempt),
+            $this->formatLearningPath($attempt),
+        ];
+
+        if ($showOfficialCode) {
+            array_unshift($row, (string) ($user->getOfficialCode() ?? ''));
+        }
+
+        $this->appendExtraFieldValues($row, $user, $extraFields, $extraFieldValues);
+
+        return $row;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $extraFields
+     * @param array<int, array<int, string>>  $extraFieldValues
+     *
+     * @return array<int, int|float|string>
+     */
+    private function buildNotAttemptedUserRow(
+        User $user,
+        bool $showOfficialCode,
+        array $extraFields,
+        array $extraFieldValues,
+    ): array {
+        $row = [
+            (string) $user->getFirstname(),
+            (string) $user->getLastname(),
+            (string) $user->getUsername(),
+            '-',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            'Not attempted',
+            '-',
+        ];
+
+        if ($showOfficialCode) {
+            array_unshift($row, (string) ($user->getOfficialCode() ?? ''));
+        }
+
+        $this->appendExtraFieldValues($row, $user, $extraFields, $extraFieldValues);
+
+        return $row;
+    }
+
+    /**
+     * @param array<int, int|float|string>    $row
+     * @param array<int, array<string, mixed>> $extraFields
+     * @param array<int, array<int, string>>  $extraFieldValues
+     */
+    private function appendExtraFieldValues(array &$row, User $user, array $extraFields, array $extraFieldValues): void
+    {
+        $userValues = $extraFieldValues[(int) $user->getId()] ?? [];
+        foreach ($extraFields as $field) {
+            $fieldId = (int) ($field['id'] ?? 0);
+            $row[] = $userValues[$fieldId] ?? '';
+        }
     }
 
     /**
@@ -280,6 +405,21 @@ private function getAttempts(CQuiz $quiz, Course $course, ?Session $session, Req
             $queryBuilder->andWhere('attempt.session IS NULL');
         }
 
+        $this->applyUserFilters($queryBuilder, $request);
+        $this->applyStatusFilter($queryBuilder, $request);
+
+        $attempts = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
+            if ($attempt instanceof TrackEExercise) {
+                $attempts[] = $attempt;
+            }
+        }
+
+        return $attempts;
+    }
+
+    private function applyUserFilters(QueryBuilder $queryBuilder, Request $request): void
+    {
         $firstName = trim((string) $request->query->get('firstName', ''));
         if ('' !== $firstName) {
             $queryBuilder
@@ -295,31 +435,227 @@ private function getAttempts(CQuiz $quiz, Course $course, ?Session $session, Req
                 ->setParameter('lastName', '%'.mb_strtolower($lastName).'%', Types::STRING)
             ;
         }
+    }
 
+    private function applyStatusFilter(QueryBuilder $queryBuilder, Request $request): void
+    {
         $status = trim((string) $request->query->get('status', ''));
         if (self::STATUS_PENDING_CORRECTION === $status) {
             $queryBuilder->andWhere("attempt.questionsToCheck <> ''");
-        } elseif (self::STATUS_INCOMPLETE === $status) {
+
+            return;
+        }
+
+        if (self::STATUS_INCOMPLETE === $status) {
             $queryBuilder
                 ->andWhere('attempt.status = :status')
                 ->setParameter('status', self::STATUS_INCOMPLETE, Types::STRING)
             ;
-        } elseif (self::STATUS_COMPLETED === $status) {
+
+            return;
+        }
+
+        if (self::STATUS_COMPLETED === $status) {
             $queryBuilder
                 ->andWhere('attempt.status = :status')
                 ->andWhere("attempt.questionsToCheck = ''")
                 ->setParameter('status', self::STATUS_COMPLETED, Types::STRING)
             ;
         }
+    }
 
-        $attempts = [];
-        foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
-            if ($attempt instanceof TrackEExercise) {
-                $attempts[] = $attempt;
+    /**
+     * @param array<int, TrackEExercise> $attempts
+     *
+     * @return array<int, TrackEExercise>
+     */
+    private function filterBestAttempts(array $attempts): array
+    {
+        $bestAttempts = [];
+        foreach ($attempts as $attempt) {
+            $userId = (int) $attempt->getUser()->getId();
+            $current = $bestAttempts[$userId] ?? null;
+            if (!$current instanceof TrackEExercise || $this->isBetterAttempt($attempt, $current)) {
+                $bestAttempts[$userId] = $attempt;
             }
         }
 
-        return $attempts;
+        return array_values($bestAttempts);
+    }
+
+    private function isBetterAttempt(TrackEExercise $candidate, TrackEExercise $current): bool
+    {
+        $candidateMaxScore = $candidate->getMaxScore();
+        $currentMaxScore = $current->getMaxScore();
+        $candidatePercentage = 0.0 < $candidateMaxScore ? ($candidate->getScore() * 100) / $candidateMaxScore : 0.0;
+        $currentPercentage = 0.0 < $currentMaxScore ? ($current->getScore() * 100) / $currentMaxScore : 0.0;
+
+        if ($candidatePercentage > $currentPercentage) {
+            return true;
+        }
+
+        if ($candidatePercentage < $currentPercentage) {
+            return false;
+        }
+
+        return $candidate->getExeDate() > $current->getExeDate();
+    }
+
+    /**
+     * @return array<int, User>
+     */
+    private function getSubscribedUsers(Course $course, ?Session $session, Request $request): array
+    {
+        if (null !== $session) {
+            $queryBuilder = $this->entityManager->createQueryBuilder()
+                ->select('rel', 'user')
+                ->from(SessionRelCourseRelUser::class, 'rel')
+                ->innerJoin('rel.user', 'user')
+                ->andWhere('IDENTITY(rel.course) = :courseId')
+                ->andWhere('IDENTITY(rel.session) = :sessionId')
+                ->andWhere('rel.status = :status')
+                ->andWhere('user.status <> :softDeleted')
+                ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+                ->setParameter('status', Session::STUDENT, Types::INTEGER)
+                ->setParameter('softDeleted', User::SOFT_DELETED, Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder = $this->entityManager->createQueryBuilder()
+                ->select('rel', 'user')
+                ->from(CourseRelUser::class, 'rel')
+                ->innerJoin('rel.user', 'user')
+                ->andWhere('IDENTITY(rel.course) = :courseId')
+                ->andWhere('rel.status = :status')
+                ->andWhere('user.status <> :softDeleted')
+                ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+                ->setParameter('status', CourseRelUser::STUDENT, Types::INTEGER)
+                ->setParameter('softDeleted', User::SOFT_DELETED, Types::INTEGER)
+            ;
+        }
+
+        $this->applyUserFilters($queryBuilder, $request);
+        $queryBuilder
+            ->orderBy('user.lastname', 'ASC')
+            ->addOrderBy('user.firstname', 'ASC')
+            ->addOrderBy('user.username', 'ASC')
+        ;
+
+        $users = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $relation) {
+            if (!$relation instanceof CourseRelUser && !$relation instanceof SessionRelCourseRelUser) {
+                continue;
+            }
+
+            $user = $relation->getUser();
+            $userId = (int) $user->getId();
+            if (0 >= $userId) {
+                continue;
+            }
+
+            $users[$userId] = $user;
+        }
+
+        return array_values($users);
+    }
+
+    /**
+     * @param array<int, TrackEExercise> $attempts
+     * @param array<int, User>           $users
+     *
+     * @return array<int, int>
+     */
+    private function collectUserIds(array $attempts, array $users): array
+    {
+        $userIds = [];
+        foreach ($attempts as $attempt) {
+            $userIds[] = (int) $attempt->getUser()->getId();
+        }
+        foreach ($users as $user) {
+            $userIds[] = (int) $user->getId();
+        }
+
+        return array_values(array_unique(array_filter($userIds, static fn (int $userId): bool => 0 < $userId)));
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getFilterableUserExtraFields(): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('field')
+            ->from(ExtraField::class, 'field')
+            ->andWhere('field.itemType = :itemType')
+            ->andWhere('field.filter = :filter')
+            ->setParameter('itemType', ExtraField::USER_FIELD_TYPE, Types::INTEGER)
+            ->setParameter('filter', true, Types::BOOLEAN)
+            ->orderBy('field.fieldOrder', 'ASC')
+            ->addOrderBy('field.id', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $fields = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof ExtraField) {
+                continue;
+            }
+
+            $fieldId = (int) $row->getId();
+            if (0 >= $fieldId) {
+                continue;
+            }
+
+            $fields[] = [
+                'id' => $fieldId,
+                'variable' => $row->getVariable(),
+                'label' => (string) ($row->getDisplayText() ?: $row->getVariable()),
+            ];
+        }
+
+        return $fields;
+    }
+
+    /**
+     * @param array<int, array<string, mixed>> $extraFields
+     * @param array<int, int>                  $userIds
+     *
+     * @return array<int, array<int, string>>
+     */
+    private function getExtraFieldValues(array $extraFields, array $userIds): array
+    {
+        $fieldIds = array_values(array_filter(
+            array_map(static fn (array $field): int => (int) ($field['id'] ?? 0), $extraFields),
+            static fn (int $fieldId): bool => 0 < $fieldId
+        ));
+
+        if ([] === $fieldIds || [] === $userIds) {
+            return [];
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('value', 'field')
+            ->from(ExtraFieldValues::class, 'value')
+            ->innerJoin('value.field', 'field')
+            ->andWhere('field.id IN (:fieldIds)')
+            ->andWhere('value.itemId IN (:userIds)')
+            ->setParameter('fieldIds', $fieldIds, ArrayParameterType::INTEGER)
+            ->setParameter('userIds', $userIds, ArrayParameterType::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $values = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof ExtraFieldValues) {
+                continue;
+            }
+
+            $values[$row->getItemId()][(int) $row->getField()->getId()] = (string) ($row->getFieldValue() ?? '');
+        }
+
+        return $values;
     }
 
     private function canExportReport(): bool
@@ -328,6 +664,25 @@ private function canExportReport(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function shouldShowOfficialCode(): bool
+    {
+        return 'true' === $this->settingsManager->getSetting('exercise.show_official_code_exercise_result_list', true);
+    }
+
+    private function shouldAppendNotAttemptedUsers(Request $request): bool
+    {
+        $status = trim((string) $request->query->get('status', ''));
+
+        return '' === $status || self::STATUS_NOT_ATTEMPTED === $status;
+    }
+
+    private function getBooleanQuery(Request $request, string $modernName, string $legacyName): bool
+    {
+        $value = $request->query->get($modernName, $request->query->get($legacyName, '0'));
+
+        return \in_array(strtolower((string) $value), ['1', 'true', 'yes', 'on'], true);
+    }
+
     private function getAttemptStatusLabel(TrackEExercise $attempt): string
     {
         if ('' !== trim($attempt->getQuestionsToCheck())) {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
index 9aded5d66d9..85503015451 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
@@ -10,6 +10,7 @@
 use ApiPlatform\State\ProviderInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeReport;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ExtraField;
 use Chamilo\CoreBundle\Entity\GradebookLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
@@ -78,6 +79,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $quiz = $this->getExerciseFromCurrentContext($exerciseId, $course, $session);
         $lockedByGradebook = $this->isGradebookLocked((int) $quiz->getIid(), $course);
         $attempts = $this->getAttempts($request, $quiz, $course, $session, $lockedByGradebook);
+        $showOfficialCode = $this->shouldShowOfficialCode();
 
         $response = new ExerciseRuntimeReport();
         $response->exerciseId = $exerciseId;
@@ -96,6 +98,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->canBulkDelete = !$lockedByGradebook && $this->canDeleteResults();
         $response->canCleanResults = !$lockedByGradebook && $this->canCleanResults();
         $response->canBulkRecalculate = !$lockedByGradebook;
+        $response->showOfficialCode = $showOfficialCode;
+        $response->extraFields = $this->getFilterableUserExtraFields();
         $response->bulkActionToken = $this->csrfTokenManager->getToken(self::BULK_ACTION_CSRF_TOKEN_ID)->getValue();
         $response->emailActionToken = $this->csrfTokenManager->getToken(self::EMAIL_ACTION_CSRF_TOKEN_ID)->getValue();
 
@@ -278,6 +282,7 @@ private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request
             'exerciseId' => (int) $quiz->getIid(),
             'userId' => $userId,
             'username' => $user->getUsername(),
+            'officialCode' => (string) ($user->getOfficialCode() ?? ''),
             'firstName' => (string) $user->getFirstname(),
             'lastName' => (string) $user->getLastname(),
             'fullName' => $user->getFullName(),
@@ -397,6 +402,51 @@ private function isSettingEnabled(string $name): bool
         return 'true' === $this->settingsManager->getSetting($name, true);
     }
 
+
+    private function shouldShowOfficialCode(): bool
+    {
+        return $this->isSettingEnabled('exercise.show_official_code_exercise_result_list');
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getFilterableUserExtraFields(): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('field')
+            ->from(ExtraField::class, 'field')
+            ->andWhere('field.itemType = :itemType')
+            ->andWhere('field.filter = :filter')
+            ->setParameter('itemType', ExtraField::USER_FIELD_TYPE, Types::INTEGER)
+            ->setParameter('filter', true, Types::BOOLEAN)
+            ->orderBy('field.fieldOrder', 'ASC')
+            ->addOrderBy('field.id', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $fields = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof ExtraField) {
+                continue;
+            }
+
+            $fieldId = (int) $row->getId();
+            if (0 >= $fieldId) {
+                continue;
+            }
+
+            $fields[] = [
+                'id' => $fieldId,
+                'variable' => $row->getVariable(),
+                'label' => (string) ($row->getDisplayText() ?: $row->getVariable()),
+            ];
+        }
+
+        return $fields;
+    }
+
     /**
      * @return array<string, string>
      */

From 534e41809d876ae71504155c5e43736fbd8e86f3 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 10:21:55 -0500
Subject: [PATCH 11/21] Enforce exercise runtime rules

---
 .../vue/views/exercise/ExercisePlayerView.vue |  9 +--
 .../ExerciseRuntimeAnswerProcessor.php        | 64 ++++++++++++++++++-
 .../ExerciseRuntimeAttemptProcessor.php       | 23 +++++++
 .../Exercise/ExerciseRuntimeProvider.php      | 34 ++++++++--
 .../ExerciseRuntimeUploadAnswerProcessor.php  | 62 ++++++++++++++++++
 5 files changed, 183 insertions(+), 9 deletions(-)

diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index cecbe999085..a59e2ea82da 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -1178,7 +1178,7 @@
             <span>
               {{ t("I confirm that my answers were saved.") }}
               <span class="block text-xs">
-                {{ t("Saved answers: {0} / {1}", [savedQuestionIds.size, visibleQuestionTotal]) }}
+                {{ t("Saved") }} {{ t("answers") }}: {{ savedQuestionIds.size }} / {{ visibleQuestionTotal }}
               </span>
             </span>
           </label>
@@ -1834,7 +1834,7 @@ async function handleExpiredTimeLimit() {
   isAutoFinishingExpiredAttempt.value = true
   attemptMessage.value = t("Time limit reached. Finishing the attempt.")
 
-  await finishAttempt({ skipDraftSave: false, expiredByTimer: true })
+  await finishAttempt({ skipDraftSave: true, expiredByTimer: true })
 }
 
 function syncQuestionCountdown() {
@@ -2384,7 +2384,7 @@ async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
   }
 
   const response = isUploadQuestion(question) || isOralQuestion(question)
-    ? await saveUploadQuestionAnswer(question, exerciseId, attemptId)
+    ? await saveUploadQuestionAnswer(question, exerciseId, attemptId, afterFeedback)
     : await exerciseService.saveExerciseRuntimeAnswer(
       {
         exerciseId,
@@ -2430,7 +2430,7 @@ async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
 }
 
 
-async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
+async function saveUploadQuestionAnswer(question, exerciseId, attemptId, afterFeedback = "none") {
   const questionAnswer = answers.value[question.id] || {}
   if (!questionAnswer.uploadFile && !questionAnswer.oralFile) {
     return null
@@ -2440,6 +2440,7 @@ async function saveUploadQuestionAnswer(question, exerciseId, attemptId) {
   formData.append("questionId", String(Number(question.id)))
   formData.append("secondsSpent", String(getQuestionSecondsSpent(question)))
   formData.append("reviewLater", isQuestionMarkedForReview(question.id) ? "1" : "0")
+  formData.append("navigationAction", afterFeedback)
   formData.append("file", questionAnswer.uploadFile || questionAnswer.oralFile)
 
   const response = await exerciseService.uploadExerciseRuntimeAnswer(
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index 09bd9d833d7..f900b30b871 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -119,6 +119,9 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new AccessDeniedHttpException('The requested question does not belong to this attempt.');
         }
 
+        $navigationAction = strtolower(trim((string) $data->navigationAction));
+        $this->assertAttemptAcceptsAnswer($attempt, $quiz, $questionId, $navigationAction);
+
         if (true === $data->reviewLaterOnly) {
             if (null !== $data->reviewLater) {
                 $this->syncReviewQuestion($attempt, $questionId, true === $data->reviewLater);
@@ -156,7 +159,8 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $this->syncReviewQuestion($attempt, $questionId, true === $data->reviewLater);
         }
 
-        $this->blockCategoryIfNeeded($attempt, $quiz, $question, (string) $data->navigationAction);
+        $this->blockCategoryIfNeeded($attempt, $quiz, $question, $navigationAction);
+        $this->lockPreventBackwardsStepIfNeeded($attempt, $quiz, $questionId, $navigationAction);
 
         $this->entityManager->flush();
 
@@ -210,6 +214,64 @@ private function syncReviewQuestion(TrackEExercise $attempt, int $questionId, bo
         $attempt->setQuestionsToCheck(implode(',', $orderedReviewQuestionIds));
     }
 
+    private function assertAttemptAcceptsAnswer(TrackEExercise $attempt, CQuiz $quiz, int $questionId, string $navigationAction): void
+    {
+        if ($this->isAttemptExpired($attempt)) {
+            throw new AccessDeniedHttpException('The time for this exercise has expired.');
+        }
+
+        if (!$this->isPreventBackwardsEnabled($quiz)) {
+            return;
+        }
+
+        $questionIndex = $this->getAttemptQuestionIndex($attempt, $questionId);
+        if (0 > $questionIndex) {
+            return;
+        }
+
+        if ($questionIndex < $attempt->getStepsCounter()) {
+            throw new AccessDeniedHttpException('You cannot update a previous question in this exercise.');
+        }
+    }
+
+    private function isAttemptExpired(TrackEExercise $attempt): bool
+    {
+        $expiredAt = $attempt->getExpiredTimeControl();
+
+        return $expiredAt instanceof DateTime && $expiredAt <= new DateTime();
+    }
+
+    private function isPreventBackwardsEnabled(CQuiz $quiz): bool
+    {
+        return 1 === (int) $quiz->getPreventBackwards();
+    }
+
+    private function lockPreventBackwardsStepIfNeeded(TrackEExercise $attempt, CQuiz $quiz, int $questionId, string $navigationAction): void
+    {
+        if (!$this->isPreventBackwardsEnabled($quiz) || !\in_array($navigationAction, ['next', 'finish'], true)) {
+            return;
+        }
+
+        $questionIndex = $this->getAttemptQuestionIndex($attempt, $questionId);
+        if (0 > $questionIndex) {
+            return;
+        }
+
+        $attempt->setStepsCounter(max($attempt->getStepsCounter(), $questionIndex + 1));
+    }
+
+    private function getAttemptQuestionIndex(TrackEExercise $attempt, int $questionId): int
+    {
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        foreach ($questionIds as $index => $attemptQuestionId) {
+            if ($questionId === $attemptQuestionId) {
+                return (int) $index;
+            }
+        }
+
+        return -1;
+    }
+
     private function blockCategoryIfNeeded(TrackEExercise $attempt, CQuiz $quiz, CQuizQuestion $question, string $navigationAction): void
     {
         if (!\in_array($navigationAction, ['next', 'finish'], true) || !$this->isBlockCategoryRuntimeEnabled($quiz)) {
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index 204eeef02ae..6320b8590d7 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -1105,6 +1105,8 @@ private function normalizeAttemptResponse(CQuiz $quiz, Course $course, ?Session
         $response->status = method_exists($attempt, 'getStatus') ? (string) $attempt->getStatus() : self::STATUS_INCOMPLETE;
         $response->message = $message;
         $response->savedAnswers = $this->getSavedAnswers((int) $attempt->getExeId());
+        $response->currentQuestionIndex = $this->getResumeQuestionIndex($attempt, $quiz, $questionIds);
+        $response->currentQuestionId = $questionIds[$response->currentQuestionIndex] ?? ($questionIds[0] ?? null);
 
         if (method_exists($attempt, 'getStartDate')) {
             $startDate = $attempt->getStartDate();
@@ -1122,6 +1124,27 @@ private function normalizeAttemptResponse(CQuiz $quiz, Course $course, ?Session
         return $response;
     }
 
+    /**
+     * @param array<int, int> $questionIds
+     */
+    private function getResumeQuestionIndex(TrackEExercise $attempt, CQuiz $quiz, array $questionIds): int
+    {
+        if (1 !== (int) $quiz->getPreventBackwards()) {
+            return 0;
+        }
+
+        if ([] === $questionIds) {
+            return 0;
+        }
+
+        $stepsCounter = max(0, (int) $attempt->getStepsCounter());
+        if (0 >= $stepsCounter) {
+            return 0;
+        }
+
+        return min($stepsCounter, \count($questionIds) - 1);
+    }
+
     private function getAttemptNumber(TrackEExercise $attempt): int
     {
         $quiz = $attempt->getQuiz();
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index 370c3bd55fa..3cb02243770 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -143,7 +143,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             && $this->canFinishWithVue($questions);
 
         $response->canManage = $canManage;
-        $response->attempt = $attempt instanceof TrackEExercise ? $this->normalizeAttempt($attempt, $questions) : null;
+        $response->attempt = $attempt instanceof TrackEExercise ? $this->normalizeAttempt($attempt, $questions, $quiz) : null;
         $response->canStartAttempt = $runsAsLearner;
         $response->canSubmit = $canSubmit;
         $response->usesLegacySubmit = $requiresLegacyRuntime || !$canSubmit;
@@ -238,7 +238,7 @@ private function getRuntimeAttempt(Request $request, CQuiz $quiz, Course $course
      *
      * @return array<string, mixed>
      */
-    private function normalizeAttempt(TrackEExercise $attempt, array $questions): array
+    private function normalizeAttempt(TrackEExercise $attempt, array $questions, CQuiz $quiz): array
     {
         $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
         $expiredAt = null;
@@ -251,13 +251,18 @@ private function normalizeAttempt(TrackEExercise $attempt, array $questions): ar
             }
         }
 
+        $currentQuestionIndex = $this->getResumeQuestionIndex($attempt, $quiz, $questionIds);
+
         return [
             'attemptId' => (int) $attempt->getExeId(),
             'attemptNumber' => $this->getAttemptNumber($attempt),
             'status' => method_exists($attempt, 'getStatus') ? (string) $attempt->getStatus() : 'incomplete',
             'questionIds' => $questionIds,
-            'currentQuestionIndex' => 0,
-            'currentQuestionId' => (int) ($questionIds[0] ?? ($questions[0]['id'] ?? 0)),
+            'currentQuestionIndex' => $currentQuestionIndex,
+            'currentQuestionId' => (int) (
+                $questionIds[$currentQuestionIndex]
+                ?? ($questions[$currentQuestionIndex]['id'] ?? ($questionIds[0] ?? ($questions[0]['id'] ?? 0)))
+            ),
             'totalQuestions' => \count($questions),
             'expiredAt' => $expiredAt,
             'remainingSeconds' => $remainingSeconds,
@@ -266,6 +271,27 @@ private function normalizeAttempt(TrackEExercise $attempt, array $questions): ar
         ];
     }
 
+    /**
+     * @param array<int, int> $questionIds
+     */
+    private function getResumeQuestionIndex(TrackEExercise $attempt, ?CQuiz $quiz, array $questionIds): int
+    {
+        if (!$quiz instanceof CQuiz || 1 !== (int) $quiz->getPreventBackwards()) {
+            return 0;
+        }
+
+        if ([] === $questionIds) {
+            return 0;
+        }
+
+        $stepsCounter = max(0, (int) $attempt->getStepsCounter());
+        if (0 >= $stepsCounter) {
+            return 0;
+        }
+
+        return min($stepsCounter, \count($questionIds) - 1);
+    }
+
     private function getAttemptNumber(TrackEExercise $attempt): int
     {
         $quiz = $attempt->getQuiz();
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index 265afb5fde2..8916963c563 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -108,6 +108,8 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new AccessDeniedHttpException('The requested question does not belong to this attempt.');
         }
 
+        $this->assertAttemptAcceptsAnswer($attempt, $quiz, $questionId);
+
         $uploadedFiles = $this->getUploadedFiles($request);
         if ([] === $uploadedFiles) {
             throw new BadRequestHttpException('A file is required for this answer.');
@@ -149,6 +151,8 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             $this->syncReviewQuestion($attempt, $questionId, true === $reviewLater);
         }
 
+        $this->lockPreventBackwardsStepIfNeeded($attempt, $quiz, $questionId, strtolower(trim((string) $request->request->get('navigationAction', ''))));
+
         $this->entityManager->flush();
 
         $response = new ExerciseRuntimeUploadAnswer();
@@ -167,6 +171,64 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         return $response;
     }
 
+    private function assertAttemptAcceptsAnswer(TrackEExercise $attempt, CQuiz $quiz, int $questionId): void
+    {
+        if ($this->isAttemptExpired($attempt)) {
+            throw new AccessDeniedHttpException('The time for this exercise has expired.');
+        }
+
+        if (!$this->isPreventBackwardsEnabled($quiz)) {
+            return;
+        }
+
+        $questionIndex = $this->getAttemptQuestionIndex($attempt, $questionId);
+        if (0 > $questionIndex) {
+            return;
+        }
+
+        if ($questionIndex < $attempt->getStepsCounter()) {
+            throw new AccessDeniedHttpException('You cannot update a previous question in this exercise.');
+        }
+    }
+
+    private function isAttemptExpired(TrackEExercise $attempt): bool
+    {
+        $expiredAt = $attempt->getExpiredTimeControl();
+
+        return $expiredAt instanceof DateTime && $expiredAt <= new DateTime();
+    }
+
+    private function isPreventBackwardsEnabled(CQuiz $quiz): bool
+    {
+        return 1 === (int) $quiz->getPreventBackwards();
+    }
+
+    private function lockPreventBackwardsStepIfNeeded(TrackEExercise $attempt, CQuiz $quiz, int $questionId, string $navigationAction): void
+    {
+        if (!$this->isPreventBackwardsEnabled($quiz) || !\in_array($navigationAction, ['next', 'finish'], true)) {
+            return;
+        }
+
+        $questionIndex = $this->getAttemptQuestionIndex($attempt, $questionId);
+        if (0 > $questionIndex) {
+            return;
+        }
+
+        $attempt->setStepsCounter(max($attempt->getStepsCounter(), $questionIndex + 1));
+    }
+
+    private function getAttemptQuestionIndex(TrackEExercise $attempt, int $questionId): int
+    {
+        $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());
+        foreach ($questionIds as $index => $attemptQuestionId) {
+            if ($questionId === $attemptQuestionId) {
+                return (int) $index;
+            }
+        }
+
+        return -1;
+    }
+
     private function syncReviewQuestion(TrackEExercise $attempt, int $questionId, bool $reviewLater): void
     {
         $questionIds = $this->parseQuestionIds((string) $attempt->getDataTracking());

From 9d7401c93166d0a77f2e5a5c15e0b44ba6e355b1 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 11:13:54 -0500
Subject: [PATCH 12/21] Restore exercise report group filters

---
 .../vue/views/exercise/ExerciseReportView.vue |  62 ++++-
 .../Exercise/ExerciseRuntimeReport.php        |   7 +
 .../ExerciseRuntimeReportExportService.php    | 117 +++++++++-
 .../ExerciseRuntimeReportProvider.php         | 214 ++++++++++++++++--
 4 files changed, 372 insertions(+), 28 deletions(-)

diff --git a/assets/vue/views/exercise/ExerciseReportView.vue b/assets/vue/views/exercise/ExerciseReportView.vue
index 932b848de9c..b61eb8f4add 100644
--- a/assets/vue/views/exercise/ExerciseReportView.vue
+++ b/assets/vue/views/exercise/ExerciseReportView.vue
@@ -261,7 +261,7 @@
       class="rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
       @submit.prevent="applyFilters"
     >
-      <div class="grid gap-3 md:grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_auto] md:items-end">
+      <div class="grid gap-3 md:grid-cols-2 lg:grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_auto] lg:items-end">
         <BaseInputText
           id="exercise-report-first-name"
           v-model="filterForm.firstName"
@@ -283,6 +283,15 @@
           option-label="label"
           option-value="value"
         />
+        <BaseSelect
+          id="exercise-report-group"
+          v-model="filterForm.groupId"
+          :label="t('Group')"
+          name="groupId"
+          :options="groupOptions"
+          option-label="label"
+          option-value="value"
+        />
         <div class="flex min-h-[42px] flex-wrap items-end gap-2 md:self-end">
           <BaseButton
             :is-loading="isLoading"
@@ -501,6 +510,7 @@ const description = ref("")
 const attempts = ref([])
 const selectedAttempts = ref([])
 const actionUrls = ref({})
+const groupOptions = ref([])
 const showOfficialCode = ref(false)
 const lockedByGradebook = ref(false)
 const canBulkDelete = ref(false)
@@ -521,8 +531,9 @@ const filterForm = reactive({
   firstName: getQueryValue(route.query.firstName) || "",
   lastName: getQueryValue(route.query.lastName) || "",
   status: getQueryValue(route.query.status) || "",
+  groupId: getQueryValue(route.query.groupId) || getQueryValue(route.query.group_id) || "",
 })
-const isSearchVisible = ref(Boolean(filterForm.firstName || filterForm.lastName || filterForm.status))
+const isSearchVisible = ref(Boolean(filterForm.firstName || filterForm.lastName || filterForm.status || filterForm.groupId))
 
 const statusOptions = computed(() => [
   { label: t("All"), value: "" },
@@ -539,7 +550,15 @@ const selectedAttemptIds = computed(() =>
   selectedAttempts.value.map((attempt) => Number(attempt.attemptId || attempt.id || 0)).filter((attemptId) => attemptId > 0),
 )
 const hasSelectedAttempts = computed(() => selectedAttemptIds.value.length > 0)
-const hasFilters = computed(() => Boolean(getQueryValue(route.query.firstName) || getQueryValue(route.query.lastName) || getQueryValue(route.query.status)))
+const hasFilters = computed(() =>
+  Boolean(
+    getQueryValue(route.query.firstName) ||
+      getQueryValue(route.query.lastName) ||
+      getQueryValue(route.query.status) ||
+      getQueryValue(route.query.groupId) ||
+      getQueryValue(route.query.group_id),
+  ),
+)
 const availableIcons = Object.keys(chamiloIconToClass)
 
 function safeIcon(icon, fallback = "information") {
@@ -558,6 +577,29 @@ function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
 }
 
+function buildGroupOptions(options) {
+  const normalizedOptions = [
+    { label: t("All"), value: "" },
+    { label: t("None"), value: "group_none" },
+  ]
+
+  if (!Array.isArray(options)) {
+    return normalizedOptions
+  }
+
+  for (const option of options) {
+    const value = String(option?.value || "")
+    if (value) {
+      normalizedOptions.push({
+        label: String(option?.label || value),
+        value,
+      })
+    }
+  }
+
+  return normalizedOptions
+}
+
 function getContextParams() {
   return {
     cid: getQueryValue(route.query.cid),
@@ -597,6 +639,7 @@ function getReportParams() {
     firstName: getQueryValue(route.query.firstName),
     lastName: getQueryValue(route.query.lastName),
     status: getQueryValue(route.query.status),
+    groupId: getQueryValue(route.query.groupId) || getQueryValue(route.query.group_id),
   }
 }
 
@@ -628,6 +671,7 @@ async function loadReport() {
     attempts.value = Array.isArray(response.attempts) ? response.attempts : []
     selectedAttempts.value = []
     actionUrls.value = response.actionUrls || {}
+    groupOptions.value = buildGroupOptions(response.groupOptions)
     showOfficialCode.value = true === response.showOfficialCode
     lockedByGradebook.value = true === response.lockedByGradebook
     canBulkDelete.value = true === response.canBulkDelete
@@ -668,6 +712,14 @@ function applyFilters() {
     delete query.status
   }
 
+  if (filterForm.groupId) {
+    query.groupId = filterForm.groupId
+  } else {
+    delete query.groupId
+  }
+  delete query.group_id
+  delete query.group_id_in_toolbar
+
   router.push({ name: route.name, params: route.params, query })
 }
 
@@ -675,10 +727,14 @@ function clearFilters() {
   filterForm.firstName = ""
   filterForm.lastName = ""
   filterForm.status = ""
+  filterForm.groupId = ""
   const query = { ...route.query }
   delete query.firstName
   delete query.lastName
   delete query.status
+  delete query.groupId
+  delete query.group_id
+  delete query.group_id_in_toolbar
   router.push({ name: route.name, params: route.params, query })
 }
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
index 1a4be416515..339225117af 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeReport.php
@@ -30,6 +30,7 @@
                     new Parameter(name: 'firstName', in: 'query', required: false, schema: ['type' => 'string']),
                     new Parameter(name: 'lastName', in: 'query', required: false, schema: ['type' => 'string']),
                     new Parameter(name: 'status', in: 'query', required: false, schema: ['type' => 'string']),
+                    new Parameter(name: 'groupId', in: 'query', required: false, schema: ['type' => 'string']),
                 ],
             ),
             security: "is_granted('ROLE_CURRENT_COURSE_TEACHER') or is_granted('ROLE_CURRENT_COURSE_SESSION_TEACHER')",
@@ -63,6 +64,12 @@ final class ExerciseRuntimeReport
     #[Groups(['exercise_runtime_report:read'])]
     public array $filters = [];
 
+    /**
+     * @var array<int, array<string, int|string>>
+     */
+    #[Groups(['exercise_runtime_report:read'])]
+    public array $groupOptions = [];
+
     /**
      * @var array<string, string>
      */
diff --git a/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php b/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
index 0cf3ff014da..30b0fd14f1a 100644
--- a/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
+++ b/src/CoreBundle/Service/Exercise/ExerciseRuntimeReportExportService.php
@@ -15,6 +15,7 @@
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CGroupRelUser;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTimeInterface;
@@ -227,6 +228,7 @@ private function buildExportData(CQuiz $quiz, Request $request): array
 
         $users = $includeAllUsers ? $this->getSubscribedUsers($course, $session, $request) : [];
         $userIds = $this->collectUserIds($attempts, $users);
+        $groupNamesByUser = $this->getGroupNamesByUserIds($userIds, $course);
         $extraFieldValues = [] !== $extraFields ? $this->getExtraFieldValues($extraFields, $userIds) : [];
 
         $rows = [];
@@ -234,7 +236,13 @@ private function buildExportData(CQuiz $quiz, Request $request): array
         foreach ($attempts as $attempt) {
             $userId = (int) $attempt->getUser()->getId();
             $attemptedUserIds[$userId] = true;
-            $rows[] = $this->buildAttemptRow($attempt, $showOfficialCode, $extraFields, $extraFieldValues);
+            $rows[] = $this->buildAttemptRow(
+                $attempt,
+                $showOfficialCode,
+                $extraFields,
+                $extraFieldValues,
+                $groupNamesByUser[$userId] ?? '-'
+            );
         }
 
         if ($includeAllUsers && $this->shouldAppendNotAttemptedUsers($request)) {
@@ -244,7 +252,13 @@ private function buildExportData(CQuiz $quiz, Request $request): array
                     continue;
                 }
 
-                $rows[] = $this->buildNotAttemptedUserRow($user, $showOfficialCode, $extraFields, $extraFieldValues);
+                $rows[] = $this->buildNotAttemptedUserRow(
+                    $user,
+                    $showOfficialCode,
+                    $extraFields,
+                    $extraFieldValues,
+                    $groupNamesByUser[$userId] ?? '-'
+                );
             }
         }
 
@@ -297,6 +311,7 @@ private function buildAttemptRow(
         bool $showOfficialCode,
         array $extraFields,
         array $extraFieldValues,
+        string $groupName,
     ): array {
         $user = $attempt->getUser();
         $score = $attempt->getScore();
@@ -307,7 +322,7 @@ private function buildAttemptRow(
             (string) $user->getFirstname(),
             (string) $user->getLastname(),
             (string) $user->getUsername(),
-            '-',
+            $groupName,
             $this->formatDuration($attempt->getExeDuration()),
             $this->formatDate($attempt->getStartDate()),
             $this->formatDate($attempt->getExeDate()),
@@ -339,12 +354,13 @@ private function buildNotAttemptedUserRow(
         bool $showOfficialCode,
         array $extraFields,
         array $extraFieldValues,
+        string $groupName,
     ): array {
         $row = [
             (string) $user->getFirstname(),
             (string) $user->getLastname(),
             (string) $user->getUsername(),
-            '-',
+            $groupName,
             '',
             '',
             '',
@@ -406,6 +422,7 @@ private function getAttempts(CQuiz $quiz, Course $course, ?Session $session, Req
         }
 
         $this->applyUserFilters($queryBuilder, $request);
+        $this->applyGroupFilter($queryBuilder, $course, $request);
         $this->applyStatusFilter($queryBuilder, $request);
 
         $attempts = [];
@@ -437,6 +454,47 @@ private function applyUserFilters(QueryBuilder $queryBuilder, Request $request):
         }
     }
 
+    private function applyGroupFilter(QueryBuilder $queryBuilder, Course $course, Request $request): void
+    {
+        $groupFilter = $this->getGroupFilterValue($request);
+        if ('' === $groupFilter || 'group_all' === $groupFilter) {
+            return;
+        }
+
+        $joinType = 'group_none' === $groupFilter ? 'leftJoin' : 'innerJoin';
+        $queryBuilder
+            ->{$joinType}(
+                CGroupRelUser::class,
+                'groupRelFilter',
+                'WITH',
+                'groupRelFilter.user = user AND groupRelFilter.cId = :groupCourseId'
+            )
+            ->setParameter('groupCourseId', (int) $course->getId(), Types::INTEGER)
+        ;
+
+        if ('group_none' === $groupFilter) {
+            $queryBuilder->andWhere('groupRelFilter.iid IS NULL');
+
+            return;
+        }
+
+        $groupId = (int) $groupFilter;
+        if (0 < $groupId) {
+            $queryBuilder
+                ->andWhere('IDENTITY(groupRelFilter.group) = :groupId')
+                ->setParameter('groupId', $groupId, Types::INTEGER)
+            ;
+        }
+    }
+
+    private function getGroupFilterValue(Request $request): string
+    {
+        return trim((string) $request->query->get(
+            'groupId',
+            $request->query->get('group_id', $request->query->get('group_id_in_toolbar', ''))
+        ));
+    }
+
     private function applyStatusFilter(QueryBuilder $queryBuilder, Request $request): void
     {
         $status = trim((string) $request->query->get('status', ''));
@@ -535,6 +593,7 @@ private function getSubscribedUsers(Course $course, ?Session $session, Request $
         }
 
         $this->applyUserFilters($queryBuilder, $request);
+        $this->applyGroupFilter($queryBuilder, $course, $request);
         $queryBuilder
             ->orderBy('user.lastname', 'ASC')
             ->addOrderBy('user.firstname', 'ASC')
@@ -578,6 +637,56 @@ private function collectUserIds(array $attempts, array $users): array
         return array_values(array_unique(array_filter($userIds, static fn (int $userId): bool => 0 < $userId)));
     }
 
+    /**
+     * @param array<int, int> $userIds
+     *
+     * @return array<int, string>
+     */
+    private function getGroupNamesByUserIds(array $userIds, Course $course): array
+    {
+        if ([] === $userIds) {
+            return [];
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('rel', 'groupInfo')
+            ->from(CGroupRelUser::class, 'rel')
+            ->innerJoin('rel.group', 'groupInfo')
+            ->andWhere('rel.cId = :courseId')
+            ->andWhere('IDENTITY(rel.user) IN (:userIds)')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userIds', $userIds, ArrayParameterType::INTEGER)
+            ->orderBy('groupInfo.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $names = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CGroupRelUser) {
+                continue;
+            }
+
+            $userId = (int) $row->getUser()->getId();
+            $title = trim($row->getGroup()->getTitle());
+            if ('' === $title) {
+                continue;
+            }
+
+            if (!isset($names[$userId])) {
+                $names[$userId] = [];
+            }
+            $names[$userId][] = $title;
+        }
+
+        $formatted = [];
+        foreach ($names as $userId => $groupNames) {
+            $formatted[$userId] = implode(', ', array_values(array_unique($groupNames)));
+        }
+
+        return $formatted;
+    }
+
     /**
      * @return array<int, array<string, mixed>>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
index 85503015451..9b0307c0cd5 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeReportProvider.php
@@ -15,12 +15,15 @@
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CourseBundle\Entity\CGroupRelUser;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTimeInterface;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -80,6 +83,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $lockedByGradebook = $this->isGradebookLocked((int) $quiz->getIid(), $course);
         $attempts = $this->getAttempts($request, $quiz, $course, $session, $lockedByGradebook);
         $showOfficialCode = $this->shouldShowOfficialCode();
+        $groupOptions = $this->getGroupOptions($course);
 
         $response = new ExerciseRuntimeReport();
         $response->exerciseId = $exerciseId;
@@ -90,7 +94,9 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             'firstName' => trim((string) $request->query->get('firstName', '')),
             'lastName' => trim((string) $request->query->get('lastName', '')),
             'status' => trim((string) $request->query->get('status', '')),
+            'groupId' => $this->getGroupFilterValue($request),
         ];
+        $response->groupOptions = $groupOptions;
         $response->actionUrls = $this->getActionUrls($quiz, $request);
         $response->totalItems = \count($attempts);
         $response->canManage = true;
@@ -212,21 +218,8 @@ private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Ses
             $queryBuilder->andWhere('attempt.session IS NULL');
         }
 
-        $firstName = trim((string) $request->query->get('firstName', ''));
-        if ('' !== $firstName) {
-            $queryBuilder
-                ->andWhere('LOWER(user.firstname) LIKE :firstName')
-                ->setParameter('firstName', '%'.mb_strtolower($firstName).'%', Types::STRING)
-            ;
-        }
-
-        $lastName = trim((string) $request->query->get('lastName', ''));
-        if ('' !== $lastName) {
-            $queryBuilder
-                ->andWhere('LOWER(user.lastname) LIKE :lastName')
-                ->setParameter('lastName', '%'.mb_strtolower($lastName).'%', Types::STRING)
-            ;
-        }
+        $this->applyUserFilters($queryBuilder, $request);
+        $this->applyGroupFilter($queryBuilder, $course, $request);
 
         $status = trim((string) $request->query->get('status', ''));
         if (self::STATUS_PENDING_CORRECTION === $status) {
@@ -244,13 +237,25 @@ private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Ses
             ;
         }
 
-        $attempts = [];
+        $attemptRows = [];
         foreach ($queryBuilder->getQuery()->getResult() as $attempt) {
-            if (!$attempt instanceof TrackEExercise) {
-                continue;
+            if ($attempt instanceof TrackEExercise) {
+                $attemptRows[] = $attempt;
             }
+        }
 
-            $attempts[] = $this->normalizeAttempt($attempt, $quiz, $request, $lockedByGradebook);
+        $groupNamesByUser = $this->getGroupNamesByUserIds($this->collectUserIdsFromAttempts($attemptRows), $course);
+
+        $attempts = [];
+        foreach ($attemptRows as $attempt) {
+            $userId = (int) $attempt->getUser()->getId();
+            $attempts[] = $this->normalizeAttempt(
+                $attempt,
+                $quiz,
+                $request,
+                $lockedByGradebook,
+                $groupNamesByUser[$userId] ?? '-'
+            );
         }
 
         return $attempts;
@@ -259,7 +264,7 @@ private function getAttempts(Request $request, CQuiz $quiz, Course $course, ?Ses
     /**
      * @return array<string, mixed>
      */
-    private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request $request, bool $lockedByGradebook): array
+    private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request $request, bool $lockedByGradebook, string $groupName): array
     {
         $user = $attempt->getUser();
         $questionsToCheck = $this->parseQuestionIds($attempt->getQuestionsToCheck());
@@ -286,7 +291,7 @@ private function normalizeAttempt(TrackEExercise $attempt, CQuiz $quiz, Request
             'firstName' => (string) $user->getFirstname(),
             'lastName' => (string) $user->getLastname(),
             'fullName' => $user->getFullName(),
-            'groupName' => '-',
+            'groupName' => $groupName,
             'duration' => $attempt->getExeDuration(),
             'startedAt' => $this->formatDate($attempt->getStartDate()),
             'completedAt' => $this->formatDate($attempt->getExeDate()),
@@ -349,6 +354,168 @@ private function parseQuestionIds(string $value): array
         return array_values(array_unique($ids));
     }
 
+    private function applyUserFilters(QueryBuilder $queryBuilder, Request $request): void
+    {
+        $firstName = trim((string) $request->query->get('firstName', ''));
+        if ('' !== $firstName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.firstname) LIKE :firstName')
+                ->setParameter('firstName', '%'.mb_strtolower($firstName).'%', Types::STRING)
+            ;
+        }
+
+        $lastName = trim((string) $request->query->get('lastName', ''));
+        if ('' !== $lastName) {
+            $queryBuilder
+                ->andWhere('LOWER(user.lastname) LIKE :lastName')
+                ->setParameter('lastName', '%'.mb_strtolower($lastName).'%', Types::STRING)
+            ;
+        }
+    }
+
+    private function applyGroupFilter(QueryBuilder $queryBuilder, Course $course, Request $request): void
+    {
+        $groupFilter = $this->getGroupFilterValue($request);
+        if ('' === $groupFilter || 'group_all' === $groupFilter) {
+            return;
+        }
+
+        $joinType = 'group_none' === $groupFilter ? 'leftJoin' : 'innerJoin';
+        $queryBuilder
+            ->{$joinType}(
+                CGroupRelUser::class,
+                'groupRelFilter',
+                'WITH',
+                'groupRelFilter.user = user AND groupRelFilter.cId = :groupCourseId'
+            )
+            ->setParameter('groupCourseId', (int) $course->getId(), Types::INTEGER)
+        ;
+
+        if ('group_none' === $groupFilter) {
+            $queryBuilder->andWhere('groupRelFilter.iid IS NULL');
+
+            return;
+        }
+
+        $groupId = (int) $groupFilter;
+        if (0 < $groupId) {
+            $queryBuilder
+                ->andWhere('IDENTITY(groupRelFilter.group) = :groupId')
+                ->setParameter('groupId', $groupId, Types::INTEGER)
+            ;
+        }
+    }
+
+    private function getGroupFilterValue(Request $request): string
+    {
+        return trim((string) $request->query->get(
+            'groupId',
+            $request->query->get('group_id', $request->query->get('group_id_in_toolbar', ''))
+        ));
+    }
+
+    /**
+     * @param array<int, TrackEExercise> $attempts
+     *
+     * @return array<int, int>
+     */
+    private function collectUserIdsFromAttempts(array $attempts): array
+    {
+        $userIds = [];
+        foreach ($attempts as $attempt) {
+            $userIds[] = (int) $attempt->getUser()->getId();
+        }
+
+        return array_values(array_unique(array_filter($userIds, static fn (int $userId): bool => 0 < $userId)));
+    }
+
+    /**
+     * @param array<int, int> $userIds
+     *
+     * @return array<int, string>
+     */
+    private function getGroupNamesByUserIds(array $userIds, Course $course): array
+    {
+        if ([] === $userIds) {
+            return [];
+        }
+
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('rel', 'groupInfo')
+            ->from(CGroupRelUser::class, 'rel')
+            ->innerJoin('rel.group', 'groupInfo')
+            ->andWhere('rel.cId = :courseId')
+            ->andWhere('IDENTITY(rel.user) IN (:userIds)')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userIds', $userIds, ArrayParameterType::INTEGER)
+            ->orderBy('groupInfo.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $names = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CGroupRelUser) {
+                continue;
+            }
+
+            $userId = (int) $row->getUser()->getId();
+            $title = trim($row->getGroup()->getTitle());
+            if ('' === $title) {
+                continue;
+            }
+
+            if (!isset($names[$userId])) {
+                $names[$userId] = [];
+            }
+            $names[$userId][] = $title;
+        }
+
+        $formatted = [];
+        foreach ($names as $userId => $groupNames) {
+            $formatted[$userId] = implode(', ', array_values(array_unique($groupNames)));
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * @return array<int, array<string, int|string>>
+     */
+    private function getGroupOptions(Course $course): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('rel', 'groupInfo')
+            ->from(CGroupRelUser::class, 'rel')
+            ->innerJoin('rel.group', 'groupInfo')
+            ->andWhere('rel.cId = :courseId')
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->orderBy('groupInfo.title', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $options = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CGroupRelUser) {
+                continue;
+            }
+
+            $group = $row->getGroup();
+            $groupId = (int) $group->getIid();
+            if (0 >= $groupId || isset($options[$groupId])) {
+                continue;
+            }
+
+            $options[$groupId] = [
+                'label' => $group->getTitle(),
+                'value' => $groupId,
+            ];
+        }
+
+        return array_values($options);
+    }
+
     private function canDeleteResults(): bool
     {
         if ($this->security->isGranted('ROLE_ADMIN')) {
@@ -489,6 +656,11 @@ private function getExportParams(int $exerciseId, Request $request): array
             }
         }
 
+        $groupFilter = $this->getGroupFilterValue($request);
+        if ('' !== $groupFilter && 'group_all' !== $groupFilter) {
+            $params['groupId'] = $groupFilter;
+        }
+
         return $params;
     }
 

From 32c34c9aec8b846f97daf2268aa6ee68e1ce71b0 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Mon, 15 Jun 2026 12:27:08 -0500
Subject: [PATCH 13/21] Restore exercise category score breakdown

---
 assets/locales/en_US.json                     |   3 +
 .../vue/views/exercise/ExerciseResultView.vue |  62 +++++++
 .../Exercise/ExerciseRuntimeResult.php        |   6 +
 .../ExerciseRuntimeResultProvider.php         | 154 ++++++++++++++++++
 4 files changed, 225 insertions(+)

diff --git a/assets/locales/en_US.json b/assets/locales/en_US.json
index d86ab1fac91..5ade927b85d 100644
--- a/assets/locales/en_US.json
+++ b/assets/locales/en_US.json
@@ -1605,6 +1605,9 @@
     "Standard list": "Standard list",
     "Management list": "Management list",
     "Categories": "Categories",
+    "Absolute score": "Absolute score",
+    "Relative score": "Relative score",
+    "Total": "Total",
     "Registr. allowed": "Registr. allowed",
     "Unreg. allowed": "Unreg. allowed",
     "Creation date": "Creation date",
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index 92ec74e5355..8b6788543d7 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -236,6 +236,40 @@
         </div>
       </div>
 
+      <div
+        v-if="shouldShowCategoryScores"
+        class="overflow-hidden rounded-xl border border-gray-20 bg-white shadow-sm"
+      >
+        <div class="border-b border-gray-20 bg-gray-10 p-4">
+          <h2 class="text-lg font-semibold text-gray-90">{{ t("Categories") }}</h2>
+        </div>
+        <div class="overflow-x-auto p-4">
+          <table class="min-w-full text-sm">
+            <thead>
+              <tr class="border-b border-gray-20 text-left text-xs font-semibold uppercase tracking-wide text-gray-500">
+                <th class="px-3 py-2">{{ t("Categories") }}</th>
+                <th class="px-3 py-2 text-right">{{ t("Absolute score") }}</th>
+                <th class="px-3 py-2 text-right">{{ t("Relative score") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr
+                v-for="categoryScore in categoryScores"
+                :key="categoryScoreKey(categoryScore)"
+                class="border-b border-gray-20"
+                :class="categoryScore.isTotal ? 'bg-gray-10 font-semibold' : ''"
+              >
+                <td class="px-3 py-2">{{ categoryScoreTitle(categoryScore) }}</td>
+                <td class="px-3 py-2 text-right">
+                  {{ formatNumber(categoryScore.score) }} / {{ formatNumber(categoryScore.maxScore) }}
+                </td>
+                <td class="px-3 py-2 text-right">{{ formatNumber(categoryScore.percentage) }}%</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+
       <div
         v-if="!questions.length && visibility.showQuestionDetails === false"
         class="rounded-xl border border-info/30 bg-support-1 p-4 text-sm text-support-4"
@@ -1514,6 +1548,7 @@ const description = ref("")
 const attempt = ref({})
 const visibility = ref({})
 const questions = ref([])
+const categoryScores = ref([])
 const ranking = ref([])
 const finalActions = ref({})
 const aiCorrection = ref({})
@@ -1628,6 +1663,32 @@ const showStandaloneFinalActions = computed(() => {
     && getCourseId() > 0
 })
 
+const shouldShowCategoryScores = computed(() => {
+  return visibility.value?.showScore === true
+    && visibility.value?.showCategoryTable !== false
+    && categoryScores.value.length > 0
+})
+
+function categoryScoreKey(categoryScore) {
+  if (categoryScore?.isTotal) {
+    return "total"
+  }
+
+  if (categoryScore?.labelKey) {
+    return `label-${categoryScore.labelKey}`
+  }
+
+  return `category-${Number(categoryScore?.categoryId || 0)}`
+}
+
+function categoryScoreTitle(categoryScore) {
+  if (categoryScore?.labelKey) {
+    return t(categoryScore.labelKey)
+  }
+
+  return displayText(categoryScore?.title || "", t("None"))
+}
+
 function buildPlayerQuery(startResponse = null) {
   const query = { ...getContextParams() }
   const attemptId = Number(startResponse?.attemptId || 0)
@@ -1703,6 +1764,7 @@ async function loadResult() {
     attempt.value = response.attempt || {}
     visibility.value = response.visibility || {}
     questions.value = Array.isArray(response.questions) ? response.questions : []
+    categoryScores.value = Array.isArray(response.categoryScores) ? response.categoryScores : []
     ranking.value = Array.isArray(response.ranking) ? response.ranking : []
     finalActions.value = response.finalActions || {}
     aiCorrection.value = response.aiCorrection || {}
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
index a23e74b457b..f216d40310f 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
@@ -74,6 +74,12 @@ final class ExerciseRuntimeResult
     #[Groups(['exercise_runtime_result:read'])]
     public array $questions = [];
 
+    /**
+     * @var array<int, array<string, mixed>>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $categoryScores = [];
+
     /**
      * @var array<int, array<string, mixed>>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index 736670ba245..d63001d4e38 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -20,6 +20,7 @@
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Entity\CLpItem;
@@ -118,6 +119,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
         $visibility['isReviewMode'] = $isReviewMode;
 
+        $categoryScores = $this->getCategoryScores($questionIds, $rowsByQuestion, $attempt, $visibility);
+
         $questions = [];
         if ($canManage || true === ($visibility['showQuestionDetails'] ?? false)) {
             $questions = $this->getQuestions($quiz, $questionIds, $rowsByQuestion, $visibility, $pendingQuestionIds, $canManage, $isReviewMode);
@@ -140,6 +143,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->attempt = $this->normalizeAttempt($attempt, $quiz, $visibility);
         $response->visibility = $visibility;
         $response->questions = $questions;
+        $response->categoryScores = $categoryScores;
         $response->ranking = true === ($visibility['showRanking'] ?? false)
             ? $this->getRanking($quiz, $course, $session, $attempt)
             : [];
@@ -736,6 +740,156 @@ private function getFinishedText(CQuiz $quiz, ?bool $passed): string
         return (string) $quiz->getTextWhenFinished();
     }
 
+    /**
+     * @param array<int, int>                       $questionIds
+     * @param array<int, array<int, TrackEAttempt>> $rowsByQuestion
+     * @param array<string, mixed>                  $visibility
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    private function getCategoryScores(array $questionIds, array $rowsByQuestion, TrackEExercise $attempt, array $visibility): array
+    {
+        if ([] === $questionIds || true !== ($visibility['showScore'] ?? false) || true !== ($visibility['showCategoryTable'] ?? false)) {
+            return [];
+        }
+
+        $questionsById = $this->getQuestionsById($questionIds);
+        $categoryRows = [];
+        $noneRow = null;
+        $hasNamedCategory = false;
+
+        foreach ($questionIds as $questionId) {
+            $question = $questionsById[$questionId] ?? null;
+            if (!$question instanceof CQuizQuestion || $this->isStructuralContentQuestion($question)) {
+                continue;
+            }
+
+            $score = $this->getQuestionScore($rowsByQuestion[$questionId] ?? []);
+            $maxScore = $this->getQuestionMaxScore($question);
+            if (0.0 === $score && 0.0 === $maxScore) {
+                continue;
+            }
+
+            $categories = $question->getCategories();
+            if (0 === $categories->count()) {
+                if (null === $noneRow) {
+                    $noneRow = [
+                        'categoryId' => null,
+                        'title' => '',
+                        'labelKey' => 'None',
+                        'score' => 0.0,
+                        'maxScore' => 0.0,
+                    ];
+                }
+
+                $noneRow['score'] += $score;
+                $noneRow['maxScore'] += $maxScore;
+
+                continue;
+            }
+
+            foreach ($categories as $category) {
+                if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+                    continue;
+                }
+
+                $categoryId = (int) $category->getIid();
+                if (!isset($categoryRows[$categoryId])) {
+                    $categoryRows[$categoryId] = [
+                        'categoryId' => $categoryId,
+                        'title' => $category->getTitle(),
+                        'labelKey' => null,
+                        'score' => 0.0,
+                        'maxScore' => 0.0,
+                    ];
+                }
+
+                $categoryRows[$categoryId]['score'] += $score;
+                $categoryRows[$categoryId]['maxScore'] += $maxScore;
+                $hasNamedCategory = true;
+            }
+        }
+
+        if (!$hasNamedCategory) {
+            return [];
+        }
+
+        uasort($categoryRows, static function (array $left, array $right): int {
+            return strcasecmp((string) ($left['title'] ?? ''), (string) ($right['title'] ?? ''));
+        });
+
+        $rows = [];
+        foreach ($categoryRows as $row) {
+            $rows[] = $this->normalizeCategoryScoreRow($row);
+        }
+
+        if (null !== $noneRow && 0.0 < (float) ($noneRow['maxScore'] ?? 0.0)) {
+            $rows[] = $this->normalizeCategoryScoreRow($noneRow);
+        }
+
+        $rows[] = $this->normalizeCategoryScoreRow([
+            'categoryId' => null,
+            'title' => '',
+            'labelKey' => 'Total',
+            'score' => (float) $attempt->getScore(),
+            'maxScore' => (float) $attempt->getMaxScore(),
+            'isTotal' => true,
+        ]);
+
+        return $rows;
+    }
+
+    /**
+     * @param array<int, int> $questionIds
+     *
+     * @return array<int, CQuizQuestion>
+     */
+    private function getQuestionsById(array $questionIds): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('question')
+            ->addSelect('category')
+            ->from(CQuizQuestion::class, 'question')
+            ->leftJoin('question.categories', 'category')
+            ->andWhere('question.iid IN (:questionIds)')
+            ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questions = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof CQuizQuestion || null === $row->getIid()) {
+                continue;
+            }
+
+            $questions[(int) $row->getIid()] = $row;
+        }
+
+        return $questions;
+    }
+
+    /**
+     * @param array<string, mixed> $row
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeCategoryScoreRow(array $row): array
+    {
+        $score = (float) ($row['score'] ?? 0.0);
+        $maxScore = (float) ($row['maxScore'] ?? 0.0);
+
+        return [
+            'categoryId' => isset($row['categoryId']) ? (int) $row['categoryId'] : null,
+            'title' => (string) ($row['title'] ?? ''),
+            'labelKey' => isset($row['labelKey']) ? (string) $row['labelKey'] : null,
+            'score' => $score,
+            'maxScore' => $maxScore,
+            'percentage' => 0.0 < $maxScore ? round(($score / $maxScore) * 100, 2) : 0.0,
+            'isTotal' => true === ($row['isTotal'] ?? false),
+        ];
+    }
+
     /**
      * @param array<int, int>                      $questionIds
      * @param array<int, array<int, TrackEAttempt>> $rowsByQuestion

From 20832935bb7ae8bcdff16bc62b4f135e2f09cfbf Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Tue, 16 Jun 2026 01:23:10 -0500
Subject: [PATCH 14/21] Exercise: Restore exercise runtime settings parity

---
 .../vue/views/exercise/ExercisePlayerView.vue | 43 ++++++++++--
 .../Exercise/ExerciseOverviewProvider.php     | 67 ++++++++++++++++++-
 .../ExerciseRuntimeAttemptProcessor.php       | 16 +++++
 .../Exercise/ExerciseRuntimeProvider.php      |  2 +
 4 files changed, 121 insertions(+), 7 deletions(-)

diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index a59e2ea82da..e69c560a9be 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -213,9 +213,9 @@
       >
         <div class="space-y-2">
           <h2 class="text-xl font-semibold text-gray-90">
-            {{ t("Questions to be reviewed") }}
+            {{ reviewReminderTitle }}
           </h2>
-          <p class="text-sm text-gray-700">
+          <p v-if="isReviewAnswersEnabled" class="text-sm text-gray-700">
             {{ t("Review selected questions") }}
           </p>
           <div
@@ -234,6 +234,7 @@
             :class="question.isAnswered ? 'bg-white' : 'border-danger/30 bg-danger/10 text-danger'"
           >
             <input
+              v-if="isReviewAnswersEnabled"
               :checked="question.isMarked"
               class="mt-1"
               :disabled="isReviewFlagSaving"
@@ -257,6 +258,15 @@
 
         <div class="flex flex-wrap gap-2">
           <BaseButton
+            v-if="!isReviewAnswersEnabled && firstUnansweredReviewQuestionId > 0"
+            :disabled="isReviewFlagSaving"
+            :label="t('Proceed with the test')"
+            icon="back"
+            type="secondary"
+            @click="returnToFirstUnansweredQuestion"
+          />
+          <BaseButton
+            v-if="isReviewAnswersEnabled"
             :disabled="isReviewFlagSaving || selectedReviewQuestionIds.length === 0"
             :label="t('Review selected questions')"
             icon="eye"
@@ -264,6 +274,7 @@
             @click="reviewSelectedQuestions"
           />
           <BaseButton
+            v-if="isReviewAnswersEnabled"
             :disabled="isReviewFlagSaving"
             :label="t('Select all')"
             icon="checkbox-marked-outline"
@@ -271,6 +282,7 @@
             @click="setAllReviewQuestions(true)"
           />
           <BaseButton
+            v-if="isReviewAnswersEnabled"
             :disabled="isReviewFlagSaving"
             :label="t('Unselect all')"
             icon="checkbox-blank-outline"
@@ -1416,11 +1428,13 @@ const visibleQuestions = computed(() => {
 
 const visibleQuestionTotal = computed(() => answerableQuestions.value.length)
 const isReviewAnswersEnabled = computed(() => Number(settings.value.reviewAnswers || 0) > 0)
+const isCheckAnswersBeforeFinishEnabled = computed(() => true === settings.value.checkAllAnswersBeforeEndTest)
+const isFinalAnswerChecklistEnabled = computed(() => isReviewAnswersEnabled.value || isCheckAnswersBeforeFinishEnabled.value)
 const isReviewingMarkedQuestions = computed(() => reviewQueue.value.length > 0)
 const showReviewReminderScreen = computed(() => {
   return !canManage.value
     && Boolean(activeAttempt.value?.attemptId)
-    && isReviewAnswersEnabled.value
+    && isFinalAnswerChecklistEnabled.value
     && isReviewReminderVisible.value
     && !isReviewingMarkedQuestions.value
 })
@@ -1508,6 +1522,14 @@ const reviewQuestionList = computed(() => answerableQuestions.value.map((questio
   isAnswered: savedQuestionIds.value.has(Number(question.id || 0)),
   isMarked: reviewQuestionIds.value.has(Number(question.id || 0)),
 })))
+const firstUnansweredReviewQuestionId = computed(() => {
+  const question = reviewQuestionList.value.find((item) => !item.isAnswered)
+
+  return Number(question?.id || 0)
+})
+const reviewReminderTitle = computed(() => {
+  return isReviewAnswersEnabled.value ? t("Questions to be reviewed") : t("Review my answers")
+})
 const feedbackDialogTitle = computed(() => t(feedbackDialog.value?.title || "Feedback"))
 const requiresSavedAnswerConfirmation = computed(() => {
   return !canManage.value && Boolean(activeAttempt.value?.attemptId) && true === settings.value.confirmSavedAnswers
@@ -1691,7 +1713,7 @@ async function setAllReviewQuestions(checked) {
 }
 
 function showReviewReminder() {
-  if (!isReviewAnswersEnabled.value || canManage.value || !activeAttempt.value?.attemptId) {
+  if (!isFinalAnswerChecklistEnabled.value || canManage.value || !activeAttempt.value?.attemptId) {
     return false
   }
 
@@ -1725,6 +1747,19 @@ function returnToReviewReminder() {
   syncQuestionCountdown()
 }
 
+function returnToFirstUnansweredQuestion() {
+  const questionId = firstUnansweredReviewQuestionId.value
+  if (questionId <= 0) {
+    return
+  }
+
+  reviewQueue.value = []
+  reviewQueueIndex.value = 0
+  isReviewReminderVisible.value = false
+  setCurrentQuestionById(questionId)
+  syncQuestionCountdown()
+}
+
 function setCurrentQuestionById(questionId) {
   const navigationIndex = findNavigationIndexForQuestion(questionId)
   if (navigationIndex >= 0) {
diff --git a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
index b893f61d253..32bc4363c6d 100644
--- a/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseOverviewProvider.php
@@ -50,6 +50,7 @@
     private const RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING = 8;
     private const RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK = 10;
     private const EXERCISE_FEEDBACK_TYPE_END = 0;
+    private const STATUS_INCOMPLETE = 'incomplete';
 
     public function __construct(
         private RequestStack $requestStack,
@@ -95,12 +96,16 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $learnpathItemId = max(0, $request->query->getInt('learnpath_item_id'));
         $currentUserAttempts = $this->getCurrentUserAttempts($quiz, $course, $session, $user, $learnpathId, $learnpathItemId);
         $currentUserAttemptCount = \count($currentUserAttempts);
+        $incompleteAttempt = $this->findIncompleteAttempt($quiz, $course, $session, $user, $request);
+        $hasIncompleteAttempt = $incompleteAttempt instanceof TrackEExercise;
+        $newAttemptsDisabled = $this->isSettingEnabled('exercise.exercises_disable_new_attempts');
         $maxAttempt = (int) $quiz->getMaxAttempt();
         $attemptLimitReached = 0 < $maxAttempt && $currentUserAttemptCount >= $maxAttempt;
         $hideAttemptsTable = $this->isSettingEnabled('exercise.quiz_hide_attempts_table_on_start_page');
 
         $availabilityStatus = $this->getAvailabilityStatus($quiz->getStartTime(), $quiz->getEndTime());
         $canOpen = $canManage || ($effectiveVisible && 'open' === $availabilityStatus);
+        $canStart = $canOpen && !$attemptLimitReached && (!$newAttemptsDisabled || $hasIncompleteAttempt || $canManage);
 
         $overview = new ExerciseOverview();
         $overview->exerciseId = (int) $quiz->getIid();
@@ -126,7 +131,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $overview->randomByCategory = (int) $quiz->getRandomByCategory();
         $overview->canManage = $canManage;
         $overview->canOpen = $canOpen;
-        $overview->canStart = $canOpen && !$attemptLimitReached;
+        $overview->canStart = $canStart;
         $overview->canReport = $canManage;
         $overview->availabilityStatus = $availabilityStatus;
         $overview->currentUserAttempts = $currentUserAttempts;
@@ -134,8 +139,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $overview->showScoreColumn = $this->shouldShowScoreColumn($quiz, $currentUserAttemptCount);
         $overview->showDetailsColumn = $this->shouldShowDetailsColumn($quiz, $currentUserAttemptCount);
         $overview->attemptLimitReached = $attemptLimitReached;
-        $overview->startButtonLabel = 0 < $currentUserAttemptCount ? 'Proceed with the test' : 'Start test';
-        $overview->notice = 0 < $currentUserAttemptCount ? 'You have tried to resolve this exercise earlier' : '';
+        $overview->startButtonLabel = 0 < $currentUserAttemptCount || $hasIncompleteAttempt ? 'Proceed with the test' : 'Start test';
+        $overview->notice = $this->getOverviewNotice($currentUserAttemptCount, $newAttemptsDisabled, $hasIncompleteAttempt, $canManage);
 
         return $overview;
     }
@@ -421,6 +426,49 @@ private function getAverageScore(CQuiz $quiz, Course $course, ?Session $session)
     /**
      * @return array<int, array<string, mixed>>
      */
+
+    private function findIncompleteAttempt(
+        CQuiz $quiz,
+        Course $course,
+        ?Session $session,
+        User $user,
+        Request $request,
+    ): ?TrackEExercise {
+        $queryBuilder = $this->entityManager->createQueryBuilder()
+            ->select('attempt')
+            ->from(TrackEExercise::class, 'attempt')
+            ->andWhere('IDENTITY(attempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(attempt.course) = :courseId')
+            ->andWhere('IDENTITY(attempt.user) = :userId')
+            ->andWhere('attempt.status = :status')
+            ->andWhere('attempt.origLpId = :lpId')
+            ->andWhere('attempt.origLpItemId = :lpItemId')
+            ->andWhere('attempt.origLpItemViewId = :lpItemViewId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('courseId', (int) $course->getId(), Types::INTEGER)
+            ->setParameter('userId', (int) $user->getId(), Types::INTEGER)
+            ->setParameter('status', self::STATUS_INCOMPLETE)
+            ->setParameter('lpId', $request->query->getInt('learnpath_id'), Types::INTEGER)
+            ->setParameter('lpItemId', $request->query->getInt('learnpath_item_id'), Types::INTEGER)
+            ->setParameter('lpItemViewId', $request->query->getInt('learnpath_item_view_id'), Types::INTEGER)
+            ->orderBy('attempt.exeId', 'DESC')
+            ->setMaxResults(1)
+        ;
+
+        if (null !== $session) {
+            $queryBuilder
+                ->andWhere('IDENTITY(attempt.session) = :sessionId')
+                ->setParameter('sessionId', (int) $session->getId(), Types::INTEGER)
+            ;
+        } else {
+            $queryBuilder->andWhere('attempt.session IS NULL');
+        }
+
+        $attempt = $queryBuilder->getQuery()->getOneOrNullResult();
+
+        return $attempt instanceof TrackEExercise ? $attempt : null;
+    }
+
     private function getCurrentUserAttempts(
         CQuiz $quiz,
         Course $course,
@@ -503,6 +551,19 @@ private function hasPendingManualCorrection(TrackEExercise $attempt): bool
         return '' !== trim($attempt->getQuestionsToCheck(), " \t\n\r\0\x0B,");
     }
 
+    private function getOverviewNotice(
+        int $currentUserAttemptCount,
+        bool $newAttemptsDisabled,
+        bool $hasIncompleteAttempt,
+        bool $canManage,
+    ): string {
+        if ($newAttemptsDisabled && !$hasIncompleteAttempt && !$canManage) {
+            return 'Disable new test attempts';
+        }
+
+        return 0 < $currentUserAttemptCount ? 'You have tried to resolve this exercise earlier' : '';
+    }
+
     private function shouldShowScoreColumn(CQuiz $quiz, int $attemptCount): bool
     {
         $resultMode = (int) $quiz->getResultsDisabled();
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index 6320b8590d7..f58010cda54 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -155,6 +155,17 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             return $this->normalizeAttemptResponse($quiz, $course, $session, $request, $incompleteAttempt, 'Attempt resumed');
         }
 
+        if ($this->isSettingEnabled('exercise.exercises_disable_new_attempts')) {
+            return $this->createBlockedResponse(
+                $quiz,
+                $course,
+                $session,
+                $request,
+                'Disable new test attempts',
+                $this->buildQuestionList($quiz)
+            );
+        }
+
         if (!$this->canCreateNewAttempt($quiz, $course, $session, $user, $request)) {
             return $this->createLegacyRequiredResponse(
                 $quiz,
@@ -1043,6 +1054,11 @@ private function getCourseSettingInt(Course $course, string $settingName): int
         return (int) api_get_course_setting($settingName, $course);
     }
 
+    private function isSettingEnabled(string $name): bool
+    {
+        return 'true' === $this->settingsManager->getSetting($name, true);
+    }
+
     private function buildExpiredAt(CQuiz $quiz): ?DateTime
     {
         $expiredMinutes = (int) $quiz->getExpiredTime();
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index 3cb02243770..71504841b7c 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -767,6 +767,8 @@ private function getRuntimeSettings(CQuiz $quiz): array
             'preventCopyPaste' => $this->isSettingEnabled('exercise.quiz_prevent_copy_paste'),
             'keepAlivePingInterval' => $this->getKeepAlivePingInterval(),
             'confirmSavedAnswers' => $this->isSettingEnabled('exercise.quiz_confirm_saved_answers'),
+            'checkAllAnswersBeforeEndTest' => $this->isSettingEnabled('exercise.quiz_check_all_answers_before_end_test'),
+            'disableNewAttempts' => $this->isSettingEnabled('exercise.exercises_disable_new_attempts'),
             'allowTimePerQuestion' => $this->isSettingEnabled('exercise.allow_time_per_question'),
             'hasTimedQuestions' => $this->hasTimedQuestions($quiz),
             'blockCategoryQuestions' => $this->isBlockCategoryRuntimeEnabled($quiz),

From e5f330626903a29c24a5657f8fc8697e9da02594 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Tue, 16 Jun 2026 07:22:02 -0500
Subject: [PATCH 15/21] Restore exercise runtime UI helpers

---
 .../vue/views/exercise/ExercisePlayerView.vue | 238 +++++++++++++++++-
 .../Exercise/ExerciseRuntimeProvider.php      |  90 ++++++-
 2 files changed, 324 insertions(+), 4 deletions(-)

diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index e69c560a9be..22b21a950d5 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="space-y-5">
+  <section class="space-y-5" @click="handleRuntimeContentClick">
     <div
       v-if="!isLearnpathContext"
       class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit"
@@ -1297,11 +1297,35 @@
         />
       </template>
     </BaseDialog>
+
+    <BaseDialog
+      v-model:is-visible="isZoomDialogVisible"
+      :show-close-button="false"
+      :title="zoomImageAlt || t('Image')"
+      header-icon="file-image"
+    >
+      <div class="flex justify-center rounded-lg bg-gray-10 p-3">
+        <img
+          v-if="zoomImageSrc"
+          class="max-h-[80vh] max-w-full object-contain"
+          :alt="zoomImageAlt || t('Image')"
+          :src="zoomImageSrc"
+        />
+      </div>
+
+      <template #footer>
+        <BaseButton
+          :label="t('Close')"
+          type="plain"
+          @click="isZoomDialogVisible = false"
+        />
+      </template>
+    </BaseDialog>
   </section>
 </template>
 
 <script setup>
-import { computed, onBeforeUnmount, onMounted, ref, watch } from "vue"
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
 import { useRoute, useRouter } from "vue-router"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
@@ -1363,6 +1387,9 @@ const feedbackDialog = ref(null)
 const isFeedbackDialogVisible = ref(false)
 const feedbackShownOnLastSave = ref(false)
 const confirmedSavedAnswers = ref(false)
+const isZoomDialogVisible = ref(false)
+const zoomImageSrc = ref("")
+const zoomImageAlt = ref("")
 let copyPasteCleanup = null
 let keepAliveTimer = null
 
@@ -1472,6 +1499,17 @@ const displayedRemainingSeconds = computed(() => hasQuestionTimeControl.value ?
 const isDisplayedTimeExpired = computed(() => isTimeExpired.value || isQuestionTimeExpired.value)
 const timeControlLabel = computed(() => hasQuestionTimeControl.value ? t("Question time left") : t("Time left"))
 const answerableQuestions = computed(() => questions.value.filter((question) => !isStructuralQuestion(question)))
+const imageZoomEnabled = computed(() => {
+  const origin = String(getQueryValue(route.query.origin) || "").toLowerCase()
+
+  return true === settings.value.imageZoomEnabled && !["embeddable", "mobileapp"].includes(origin)
+})
+const glossaryTerms = computed(() => {
+  const terms = settings.value?.glossary?.terms
+
+  return Array.isArray(terms) ? terms : []
+})
+const glossaryEnabled = computed(() => true === settings.value?.glossary?.enabled && glossaryTerms.value.length > 0)
 const currentNavigationIndex = computed(() => {
   const index = isReviewingMarkedQuestions.value ? reviewQueueIndex.value : currentQuestionIndex.value
 
@@ -2148,6 +2186,7 @@ async function loadRuntime() {
     syncCountdownFromAttempt(activeAttempt.value)
     syncRuntimeSettingsEffects()
     syncQuestionCountdown()
+    scheduleRuntimeHtmlEnhancement()
   } catch (error) {
     console.error("Error loading exercise runtime", error)
     errorMessage.value = t("Could not load exercise")
@@ -3799,6 +3838,172 @@ function stopKeepAlivePing() {
   }
 }
 
+function handleRuntimeContentClick(event) {
+  const target = event.target
+  if (
+    !(target instanceof HTMLImageElement)
+    || !imageZoomEnabled.value
+    || !target.closest(".exercise-runtime-html")
+  ) {
+    return
+  }
+
+  const source = target.getAttribute("data-zoom-image") || target.currentSrc || target.getAttribute("src") || ""
+  if (!source) {
+    return
+  }
+
+  event.preventDefault()
+  zoomImageSrc.value = source
+  zoomImageAlt.value = target.getAttribute("alt") || target.getAttribute("title") || t("Image")
+  isZoomDialogVisible.value = true
+}
+
+function scheduleRuntimeHtmlEnhancement() {
+  if (typeof document === "undefined") {
+    return
+  }
+
+  nextTick(() => {
+    markZoomableRuntimeImages()
+    applyGlossaryTermsToRuntimeHtml()
+  })
+}
+
+function markZoomableRuntimeImages() {
+  document.querySelectorAll(".exercise-runtime-html img").forEach((image) => {
+    if (!(image instanceof HTMLImageElement)) {
+      return
+    }
+
+    if (!imageZoomEnabled.value) {
+      image.removeAttribute("data-exercise-runtime-zoom")
+      return
+    }
+
+    const source = image.getAttribute("data-zoom-image") || image.currentSrc || image.getAttribute("src") || ""
+    if (!source) {
+      return
+    }
+
+    image.setAttribute("data-exercise-runtime-zoom", "1")
+    if (!image.getAttribute("title")) {
+      image.setAttribute("title", t("Image"))
+    }
+  })
+}
+
+function applyGlossaryTermsToRuntimeHtml() {
+  if (!glossaryEnabled.value) {
+    return
+  }
+
+  const terms = normalizedGlossaryTerms()
+  if (!terms.length) {
+    return
+  }
+
+  const termPattern = terms.map((term) => escapeRegExp(term.title)).join("|")
+  const expression = new RegExp(`(^|[^\\p{L}\\p{N}_])(${termPattern})(?=$|[^\\p{L}\\p{N}_])`, "giu")
+  const descriptions = new Map(terms.map((term) => [term.title.toLowerCase(), term.description]))
+
+  document.querySelectorAll(".exercise-runtime-html").forEach((container) => {
+    if (!(container instanceof HTMLElement)) {
+      return
+    }
+
+    wrapGlossaryTermsInContainer(container, expression, descriptions)
+  })
+}
+
+function normalizedGlossaryTerms() {
+  const seen = new Set()
+
+  return glossaryTerms.value
+    .map((term) => ({
+      title: displayText(term?.title || ""),
+      description: displayText(term?.description || ""),
+    }))
+    .filter((term) => term.title.length > 1)
+    .filter((term) => {
+      const key = term.title.toLowerCase()
+      if (seen.has(key)) {
+        return false
+      }
+      seen.add(key)
+
+      return true
+    })
+    .sort((left, right) => right.title.length - left.title.length)
+}
+
+function wrapGlossaryTermsInContainer(container, expression, descriptions) {
+  const walker = document.createTreeWalker(
+    container,
+    NodeFilter.SHOW_TEXT,
+    {
+      acceptNode(node) {
+        const parent = node.parentElement
+        if (
+          !parent
+          || parent.closest(".glossary-term, a, button, input, select, textarea, script, style, svg")
+        ) {
+          return NodeFilter.FILTER_REJECT
+        }
+
+        expression.lastIndex = 0
+        const hasMatch = expression.test(node.nodeValue || "")
+        expression.lastIndex = 0
+
+        return hasMatch ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT
+      },
+    },
+  )
+
+  const textNodes = []
+  while (walker.nextNode()) {
+    textNodes.push(walker.currentNode)
+  }
+
+  textNodes.forEach((node) => wrapGlossaryTermsInTextNode(node, expression, descriptions))
+}
+
+function wrapGlossaryTermsInTextNode(node, expression, descriptions) {
+  const text = node.nodeValue || ""
+  const fragment = document.createDocumentFragment()
+  let lastIndex = 0
+  let matched = false
+
+  expression.lastIndex = 0
+  let match = expression.exec(text)
+  while (match) {
+    const leadingText = match[1] || ""
+    const matchedText = match[2] || ""
+    const leadingEnd = match.index + leadingText.length
+    const matchedEnd = leadingEnd + matchedText.length
+
+    fragment.append(document.createTextNode(text.slice(lastIndex, leadingEnd)))
+
+    const term = document.createElement("span")
+    term.className = "glossary-term"
+    term.textContent = matchedText
+    term.title = descriptions.get(matchedText.toLowerCase()) || matchedText
+    fragment.append(term)
+
+    lastIndex = matchedEnd
+    matched = true
+    match = expression.exec(text)
+  }
+
+  if (!matched) {
+    return
+  }
+
+  fragment.append(document.createTextNode(text.slice(lastIndex)))
+  node.parentNode?.replaceChild(fragment, node)
+}
+
+
 function submitDisabled() {
   return false
 }
@@ -3852,6 +4057,19 @@ watch(
   () => [currentTimedQuestionId.value, activeAttempt.value?.attemptId, activeAttempt.value?.status],
   () => syncQuestionCountdown(),
 )
+
+watch(
+  () => [
+    currentQuestionIndex.value,
+    reviewQueueIndex.value,
+    isFeedbackDialogVisible.value,
+    imageZoomEnabled.value,
+    glossaryEnabled.value,
+    glossaryTerms.value.length,
+    visibleQuestions.value.map((question) => question.id).join(","),
+  ],
+  () => scheduleRuntimeHtmlEnhancement(),
+)
 </script>
 
 <style scoped>
@@ -3860,6 +4078,22 @@ watch(
   height: auto;
 }
 
+.exercise-runtime-html :deep(img[data-exercise-runtime-zoom="1"]) {
+  cursor: zoom-in;
+}
+
+.exercise-runtime-html :deep(.glossary-term) {
+  cursor: help;
+  font-weight: 500;
+  color: #2563eb;
+  border-bottom: 1px dotted currentColor;
+}
+
+.exercise-runtime-html :deep(.glossary-term:hover) {
+  color: #1d4ed8;
+  border-bottom-style: solid;
+}
+
 .exercise-runtime-html :deep(p) {
   margin-bottom: 0.5rem;
 }
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index 71504841b7c..f9e04662489 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -20,6 +20,7 @@
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Settings\SettingsManager;
+use Chamilo\CourseBundle\Entity\CGlossary;
 use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\CourseBundle\Entity\CQuiz;
@@ -28,6 +29,7 @@
 use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
+use Chamilo\CourseBundle\Repository\CGlossaryRepository;
 use Chamilo\CourseBundle\Repository\CQuizQuestionRepository;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTimeImmutable;
@@ -82,6 +84,7 @@ public function __construct(
         private EntityManagerInterface $entityManager,
         private CQuizRepository $quizRepository,
         private CQuizQuestionRepository $questionRepository,
+        private CGlossaryRepository $glossaryRepository,
         private Security $security,
         private SettingsManager $settingsManager,
     ) {}
@@ -117,7 +120,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $attemptQuestionIds = $attempt instanceof TrackEExercise ? $this->parseQuestionIds((string) $attempt->getDataTracking()) : null;
         $questions = $this->getRuntimeQuestions($quiz, $course, $session, $canManage, $attemptQuestionIds, $attempt);
         $runtimePages = $this->buildRuntimePages($quiz, $questions);
-        $settings = $this->getRuntimeSettings($quiz);
+        $settings = $this->getRuntimeSettings($quiz, $course, $session);
         $legacyRuntimeReasons = $this->getLegacyRuntimeReasons($quiz);
         $settings['runtimePages'] = $runtimePages['pages'];
         $settings['usesStructuralPages'] = $runtimePages['usesStructuralPages'];
@@ -725,8 +728,10 @@ private function getExerciseFromCurrentContext(int $exerciseId, Course $course,
     /**
      * @return array<string, mixed>
      */
-    private function getRuntimeSettings(CQuiz $quiz): array
+    private function getRuntimeSettings(CQuiz $quiz, Course $course, ?Session $session): array
     {
+        $showGlossary = $this->shouldShowGlossaryInRuntime();
+
         return [
             'type' => (int) $quiz->getType(),
             'oneQuestionPerPage' => CQuiz::ONE_PER_PAGE === (int) $quiz->getType(),
@@ -772,6 +777,11 @@ private function getRuntimeSettings(CQuiz $quiz): array
             'allowTimePerQuestion' => $this->isSettingEnabled('exercise.allow_time_per_question'),
             'hasTimedQuestions' => $this->hasTimedQuestions($quiz),
             'blockCategoryQuestions' => $this->isBlockCategoryRuntimeEnabled($quiz),
+            'imageZoomEnabled' => $this->isImageZoomEnabled(),
+            'glossary' => [
+                'enabled' => $showGlossary,
+                'terms' => $showGlossary ? $this->getRuntimeGlossaryTerms($course, $session) : [],
+            ],
         ];
     }
 
@@ -860,6 +870,82 @@ private function isBlockCategoryRuntimeEnabled(CQuiz $quiz): bool
         return \in_array(strtolower((string) ($row->getFieldValue() ?? '')), ['1', 'true', 'yes', 'on'], true);
     }
 
+    private function isImageZoomEnabled(): bool
+    {
+        $value = $this->settingsManager->getSetting('exercise.quiz_image_zoom', true);
+        if (\is_array($value)) {
+            return isset($value['options'])
+                || true === ($value['value'] ?? false)
+                || 'true' === strtolower((string) ($value['value'] ?? ''))
+                || '1' === (string) ($value['value'] ?? '');
+        }
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
+    private function shouldShowGlossaryInRuntime(): bool
+    {
+        $value = strtolower(
+            trim((string) $this->settingsManager->getSetting('glossary.show_glossary_in_extra_tools', true))
+        );
+        $isLearnpathContext = $this->isLearnpathRuntimeContext();
+
+        return match ($value) {
+            'exercise' => !$isLearnpathContext,
+            'lp' => $isLearnpathContext,
+            'exercise_and_lp', 'true', '1', 'yes' => true,
+            default => false,
+        };
+    }
+
+    private function isLearnpathRuntimeContext(): bool
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (null === $request) {
+            return false;
+        }
+
+        return 'learnpath' === strtolower(trim((string) $request->query->get('origin', '')))
+            || $request->query->has('lp_init')
+            || 0 < $request->query->getInt('learnpath_id')
+            || 0 < $request->query->getInt('lp_id')
+            || 0 < $request->query->getInt('learnpath_item_id')
+            || 0 < $request->query->getInt('learnpath_item_view_id');
+    }
+
+    /**
+     * @return array<int, array{id: int, title: string, description: string}>
+     */
+    private function getRuntimeGlossaryTerms(Course $course, ?Session $session): array
+    {
+        $items = $this->glossaryRepository
+            ->getResourcesByCourse($course, $session, null, null, true, true)
+            ->setMaxResults(200)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $terms = [];
+        foreach ($items as $item) {
+            if (!$item instanceof CGlossary || null === $item->getIid()) {
+                continue;
+            }
+
+            $title = trim(strip_tags($item->getTitle()));
+            if ('' === $title) {
+                continue;
+            }
+
+            $terms[] = [
+                'id' => (int) $item->getIid(),
+                'title' => $title,
+                'description' => trim(strip_tags((string) $item->getDescription())),
+            ];
+        }
+
+        return $terms;
+    }
+
     private function getKeepAlivePingInterval(): int
     {
         $interval = (int) $this->settingsManager->getSetting('exercise.quiz_keep_alive_ping_interval', true);

From 7aef787fb46f5df369216feb333dd7ee731cb568 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Tue, 16 Jun 2026 07:46:41 -0500
Subject: [PATCH 16/21] Exercise: Clean up exercise translation key reuse

---
 assets/locales/en_US.json                     | 5040 +++++++++--------
 .../exercise/ExerciseCategoryManagerView.vue  |    8 +-
 .../exercise/ExerciseConfigurationView.vue    |    8 +-
 .../ExerciseGlobalQuestionSelectorView.vue    |    4 +-
 .../vue/views/exercise/ExerciseListView.vue   |    8 +-
 .../exercise/ExerciseLiveResultsView.vue      |    2 +-
 .../views/exercise/ExerciseOverviewView.vue   |    2 +-
 .../vue/views/exercise/ExercisePlayerView.vue |   20 +-
 .../exercise/ExerciseQuestionBankView.vue     |    4 +-
 .../exercise/ExerciseQuestionEditorView.vue   |   32 +-
 .../exercise/ExerciseQuestionImportView.vue   |    4 +-
 .../exercise/ExerciseQuestionSelectorView.vue |    8 +-
 .../exercise/ExerciseQuestionStatsView.vue    |    4 +-
 .../exercise/ExerciseReportByQuestionView.vue |    8 +-
 .../vue/views/exercise/ExerciseReportView.vue |    2 +-
 .../vue/views/exercise/ExerciseResultView.vue |   18 +-
 16 files changed, 2712 insertions(+), 2460 deletions(-)

diff --git a/assets/locales/en_US.json b/assets/locales/en_US.json
index 5ade927b85d..01754266c8c 100644
--- a/assets/locales/en_US.json
+++ b/assets/locales/en_US.json
@@ -1,2395 +1,2647 @@
 {
-    "Agenda": "Agenda",
-    "Documents": "Documents",
-    "Groups": "Groups",
-    "Sign in": "Sign in",
-    "My courses": "My courses",
-    "Start recording": "Start recording",
-    "Stop recording": "Stop recording",
-    "Home": "Home",
-    "Title": "Title",
-    "Content": "Content",
-    "Invitees": "Invitees",
-    "Invitee": "Invitee",
-    "Are you sure you want to delete this item?": "Are you sure you want to delete this item?",
-    "Search": "Search",
-    "Searching": "Searching",
-    "User list": "User list",
-    "All users": "All users",
-    "Deleted users": "Deleted users",
-    "Official code": "Official code",
-    "Registration date": "Registration date",
-    "Latest login": "Latest login",
-    "Login as": "Login as",
-    "Add a user": "Add a user",
-    "No data available": "No data available",
-    "Inactive": "Inactive",
-    "Account": "Account",
-    "Account expired": "Account expired",
-    "Anonymize": "Anonymize",
-    "Are you sure you want to lock this user?": "Are you sure you want to lock this user?",
-    "Are you sure you want to unlock this user?": "Are you sure you want to unlock this user?",
-    "Assign courses": "Assign courses",
-    "Assign sessions": "Assign sessions",
-    "Assign skill": "Assign skill",
-    "Assign users": "Assign users",
-    "Check passwords too easy to guess": "Check passwords too easy to guess",
-    "Delete permanently": "Delete permanently",
-    "Is administrator": "Is administrator",
-    "Is not administrator": "Is not administrator",
-    "Lock": "Lock",
-    "Login": "Login",
-    "Please confirm your choice": "Please confirm your choice",
-    "Reporting": "Reporting",
-    "Restore": "Restore",
-    "Search users": "Search users",
-    "The account has been removed temporarily.": "The account has been removed temporarily.",
-    "Unlock": "Unlock",
-    "Filter": "Filter",
-    "Reset": "Reset",
-    "Filters": "Filters",
-    "Inbox": "Inbox",
-    "Settings": "Settings",
-    "Sign out": "Sign out",
-    "My sessions": "My sessions",
-    "Users": "Users",
-    "Courses": "Courses",
-    "Sessions": "Sessions",
-    "Administration": "Administration",
-    "Remember me": "Remember me",
-    "Share with user": "Share with user",
-    "Course": "Course",
-    "Session": "Session",
-    "Group": "Group",
-    "Class": "Class",
-    "Status": "Status",
-    "Close": "Close",
-    "List": "List",
-    "Edit": "Edit",
-    "Submit": "Submit",
-    "Send": "Send",
-    "Delete": "Delete",
-    "{0} created": "{0} created",
-    "Edit event": "Edit event",
-    "Add event": "Add event",
-    "Add": "Add",
-    "Add skill to search profile": "Add skill to search profile",
-    "Go to session": "Go to session",
-    "Course introduction": "Course introduction",
-    "Tools": "Tools",
-    "Loading": "Loading",
-    "Loading...": "Loading...",
-    "Course language": "Course language",
-    "Department": "Department",
-    "Department URL": "Department URL",
-    "Expiration date": "Expiration date",
-    "Modified": "Modified",
-    "Size": "Size",
-    "New folder": "New folder",
-    "Name": "Name",
-    "Title is required": "Title is required",
-    "Actions": "Actions",
-    "All": "All",
-    "New document": "New document",
-    "Upload": "Upload",
-    "Download": "Download",
-    "Delete selected": "Delete selected",
-    "Download file": "Download file",
-    "Author": "Author",
-    "Comment": "Comment",
-    "Create child skill": "Create child skill",
-    "Created at": "Created at",
-    "Updated at": "Updated at",
-    "File": "File",
-    "From": "From",
-    "To": "To",
-    "Cc": "Cc",
-    "User": "User",
-    "Sent date": "Sent date",
-    "Sent": "Sent",
-    "Attachments": "Attachments",
-    "You don't have any course content yet.": "You don't have any course content yet.",
-    "You don't have any course yet.": "You don't have any course yet.",
-    "Go to \"Explore\" to find a topic of interest, or wait for someone to subscribe you.": "Go to \"Explore\" to find a topic of interest, or wait for someone to subscribe you.",
-    "You don't have any session yet.": "You don't have any session yet.",
-    "Username": "Username",
-    "Password": "Password",
-    "Update": "Update",
-    "Add a course introduction to display to your students.": "Add a course introduction to show your students.",
-    "Assessments": "Assessments",
-    "Assignments": "Assignments",
-    "Edit profile": "Edit profile",
-    "Clear filter results": "Clear filter results",
-    "Teachers": "Teachers",
-    "Teacher": "Teacher",
-    "Category": "Category",
-    "Language": "Language",
-    "Go to the course": "Go to the course",
-    "Go to the session": "Go to the session",
-    "Total number of courses": "Total number of courses",
-    "Start Date": "Start Date",
-    "No course available": "No course available",
-    "Loading courses. Please wait.": "Loading courses. Please wait.",
-    "Loading sessions. Please wait.": "Loading sessions. Please wait.",
-    "There are no terms that match the search: {0}": "There are no terms that match the search: {0}",
-    "Contact": "Contact",
-    "Registration": "Registration",
-    "Current session tab": "Current",
-    "Upcoming session tab": "Upcoming",
-    "Past session tab": "Past",
-    "Sticky courses": "Special courses",
-    "My General Certificate": "My General Certificate",
-    "My skills": "My skills",
-    "Social network": "Social network",
-    "Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:": "Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:",
-    "Email reply header": "The {0}, {1} ({2}) wrote:",
-    "My files": "My files",
-    "Read the installation guide": "Read the installation guide",
-    "Installation language": "Installation language",
-    "Requirements": "Requirements",
-    "License": "License",
-    "Database settings": "Database settings",
-    "Config settings": "Config settings",
-    "Show Overview": "Show Overview",
-    "Install": "Install",
-    "New installation": "New installation",
-    "Chamilo installation wizard": "Chamilo installation wizard",
-    "Keyword": "Keyword",
-    "Assignment name": "Assignment name",
-    "Description": "Description",
-    "Maximum score": "Maximum score",
-    "Add to gradebook": "Add to gradebook",
-    "Select assessment": "Select assessment",
-    "Weight inside assessment": "Weight inside assessment",
-    "Enable handing over deadline (visible to learners)": "Enable handing over deadline (visible to learners)",
-    "Posted sending deadline": "Posted sending deadline",
-    "Enable final acceptance date (invisible to learners)": "Enable final acceptance date (invisible to learners)",
-    "Ends at (completely closed)": "Ends at (completely closed)",
-    "Add to calendar": "Add to calendar",
-    "Save": "Save",
-    "Allow files or online text": "Allow files or online text",
-    "Allow only text": "Allow only text",
-    "Allow only files": "Allow only files",
-    "Deadline": "Deadline",
-    "Number submitted": "Number submitted",
-    "Visibility": "Visibility",
-    "Confirmation": "Confirmation",
-    "Are you sure you want to delete the selected items?": "Are you sure you want to delete the selected items?",
-    "Assignments deleted": "Assignments deleted",
-    "Permission to use the microphone is not enabled, please enable it in your browser to record audio": "Permission to use the microphone is not enabled, please enable it in your browser to record audio",
-    "Hide advanced settings": "Hide advanced settings",
-    "Show advanced settings": "Show advanced settings",
-    "Yes": "Yes",
-    "No": "No",
-    "Confirm": "Confirm",
-    "No available options": "No available options",
-    "Pages": "Pages",
-    "Messages": "Messages",
-    "Enter filename here": "Enter filename here",
-    "Save recorded audio": "Save recorded audio",
-    "Export format": "Export format",
-    "Back": "Back",
-    "Export": "Export",
-    "Glossary exported": "Glossary exported",
-    "Could not export glossary": "Could not export glossary",
-    "Term": "Term",
-    "Save term": "Save term",
-    "Could not fetch glossary term": "Could not fetch glossary term",
-    "Glossary term saved": "Glossary term saved",
-    "Could not create glossary term": "Could not create glossary term",
-    "File type": "File type",
-    "Delete all terms before import.": "Delete all terms before import.",
-    "Update existing terms.": "Update existing terms.",
-    "Import": "Import",
-    "Terms imported successfully": "Terms imported successfully",
-    "Could not import terms": "Could not import terms",
-    "Definition": "Definition",
-    "Step 1 - Installation Language": "Step 1 - Installation Language",
-    "Next": "Next",
-    "Please select installation language": "Please select installation language",
-    "Server requirements": "Server requirements",
-    "PHP version": "PHP version",
-    "Your PHP version matches the minimum requirement:": "Your PHP version matches the minimum requirement:",
-    "Recommended settings": "Recommended settings",
-    "Setting": "Setting",
-    "Currently": "Currently",
-    "Directory and files permissions": "Directory and files permissions",
-    "Writable": "Writable",
-    "Not writable": "Not writable",
-    "Error": "Error",
-    "has not been found in that directory": "has not been found in that directory",
-    "Previous": "Previous",
-    "Upgrade Chamilo LMS version": "Upgrade Chamilo LMS version",
-    "For more details {0}": "For more details {0}",
-    "Step 2 - Requirements": "Step 2 - Requirements",
-    "Warning!": "Warning!",
-    "Contact information": "Contact information",
-    "Send information": "Send information",
-    "You must accept the licence": "You must accept the licence",
-    "Contact information has been sent": "Contact information has been sent",
-    "Step 3 - License": "Step 3 - License",
-    "Printable version": "Printable version",
-    "I accept": "I accept",
-    "Dear user": "Dear user",
-    "E-mail": "E-mail",
-    "Company city": "Company city",
-    "Preferred contact language": "Preferred contact language",
-    "Do you have the power to take financial decisions on behalf of your company?": "Do you have the power to take financial decisions on behalf of your company?",
-    "Check database connection": "Check database connection",
-    "Step 4 - Database settings": "Step 4 - Database settings",
-    "Database host": "Database host",
-    "Port": "Port",
-    "Database name": "Database name",
-    "Database port": "Database port",
-    "Database driver": "Database driver",
-    "CREATE TABLE works": "CREATE TABLE works",
-    "OK": "OK",
-    "ALTER TABLE works": "ALTER TABLE works",
-    "DROP COLUMN works": "DROP COLUMN works",
-    "Step 5 - Configuration settings": "Step 5 - Configuration settings",
-    "System": "System",
-    "Chamilo URL": "Chamilo URL",
-    "Path": "Path",
-    "Administrator": "Administrator",
-    "Superior (n+1)": "Superior (n+1)",
-    "Administrator login": "Administrator login",
-    "Administrator password": "Administrator password",
-    "You may want to change this": "You may want to change this",
-    "Administrator first name": "Administrator first name",
-    "Administrator last name": "Administrator last name",
-    "Administrator e-mail": "Administrator e-mail",
-    "Administrator telephone": "Administrator telephone",
-    "Portal": "Portal",
-    "Your portal name": "Your portal name",
-    "Your company short name": "Your company short name",
-    "URL of this company": "URL of this company",
-    "Encryption method": "Encryption method",
-    "None": "None",
-    "Allow self-registration": "Allow self-registration",
-    "After approval": "After approval",
-    "Allow self-registration as a trainer": "Allow self-registration as a trainer",
-    "Update Chamilo": "Update Chamilo",
-    "Install Chamilo": "Install Chamilo",
-    "Step 6 - Last check before install": "Step 6 - Last check before install",
-    "Here are the values you entered": "Here are the values you entered",
-    "Main language": "Main language",
-    "Database": "Database",
-    "Database Host": "Database Host",
-    "Database user": "Database user",
-    "Database Password": "Database Password",
-    "Step 7 - Installation process execution": "Step 7 - Installation process execution",
-    "Step 7 - Update process execution": "Step 7 - Update process execution",
-    "Security advice": "Security advice",
-    "Menu": "Menu",
-    "Created with Chamilo copyright year": "Created with Chamilo \u00a9 {0}",
-    "FAQ": "FAQ",
-    "Demo": "Demo",
-    "Category name": "Category name",
-    "Category saved": "Category saved",
-    "URL": "URL",
-    "Link name": "Link name",
-    "Show link on course homepage": "Show link on course homepage",
-    "Select a category": "Select a category",
-    "Save link": "Save link",
-    "Link saved": "Link saved",
-    "Link is valid": "Link is valid",
-    "Link is not valid": "Link is not valid",
-    "Check link": "Check link",
-    "Toggle visibility": "Toggle visibility",
-    "Move up": "Move up",
-    "Move down": "Move down",
-    "Forgot your password?": "Forgot your password?",
-    "Enabled": "Enabled",
-    "Published": "Published",
-    "Draft": "Draft",
-    "Like": "Like",
-    "Dislike": "Dislike",
-    "My friends": "My friends",
-    "View all friends": "View all friends",
-    "My communities": "My communities",
-    "See all communities": "See all communities",
-    "Skills": "Skills",
-    "Your skill ranking": "Your skill ranking",
-    "Skills ranking": "Skills ranking",
-    "Skills acquired": "Skills acquired",
-    "Currently learning": "Currently learning",
-    "Rank": "Rank",
-    "Without achieved skills": "No achieved skills yet",
-    "My profile": "My profile",
-    "Social groups": "Social groups",
-    "Promoted messages": "Promoted messages",
-    "Personal data": "Personal data",
-    "Send message": "Send message",
-    "Write new comment": "Write new comment",
-    "Post": "Post",
-    "The comment is required": "The comment is required",
-    "Comments": "Comments",
-    "Mark as promoted message": "Mark as promoted message",
-    "File upload": "File upload",
-    "What are you thinking about?": "What are you thinking about?",
-    "Write something to {0}": "Write something to {0}",
-    "Switch to student view": "Switch to student view",
-    "Switch to teacher view": "Switch to teacher view",
-    "Waiting": "Waiting",
-    "Requests": "Requests",
-    "Deleted": "Deleted",
-    "{0} updated": "{0} updated",
-    "Course sessions": "Course sessions",
-    "Learners": "Learners",
-    "Learner": "Learner",
-    "Progress": "Progress",
-    "Diagnosis": "Diagnosis",
-    "Add user": "Add user",
-    "You can see examples of how chamilo will look here": "You can see examples of how Chamilo will look here",
-    "Buttons": "Buttons",
-    "Disabled": "Disabled",
-    "Secondary": "Secondary",
-    "Tertiary": "Tertiary",
-    "Success": "Success",
-    "Danger": "Danger",
-    "Checkbox and radio buttons": "Checkbox and radio buttons",
-    "Checkbox 1": "Checkbox 1",
-    "Checkbox 2": "Checkbox 2",
-    "Show dialog": "Show dialog",
-    "Dialog example": "Dialog example",
-    "Item 1": "Item 1",
-    "Item 2": "Item 2",
-    "Item 3": "Item 3",
-    "Value 1": "Value 1",
-    "Value 2": "Value 2",
-    "Value 3": "Value 3",
-    "Here you can manage registered users within your platform": "Here you can manage registered users within your platform",
-    "User management": "User management",
-    "Create and manage your courses in a simple way": "Create and manage your courses in a simple way",
-    "Course management": "Course management",
-    "Create course packages for a certain time with training sessions": "Create course packages for a certain time with training sessions",
-    "Sessions management": "Sessions management",
-    "Tracking": "Tracking",
-    "View reports, statistics and tracking data": "View reports, statistics and tracking data",
-    "Manage the skills of your users, through courses and badges": "Manage the skills of your users, through courses and badges",
-    "Personal data protection": "Personal data protection",
-    "View the status of your server, perform performance tests": "View the status of your server, perform performance tests",
-    "List icons": "List icons",
-    "Icon": "Icon",
-    "Constant name": "Constant name",
-    "MDI icon name": "MDI icon name",
-    "Enable version check": "Enable version check",
-    "Configure your platform, view reports, publish and send announcements globally": "Configure your platform, view reports, publish and send announcements globally",
-    "Platform management": "Platform management",
-    "Learn more about Chamilo and its use, official references links": "Learn more about Chamilo and its use, official references links",
-    "Version check enabled": "Version check enabled",
-    "Version check": "Version check",
-    "Hide campus from public platforms list": "Hide campus from public platforms list",
-    "Assignment created": "Assignment created",
-    "Create assignment": "Create assignment",
-    "Assignment updated": "Assignment updated",
-    "Edit assignment": "Edit assignment",
-    "Cancel": "Cancel",
-    "Event": "Event",
-    "Are you sure you want to delete this event?": "Are you sure you want to delete this event?",
-    "Edit introduction": "Edit introduction",
-    "Show all": "Show all",
-    "Hide all": "Hide all",
-    "Sort": "Sort",
-    "Customize": "Customize",
-    "Create certificate": "Create certificate",
-    "New drawing": "New drawing",
-    "Record audio": "Record audio",
-    "New cloud file": "New cloud file",
-    "Slideshow": "Slideshow",
-    "Usage": "Usage",
-    "Download all": "Download all",
-    "Select all": "Select all",
-    "Unselect all": "Unselect all",
-    "Are you sure you want to delete": "Are you sure you want to delete",
-    "Space available": "Space available",
-    "Add as a template": "Add as a template",
-    "Saved": "Saved",
-    "Document not saved": "Document not saved",
-    "Certificate set as default successfully": "Certificate set as default successfully",
-    "Error setting certificate as default": "Error setting certificate as default",
-    "Options": "Options",
-    "Uncompress zip": "Uncompress zip",
-    "If file exists": "If file exists",
-    "Do nothing": "Do nothing",
-    "Overwrite the existing file": "Overwrite the existing file",
-    "Rename the uploaded file if it exists": "Rename the uploaded file if it exists",
-    "Export glossary": "Export glossary",
-    "Import glossary": "Import glossary",
-    "Add new glossary term": "Add new glossary term",
-    "List view": "List view",
-    "Table view": "Table view",
-    "Export to documents": "Export to documents",
-    "Could not delete term": "Could not delete term",
-    "Exported to documents": "Exported to documents",
-    "Could not export to documents": "Could not export to documents",
-    "Could not fetch glossary terms": "Could not fetch glossary terms",
-    "Edit glossary term": "Edit glossary term",
-    "Add a category": "Add a category",
-    "Update category": "Update category",
-    "Add a link": "Add a link",
-    "Export to PDF": "Export to PDF",
-    "Add your first link to this course": "Add your first link to this course",
-    "General": "General",
-    "Change visibility": "Change visibility",
-    "There are no links in this category": "There are no links in this category",
-    "With links": "With links",
-    "Link deleted": "Link deleted",
-    "Could not delete link": "Could not delete link",
-    "Link visibility updated": "Link visibility updated",
-    "Could not change visibility of link": "Could not change visibility of link",
-    "Link moved up": "Link moved up",
-    "Link moved down": "Link moved down",
-    "Category deleted": "Category deleted",
-    "Could not delete category": "Could not delete category",
-    "Visibility of category changed": "Visibility of category changed",
-    "Could not change visibility of category": "Could not change visibility of category",
-    "Could not retrieve links": "Could not retrieve links",
-    "Update link": "Update link",
-    "Unread": "Unread",
-    "As read": "As read",
-    "As unread": "As unread",
-    "Message deleted": "Message deleted",
-    "No sender": "No sender",
-    "Tags": "Tags",
-    "New page": "New page",
-    "Pages deleted": "Pages deleted",
-    "Go to Explore to find a topic of interest, or wait for someone to subscribe you": "Go to Explore to find a topic of interest, or wait for someone to subscribe you",
-    "Personal data: introduction": "Personal data: introduction",
-    "Personal data we keep about you": "Personal data we keep about you",
-    "Terms and Conditions": "Terms and Conditions",
-    "Read the Terms and Conditions": "Read the Terms and Conditions",
-    "Permissions you gave us": "Permissions you gave us",
-    "Legal agreement accepted": "Legal agreement accepted",
-    "Date": "Date",
-    "Why you want to delete your Legal Agreement": "Why you want to delete your Legal Agreement",
-    "Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible": "Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible",
-    "Delete legal agreement": "Delete legal agreement",
-    "Explain in this box why you want your account deleted": "Explain in this box why you want your account deleted",
-    "Friend request sent successfully": "Friend request sent successfully",
-    "Failed to send friend request": "Failed to send friend request",
-    "Add friends": "Add friends",
-    "Add friend": "Add friend",
-    "Refresh": "Refresh",
-    "Are you sure to delete the friendship?": "Are you sure to delete the friendship?",
-    "Friends": "Friends",
-    "Go to friends list": "Go to friends list",
-    "Please enter a search query": "Please enter a search query",
-    "Error fetching friends list": "Error fetching friends list",
-    "Error fetching users": "Error fetching users",
-    "Search users for friends": "Search users for friends",
-    "Business card": "Business card",
-    "Picture": "Picture",
-    "In order to enable the automatic version checking you have to register your portal on chamilo.org. The information obtained by clicking this button is only for internal use and only aggregated data will be publicly available (total number of portals, total number of Chamilo course, total number of Chamilo users, ...) (see {0}). When registering you will also appear on the worldwide list ({1}). If you do not want to appear in this list you have to check the checkbox below. The registration is as easy as it can be: you only have to click this button:": "In order to enable the automatic version checking you have to register your portal on chamilo.org. The information obtained by clicking this button is only for internal use and only aggregated data will be publicly available (total number of portals, total number of Chamilo course, total number of Chamilo users, ...) (see {0}). When registering you will also appear on the worldwide list ({1}). If you do not want to appear in this list you have to check the checkbox below. The registration is as easy as it can be: you only have to click this button:",
-    "To protect your site, make the whole {0} directory read-only (chmod -R 0555 on Linux) and delete the {1} directory.": "To protect your site, make the whole {0} directory read-only (chmod -R 0555 on Linux) and delete the {1} directory.",
-    "Cannot find your language in the list? Contact us at info@chamilo.org to contribute as a translator.": "Cannot find your language in the list? Contact us at info{'@'}chamilo.org to contribute as a translator.",
-    "Please read the following requirements thoroughly.": "Please read the following requirements thoroughly.",
-    "Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.": "Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.",
-    "Chamilo is free software distributed under the GNU General Public licence (GPL).": "Chamilo is free software distributed under the GNU General Public licence (GPL).",
-    "The install script will create (or use) the Chamilo database using the database name given here. Please make sure the user you give has the right to create the database by the name given here. If a database with this name exists, it will be overwritten. Please do not use the root user as the Chamilo database user. This can lead to serious security issues.": "The install script will create (or use) the Chamilo database using the database name given here. Please make sure the user you give has the right to create the database by the name given here. If a database with this name exists, it will be overwritten. Please do not use the root user as the Chamilo database user. This can lead to serious security issues.",
-    "The install script will erase all tables of the selected database. We heavily recommend you do a full backup of them before confirming this last install step.": "The install script will erase all tables of the selected database. We heavily recommend you do a full backup of them before confirming this last install step.",
-    "Continue with {0}": "Continue with {0}",
-    "Change Password": "Change Password",
-    "All Messages": "All Messages",
-    "Promoted Messages": "Promoted Messages",
-    "Are you sure you want to delete {0}?": "Are you sure you want to delete {0}?",
-    "+%d": "+{0}",
-    "%d minutes before": "{0} minutes before",
-    "%d hours before": "{0} hours before",
-    "%d days before": "{0} days before",
-    "Move": "Move",
-    "Select the destination folder": "Select the destination folder",
-    "Select a folder": "Select a folder",
-    "Move document": "Move document",
-    "Reminders": "Reminders",
-    "Add reminder": "Add reminder",
-    "Update introduction links": "Update introduction links",
-    "Conference Room": "Conference Room",
-    "Please wait, this could take a while...": "Please wait, this could take a while...",
-    "Select replacement file": "Select replacement file",
-    "No file selected.": "No file selected.",
-    "Only files can be replaced.": "Only files can be replaced.",
-    "Error replacing file.": "Error replacing file.",
-    "Download selected items as ZIP": "Download selected items as ZIP",
-    "No items selected.": "No items selected.",
-    "Download started": "Download started",
-    "Error downloading selected items.": "Error downloading selected items.",
-    "Remove current icon": "Remove current icon",
-    "This icon will show for the link displayed as a tool on the course homepage.": "This icon will show for the link displayed as a tool on the course homepage.",
-    "The icon must be 120x120 pixels.": "The icon must be 120x120 pixels.",
-    "Error saving the link": "Error saving the link",
-    "Enter 2FA code": "Enter 2FA code",
-    "Submit code": "Submit code",
-    "Sign up": "Sign up",
-    "2FA disabled successfully.": "2FA disabled successfully.",
-    "Private course": "Private course",
-    "The database connection has failed. This is generally due to the wrong user, the wrong password or the wrong database prefix being set above. Please review these settings and try again.": "The database connection has failed. This is generally due to the wrong user, the wrong password or the wrong database prefix being set above. Please review these settings and try again.",
-    "Accept Terms and Conditions": "Accept Terms and Conditions",
-    "You accepted these terms on": "You accepted these terms on",
-    "Revoke Acceptance": "Revoke Acceptance",
-    "Minutes": "Minutes",
-    "Hours": "Hours",
-    "Days": "Days",
-    "Notification to remind the event": "Notification to remind the event",
-    "Before": "Before",
-    "We respect your privacy!": "We respect your privacy!",
-    "Go to your newly created portal.": "Go to your newly created portal.",
-    "Email Settings": "Email Settings",
-    "The DSN fully includes all parameters needed to connect to the mail service. You can learn more at {0}. The default value is null:\/\/null and will disable e-mail sending. Use native:\/\/default to use the default PHP configuration on your server. Here are a few examples of supported DSN syntaxes: {1}.": "The DSN fully includes all parameters needed to connect to the mail service. You can learn more at {0}. The default value is null:\/\/null and will disable e-mail sending. Use native:\/\/default to use the default PHP configuration on your server. Here are a few examples of supported DSN syntaxes: {1}.",
-    "Mail DSN": "Mail DSN",
-    "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header. We recommend using a 'no-reply' e-mail address here, to avoid excessive filling of an e-mail box. The support e-mail address defined in the Platform section should be used to contact you, but replying to automatic notifications should not be encouraged.": "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header. We recommend using a 'no-reply' e-mail address here, to avoid excessive filling of an e-mail box. The support e-mail address defined in the Platform section should be used to contact you, but replying to automatic notifications should not be encouraged.",
-    "The name that appears as the sender (next to the From e-mail address) when the platform sends an e-mail.": "The name that appears as the sender (next to the From e-mail address) when the platform sends an e-mail.",
-    "Installer data is missing.": "Installer data is missing.",
-    "Test email sent successfully": "Test email sent successfully",
-    "Test email failed: ": "Test email failed: ",
-    "Error during test email: ": "Error during test email: ",
-    "Destination of test e-mail": "Destination of test e-mail",
-    "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).": "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).",
-    "A database with the same name already exists. It will be deleted.": "A database with the same name already exists. It will be deleted.",
-    "When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.",
-    "You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.": "You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.",
-    "By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.": "By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.",
-    "By filling this form, you agree that the editor of Chamilo, the {0} company, registered in Belgium, and\/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.": "By filling this form, you agree that the editor of Chamilo, the {0} company, registered in Belgium, and\/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.",
-    "Please note that you are NOT REQUIRED to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click Next.": "Please note that you are NOT REQUIRED to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click Next.",
-    "Multilingual": "Multilingual",
-    "Subscribing...": "Subscribing...",
-    "No description": "No description",
-    "Repeat date": "Repeat date",
-    "Repeat type": "Repeat type",
-    "Repeat end date": "Repeat end date",
-    "Duration (minutes)": "Duration (minutes)",
-    "Daily": "Daily",
-    "Weekly": "Weekly",
-    "Bi-weekly": "Bi-weekly",
-    "Monthly, by date": "Monthly, by date",
-    "Gradebook options": "Gradebook options",
-    "Qualify attendance gradebook": "Qualify attendance gradebook",
-    "Select gradebook option": "Select gradebook option",
-    "Gradebook column title": "Gradebook column title",
-    "Grade weight": "Grade weight",
-    "No invitations or records found": "No invitations or records found",
-    "Accept invitation": "Accept invitation",
-    "Reject invitation": "Reject invitation",
-    "Friend added successfully": "Friend added successfully",
-    "Friend request rejected": "Friend request rejected",
-    "We could not retrieve the themes": "We could not retrieve the themes",
-    "Theme title": "Theme title",
-    "Required field": "Required field",
-    "A file name is required to save the recorded audio": "A file name is required to save the recorded audio",
-    "Attachment": "Attachment",
-    "We are sorry, your browser does not support using a microphone": "We are sorry, your browser does not support using a microphone",
-    "Results for": "Results for",
-    "Search groups": "Search groups",
-    "Pending group invitations": "Pending group invitations",
-    "Delete skill profile": "Delete skill profile",
-    "Skill profile deleted": "Skill profile deleted",
-    "Skill profiles": "Skill profiles",
-    "No skill profile": "No skill profile",
-    "Original assignment": "Original assignment",
-    "Student's submission": "Student's submission",
-    "Write your comment...": "Write your comment...",
-    "Max score": "Max score",
-    "Not graded yet": "Not graded yet",
-    "Attach file (optional)": "Attach file (optional)",
-    "Please add a comment, a grade or a file": "Please add a comment, a grade or a file",
-    "Score updated successfully": "Score updated successfully",
-    "Comment added successfully": "Comment added successfully",
-    "Each file name must match: YYYY-MM-DD_HH-MM_username_originalTitle.ext": "Each file name must match: YYYY-MM-DD_HH-MM_username_originalTitle.ext",
-    "Failed to download package": "Failed to download package",
-    "Failed to upload corrections": "Failed to upload corrections",
-    "Edit submission": "Edit submission",
-    "Submission updated!": "Submission updated!",
-    "No assignments available": "No assignments available",
-    "Move the file": "Move the file",
-    "Please select a target assignment": "Please select a target assignment",
-    "Submission moved successfully": "Submission moved successfully",
-    "Correction uploaded successfully!": "Correction uploaded successfully!",
-    "Invalid submission": "Invalid submission",
-    "Invalid resource link ID": "Invalid resource link ID",
-    "Can not change visibility": "Can not change visibility",
-    "Visibility updated successfully!": "Visibility updated successfully!",
-    "No download available": "No download available",
-    "Are you sure you want to delete this submission?": "Are you sure you want to delete this submission?",
-    "Submission deleted successfully!": "Submission deleted successfully!",
-    "Friendly URL": "Friendly URL",
-    "Column": "Column",
-    "Blocks Palette": "Blocks Palette",
-    "Error message": "Error message",
-    "You only have access to the URL {0}": "You only have access to the URL {0}",
-    "Access URL": "Access URL",
-    "Editable content": "Editable content",
-    "Color updated": "Color updated",
-    "Modify color theme": "Modify color theme",
-    "Hide advanced mode": "Hide advanced mode",
-    "Show advanced mode": "Show advanced mode",
-    "Primary color": "Primary color",
-    "Primary color hover\/background": "Primary color hover\/background",
-    "Primary color button text": "Primary color button text",
-    "Primary color button alternative text": "Primary color button alternative text",
-    "Secondary color": "Secondary color",
-    "Secondary color hover\/background": "Secondary color hover\/background",
-    "Secondary color button text": "Secondary color button text",
-    "Tertiary color": "Tertiary color",
-    "Tertiary color hover\/background": "Tertiary color hover\/background",
-    "Success color": "Success color",
-    "Success color hover\/background": "Success color hover\/background",
-    "Success color button text": "Success color button text",
-    "Info color": "Info color",
-    "Info color hover\/background": "Info color hover\/background",
-    "Info color button text": "Info color button text",
-    "Warning color": "Warning color",
-    "Warning color hover\/background": "Warning color hover\/background",
-    "Warning color button text": "Warning color button text",
-    "Danger color": "Danger color",
-    "Danger color hover\/background": "Danger color hover\/background",
-    "Form outline color": "Form outline color",
-    "Select as current theme": "Select as current theme",
-    "Save as new theme": "Save as new theme",
-    "New color theme": "New color theme",
-    "Primary": "Primary",
-    "Primary alternative": "Primary alternative",
-    "Info": "Info",
-    "Warning": "Warning",
-    "Dropdowns": "Dropdowns",
-    "Toggle": "Toggle",
-    "Forms": "Forms",
-    "This is the default form": "This is the default form",
-    "This is a form with an error": "This is a form with an error",
-    "Dialogs": "Dialogs",
-    "Some more elements": "Some more elements",
-    "Score": "Score",
-    "Send mail to student": "Send mail to student",
-    "Select": "Select",
-    "Type": "Type",
-    "Feedback": "Feedback",
-    "Last upload": "Last upload",
-    "Upload corrections package": "Upload corrections package",
-    "Download assignments package": "Download assignments package",
-    "Full name": "Full name",
-    "Upload correction": "Upload correction",
-    "Correct and rate": "Correct and grade",
-    "No resource link entity found": "No resource link entity found",
-    "Number of days": "Number of days",
-    "Every x days": "Every x days",
-    "{0}'s picture": "{0}'s picture",
-    "Invalid format": "Invalid format",
-    "Invitations": "Invitations",
-    "Subscriptions": "Subscriptions",
-    "Allow subscriptions": "Allow subscriptions",
-    "Maximum number of subscriptions": "Maximum number of subscriptions",
-    "Subscriptions count": "Subscriptions count",
-    "Subscribers": "Subscribers",
-    "All system users": "All system users",
-    "Users inside the class": "Users inside the class",
-    "Event editable by the invitees": "Event editable by the invitees",
-    "Social group": "Social group",
-    "Sessions plan calendar": "Sessions plan calendar",
-    "My students schedule": "My students schedule",
-    "Color": "Color",
-    "Unmark favorite": "Unmark favorite",
-    "Mark favorite": "Mark favorite",
-    "Register student": "Register student",
-    "Register Student": "Register Student",
-    "Duration": "Duration",
-    "Dependencies": "Dependencies",
-    "Price": "Price",
-    "Free": "Free",
-    "Your vote": "Your vote",
-    "Check requirements": "Check requirements",
-    "Subscribe": "Subscribe",
-    "Subscription not allowed": "Subscription not allowed",
-    "Not available": "Not available",
-    "No description available": "No description available",
-    "Session requirements and dependencies": "Session requirements and dependencies",
-    "No dependencies": "No dependencies",
-    "Ends tomorrow": "Ends tomorrow",
-    "Ends today": "Ends today",
-    "Expired": "Expired",
-    "Introduction updated successfully!": "Introduction updated successfully!",
-    "Introduction created successfully!": "Introduction created successfully!",
-    "Write a short and striking course name, for example: Innovation Management": "Write a short and striking course name, for example: Innovation Management",
-    "Course name": "Course name",
-    "Only letters (a-z) and numbers (0-9)": "Only letters (a-z) and numbers (0-9)",
-    "Course code": "Course code",
-    "Fill with demo content": "Fill with demo content",
-    "Course template": "Course template",
-    "Create this course": "Create this course",
-    "Complete": "Complete",
-    "Incomplete": "Incomplete",
-    "Code": "Code",
-    "Add a new folder": "Add a new folder",
-    "Mail: 'From' address": "Mail: 'From' address",
-    "Mail: 'From' name": "Mail: 'From' name",
-    "If you plan to upgrade from an older version of Chamilo, you might want to": "If you plan to upgrade from an older version of Chamilo, you might want to",
-    "have a look at the changelog": "have a look at the changelog",
-    "Old version's root path": "Old version's root path",
-    "Your company's name": "Your company's name",
-    "Your company's activity": "Your company's activity",
-    "Your job's description": "Your job's description",
-    "Your company's home country": "Your company's home country",
-    "Verifying migration:": "Verifying migration:",
-    "The last migration executed successfully was:": "The last migration executed successfully was:",
-    "Please check the following error:": "Please check the following error:",
-    "Migration completed successfully!": "Migration completed successfully!",
-    "Migration failed!": "Migration failed!",
-    "Browse courses": "Browse courses",
-    "Save the category": "Save the category",
-    "Link's target": "Link's target",
-    "Current icon": "Current icon",
-    "Or": "Or",
-    "Preview": "Preview",
-    "Start date": "Start date",
-    "End date": "End date",
-    "Registered": "Registered",
-    "Select a course": "Select a course",
-    "Go": "Go",
-    "Skill profile": "Skill profile",
-    "Edit this group": "Edit this group",
-    "Add a picture": "Add a picture",
-    "Allow members to leave group": "Allow members to leave group",
-    "By geolocalization": "By geolocalization",
-    "Skills wheel": "Skills wheel",
-    "Waiting list": "Waiting list",
-    "Invite friends": "Invite friends",
-    "Leave group": "Leave group",
-    "You have left the group successfully": "You have left the group successfully",
-    "Chat": "Chat",
-    "Online": "Online",
-    "Unsubscribe": "Unsubscribe",
-    "Endpoint": "Endpoint",
-    "Enable notifications": "Enable notifications",
-    "Create a new document": "Create a new document",
-    "Create thread": "Create thread",
-    "Replies": "Replies",
-    "Created": "Created",
-    "Add files": "Add files",
-    "Diagnosis management": "Diagnosis management",
-    "Dashboard": "Dashboard",
-    "Favorite courses": "Favorite courses",
-    "Completed courses": "Completed courses",
-    "Incomplete courses": "Incomplete courses",
-    "Restartable courses": "Restartable courses",
-    "Session administrator": "Session administrator",
-    "Does not have enough contrast against background": "Does not have enough contrast against background",
-    "Featured courses": "Featured courses",
-    "Show more courses": "Show more courses",
-    "Configure Chamilo colors": "Configure Chamilo colors",
-    "Professional support": "Professional support",
-    "News from Chamilo": "News from Chamilo",
-    "Data exchanges (GDPR)": "Data exchanges (GDPR)",
-    "Back to third parties": "Back to third parties",
-    "Add exchange": "Add exchange",
-    "Third party": "Third party",
-    "Date sent": "Date sent",
-    "All users?": "All users?",
-    "Add data exchange": "Add data exchange",
-    "Select users": "Select users",
-    "Third parties (GDPR)": "Third parties (GDPR)",
-    "Add third party": "Add third party",
-    "Website": "Website",
-    "Recruiter": "Recruiter",
-    "Data exchange": "Data exchange",
-    "Send data": "Send data",
-    "Address": "Address",
-    "Is recruiter?": "Is recruiter?",
-    "Is used for data exchange?": "Is used for data exchange?",
-    "Add documents": "Add documents",
-    "Documents added": "Documents added",
-    "Remove": "Remove",
-    "Available documents": "Available documents",
-    "Document added": "Document added",
-    "Error adding document": "Error adding document",
-    "Document removed": "Document removed",
-    "Error removing document": "Error removing document",
-    "Add users": "Add users",
-    "Users added": "Users added",
-    "Users to add": "Users to add",
-    "Search users by username": "Search users by username",
-    "Page": "Page",
-    "User added": "User added",
-    "Error adding user": "Error adding user",
-    "User removed": "User removed",
-    "Error removing user": "Error removing user",
-    "Write my submission": "Write my submission",
-    "Upload file": "Upload file",
-    "Add document": "Add document",
-    "Users without submission": "Users without submission",
-    "Delete all corrections": "Delete all corrections",
-    "Failed to export PDF": "Failed to export PDF",
-    "Are you sure you want to delete all corrections?": "Are you sure you want to delete all corrections?",
-    "All corrections deleted": "All corrections deleted",
-    "Failed to delete corrections": "Failed to delete corrections",
-    "Send email to all": "Send email to all",
-    "Users without submission for assignment": "Users without submission for assignment",
-    "Last name": "Last name",
-    "First name": "First name",
-    "Student progress": "Student progress",
-    "Upload your assignment": "Upload your assignment",
-    "Submission title": "Submission title",
-    "Enter a title for your submission": "Enter a title for your submission",
-    "Your answer": "Your answer",
-    "Text": "Text",
-    "File uploaded successfully": "File uploaded successfully",
-    "Failed to upload file": "Failed to upload file",
-    "Please provide a title and some text": "Please provide a title and some text",
-    "Text submitted successfully": "Text submitted successfully",
-    "Information": "Information",
-    "You are adding calendar events for attendance": "You are adding calendar events for attendance",
-    "Add attendance date": "Add attendance date",
-    "Back to attendance sheet": "Back to attendance sheet",
-    "Add calendar event": "Add calendar event",
-    "Clear all": "Clear all",
-    "Edit calendar event": "Edit calendar event",
-    "Delete calendar event": "Delete calendar event",
-    "Are you sure you want to delete all calendar events?": "Are you sure you want to delete all calendar events?",
-    "Add attendance": "Add attendance",
-    "Edit attendance": "Edit attendance",
-    "Go back": "Go back",
-    "Go to calendar": "Go to calendar",
-    "Export to Excel": "Export to Excel",
-    "Generate QR code": "Generate QR code",
-    "Report of attendance sheets": "Report of attendance sheets",
-    "To attend": "To attend",
-    "View comment": "View comment",
-    "Sign": "Sign",
-    "Photo": "Photo",
-    "Not attended": "Not attended",
-    "Column is locked or read-only": "Column is locked or read-only",
-    "Remove state": "Remove state",
-    "Save attendance": "Save attendance",
-    "Signature": "Signature",
-    "Clear": "Clear",
-    "Attendance saved successfully": "Attendance saved successfully",
-    "Unknown attendance": "Unknown attendance",
-    "Today": "Today",
-    "All done": "All done",
-    "All not done": "All not done",
-    "Present": "Present",
-    "Absent": "Absent",
-    "Unknown": "Unknown",
-    "Error exporting to PDF": "Error exporting to PDF",
-    "Error exporting to Excel": "Error exporting to Excel",
-    "Failed to generate QR code": "Failed to generate QR code",
-    "Matching courses": "Matching courses",
-    "Advanced search": "Advanced search",
-    "Apply advanced filters": "Apply advanced filters",
-    "Sort by": "Sort by",
-    "Filter by title": "Filter by title",
-    "Filter by category": "Filter by category",
-    "Filter by language": "Filter by language",
-    "Total number of sessions": "Total number of sessions",
-    "Matching sessions": "Matching sessions",
-    "Searching by": "Searching by",
-    "No session available": "No session available",
-    "Add a new course": "Add a new course",
-    "Add file variation": "Add file variation",
-    "Back to Documents": "Back to Documents",
-    "Original file": "Original file",
-    "Title:": "Title:",
-    "Format:": "Format:",
-    "Size:": "Size:",
-    "Upload new variation": "Upload new variation",
-    "Choose file": "Choose file",
-    "Current variations": "Current variations",
-    "Format": "Format",
-    "View": "View",
-    "Creator": "Creator",
-    "Associated URL": "Associated URL",
-    "Default (No URL)": "Default (No URL)",
-    "Set as default certificate": "Set as default certificate",
-    "Template options": "Template options",
-    "In progress": "In progress",
-    "Replace file": "Replace file",
-    "Confirm deletion": "Confirm deletion",
-    "The following documents are used in learning paths:": "The following documents are used in learning paths:",
-    "Do you still want to delete them?": "Do you still want to delete them",
-    "Documents deleted": "Documents deleted",
-    "Replace video": "Replace video",
-    "Replace (files or videos only)": "Replace (files or videos only)",
-    "File replaced": "File replaced",
-    "Document moved successfully": "Document moved successfully",
-    "Error moving the document": "Error moving the document",
-    "Search term": "Search term",
-    "Term removed": "Term removed",
-    "Could not move link up": "Could not move link up",
-    "Could not move link down": "Could not move link down",
-    "of": "of",
-    "messages": "messages",
-    "Error deleting message": "Error deleting message",
-    "Re:": "Re:",
-    "Show public link": "Show public link",
-    "Public link": "Public link",
-    "You can share or copy this link:": "You can share or copy this link:",
-    "Select the link above and press Ctrl+C to copy it": "Select the link above and press Ctrl+C to copy it",
-    "Not found": "Not found",
-    "Back to list": "Back to list",
-    "Create page layout": "Create page layout",
-    "URL is required": "URL is required",
-    "Roles": "Roles",
-    "Layout template": "Layout template",
-    "Select a template": "Select a template",
-    "Create layout template": "Create layout template",
-    "Layout template name": "Layout template name",
-    "Template name is required": "Template name is required",
-    "Layout type": "Layout type",
-    "Save template": "Save template",
-    "Edit page layout": "Edit page layout",
-    "Save changes": "Save changes",
-    "Edit layout template": "Edit layout template",
-    "Replace layout with predefined type?": "Replace layout with predefined type?",
-    "Page layouts": "Page layouts",
-    "Create layout": "Create layout",
-    "Manage templates": "Manage templates",
-    "ID": "ID",
-    "Are you sure you want to delete this layout?": "Are you sure you want to delete this layout?",
-    "Layout templates": "Layout templates",
-    "Create template": "Create template",
-    "Back to layouts": "Back to layouts",
-    "Columns": "Columns",
-    "Blocks": "Blocks",
-    "View JSON": "View JSON",
-    "Layout JSON details": "Layout JSON details",
-    "Are you sure you want to delete this template?": "Are you sure you want to delete this template?",
-    "Page layout details": "Page layout details",
-    "Available courses in this URL": "Available courses in this URL",
-    "Issued at": "Issued at",
-    "Load more": "Load more",
-    "Session period": "Session period",
-    "Search student": "Search student",
-    "Create new user": "Create new user",
-    "Matching students": "Matching students",
-    "Active": "Active",
-    "Local user": "Local user",
-    "External user": "External user",
-    "Send course invitation": "Send course invitation",
-    "Password (leave blank to auto)": "Password (leave blank to auto)",
-    "Send access details to user by email": "Send access details to user by email",
-    "Course sent to": "Course sent to",
-    "User created": "User created",
-    "Could not create user": "Could not create user",
-    "A user with this username already exists": "A user with this username already exists",
-    "Ended": "Ended",
-    "Extend one week": "Extend one week",
-    "Could not load data": "Could not load data",
-    "Session extended": "Session extended",
-    "Action failed": "Action failed",
-    "What skills are you looking for?": "What skills are you looking for?",
-    "View skills wheel": "View skills wheel",
-    "Enter the skill name to search": "Enter the skill name to search",
-    "Search profile matches": "Search profile matches",
-    "Save this search": "Save this search",
-    "Legend": "Legend",
-    "Basic skills": "Basic skills",
-    "Skills you can learn": "Skills you can learn",
-    "Skills searched for": "Skills searched for",
-    "Is this what you were looking for?": "Is this what you were looking for?",
-    "You do not have permission to view this page": "You do not have permission to view this page",
-    "Users, Groups": "Users, Groups",
-    "Subject": "Subject",
-    "Message": "Message",
-    "Results and feedback": "Results and feedback",
-    "Display a Terms & Conditions statement on the registration page, require visitor to accept the T&C to register": "Display a Terms & Conditions statement on the registration page, require visitor to accept the T&C to register",
-    "Load": "Load",
-    "All versions": "All versions",
-    "Why do we collect this data?": "Why do we collect this data?",
-    "Personal data collection": "Personal data collection",
-    "Type of terms": "Type of terms",
-    "Edit Terms and Conditions": "Edit Terms and Conditions",
-    "HTML": "HTML",
-    "Page Link": "Page Link",
-    "Delete account": "Delete account",
-    "Invite friends to group": "Invite friends to group",
-    "Available friends": "Available friends",
-    "Selected friends": "Selected friends",
-    "Sent invitations": "Sent invitations",
-    "Users already invited": "Users already invited",
-    "See more": "See more",
-    "This skill can be obtained through:": "This skill can be obtained through:",
-    "This is an open group": "This is an open group",
-    "This is a closed group": "This is a closed group",
-    "Join group": "Join group",
-    "You have been invited to join this group": "You have been invited to join this group",
-    "Discussions": "Discussions",
-    "Members": "Members",
-    "You have a new friend request": "You have a new friend request",
-    "here": "here",
-    "Notification message sent successfully": "Notification message sent successfully",
-    "Failed to send notification message": "Failed to send notification message",
-    "An error occurred while sending the notification message": "An error occurred while sending the notification message",
-    "You will therefore be automatically redirected to this URL": "You will therefore be automatically redirected to this URL",
-    "You have access to multiple URLs": "You have access to multiple URLs",
-    "Please click on the link below corresponding to the URL you wish to access": "Please click on the link below corresponding to the URL you wish to access",
-    "You do not currently have access to any URL": "You do not currently have access to any URL",
-    "Maximum number of subscriptions allowed": "Maximum number of subscriptions allowed",
-    "An error occurred": "An error occurred",
-    "You don't have any course content yet": "You don't have any course content yet",
-    "This course is locked": "This course is locked",
-    "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header": "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header",
-    "Test e-mail sending": "Test e-mail sending",
-    "Cannot find your language in the list? Contact us at {0} to contribute as a translator": "Cannot find your language in the list? Contact us at {0} to contribute as a translator",
-    "An update is available": "An update is available",
-    "to know what's new and what has been changed": "to know what's new and what has been changed",
-    "We have detected that your PHP installation does not define the date": "We have detected that your PHP installation does not define the date",
-    "Your PHP version does not match the requirements for this software": "Your PHP version does not match the requirements for this software",
-    "Some files or folders don't have writing permission": "Some files or folders don't have writing permission",
-    "Installation guide": "Installation guide",
-    "Warning! The installer has detected an existing Chamilo platform on your system": "Warning! The installer has detected an existing Chamilo platform on your system",
-    "Because the <code>newscorm<\/code> and <code>exercice<\/code> directories were renamed to <code>lp<\/code> and <code>exercise<\/code> respectively, is necessary to delete or rename to <code>newscorm_old<\/code> and <code>exercice_old<\/code>": "Because the <code>newscorm<\/code> and <code>exercice<\/code> directories were renamed to <code>lp<\/code> and <code>exercise<\/code> respectively, is necessary to delete or rename to <code>newscorm_old<\/code> and <code>exercice_old<\/code>",
-    "The form contains incorrect or incomplete data": "The form contains incorrect or incomplete data",
-    "Your contact information could not be sent": "Your contact information could not be sent",
-    "ex": "ex",
-    "Please contact support with the error details": "Please contact support with the error details",
-    "Click the image to crop it (1:1 ratio, 120x120 px recommended)": "Click the image to crop it (1:1 ratio, 120x120 px recommended)",
-    "Use the crop tool to select a 1:1 region": "Use the crop tool to select a 1:1 region",
-    "All messages here are automatically marked as promoted.": "All messages here are automatically marked as promoted.",
-    "Checking push subscription": "Checking push subscription",
-    "You're subscribed to push notifications in this browser": "You're subscribed to push notifications in this browser",
-    "Push notifications are not enabled in this browser": "Push notifications are not enabled in this browser",
-    "By accepting this invitation, you will become linked to the requesting user in a way that will make some or all of your profile data available for reading by the requesting user": "By accepting this invitation, you will become linked to the requesting user in a way that will make some or all of your profile data available for reading by the requesting user",
-    "Please select at least one user.": "Please select at least one user.",
-    "Data exchange successfully saved": "Data exchange successfully saved",
-    "Error saving data exchange": "Error saving data exchange",
-    "No documents added yet": "No documents added yet",
-    "No additional details available for this skill.": "No additional details available for this skill.",
-    "No course currently allows you to obtain this skill.": "No course currently allows you to obtain this skill.",
-    "No available documents": "No available documents",
-    "No users added yet": "No users added yet",
-    "No available users": "No available users",
-    "You can no longer submit": "You can no longer submit",
-    "No missing submissions found for this assignment or data is not available": "No missing submissions found for this assignment or data is not available",
-    "Email sent to all unsubmitted users": "Email sent to all unsubmitted users",
-    "Failed to send email": "Failed to send email",
-    "Write your answer here": "Write your answer here",
-    "The attendance calendar allows you to register attendance lists (one per real session the students need to attend)": "The attendance calendar allows you to register attendance lists (one per real session the students need to attend)",
-    "Loading attendance data": "Loading attendance data",
-    "No attendance assigned yet": "No attendance assigned yet",
-    "There is no class scheduled today, try picking another day or add your attendance entry yourself using the action icons": "There is no class scheduled today, try picking another day or add your attendance entry yourself using the action icons",
-    "No attendance data for today": "No attendance data for today",
-    "Saving": "Saving",
-    "No attendance data to save": "No attendance data to save",
-    "Failed to save attendance": "Failed to save attendance",
-    "Loading more courses": "Loading more courses",
-    "Loading more sessions": "Loading more sessions",
-    "The document auto-launch feature configuration is enabled": "The document auto-launch feature configuration is enabled",
-    "The exercises auto-launch feature configuration is enabled": "The exercises auto-launch feature configuration is enabled",
-    "The learning path auto-launch setting is ON": "The learning path auto-launch setting is ON",
-    "The forum's auto-launch setting is on": "The forum's auto-launch setting is on",
-    "Once you click on \"Create a course\", a course is created with a section for Tests, Project based learning, Assessments, Courses, Dropbox, Agenda and much more. Logging in as teacher provides you with editing privileges for this course.": "Once you click on \"Create a course\", a course is created with a section for Tests, Project based learning, Assessments, Courses, Dropbox, Agenda and much more. Logging in as teacher provides you with editing privileges for this course.",
-    "Course ID is missing": "Course ID is missing",
-    "Course created successfully": "Course created successfully",
-    "An unexpected error occurred.": "An unexpected error occurred.",
-    "Error deleting document(s)": "Error deleting document(s)",
-    "Template successfully deleted": "Template successfully deleted",
-    "Error deleting the template": "Error deleting the template",
-    "The title and thumbnail are required": "The title and thumbnail are required",
-    "Template created successfully": "Template created successfully",
-    "Error creating the template": "Error creating the template",
-    "Error submitting the form": "Error submitting the form",
-    "e": "e",
-    "Optional - e": "Optional - e",
-    "Loading templates": "Loading templates",
-    "Loading layout": "Loading layout",
-    "Loading courses": "Loading courses",
-    "No courses available": "No courses available",
-    "No favorite courses.": "No favorite courses.",
-    "This list displays users from all access URLs because the setting \"session_admin_access_to_all_users_on_all_urls\" is enabled.": "This list displays users from all access URLs because the setting \"session_admin_access_to_all_users_on_all_urls\" is enabled.",
-    "User not found": "User not found",
-    "An error occurred while sending the course": "An error occurred while sending the course",
-    "Please remember that modifications to the terms related to GDPR require you to report those modifications to third parties to whom you have provided personal information about your users, as stated in Article 19 of GDPR": "Please remember that modifications to the terms related to GDPR require you to report those modifications to third parties to whom you have provided personal information about your users, as stated in Article 19 of GDPR",
-    "You should create the \"Term and Conditions\" for all the available languages": "You should create the \"Term and Conditions\" for all the available languages",
-    "You don't have any course yet": "You don't have any course yet",
-    "You have received a new friend request": "You have received a new friend request",
-    "DiagnosticfinalizationmessageTitle": "Diagnostic finalization",
-    "DiagnosticfinalizationmessageContent": "Hi {0}, I'm {1} and I'm reviewing your diagnostic to define the course you will be following.",
-    "Events": "Events",
-    "Diagnosis Management": "Diagnosis Management",
-    "Course description": "Course description",
-    "Learning paths": "Learning paths",
-    "Links": "Links",
-    "Tests": "Tests",
-    "Announcements": "Announcements",
-    "Forum": "Forum",
-    "Surveys": "Surveys",
-    "Wiki": "Wiki",
-    "Glossary": "Glossary",
-    "Notebook": "Notebook",
-    "Attendances": "Attendances",
-    "Course progress": "Course progress",
-    "The forum's auto-launch setting is on. Students will be redirected to the forum tool when entering this course.": "The forum's auto-launch setting is on. Students will be redirected to the forum tool when entering this course.",
-    "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to the selected exercise.": "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to the selected exercise.",
-    "The learning path auto-launch setting is ON. When learners enter this course, they will be automatically redirected to the learning path marked as auto-launch.": "The learning path auto-launch setting is ON. When learners enter this course, they will be automatically redirected to the learning path marked as auto-launch.",
-    "The document auto-launch feature configuration is enabled. Learners will be automatically redirected to document tool.": "The document auto-launch feature configuration is enabled. Learners will be automatically redirected to document tool.",
-    "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to exercise list.": "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to exercise list.",
-    "Contact support": "Contact support",
-    "ex. localhost": "ex. localhost",
-    "ex. 3306": "ex. 3306",
-    "ex. root": "ex. root",
-    "Theme selected as current": "Theme selected as current",
-    "Color theme created": "Color theme created",
-    "You are editing logos for visual theme": "You are editing logos for visual theme",
-    "Header logo": "Header logo",
-    "Effective preview": "Effective preview",
-    "Using default theme logo": "Using default theme logo",
-    "Files in current theme": "Files in current theme",
-    "No SVG uploaded": "No SVG uploaded",
-    "Remove SVG": "Remove SVG",
-    "No PNG uploaded": "No PNG uploaded",
-    "Remove PNG": "Remove PNG",
-    "Save header logo": "Save header logo",
-    "Email logo": "Email logo",
-    "Save email logo": "Save email logo",
-    "PNG format required": "PNG format required",
-    "SVG format required": "SVG format required",
-    "Select at least one file": "Select at least one file",
-    "Upload failed": "Upload failed",
-    "Deletion failed": "Deletion failed",
-    "Drag to reorder": "Drag to reorder",
-    "Clean temporary files": "Clean temporary files",
-    "Prerequisites": "Prerequisites",
-    "Publish \/ Hide": "Publish \/ Hide",
-    "Edit learnpath": "Edit learnpath",
-    "Select which items to include in the PDF": "Select which items to include in the PDF",
-    "Open in a new tab": "Open in a new tab",
-    "Delete third party": "Delete third party",
-    "Learning path": "Learning path",
-    "Category options": "Category options",
-    "Expand": "Expand",
-    "Collapse": "Collapse",
-    "Copy link": "Copy link",
-    "Untitled": "Untitled",
-    "Security tools and reports": "Security tools and reports",
-    "This field cannot be empty": "This field cannot be empty",
-    "This is not a valid URL. Example: https:\/\/example.com": "This is not a valid URL. Example: https:\/\/example.com",
-    "Are you sure you want to delete this?": "Are you sure you want to delete this?",
-    "Add tags": "Add tags",
-    "Color theme": "Color theme",
-    "Logos will be applied to the current visual theme: ": "Logos will be applied to the current visual theme: ",
-    "Switch the active theme if you want to upload logos for a different one.": "Switch the active theme if you want to upload logos for a different one.",
-    "Create new learning path": "Create new learning path",
-    "Go to branding (logos)": "Go to branding (logos)",
-    "Visual theme (assets)": "Visual theme (assets)",
-    "Branding (logos)": "Branding (logos)",
-    "Upload optional header and email logos. The SVG format is preferred. PNG is used as fallback.": "Upload optional header and email logos. The SVG format is preferred. PNG is used as fallback.",
-    "Updated": "Updated",
-    "Explore more courses": "Explore more courses",
-    "Sessions catalogue": "Sessions catalogue",
-    "Root": "Root",
-    "Videoconference": "Videoconference",
-    "Course settings": "Course settings",
-    "Course maintenance": "Course maintenance",
-    "Open file": "Open file",
-    "Item details": "Item details",
-    "File upload succeeded!": "File upload succeeded!",
-    "Uploading... please keep this tab open.": "Uploading... please keep this tab open.",
-    "Choose recipients": "Choose recipients",
-    "Recipients": "Recipients",
-    "Enter a value here": "Enter a value here",
-    "Write a title...": "Write a title...",
-    "Use the editor toolbar to format your content.": "Use the editor toolbar to format your content.",
-    "Drag & drop files here or click to select": "Drag & drop files here or click to select",
-    "Edit post": "Edit post",
-    "New post": "New post",
-    "Failed to create the post. Please try again.": "Failed to create the post. Please try again.",
-    "Press Ctrl+Enter to send": "Press Ctrl+Enter to send",
-    "Add comment": "Add comment",
-    "Write your comment here...": "Write your comment here...",
-    "{0} selected": "{0} selected",
-    "Search by title or path...": "Search by title or path...",
-    "Manage backups, restore, copy, recycle and delete course data.": "Manage backups, restore, copy, recycle and delete course data.",
-    "{0} comment(s)": "{0} comment(s)",
-    "Error updating third party. Please verify the data.": "Error updating third party. Please verify the data.",
-    "Import finished": "Import finished",
-    "Please choose a .imscc or .zip file.": "Please choose a .imscc or .zip file.",
-    "Import full backup": "Import full backup",
-    "Let me select learning objects": "Let me select learning objects",
-    "Select items": "Select items",
-    "Recycle course": "Recycle course",
-    "Skip same file name": "Skip same file name",
-    "Rename file (eg file.pdf becomes file_1.pdf)": "Rename file (eg file.pdf becomes file_1.pdf)",
-    "Overwrite file": "Overwrite file",
-    "Selected items": "Selected items",
-    "IMS Common Cartridge v1.3": "IMS Common Cartridge v1.3",
-    "Scope": "Scope",
-    "Select source": "Select source",
-    "No date": "No date",
-    "Download as ZIP": "Download as ZIP",
-    "Delete this folder? All files inside will be permanently deleted.": "Delete this folder? All files inside will be permanently deleted.",
-    "New task": "New task",
-    "subtitle": "subtitle",
-    "Template type": "Template type",
-    "Edit task": "Edit task",
-    "Pending validation": "Pending validation",
-    "New project": "New project",
-    "Assign task": "Assign task",
-    "Select a task": "Select a task",
-    "Select a user": "Select a user",
-    "Target date": "Target date",
-    "Create a backup": "Create a backup",
-    "Completely delete this course": "Completely delete this course",
-    "Could not load exportable items.": "Could not load exportable items.",
-    "You can close this message to continue.": "You can close this message to continue.",
-    "No contacts found": "No contacts found",
-    "Select a contact": "Select a contact",
-    "No messages yet": "No messages yet",
-    "Pick someone in the left box to start chatting": "Pick someone in the left box to start chatting",
-    "Write a message": "Write a message",
-    "Enter to send \u00b7 Shift+Enter for newline": "Enter to send \u00b7 Shift+Enter for newline",
-    "Delivered": "Delivered",
-    "Sending": "Sending",
-    "Are you sure you want to clear this conversation?": "Are you sure you want to clear this conversation?",
-    "You are registered on {0}": "You are registered on {0}",
-    "You have been enrolled in a new course": "You have been enrolled in a new course",
-    "Admin Favorites Courses": "Admin Favorites Courses",
-    "Admin Completed Courses": "Admin Completed Courses",
-    "Admin Incomplete Courses": "Admin Incomplete Courses",
-    "Admin Restart Courses": "Admin Restart Courses",
-    "Admin Dashboard": "Admin Dashboard",
-    "New messages": "New messages",
-    "Authentication source": "Authentication source",
-    "Assign authentication sources to users": "Assign authentication sources to users",
-    "Back to user assignment page": "Back to user assignment page",
-    "Authentication sources assigned successfully": "Authentication sources assigned successfully",
-    "Tip: choose \u201c\u2014 Just upload \u2014\u201d to store without sending to anyone.": "Tip: choose \u201c\u2014 Just upload \u2014\u201d to store without sending to anyone.",
-    "Please select at least one recipient (\u201c\u2014 Just upload \u2014\u201d or any user)": "Please select at least one recipient (\u201c\u2014 Just upload \u2014\u201d or any user)",
-    "Sharing": "Sharing",
-    "Overwrite previous versions of same document?": "Overwrite previous versions of same document?",
-    "Selected files": "Selected files",
-    "Hide password": "Hide password",
-    "Show password": "Show password",
-    "Upload SVG logo for e-mails": "Upload SVG logo for e-mails",
-    "You must move or remove all learning paths from this category before deleting it.": "You must move or remove all learning paths from this category before deleting it.",
-    "Clear filters": "Clear filters",
-    "Attendances (tablet)": "Attendances (tablet)",
-    "Exit tablet mode": "Exit tablet mode",
-    "Attended": "Attended",
-    "No members found.": "No members found.",
-    "Health check": "Health check",
-    "Export Common Cartridge v1.3": "Export Common Cartridge v1.3",
-    "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.": "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.",
-    "Full copy": "Full copy",
-    "Loading resources...": "Loading resources...",
-    "Import Common Cartridge v1.3": "Import Common Cartridge v1.3",
-    "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.": "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.",
-    "Failed to load resources.": "Failed to load resources.",
-    "Please select at least one exportable resource (document, web link, discussion,...).": "Please select at least one exportable resource (document, web link, discussion,...).",
-    "Export finished.": "Export finished.",
-    "Export failed.": "Export failed.",
-    "Import failed.": "Import failed.",
-    "Local file (.zip, .mbz, .tgz, .gz)": "Local file (.zip, .mbz, .tgz, .gz)",
-    "server file": "server file",
-    "Select a backup file": "Select a backup file",
-    "What should be done with imported files with the same file name as existing files?": "What should be done with imported files with the same file name as existing files?",
-    "Ready to import": "Ready to import",
-    "We will restore the backup into this course. You can go back to change options.": "We will restore the backup into this course. You can go back to change options.",
-    "Import backup": "Import backup",
-    "Select resources to import": "Select resources to import",
-    "No resources available in this backup.": "No resources available in this backup.",
-    "Import selection": "Import selection",
-    "Import completed": "Import completed",
-    "Could not load options.": "Could not load options.",
-    "Please select a backup file (.zip, .mbz, .tgz, .gz)": "Please select a backup file (.zip, .mbz, .tgz, .gz)",
-    "Please choose a backup from the server": "Please choose a backup from the server",
-    "Error selecting source.": "Error selecting source.",
-    "Recycling options": "Recycling options",
-    "Delete everything": "Delete everything",
-    "Type the course code to confirm": "Type the course code to confirm",
-    "This will remove or reset selected resources. This action cannot be undone.": "This will remove or reset selected resources. This action cannot be undone.",
-    "Select resources to recycle": "Select resources to recycle",
-    "No resources available in this course.": "No resources available in this course.",
-    "Recycle selected": "Recycle selected",
-    "Recycle is finished": "Recycle is finished",
-    "Error loading resources.": "Error loading resources.",
-    "Clear search": "Clear search",
-    "Only letters, digits and underscore (_) are allowed in the database name. Invalid characters will be removed automatically.": "Only letters, digits and underscore (_) are allowed in the database name. Invalid characters will be removed automatically.",
-    "Question manager": "Question manager",
-    "Questions": "Questions",
-    "Security": "Security",
-    "What general terms and conditions are given to users to use this platform?": "What general terms and conditions are given to users to use this platform?",
-    "ex. {0}": "ex. {0}",
-    "Blogs": "Blogs",
-    "Blog": "Blog",
-    "Dropbox": "Dropbox",
-    "Your browser does not support Javascript": "Your browser does not support Javascript",
-    "The value must match exactly: {0}": "The value must match exactly: {0}",
-    "Repeat end date must be after start date.": "Repeat end date must be after start date.",
-    "Index document content?": "Index document content?",
-    "Upload SVG logo to platform header": "Upload SVG logo to platform header",
-    "Upload PNG logo to platform header ({0})": "Upload PNG logo to platform header ({0})",
-    "Preferred: SVG. PNG recommended width: {0}px.": "Preferred: SVG. PNG recommended width: {0}px.",
-    "Upload PNG logo for e-mails (~{0}px width)": "Upload PNG logo for e-mails (~{0}px width)",
-    "Header PNG must be \u2264 {0}px.": "Header PNG must be \u2264 {0}px.",
-    "Require specific file format": "Require specific file format",
-    "Select allowed file formats": "Select allowed file formats",
-    "Custom extensions (separated by space)": "Custom extensions (separated by space)",
-    "Other extensions": "Other extensions",
-    "My invitations": "My invitations",
-    "Delete access": "Delete access",
-    "Certificate tags": "Certificate tags",
-    "Copy all": "Copy all",
-    "Click to insert": "Click to insert",
-    "Preferred: SVG. PNG max size: {0}px.": "Preferred: SVG. PNG max size: {0}px.",
-    "View badge": "View badge",
-    "{0} min": "{0} min",
-    "Duration in minutes": "Duration in minutes",
-    "Go back to standard view": "Go back to standard view",
-    "Search for student...": "Search for student...",
-    "This date is locked or read-only.": "This date is locked or read-only.",
-    "Failed to load attendance. Please try again later.": "Failed to load attendance. Please try again later.",
-    "Nothing to save": "Nothing to save",
-    "You have unsaved changes. Leave anyway?": "You have unsaved changes. Leave anyway?",
-    "Storage usage unavailable": "Storage usage unavailable",
-    "Search for members...": "Search for members...",
-    "Current members": "Current members",
-    "Add members": "Add members",
-    "Search for users in course\/session...": "Search for users in course\/session...",
-    "No users available.": "No users available.",
-    "Browse and publish new posts": "Browse and publish new posts",
-    "Create and assign tasks": "Create and assign tasks",
-    "Filtered by {0}": "Filtered by {0}",
-    "No posts": "No posts",
-    "No tasks": "No tasks",
-    "Select a score": "Select a score",
-    "No comment": "No comment",
-    "Edit Comment": "Edit Comment",
-    "Failed to update the post.": "Failed to update the post.",
-    "Delete this post? This action cannot be undone.": "Delete this post? This action cannot be undone.",
-    "Failed to delete the post.": "Failed to delete the post.",
-    "Failed to update the comment.": "Failed to update the comment.",
-    "Delete this comment?": "Delete this comment?",
-    "Failed to delete the comment.": "Failed to delete the comment.",
-    "Search for projects...": "Search for projects...",
-    "Only visible": "Only visible",
-    "Rename project": "Rename project",
-    "New title": "New title",
-    "You need to be a admin or teacher to manage projects.": "You need to be a admin or teacher to manage projects.",
-    "Delete this project? This action cannot be undone.": "Delete this project? This action cannot be undone.",
-    "Task list": "Task list",
-    "Change status": "Change status",
-    "Waiting for validation": "Waiting for validation",
-    "Delete this task?": "Delete this task?",
-    "Failed to delete the task.": "Failed to delete the task.",
-    "Failed to update status.": "Failed to update status.",
-    "Are you sure you want to delete this third party? This action cannot be undone.": "Are you sure you want to delete this third party? This action cannot be undone.",
-    "Please fix the errors before saving.": "Please fix the errors before saving.",
-    "Error creating third party. Please verify the data.": "Error creating third party. Please verify the data.",
-    "Error deleting third party.": "Error deleting third party.",
-    "Upload optional header and email logos. SVG is preferred; PNG is used as fallback.": "Upload optional header and email logos. SVG is preferred; PNG is used as fallback.",
-    "Data exchange updated successfully.": "Data exchange updated successfully.",
-    "Error deleting data exchange.": "Error deleting data exchange.",
-    "Failed to recycle course.": "Failed to recycle course.",
-    "Select source course": "Select source course",
-    "Course to copy from": "Course to copy from",
-    "Search by code or title...": "Search by code or title...",
-    "No courses match your search.": "No courses match your search.",
-    "Copy options": "Copy options",
-    "Include users (enrollments)": "Include users (enrollments)",
-    "Reset dates": "Reset dates",
-    "When a file with the same name exists": "When a file with the same name exists",
-    "Ready to copy": "Ready to copy",
-    "We will copy content from the selected course into this course. You can go back to change options.": "We will copy content from the selected course into this course. You can go back to change options.",
-    "Start copying": "Start copying",
-    "Select resources to copy": "Select resources to copy",
-    "Copy selected": "Copy selected",
-    "Copy completed": "Copy completed",
-    "Danger zone: deleting a course is permanent.": "Danger zone: deleting a course is permanent.",
-    "Type the course code to confirm. All data will be permanently removed.": "Type the course code to confirm. All data will be permanently removed.",
-    "The code must match '{0}' exactly.": "The code must match '{0}' exactly.",
-    "Also delete documents that are only used in this course (if any).": "Also delete documents that are only used in this course (if any).",
-    "Delete course": "Delete course",
-    "This action cannot be undone. Continue?": "This action cannot be undone. Continue?",
-    "Course deleted successfully.": "Course deleted successfully.",
-    "Failed to delete course.": "Failed to delete course.",
-    "Create .mbz": "Create .mbz",
-    "Backup scope": "Backup scope",
-    "Full course": "Full course",
-    "Selected items will be the only ones included in the exported file.": "Selected items will be the only ones included in the exported file.",
-    "Moodle export": "Moodle export",
-    "Moodle version": "Moodle version",
-    "Admin ID": "Admin ID",
-    "Internal integer user id": "Internal integer user id",
-    "Moodle requires an internal user id stored in XML. If in doubt, use 1.": "Moodle requires an internal user id stored in XML. If in doubt, use 1.",
-    "Username to appear as owner of imported items": "Username to appear as owner of imported items",
-    "Email to use in the archive metadata": "Email to use in the archive metadata",
-    "A .mbz file will be generated. You will be able to download it once finished.": "A .mbz file will be generated. You will be able to download it once finished.",
-    "Select resources to include": "Select resources to include",
-    "Export completed": "Export completed",
-    "Your Moodle backup has been created. You can find it in the course backups list.": "Your Moodle backup has been created. You can find it in the course backups list.",
-    "Please complete all required fields.": "Please complete all required fields.",
-    "Failed to create Moodle backup.": "Failed to create Moodle backup.",
-    "More actions": "More actions",
-    "Add feedback": "Add feedback",
-    "An error occurred.": "An error occurred.",
-    "Write something": "Write something",
-    "Friends of {0}": "Friends of {0}",
-    "Error loading learning paths.": "Error loading learning paths.",
-    "You don't have any learning path.": "You don't have any learning path.",
-    "Create your first learning path to start organizing course content.": "Create your first learning path to start organizing course content.",
-    "Could not save the new category order.": "Could not save the new category order.",
-    "Could not save the new order.": "Could not save the new order.",
-    "Assignment": "Assignment",
-    "Allowed file formats: {0}": "Allowed file formats: {0}",
-    "File type not allowed. Allowed extensions: {0}": "File type not allowed. Allowed extensions: {0}",
-    "File manager": "File manager",
-    "Select a file to insert into the editor.": "Select a file to insert into the editor.",
-    "Images": "Images",
-    "Media": "Media",
-    "Files": "Files",
-    "Folder name": "Folder name",
-    "Rename folder": "Rename folder",
-    "New name": "New name",
-    "Choose an action": "Choose an action",
-    "New version": "New version",
-    "Change title to selected filename": "Change title to selected filename",
-    "You can replace the file, move it to another folder, or both.": "You can replace the file, move it to another folder, or both.",
-    "Move {0}": "Move {0}",
-    "Only non-root folders are shown to avoid leaving items in root.": "Only non-root folders are shown to avoid leaving items in root.",
-    "No feedback yet.": "No feedback yet.",
-    "Upload first, organize later": "Upload first, organize later",
-    "Drag & drop or browse to add files": "Drag & drop or browse to add files",
-    "Social wall...": "Social wall...",
-    "Wall of {0}": "Wall of {0}",
-    "Please select a language": "Please select a language",
-    "Version currently loaded": "Version currently loaded",
-    "Completion": "Completion",
-    "Quick navigation": "Quick navigation",
-    "Filled": "Filled",
-    "Terms sections": "Terms sections",
-    "Open a section to edit its content.": "Open a section to edit its content.",
-    "Open this section to load the editor.": "Open this section to load the editor.",
-    "Where do we record the data? (in which system, hosted where, accessible by which company that handles the servers, etc.)": "Where do we record the data? (in which system, hosted where, accessible by which company that handles the servers, etc.)",
-    "How is the data structured? To what extent does the organization of the data protect your security? ... Do you have established processes that ensure that a hacker will not be able to collect all the personal data on the first attempt? Are they encrypted?": "How is the data structured? To what extent does the organization of the data protect your security? ... Do you have established processes that ensure that a hacker will not be able to collect all the personal data on the first attempt? Are they encrypted?",
-    "How is the data structured in this software? (one tab for all the data, it has some categorization \/ label, ...)": "How is the data structured in this software? (one tab for all the data, it has some categorization \/ label, ...)",
-    "How long do we save the data? Is there data that expires even though the account is still active? How much time do we keep the data after the last use of the system?": "How long do we save the data? Is there data that expires even though the account is still active? How much time do we keep the data after the last use of the system?",
-    "What changes can we make to the data? What changes can be made to the data without affecting the service?": "What changes can we make to the data? What changes can be made to the data without affecting the service?",
-    "What do we extract data for (towards other internal processes) and which data is it?": "What do we extract data for (towards other internal processes) and which data is it?",
-    "Who can consult the personal data? For what purpose?": "Who can consult the personal data? For what purpose?",
-    "How and for what can we use the personal data?": "How and for what can we use the personal data?",
-    "With whom can we share them? In what opportunities? Through what processes (safe or not)?": "With whom can we share them? In what opportunities? Through what processes (safe or not)?",
-    "Do we have another system with which Chamilo interacts? What is the interconnection process? What are the data pieces exchanged and in what way?": "Do we have another system with which Chamilo interacts? What is the interconnection process? What are the data pieces exchanged and in what way?",
-    "What are the limits that we will always respect when using personal data? How far can we go?": "What are the limits that we will always respect when using personal data? How far can we go?",
-    "After how long do we erase the data? (event, last use, contract validity, etc.) What are the elimination processes?": "After how long do we erase the data? (event, last use, contract validity, etc.) What are the elimination processes?",
-    "What happens if the data is destroyed as a result of a technical failure? (unauthorized deletion or loss of material, for example)": "What happens if the data is destroyed as a result of a technical failure? (unauthorized deletion or loss of material, for example)",
-    "For what purpose do we process personal data? Do we use it to filter the access users have to certain parts of our application? (negative or positive discrimination)": "For what purpose do we process personal data? Do we use it to filter the access users have to certain parts of our application? (negative or positive discrimination)",
-    "Danger zone: deleting an access URL is permanent.": "Danger zone: deleting an access URL is permanent.",
-    "Type the full URL to confirm. The URL and its relations will be permanently removed.": "Type the full URL to confirm. The URL and its relations will be permanently removed.",
-    "URL deleted.": "URL deleted.",
-    "sender": "sender",
-    "Require unique presence": "Require unique presence",
-    "If enabled, the gradebook will give a learner 100% when present at least once.": "If enabled, the gradebook will give a learner 100% when present at least once.",
-    "AI feedback": "AI feedback",
-    "Prompt": "Prompt",
-    "Tip": "Tip",
-    "You can edit the prompt before asking for feedback.": "You can edit the prompt before asking for feedback.",
-    "Result (you can apply it to the comment)": "Result (you can apply it to the comment)",
-    "Apply to comment": "Apply to comment",
-    "Apply score": "Apply score",
-    "AI grade": "AI grade",
-    "AI tutor is disabled during tests": "AI tutor is disabled during tests",
-    "Generate glossary terms": "Generate glossary terms",
-    "Generate media": "Generate media",
-    "You do not have permission to generate AI media in this course.": "You do not have permission to generate AI media in this course.",
-    "AI helpers are disabled at platform level.": "AI helpers are disabled at platform level.",
-    "AI media generation is disabled in course settings.": "AI media generation is disabled in course settings.",
-    "No AI media providers available.": "No AI media providers available.",
-    "Provider": "Provider",
-    "Select a provider": "Select a provider",
-    "Example: generated_media": "Example: generated_media",
-    "The name is not added to the prompt; it is only used to save the file.": "The name is not added to the prompt; it is only used to save the file.",
-    "Describe what you want to generate...": "Describe what you want to generate...",
-    "Tip: click a preset to quickly set the size.": "Tip: click a preset to quickly set the size.",
-    "Generating...": "Generating...",
-    "Save to Documents": "Save to Documents",
-    "Document IRI": "Document IRI",
-    "Go to folder": "Go to folder",
-    "Provider used": "Provider used",
-    "This video result cannot be saved yet": "This video result cannot be saved yet",
-    "Video polling was stopped because the provider changed.": "Video polling was stopped because the provider changed.",
-    "Video generation is taking too long. Please try again later.": "Video generation is taking too long. Please try again later.",
-    "Failed to check video status.": "Failed to check video status.",
-    "Video generated successfully. You can now save it.": "Video generated successfully. You can now save it.",
-    "Video generation completed, but no playable content was returned.": "Video generation completed, but no playable content was returned.",
-    "Video generation failed.": "Video generation failed.",
-    "Waiting for the video to be ready...": "Waiting for the video to be ready...",
-    "Please complete all fields.": "Please complete all fields.",
-    "Image generation is not enabled for this course.": "Image generation is not enabled for this course.",
-    "Video generation is not enabled for this course.": "Video generation is not enabled for this course.",
-    "Generation failed.": "Generation failed.",
-    "Generated successfully. Review the preview and save when ready.": "Generated successfully. Review the preview and save when ready.",
-    "Generated successfully. Saving is disabled because the provider returned a URL.": "Generated successfully. Saving is disabled because the provider returned a URL.",
-    "Video generation started. Waiting for the result...": "Video generation started. Waiting for the result...",
-    "AI returned an empty response.": "AI returned an empty response.",
-    "Nothing to save yet.": "Nothing to save yet.",
-    "This provider did not return base64 content. Please try another provider.": "This provider did not return base64 content. Please try another provider.",
-    "Saving failed.": "Saving failed.",
-    "Get AI feedback": "Get AI feedback",
-    "Copy answer to clipboard": "Copy answer to clipboard",
-    "Save answer to my inbox": "Save answer to my inbox",
-    "The document is already in this folder": "The document is already in this folder",
-    "Copied": "Copied",
-    "You do not have permission to generate glossary terms.": "You do not have permission to generate glossary terms.",
-    "Video generation is in progress": "Video generation is in progress",
-    "Job": "Job",
-    "Modified prompt": "Modified prompt",
-    "Saved in Documents": "Saved in Documents",
-    "Branches": "Branches",
-    "Rooms": "Rooms",
-    "Room availability finder": "Room availability finder",
-    "New branch": "New branch",
-    "New room": "New room",
-    "Branch": "Branch",
-    "Default room": "Default room",
-    "Room occupation: {0}": "Room occupation: {0}",
-    "Find available rooms": "Find available rooms",
-    "Available rooms": "Available rooms",
-    "Occupied rooms": "Occupied rooms",
-    "No available rooms found for this time range": "No available rooms found for this time range",
-    "No rooms have been created yet": "No rooms have been created yet",
-    "Courses linked to {0}": "Courses linked to {0}",
-    "No branches have been created yet": "No branches have been created yet",
-    "Occupation": "Occupation",
-    "Cannot delete branch with rooms attached": "Cannot delete branch with rooms attached",
-    "Cannot delete room with courses attached": "Cannot delete room with courses attached",
-    "Conflicts": "Conflicts",
-    "Advanced settings": "Advanced settings",
-    "Geolocation": "Geolocation",
-    "Latitude, Longitude (e.g. 48.8566, 2.3522)": "Latitude, Longitude (e.g. 48.8566, 2.3522)",
-    "IP address": "IP address",
-    "IPv4 or IPv6": "IPv4 or IPv6",
-    "IP mask": "IP mask",
-    "e.g. \/24": "e.g. \/24",
-    "Parent": "Parent",
-    "Parent branch": "Parent branch",
-    "Unique identifier": "Unique identifier",
-    "Latitude": "Latitude",
-    "e.g. 48.8566": "e.g. 48.8566",
-    "Longitude": "Longitude",
-    "e.g. 2.3522": "e.g. 2.3522",
-    "Download speed (KB\/s)": "Download speed (KB\/s)",
-    "Upload speed (KB\/s)": "Upload speed (KB\/s)",
-    "Delay (ms)": "Delay (ms)",
-    "admin@example.com": "admin{'@'}example.com",
-    "Administrator name": "Administrator name",
-    "Administrator phone number": "Administrator phone number",
-    "ID of last synch transaction": "ID of last synch transaction",
-    "Time of last synchronization": "Time of last synchronization",
-    "Last synchronization type": "Last synchronization type",
-    "SSL public key": "SSL public key",
-    "Branch type": "Branch type",
-    "Room": "Room",
-    "{0} (current)": "{0} (current)",
-    "In this section, when clicking on 'Register student' for a course, you will be asked to select the user on the next page. When validated, it will create a new session with the selected course and user, and send a subscription notification to the user.": "In this section, when clicking on 'Register student' for a course, you will be asked to select the user on the next page. When validated, it will create a new session with the selected course and user, and send a subscription notification to the user.",
-    "Course home": "Course home",
-    "Select a session": "Select a session",
-    "Read-only view": "Read-only view",
-    "Personal agenda": "Personal agenda",
-    "Events list": "Events list",
-    "Personal": "Personal",
-    "Weeks are displayed from 1 to 52": "Weeks are displayed from 1 to 52",
-    "No tutored sessions found": "No tutored sessions found",
-    "From {0} to {1}": "From {0} to {1}",
-    "Create group": "Create group",
-    "Popular": "Popular",
-    "My groups": "My groups",
-    "Group permissions": "Group permissions",
-    "Select permission": "Select permission",
-    "My certificates": "My certificates",
-    "My custom certificate": "My custom certificate",
-    "Avatar": "Avatar",
-    "Edit group": "Edit group",
-    "Received Files": "Received Files",
-    "Share a new file": "Share a new file",
-    "Latest sent on": "Latest sent on",
-    "Learning analytics": "Learning analytics",
-    "Administrative activity auditing": "Administrative activity auditing",
-    "Course list": "Course list",
-    "Standard list": "Standard list",
-    "Management list": "Management list",
-    "Categories": "Categories",
-    "Absolute score": "Absolute score",
-    "Relative score": "Relative score",
-    "Total": "Total",
-    "Registr. allowed": "Registr. allowed",
-    "Unreg. allowed": "Unreg. allowed",
-    "Creation date": "Creation date",
-    "Latest access in course": "Latest access in course",
-    "Search courses": "Search courses",
-    "Add to catalogue": "Add to catalogue",
-    "Remove from catalogue": "Remove from catalogue",
-    "Add course": "Add course",
-    "Closed": "Closed",
-    "Open platform": "Open platform",
-    "Hidden": "Hidden",
-    "Are you sure you want to delete this course?": "Are you sure you want to delete this course?",
-    "Are you sure you want to delete the selected courses?": "Are you sure you want to delete the selected courses?",
-    "selected": "selected",
-    "Teacher user ID": "Teacher user ID",
-    "Public": "Public",
-    "Courses reports": "Courses reports",
-    "Export courses reports complete": "Export courses reports complete",
-    "Create": "Create",
-    "Show": "Show",
-    "Reply": "Reply",
-    "Compose": "Compose",
-    "Invite": "Invite",
-    "Templates": "Templates",
-    "Layouts": "Layouts",
-    "Colors": "Colors",
-    "Calendar": "Calendar",
-    "Attendance": "Attendance",
-    "Course categories": "Course categories",
-    "User groups": "User groups",
-    "Session list": "Session list",
-    "Create category": "Create category",
-    "Edit category": "Edit category",
-    "Copy course": "Copy course",
-    "Create backup": "Create backup",
-    "My account": "My account",
-    "Missing assignments": "Missing assignments",
-    "Social wall": "Social wall",
-    "Data exchanges": "Data exchanges",
-    "Third parties": "Third parties",
-    "Assign authentication sources": "Assign authentication sources",
-    "Assignment details": "Assignment details",
-    "Terms and conditions": "Terms and conditions",
-    "Icons": "Icons",
-    "Create file": "Create file",
-    "Create link": "Create link",
-    "Edit template": "Edit template",
-    "Shared files": "Shared files",
-    "Skill wheel": "Skill wheel",
-    "Favourite courses": "Favourite courses",
-    "Restart courses": "Restart courses",
-    "Generate terms": "Generate terms",
-    "Add variation": "Add variation",
-    "Editor demo": "Editor demo",
-    "Tool introduction": "Tool introduction",
-    "Subscribe users to class": "Subscribe users to class",
-    "Relation type": "Relation type",
-    "First letter (last name)": "First letter (last name)",
-    "Users on platform": "Users on platform",
-    "Users in group": "Users in group",
-    "Add all": "Add all",
-    "Remove all": "Remove all",
-    "Update successful": "Update successful",
-    "Select role": "Select role",
-    "An error occurred. Please try again.": "An error occurred. Please try again.",
-    "Reader": "Reader",
-    "Admin": "Admin",
-    "Moderator": "Moderator",
-    "Pending invitation": "Pending invitation",
-    "Human Resources Manager": "Human Resources Manager",
-    "to know what's new and what has been changed.": "to know what's new and what has been changed.",
-    "Session Item": "Session Item",
-    "Points": "Points",
-    "See notifications": "See notifications",
-    "New content available for this course.": "New content available for this course.",
-    "No new notifications.": "No new notifications.",
-    "No new content found.": "No new content found.",
-    "No tool details available yet.": "No tool details available yet.",
-    "Last access": "Last access",
-    "Open course": "Open course",
-    "Course completed": "Course completed",
-    "The subscription limit for this course has been reached.": "The subscription limit for this course has been reached.",
-    "Subscription limit reached": "Subscription limit reached",
-    "Tertiary alternative": "Tertiary alternative",
-    "Update SCORM": "Update SCORM",
-    "AI can draft feedback and a suggested score before you send it.": "AI can draft feedback and a suggested score before you send it.",
-    "What will be sent to the AI": "What will be sent to the AI",
-    "Assignment title + instructions": "Assignment title + instructions",
-    "Student submission (text)": "Student submission (text)",
-    "Student submission (text): none": "Student submission (text): none",
-    "Student attachment": "Student attachment",
-    "supported": "supported",
-    "not supported for document analysis": "not supported for document analysis",
-    "Student attachment: none": "Student attachment: none",
-    "No text AI providers available.": "No text AI providers available.",
-    "AI-assisted": "AI-assisted",
-    "This decision is saved with the correction (ExtraField) and cannot be changed later.": "This decision is saved with the correction (ExtraField) and cannot be changed later.",
-    "Optional correction attachment (this is not the student's submission).": "Optional correction attachment (this is not the student's submission).",
-    "AI": "AI",
-    "Received": "Received",
-    "Unlock column": "Unlock column",
-    "Lock column": "Lock column",
-    "Set all Present": "Set all Present",
-    "Set all Absent": "Set all Absent",
-    "Auto (recommended)": "Auto (recommended)",
-    "Error downloading all documents.": "Error downloading all documents.",
-    "Open with ONLYOFFICE": "Open with ONLYOFFICE",
-    "Limiting quota": "Limiting quota",
-    "Remaining space": "Remaining space",
-    "Course catalogue": "Course catalogue",
-    "Drag links to reorder": "Drag links to reorder",
-    "Drop links here to keep them without category": "Drop links here to keep them without category",
-    "Could not export": "Could not export",
-    "Link moved": "Link moved",
-    "Could not move link": "Could not move link",
-    "Category reordering is not enabled": "Category reordering is not enabled",
-    "Tutors": "Tutors",
-    "No data to export": "No data to export",
-    "Header PNG must be \\u2264 {0}px.": "Header PNG must be \\u2264 {0}px.",
-    "Search by name, username, email": "Search by name, username, email",
-    "Your legal agreement remains active until any withdrawal request has been reviewed and processed.": "Your legal agreement remains active until any withdrawal request has been reviewed and processed.",
-    "Your legal consent withdrawal request is pending review.": "Your legal consent withdrawal request is pending review.",
-    "Your account deletion request is pending review.": "Your account deletion request is pending review.",
-    "Why do you want to request the withdrawal of your legal consent?": "Why do you want to request the withdrawal of your legal consent?",
-    "Submitting your legal consent withdrawal request...": "Submitting your legal consent withdrawal request...",
-    "Submitting request...": "Submitting request...",
-    "Request withdrawal of legal consent": "Request withdrawal of legal consent",
-    "Submitting your account deletion request...": "Submitting your account deletion request...",
-    "Submitting your acceptance...": "Submitting your acceptance...",
-    "Event details": "Event details",
-    "You cannot access the linked course from this view.": "You cannot access the linked course from this view.",
-    "Failed to load sessions": "Failed to load sessions",
-    "Failed to load events": "Failed to load events",
-    "No events found": "No events found",
-    "Group image": "Group image",
-    "SearchTCC": "SearchTCC",
-    "Forbidden": "Forbidden",
-    "Distribution": "Distribution",
-    "Firstname": "Firstname",
-    "Lastname": "Lastname",
-    "Email": "Email",
-    "Last login in platform": "Last login in platform",
-    "Export as CSV": "Export as CSV",
-    "Export as XLS": "Export as XLS",
-    "Deactivate this user?": "Deactivate this user?",
-    "Enable this user?": "Enable this user?",
-    "Unify this duplicate group into user #%s?": "Unify this duplicate group into user #{0}?",
-    "This will merge all other accounts in the same group into this account.": "This will merge all other accounts in the same group into this account.",
-    "Merged accounts will be permanently deleted and will disappear from this report.": "Merged accounts will be permanently deleted and will disappear from this report.",
-    "This action cannot be undone.": "This action cannot be undone.",
-    "Unify": "Unify",
-    "SessionAdmin": "SessionAdmin",
-    "Drh": "Drh",
-    "Student": "Student",
-    "Total space used by portal %s limit is %s MB": "Total space used by portal {0} limit is {1} MB",
-    "Helper text": "Helper text",
-    "NotAllowed": "NotAllowed",
-    "Use the filters above to load the learner access details.": "Use the filters above to load the learner access details.",
-    "Start date must be before end date": "Start date must be before end date",
-    "Select a date range and grouping type to review the learner access details.": "Select a date range and grouping type to review the learner access details.",
-    "This course will be created using the platform default course template.": "This course will be created using the platform default course template.",
-    "Security breach avoid restart": "Security breach avoid restart",
-    "User deactivated": "User deactivated",
-    "InvalidId": "InvalidId",
-    "User enabled": "User enabled",
-    "No other duplicates found for this user.": "No other duplicates found for this user.",
-    "Users unified: merged %s account(s) into user #%s. Merged accounts were permanently deleted.": "Users unified: merged {0} account(s) into user #{1}. Merged accounts were permanently deleted.",
-    "No accounts were merged.": "No accounts were merged.",
-    "An error occurred while unifying users.": "An error occurred while unifying users.",
-    "Users unified: merged user #%s into user #%s. Merged account was permanently deleted.": "Users unified: merged user #{0} into user #{1}. Merged account was permanently deleted.",
-    "Duplicate users": "Duplicate users",
-    "Years": "Years",
-    "All time visits outside sessions": "All time visits outside sessions",
-    "All time visits in sessions": "All time visits in sessions",
-    "All time visits total": "All time visits total",
-    "Student visits per period, per course": "Student visits per period, per course",
-    "By email": "By email",
-    "By extra field": "By extra field",
-    "Select an option": "Select an option",
-    "Profile field": "Profile field",
-    "This report only lists users that have the same e-mail address.": "This report only lists users that have the same e-mail address.",
-    "This report only lists users that share the same value for the selected profile field.": "This report only lists users that share the same value for the selected profile field.",
-    "How to use this report": "How to use this report",
-    "Disable \/ Enable": "Disable \/ Enable",
-    "Only blocks or restores login. It does not delete the user and does not remove subscriptions.": "Only blocks or restores login. It does not delete the user and does not remove subscriptions.",
-    "Last week": "Last week",
-    "Next week": "Next week",
-    "Loading report...": "Loading report...",
-    "Failed to load this report. Please try again.": "Failed to load this report. Please try again.",
-    "Select one or more sessions to copy trainers from and choose the destination course": "Select one or more sessions to copy trainers from and choose the destination course",
-    "Hold Ctrl (or Cmd) to select multiple items": "Hold Ctrl (or Cmd) to select multiple items",
-    "Choose the destination course": "Choose the destination course",
-    "You can select multiple items": "You can select multiple items",
-    "Use the search box to find courses quickly": "Use the search box to find courses quickly",
-    "Select one or more source sessions and one or more destination sessions to copy students": "Select one or more source sessions and one or more destination sessions to copy students",
-    "Select destination sessions": "Select destination sessions",
-    "You can select multiple users": "You can select multiple users",
-    "Use the search box to find users quickly": "Use the search box to find users quickly",
-    "Error while creating the document": "Error while creating the document",
-    "Not a SCORM learning path": "Not a SCORM learning path",
-    "Final item": "Final item",
-    "Edit item": "Edit item",
-    "No AI text providers configured.": "No AI text providers configured.",
-    "Upload failed. The file is likely larger than the server limit (post_max_size).": "Upload failed. The file is likely larger than the server limit (post_max_size).",
-    "Update failed. No file received by the server.": "Update failed. No file received by the server.",
-    "Update failed. %s": "Update failed. {0}",
-    "Update failed. Invalid uploaded file payload.": "Update failed. Invalid uploaded file payload.",
-    "Update failed. The uploaded ZIP file name must match the original SCORM package name.": "Update failed. The uploaded ZIP file name must match the original SCORM package name.",
-    "Update failed": "Update failed",
-    "Question lower case": "Question lower case",
-    "Regenerate": "Regenerate",
-    "Case insensitive": "Case insensitive",
-    "Select a session to load its courses.": "Select a session to load its courses.",
-    "Select the source course.": "Select the source course.",
-    "Select a destination session.": "Select a destination session.",
-    "Select the destination course.": "Select the destination course.",
-    "Copy the full course content from the selected session course.": "Copy the full course content from the selected session course.",
-    "Select which tools\/items to copy.": "Select which tools\/items to copy.",
-    "Do not include the base (non-session) course content.": "Do not include the base (non-session) course content.",
-    "An error occurred while copying the course": "An error occurred while copying the course",
-    "Please select a different destination": "Please select a different destination",
-    "You must select a destination course": "You must select a destination course",
-    "To export courses with quiz you have to select quiz": "To export courses with quiz you have to select quiz",
-    "If your LPs have audio files included you should select them from the documents": "If your LPs have audio files included you should select them from the documents",
-    "If your quiz have hotspot questions included you should select the images from the documents": "If your quiz have hotspot questions included you should select the images from the documents",
-    "GeneralResourcesCourse": "GeneralResourcesCourse",
-    "Password must be at least %length% characters long.": "Password must be at least %length% characters long.",
-    "Password must contain at least %count% lowercase characters.": "Password must contain at least %count% lowercase characters.",
-    "Password must contain at least %count% uppercase characters.": "Password must contain at least %count% uppercase characters.",
-    "Password must contain at least %count% numerical (0-9) characters.": "Password must contain at least %count% numerical (0-9) characters.",
-    "Password must contain at least %count% special characters.": "Password must contain at least %count% special characters.",
-    "Invalid login request.": "Invalid login request.",
-    "Authentication failed.": "Authentication failed.",
-    "Login %status% for username %username%": "Login {0}tatus% for username %username%",
-    "Co-generated with AI": "Co-generated with AI",
-    "GDPRTitle": "GDPRTitle",
-    "EntraID ID": "EntraID ID",
-    "EntraID UID": "EntraID UID",
-    "Required fields": "Required fields",
-    "No available users.": "No available users.",
-    "No users added yet.": "No users added yet.",
-    "# attended": "# attended",
-    "Dates": "Dates",
-    "No documents added yet.": "No documents added yet.",
-    "Reminder for event : %s": "Reminder for event : {0}",
-    "No available documents.": "No available documents.",
-    "Are you sure you want to remove the class?": "Are you sure you want to remove the class?",
-    "Are you sure you want to remove the class without removing users?": "Are you sure you want to remove the class without removing users?",
-    "Remove the class without removing students": "Remove the class without removing students",
-    "All sessions": "All sessions",
-    "Active sessions": "Active sessions",
-    "Closed sessions": "Closed sessions",
-    "Custom list": "Custom list",
-    "Replication": "Replication",
-    "Planned": "Planned",
-    "All categories": "All categories",
-    "Search sessions": "Search sessions",
-    "Start date to display": "Start date to display",
-    "End date to display": "End date to display",
-    "Session status": "Session status",
-    "Cancelled": "Cancelled",
-    "Finished": "Finished",
-    "Read Only": "Read Only",
-    "Subscribe users to this session": "Subscribe users to this session",
-    "Add courses to this session": "Add courses to this session",
-    "Copy": "Copy",
-    "Add a training session": "Add a training session",
-    "Image": "Image",
-    "Video": "Video",
-    "Selected paragraph": "Selected paragraph",
-    "Destination folder": "Destination folder",
-    "Generate AI media": "Generate AI media",
-    "Filename": "Filename",
-    "Width": "Width",
-    "Height": "Height",
-    "Generate": "Generate",
-    "Saving...": "Saving...",
-    "Save and insert": "Save and insert",
-    "Saving is only supported when the provider returns base64 content. If you only received a URL, saving is disabled to avoid downloading in the browser.": "Saving is only supported when the provider returns base64 content. If you only received a URL, saving is disabled to avoid downloading in the browser.",
-    "Video generated successfully, but saving is disabled because the provider returned a URL.": "Video generated successfully, but saving is disabled because the provider returned a URL.",
-    "The file was saved, but its URL could not be resolved.": "The file was saved, but its URL could not be resolved.",
-    "Items": "Items",
-    "Newest first": "Newest first",
-    "Oldest first": "Oldest first",
-    "Title A\u2013Z": "Title A\u2013Z",
-    "Title Z\u2013A": "Title Z\u2013A",
-    "Projects": "Projects",
-    "Continue": "Continue",
-    "Import options": "Import options",
-    "Change password": "Change password",
-    "New message": "New message",
-    "Mark as": "Mark as",
-    "No results found": "No results found",
-    "Attempting to login as %s (id %d)": "Attempting to login as {0} (id {1})",
-    "Login successful. Go to %s": "Login successful. Go to {0}",
-    "Message sent successfully.": "Message sent successfully.",
-    "You cannot create a new course right now.": "You cannot create a new course right now.",
-    "Unable to verify whether you can create a new course right now.": "Unable to verify whether you can create a new course right now.",
-    "Please try again later or contact the administrator.": "Please try again later or contact the administrator.",
-    "Reply to this message": "Reply to this message",
-    "Reply to all": "Reply to all",
-    "Classes": "Classes",
-    "Class list": "Class list",
-    "Open": "Open",
-    "Social": "Social",
-    "Enrolment by classes": "Enrolment by classes",
-    "Subscribe class to courses": "Subscribe class to courses",
-    "Subscribe class to sessions": "Subscribe class to sessions",
-    "Overview students and courses subscribed to the class": "Overview students and courses subscribed to the class",
-    "Item added": "Item added",
-    "Already exists": "Already exists",
-    "Add a class": "Add a class",
-    "Search classes": "Search classes",
-    "No classes found": "No classes found",
-    "Import classes": "Import classes",
-    "Class users": "Class users",
-    "Line": "Line",
-    "{0} classes imported": "{0} classes imported",
-    "{0} user-class links imported": "{0} user-class links imported",
-    "Courses on the platform": "Courses on the platform",
-    "Courses in group": "Courses in group",
-    "Sessions not subscribed": "Sessions not subscribed",
-    "Sessions in group": "Sessions in group",
-    "{0} courses": "{0} courses",
-    "{0} sessions": "{0} sessions",
-    "Search by title or code": "Search by title or code",
-    "Search by title": "Search by title",
-    "Remove picture": "Remove picture",
-    "Hide comments": "Hide comments",
-    "No comments yet.": "No comments yet.",
-    "Loading comments...": "Loading comments...",
-    "My justifications": "My justifications",
-    "My services": "My services",
-    "Extra menu": "Extra menu",
-    "Pending tests": "Pending tests",
-    "No specific language": "No specific language",
-    "Source Chamilo version": "Source Chamilo version",
-    "Exporting...": "Exporting...",
-    "Autosaved drafts available": "Autosaved drafts available",
-    "Hide drafts": "Hide drafts",
-    "Show drafts": "Show drafts",
-    "Drafts are stored only in this browser and are removed after saving the document.": "Drafts are stored only in this browser and are removed after saving the document.",
-    "Last saved": "Last saved",
-    "Restore draft": "Restore draft",
-    "Delete draft": "Delete draft",
-    "Information about indexing document content": "Information about indexing document content",
-    "When enabled, the document text is indexed by the search engine so users can find it from platform search.": "When enabled, the document text is indexed by the search engine so users can find it from platform search.",
-    "The editor is not available.": "The editor is not available.",
-    "Please place the cursor inside a paragraph first.": "Please place the cursor inside a paragraph first.",
-    "The selected paragraph is empty.": "The selected paragraph is empty.",
-    "Loading failed.": "Loading failed.",
-    "Add introduction": "Add introduction",
-    "Course type": "Course type",
-    "Choose whether this course uses the standard platform limits or benefits from a purchased service.": "Choose whether this course uses the standard platform limits or benefits from a purchased service.",
-    "Standard course": "Standard course",
-    "Use the standard platform limits.": "Use the standard platform limits.",
-    "Selected": "Selected",
-    "Hosting limit": "Hosting limit",
-    "Document quota": "Document quota",
-    "The standard course limit has been reached.": "The standard course limit has been reached.",
-    "Use the benefits granted by this service.": "Use the benefits granted by this service.",
-    "Courses with these benefits": "Courses with these benefits",
-    "Active service": "Active service",
-    "Buy service": "Buy service",
-    "Select an available course type before creating the course.": "Select an available course type before creating the course.",
-    "users": "users",
-    "You need to buy this service before using these benefits.": "You need to buy this service before using these benefits.",
-    "You already used all courses available with this service.": "You already used all courses available with this service.",
-    "This option is not available.": "This option is not available.",
-    "This field is required": "This field is required",
-    "Show less": "Show less",
-    "Show full description": "Show full description",
-    "Virtual keyboard": "Virtual keyboard",
-    "Backspace": "Backspace",
-    "Space": "Space",
-    "Learning path only visible to selected learners": "Learning path only visible to selected learners",
-    "Create course": "Create course",
-    "Tour": "Tour",
-    "Are you sure you want to delete this comment?": "Are you sure you want to delete this comment?",
-    "No posts found": "No posts found",
-    "No communities": "No communities",
-    "No friends found": "No friends found",
-    "Visual overview of your skills": "Visual overview of your skills",
-    "Compare your progress": "Compare your progress",
-    "Please enter a search term.": "Please enter a search term.",
-    "Enter captcha code": "Enter captcha code",
-    "Refresh captcha": "Refresh captcha",
-    "Captcha is temporarily blocked. Please try again later.": "Captcha is temporarily blocked. Please try again later.",
-    "Item Details": "Item Details",
-    "Open File": "Open File",
-    "Selection": "Selection",
-    "Remove selection context": "Remove selection context",
-    "Source document": "Source document",
-    "Use the current course context": "Use the current course context",
-    "Loading documents...": "Loading documents...",
-    "No compatible PDF or TXT document was found in this course.": "No compatible PDF or TXT document was found in this course.",
-    "Select a PDF or TXT document to generate terms only from that document.": "Select a PDF or TXT document to generate terms only from that document.",
-    "Confidentiality warning": "Confidentiality warning",
-    "When a document is selected, the prompt is fixed so the generation uses only that document content.": "When a document is selected, the prompt is fixed so the generation uses only that document content.",
-    "No document-processing AI providers available.": "No document-processing AI providers available.",
-    "Failed to save signature. Please try again.": "Failed to save signature. Please try again.",
-    "Select and move": "Select and move",
-    "Freehand": "Freehand",
-    "Stroke": "Stroke",
-    "Fill": "Fill",
-    "Import SVG": "Import SVG",
-    "Import image": "Import image",
-    "Click the drawing area to place this text": "Click the drawing area to place this text",
-    "Draw a new SVG, import an existing SVG or embed an image, then save it as a reusable document.": "Draw a new SVG, import an existing SVG or embed an image, then save it as a reusable document.",
-    "Use Select and move to reposition or resize elements added in this editor.": "Use Select and move to reposition or resize elements added in this editor.",
-    "Stroke width": "Stroke width",
-    "Transparent fill": "Transparent fill",
-    "Invalid id": "Invalid id",
-    "Unable to load the drawing": "Unable to load the drawing",
-    "Only PNG, JPG, WEBP or GIF images are supported.": "Only PNG, JPG, WEBP or GIF images are supported.",
-    "Unable to read the image file.": "Unable to read the image file.",
-    "Only SVG files are supported.": "Only SVG files are supported.",
-    "The SVG file is empty or invalid.": "The SVG file is empty or invalid.",
-    "Unable to read the SVG file.": "Unable to read the SVG file.",
-    "The drawing is empty or invalid.": "The drawing is empty or invalid.",
-    "Unable to save the drawing": "Unable to save the drawing",
-    "Information about AI-assisted documents": "Information about AI-assisted documents",
-    "Location": "Location",
-    "Cloud link": "Cloud link",
-    "Add a link to a cloud document, such as Google Drive or Google Docs.": "Add a link to a cloud document, such as Google Drive or Google Docs.",
-    "Add cloud link": "Add cloud link",
-    "Document title": "Document title",
-    "Document options change how uploaded files are processed after saving.": "Document options change how uploaded files are processed after saving.",
-    "Information about uncompressing zip files": "Information about uncompressing zip files",
-    "When enabled, ZIP files are extracted into the current document folder after upload.": "When enabled, ZIP files are extracted into the current document folder after upload.",
-    "The title is required.": "The title is required.",
-    "The URL is required.": "The URL is required.",
-    "The destination folder is missing.": "The destination folder is missing.",
-    "Unable to create cloud link.": "Unable to create cloud link.",
-    "Copy to My Files": "Copy to My Files",
-    "Used space": "Used space",
-    "Available space": "Available space",
-    "Available percentage": "Available percentage",
-    "Cloud links cannot be downloaded.": "Cloud links cannot be downloaded.",
-    "Could not copy the file to My Files": "Could not copy the file to My Files",
-    "File copied to My Files": "File copied to My Files",
-    "Checking course creation options...": "Checking course creation options...",
-    "You cannot create more courses right now.": "You cannot create more courses right now.",
-    "AI analyzer": "AI analyzer",
-    "Expand all": "Expand all",
-    "Collapse all": "Collapse all",
-    "Review your active service benefits, purchase history and available receipts.": "Review your active service benefits, purchase history and available receipts.",
-    "Active services": "Active services",
-    "No active services": "No active services",
-    "Valid until": "Valid until",
-    "Recurring payment": "Recurring payment",
-    "Next charge": "Next charge",
-    "Enable auto billing": "Enable auto billing",
-    "Cancel auto billing": "Cancel auto billing",
-    "Granted benefits": "Granted benefits",
-    "Purchase history": "Purchase history",
-    "No purchases yet": "No purchases yet",
-    "Product": "Product",
-    "Reference": "Reference",
-    "Amount": "Amount",
-    "Receipt": "Receipt",
-    "Unable to load your services right now.": "Unable to load your services right now.",
-    "Auto billing enabled": "Auto billing enabled",
-    "Auto billing suspended": "Auto billing suspended",
-    "Auto billing cancelled": "Auto billing cancelled",
-    "Auto billing disabled": "Auto billing disabled",
-    "Cancel auto billing for this service?": "Cancel auto billing for this service?",
-    "Preview class members and courses": "Preview class members and courses",
-    "Please select a CSV file to import.": "Please select a CSV file to import.",
-    "%d user-class links imported": "{0} user-class links imported",
-    "The following errors occurred during import:": "The following errors occurred during import:",
-    "CSV file": "CSV file",
-    "Remove user from all group-related entities if not in the list": "Remove user from all group-related entities if not in the list",
-    "UserName": "UserName",
-    "ClassName": "ClassName",
-    "are required for each row.": "are required for each row.",
-    "title": "title",
-    "is required.": "is required.",
-    "description": "description",
-    "are optional.": "are optional.",
-    "Are you sure you want to remove this user from the class?": "Are you sure you want to remove this user from the class?",
-    "Users in class": "Users in class",
-    "Remove user": "Remove user",
-    "Class not found": "Class not found",
-    "Class overview": "Class overview",
-    "Back to classes": "Back to classes",
-    "Search members or courses": "Search members or courses",
-    "Search by name, email, username or course title": "Search by name, email, username or course title",
-    "Class members": "Class members",
-    "No email": "No email",
-    "No members found": "No members found",
-    "No courses found": "No courses found",
-    "The end date must be after the start date.": "The end date must be after the start date.",
-    "Always visible": "Always visible",
-    "No end date": "No end date",
-    "No restriction": "No restriction",
-    "Missing learning path or course identifier": "Missing learning path or course identifier",
-    "Select a user or a group first": "Select a user or a group first",
-    "Remove all date restrictions for this learning path?": "Remove all date restrictions for this learning path?",
-    "Advanced learning path access": "Advanced learning path access",
-    "Remove date restrictions": "Remove date restrictions",
-    "Search by name, email, username or group": "Search by name, email, username or group",
-    "Edit user restriction": "Edit user restriction",
-    "Edit group restriction": "Edit group restriction",
-    "Select a user or group": "Select a user or group",
-    "Save restriction": "Save restriction",
-    "members": "members",
-    "Create Assignment": "Create Assignment",
-    "The submission deadline has passed. You can no longer submit.": "The submission deadline has passed. You can no longer submit.",
-    "Mailing cannot be combined with other recipients.": "Mailing cannot be combined with other recipients.",
-    "Social map": "Social map",
-    "The map plugin is not enabled or configured.": "The map plugin is not enabled or configured.",
-    "Some configured extra fields were not found": "Some configured extra fields were not found",
-    "No user locations were found.": "No user locations were found.",
-    "OpenStreetMap needs coordinates to display an embedded marker. Address-only locations are listed below.": "OpenStreetMap needs coordinates to display an embedded marker. Address-only locations are listed below.",
-    "Locations": "Locations",
-    "Open map": "Open map",
-    "Provider: OpenStreetMap": "Provider: OpenStreetMap",
-    "Provider: Google Maps": "Provider: Google Maps",
-    "Personal files": "Personal files",
-    "Upload image": "Upload image",
-    "Upload media": "Upload media",
-    "Only image files are allowed in this upload screen.": "Only image files are allowed in this upload screen.",
-    "Only audio and video files are allowed in this upload screen.": "Only audio and video files are allowed in this upload screen.",
-    "Upload files to your personal storage.": "Upload files to your personal storage.",
-    "Linked": "Linked",
-    "No audio or video files were found in this folder.": "No audio or video files were found in this folder.",
-    "No image files were found in this folder.": "No image files were found in this folder.",
-    "No matching files were found in this folder.": "No matching files were found in this folder.",
-    "This file type is not allowed in this upload screen.": "This file type is not allowed in this upload screen.",
-    "Manage your personal files and course documents.": "Manage your personal files and course documents.",
-    "Survey questions": "Survey questions",
-    "Back to survey list": "Back to survey list",
-    "This survey already has answers. Question editing is disabled by configuration.": "This survey already has answers. Question editing is disabled by configuration.",
-    "Choose the type of question you want to add.": "Choose the type of question you want to add.",
-    "The free text option is added automatically.": "The free text option is added automatically.",
-    "No questions found": "No questions found",
-    "Mandatory": "Mandatory",
-    "Unsupported question type": "Unsupported question type",
-    "You can use the tags {{class_name}} and {{student_full_name}} in the question.": "You can use the tags {'{'}{'{'}class_name{'}'}{'}'} and {'{'}{'{'}student_full_name{'}'}{'}'} in the question.",
-    "This question is shown conditionally while answering the survey.": "This question is shown conditionally while answering the survey.",
-    "The percentage options from 1 to 100 are generated automatically.": "The percentage options from 1 to 100 are generated automatically.",
-    "Could not load survey questions": "Could not load survey questions",
-    "The question text is required.": "The question text is required.",
-    "The maximum score is required.": "The maximum score is required.",
-    "Please select a parent option.": "Please select a parent option.",
-    "Please fill all answer options.": "Please fill all answer options.",
-    "QuestionUpdated": "QuestionUpdated",
-    "Could not save survey question": "Could not save survey question",
-    "Could not delete survey question": "Could not delete survey question",
-    "Could not move survey question": "Could not move survey question",
-    "Could not copy survey question": "Could not copy survey question",
-    "Hide search": "Hide search",
-    "Showing results for: {0}": "Showing results for: {0}",
-    "Search by survey title, code or description.": "Search by survey title, code or description.",
-    "Search surveys": "Search surveys",
-    "{0} surveys selected": "{0} surveys selected",
-    "Clear selection": "Clear selection",
-    "No surveys found": "No surveys found",
-    "Unsupported": "Unsupported",
-    "Could not load surveys": "Could not load surveys",
-    "Delete selected surveys": "Delete selected surveys",
-    "The selected surveys and their questions will be deleted. This action cannot be undone.": "The selected surveys and their questions will be deleted. This action cannot be undone.",
-    "Could not delete selected surveys": "Could not delete selected surveys",
-    "Survey action": "Survey action",
-    "A copy of this survey will be created: {0}": "A copy of this survey will be created: {0}",
-    "All answers and invitations will be deleted for this survey: {0}": "All answers and invitations will be deleted for this survey: {0}",
-    "Generated multiplied questions will be removed from this survey: {0}": "Generated multiplied questions will be removed from this survey: {0}",
-    "This survey will be published for the linked group tutors: {0}": "This survey will be published for the linked group tutors: {0}",
-    "This survey and its questions will be deleted: {0}": "This survey and its questions will be deleted: {0}",
-    "Could not complete survey action": "Could not complete survey action",
-    "Not started": "Not started",
-    "Meeting polls let invited users select the dates when they are available.": "Meeting polls let invited users select the dates when they are available.",
-    "Back to surveys": "Back to surveys",
-    "Edit meeting poll": "Edit meeting poll",
-    "View meeting poll": "View meeting poll",
-    "Basic information": "Basic information",
-    "This will create a survey of type meeting poll. Answers and invitations are handled separately.": "This will create a survey of type meeting poll. Answers and invitations are handled separately.",
-    "Availability": "Availability",
-    "Meeting dates": "Meeting dates",
-    "Meeting poll": "Meeting poll",
-    "My availability": "My availability",
-    "Meeting poll results": "Meeting poll results",
-    "No invitations found": "No invitations found",
-    "available": "available",
-    "Could not load meeting poll": "Could not load meeting poll",
-    "Please complete the required fields": "Please complete the required fields",
-    "Could not save meeting poll": "Could not save meeting poll",
-    "Could not save meeting availability": "Could not save meeting availability",
-    "Copy this survey to another course or session": "Copy this survey to another course or session",
-    "The survey will be copied without answers or invitations.": "The survey will be copied without answers or invitations.",
-    "No target courses found": "No target courses found",
-    "Search by course title, course code or session name.": "Search by course title, course code or session name.",
-    "Use Duplicate survey when you want a copy in the same course.": "Use Duplicate survey when you want a copy in the same course.",
-    "Questions and options will be copied. Answers, invitations and reports will stay only in the original survey.": "Questions and options will be copied. Answers, invitations and reports will stay only in the original survey.",
-    "Selected target": "Selected target",
-    "Could not load copy form": "Could not load copy form",
-    "The survey will be copied to: {0}": "The survey will be copied to: {0}",
-    "Survey copied.": "Survey copied.",
-    "Could not copy survey": "Could not copy survey",
-    "Answer survey": "Answer survey",
-    "Preview mode does not save answers.": "Preview mode does not save answers.",
-    "Survey completed": "Survey completed",
-    "Thank you for answering the survey.": "Thank you for answering the survey.",
-    "Profile information": "Profile information",
-    "Please review the requested profile fields before answering the survey.": "Please review the requested profile fields before answering the survey.",
-    "This profile field is read-only.": "This profile field is read-only.",
-    "You already filled this survey.": "You already filled this survey.",
-    "Please specify": "Please specify",
-    "This question type is not supported in the modern survey view.": "This question type is not supported in the modern survey view.",
-    "Preview only": "Preview only",
-    "Submit answers": "Submit answers",
-    "Could not load survey": "Could not load survey",
-    "Please complete the required profile fields.": "Please complete the required profile fields.",
-    "Please answer all mandatory questions.": "Please answer all mandatory questions.",
-    "Could not save survey answers": "Could not save survey answers",
-    "Configure the main survey information before managing questions and invitations.": "Configure the main survey information before managing questions and invitations.",
-    "The survey code cannot be changed after creation.": "The survey code cannot be changed after creation.",
-    "Survey behavior": "Survey behavior",
-    "Use 0 for no time limit.": "Use 0 for no time limit.",
-    "Survey messages": "Survey messages",
-    "Profile fields selected here will be shown before the survey questions.": "Profile fields selected here will be shown before the survey questions.",
-    "No profile fields are currently available.": "No profile fields are currently available.",
-    "Profile field selection is available only for non-anonymous surveys.": "Profile field selection is available only for non-anonymous surveys.",
-    "Skill linkage will be migrated in a dedicated batch.": "Skill linkage will be migrated in a dedicated batch.",
-    "Could not load survey configuration": "Could not load survey configuration",
-    "The survey code is required.": "The survey code is required.",
-    "The survey title is required.": "The survey title is required.",
-    "The survey has been saved successfully": "The survey has been saved successfully",
-    "Could not save survey configuration": "Could not save survey configuration",
-    "Course users": "Course users",
-    "Already invited": "Already invited",
-    "No users found": "No users found",
-    "No groups found": "No groups found",
-    "Use **link** where the survey link should appear.": "Use **link** where the survey link should appear.",
-    "Remind all selected users": "Remind all selected users",
-    "Anonymous access link": "Anonymous access link",
-    "Users who are not invited can use this link to take the survey.": "Users who are not invited can use this link to take the survey.",
-    "Answered anonymously": "Answered anonymously",
-    "Could not load survey invitations": "Could not load survey invitations",
-    "Mail subject and message are required when sending mail.": "Mail subject and message are required when sending mail.",
-    "Could not publish survey": "Could not publish survey",
-    "Could not copy the link": "Could not copy the link",
-    "Please answer this survey using the following link": "Please answer this survey using the following link",
-    "Export CSV": "Export CSV",
-    "Export compact CSV": "Export compact CSV",
-    "Export Excel": "Export Excel",
-    "Export package": "Export package",
-    "Results summary": "Results summary",
-    "This view shows the migrated reporting data for this survey.": "This view shows the migrated reporting data for this survey.",
-    "Select user": "Select user",
-    "No answers found": "No answers found",
-    "answers": "answers",
-    "Could not load survey reporting": "Could not load survey reporting",
-    "Back to threads": "Back to threads",
-    "Back to learning path": "Back to learning path",
-    "Remove sticky": "Remove sticky",
-    "Make sticky": "Make sticky",
-    "Open thread": "Open thread",
-    "Close thread": "Close thread",
-    "Delete thread": "Delete thread",
-    "This thread is hidden from learners.": "This thread is hidden from learners.",
-    "Revision requested": "Revision requested",
-    "Revision": "Revision",
-    "Approve post": "Approve post",
-    "Reject post": "Reject post",
-    "Cancel revision request": "Cancel revision request",
-    "Delete post": "Delete post",
-    "Message is required": "Message is required",
-    "Target thread is required": "Target thread is required",
-    "Could not retrieve posts": "Could not retrieve posts",
-    "Thread shown": "Thread shown",
-    "Thread hidden": "Thread hidden",
-    "Could not update thread": "Could not update thread",
-    "Thread closed": "Thread closed",
-    "Thread opened": "Thread opened",
-    "Thread marked as sticky": "Thread marked as sticky",
-    "Thread unmarked as sticky": "Thread unmarked as sticky",
-    "Thread notifications enabled": "Thread notifications enabled",
-    "Thread notifications disabled": "Thread notifications disabled",
-    "Could not update thread notification": "Could not update thread notification",
-    "Are you sure you want to delete this thread?": "Are you sure you want to delete this thread?",
-    "Could not delete thread": "Could not delete thread",
-    "Post approved": "Post approved",
-    "Could not approve post": "Could not approve post",
-    "Are you sure you want to reject this post?": "Are you sure you want to reject this post?",
-    "Post rejected": "Post rejected",
-    "Could not reject post": "Could not reject post",
-    "Post shown": "Post shown",
-    "Post hidden": "Post hidden",
-    "Could not update post": "Could not update post",
-    "Post updated": "Post updated",
-    "Are you sure you want to delete this post?": "Are you sure you want to delete this post?",
-    "Post deleted": "Post deleted",
-    "Could not delete post": "Could not delete post",
-    "Untitled thread": "Untitled thread",
-    "Could not retrieve threads": "Could not retrieve threads",
-    "Post moved": "Post moved",
-    "Could not move post": "Could not move post",
-    "Revision request removed": "Revision request removed",
-    "Could not update revision request": "Could not update revision request",
-    "Are you sure you want to report this post?": "Are you sure you want to report this post?",
-    "Could not report post": "Could not report post",
-    "Are you sure you want to delete this attachment?": "Are you sure you want to delete this attachment?",
-    "Attachment deleted": "Attachment deleted",
-    "Could not delete attachment": "Could not delete attachment",
-    "Thread title": "Thread title",
-    "Sticky thread": "Sticky thread",
-    "Attach files": "Attach files",
-    "Attachments are disabled for this forum": "Attachments are disabled for this forum",
-    "The forum is not open yet.": "The forum is not open yet.",
-    "The forum is closed.": "The forum is closed.",
-    "The forum is locked.": "The forum is locked.",
-    "New threads are not allowed in this forum.": "New threads are not allowed in this forum.",
-    "Thread created": "Thread created",
-    "Could not create thread": "Could not create thread",
-    "Back to posts": "Back to posts",
-    "This reply will be stored as a revision.": "This reply will be stored as a revision.",
-    "Post reply": "Post reply",
-    "The thread is locked.": "The thread is locked.",
-    "Reply added": "Reply added",
-    "Could not add reply": "Could not add reply",
-    "Add forum": "Add forum",
-    "No forums found": "No forums found",
-    "Create your first forum category or forum to start discussions.": "Create your first forum category or forum to start discussions.",
-    "Locked": "Locked",
-    "No forums in this category": "No forums in this category",
-    "Posts require approval": "Posts require approval",
-    "Forum for current group": "Forum for current group",
-    "Group forum visibility": "Group forum visibility",
-    "No category": "No category",
-    "Could not retrieve forums": "Could not retrieve forums",
-    "Forum category updated": "Forum category updated",
-    "Forum category created": "Forum category created",
-    "Could not save forum category": "Could not save forum category",
-    "Forum updated": "Forum updated",
-    "Forum created": "Forum created",
-    "Could not save forum": "Could not save forum",
-    "Are you sure you want to delete this forum category?": "Are you sure you want to delete this forum category?",
-    "Could not delete forum category": "Could not delete forum category",
-    "Are you sure you want to delete this forum?": "Are you sure you want to delete this forum?",
-    "Could not delete forum": "Could not delete forum",
-    "Forum category unlocked": "Forum category unlocked",
-    "Forum category locked": "Forum category locked",
-    "Could not update forum category": "Could not update forum category",
-    "Forum category shown": "Forum category shown",
-    "Forum category hidden": "Forum category hidden",
-    "Forum unlocked": "Forum unlocked",
-    "Forum locked": "Forum locked",
-    "Could not update forum": "Could not update forum",
-    "Forum shown": "Forum shown",
-    "Forum hidden": "Forum hidden",
-    "Forum notifications enabled": "Forum notifications enabled",
-    "Forum notifications disabled": "Forum notifications disabled",
-    "Could not update forum notification": "Could not update forum notification",
-    "Forum category moved": "Forum category moved",
-    "Could not move forum category": "Could not move forum category",
-    "Forum moved": "Forum moved",
-    "Could not move forum": "Could not move forum",
-    "Back to forums": "Back to forums",
-    "New thread": "New thread",
-    "No threads found": "No threads found",
-    "Sticky": "Sticky",
-    "Graded": "Graded",
-    "Grade peers": "Grade peers",
-    "Move thread": "Move thread",
-    "Target forum": "Target forum",
-    "Target forum is required": "Target forum is required",
-    "Students": "Students",
-    "No students found": "No students found",
-    "No peers available to grade.": "No peers available to grade.",
-    "Qualified": "Qualified",
-    "Not qualified": "Not qualified",
-    "Could not retrieve thread grading": "Could not retrieve thread grading",
-    "Thread grading updated": "Thread grading updated",
-    "Could not update thread grading": "Could not update thread grading",
-    "Thread score saved": "Thread score saved",
-    "Could not save thread score": "Could not save thread score",
-    "Could not move thread": "Could not move thread",
-    "Thread updated": "Thread updated",
-    "Search term is too short": "Search term is too short",
-    "Could not search forums": "Could not search forums",
-    "Moderated": "Moderated",
-    "View threads": "View threads"
-}
\ No newline at end of file
+  "# attended": "# attended",
+  "%d days before": "{0} days before",
+  "%d hours before": "{0} hours before",
+  "%d minutes before": "{0} minutes before",
+  "%d user-class links imported": "{0} user-class links imported",
+  "%s words per minute": "{0} words per minute",
+  "+%d": "+{0}",
+  "-1 = All questions will be selected.": "-1 = All questions will be selected.",
+  "2FA disabled successfully.": "2FA disabled successfully.",
+  "A .mbz file will be generated. You will be able to download it once finished.": "A .mbz file will be generated. You will be able to download it once finished.",
+  "A copy of this survey will be created: {0}": "A copy of this survey will be created: {0}",
+  "A database with the same name already exists. It will be deleted.": "A database with the same name already exists. It will be deleted.",
+  "A file name is required to save the recorded audio": "A file name is required to save the recorded audio",
+  "A user with this username already exists": "A user with this username already exists",
+  "AI": "AI",
+  "AI Aiken generator": "AI Aiken generator",
+  "AI analyzer": "AI analyzer",
+  "AI can draft feedback and a suggested score before you send it.": "AI can draft feedback and a suggested score before you send it.",
+  "AI feedback": "AI feedback",
+  "AI grade": "AI grade",
+  "AI helpers are disabled at platform level.": "AI helpers are disabled at platform level.",
+  "AI media generation is disabled in course settings.": "AI media generation is disabled in course settings.",
+  "AI provider": "AI provider",
+  "AI returned an empty response.": "AI returned an empty response.",
+  "AI suggestion": "AI suggestion",
+  "AI tutor is disabled during tests": "AI tutor is disabled during tests",
+  "AI-assisted": "AI-assisted",
+  "ALTER TABLE works": "ALTER TABLE works",
+  "Absent": "Absent",
+  "Absolute score": "Absolute score",
+  "Accept Terms and Conditions": "Accept Terms and Conditions",
+  "Accept invitation": "Accept invitation",
+  "Access URL": "Access URL",
+  "Account": "Account",
+  "Account expired": "Account expired",
+  "Action failed": "Action failed",
+  "Actions": "Actions",
+  "Activate": "Activate",
+  "Active": "Active",
+  "Active service": "Active service",
+  "Active services": "Active services",
+  "Active sessions": "Active sessions",
+  "Adaptive behavior (success/failure)": "Adaptive behavior (success/failure)",
+  "Add": "Add",
+  "Add a category": "Add a category",
+  "Add a class": "Add a class",
+  "Add a course introduction to display to your students.": "Add a course introduction to show your students.",
+  "Add a link": "Add a link",
+  "Add a link to a cloud document, such as Google Drive or Google Docs.": "Add a link to a cloud document, such as Google Drive or Google Docs.",
+  "Add a new course": "Add a new course",
+  "Add a new folder": "Add a new folder",
+  "Add a picture": "Add a picture",
+  "Add a question": "Add a question",
+  "Add a training session": "Add a training session",
+  "Add a user": "Add a user",
+  "Add all": "Add all",
+  "Add annotation path": "Add annotation path",
+  "Add annotation text": "Add annotation text",
+  "Add answer option": "Add answer option",
+  "Add as a template": "Add as a template",
+  "Add attendance": "Add attendance",
+  "Add attendance date": "Add attendance date",
+  "Add calendar event": "Add calendar event",
+  "Add category": "Add category",
+  "Add cloud link": "Add cloud link",
+  "Add comment": "Add comment",
+  "Add course": "Add course",
+  "Add courses to this session": "Add courses to this session",
+  "Add data exchange": "Add data exchange",
+  "Add document": "Add document",
+  "Add documents": "Add documents",
+  "Add element": "Add element",
+  "Add event": "Add event",
+  "Add exchange": "Add exchange",
+  "Add feedback": "Add feedback",
+  "Add file variation": "Add file variation",
+  "Add files": "Add files",
+  "Add forum": "Add forum",
+  "Add friend": "Add friend",
+  "Add friends": "Add friends",
+  "Add hotspot": "Add hotspot",
+  "Add image with zoom": "Add image with zoom",
+  "Add introduction": "Add introduction",
+  "Add members": "Add members",
+  "Add new glossary term": "Add new glossary term",
+  "Add question to test": "Add question to test",
+  "Add reminder": "Add reminder",
+  "Add skill to search profile": "Add skill to search profile",
+  "Add tags": "Add tags",
+  "Add third party": "Add third party",
+  "Add this question to the test": "Add this question to the test",
+  "Add to calendar": "Add to calendar",
+  "Add to catalogue": "Add to catalogue",
+  "Add to gradebook": "Add to gradebook",
+  "Add user": "Add user",
+  "Add users": "Add users",
+  "Add variation": "Add variation",
+  "Add your first link to this course": "Add your first link to this course",
+  "Address": "Address",
+  "Admin": "Admin",
+  "Admin Completed Courses": "Admin Completed Courses",
+  "Admin Dashboard": "Admin Dashboard",
+  "Admin Favorites Courses": "Admin Favorites Courses",
+  "Admin ID": "Admin ID",
+  "Admin Incomplete Courses": "Admin Incomplete Courses",
+  "Admin Restart Courses": "Admin Restart Courses",
+  "Administration": "Administration",
+  "Administrative activity auditing": "Administrative activity auditing",
+  "Administrator": "Administrator",
+  "Administrator e-mail": "Administrator e-mail",
+  "Administrator first name": "Administrator first name",
+  "Administrator last name": "Administrator last name",
+  "Administrator login": "Administrator login",
+  "Administrator name": "Administrator name",
+  "Administrator password": "Administrator password",
+  "Administrator phone number": "Administrator phone number",
+  "Administrator telephone": "Administrator telephone",
+  "Advanced learning path access": "Advanced learning path access",
+  "Advanced search": "Advanced search",
+  "Advanced settings": "Advanced settings",
+  "After approval": "After approval",
+  "After how long do we erase the data? (event, last use, contract validity, etc.) What are the elimination processes?": "After how long do we erase the data? (event, last use, contract validity, etc.) What are the elimination processes?",
+  "Agenda": "Agenda",
+  "All": "All",
+  "All Messages": "All Messages",
+  "All answers and invitations will be deleted for this survey: {0}": "All answers and invitations will be deleted for this survey: {0}",
+  "All categories": "All categories",
+  "All corrections deleted": "All corrections deleted",
+  "All done": "All done",
+  "All messages here are automatically marked as promoted.": "All messages here are automatically marked as promoted.",
+  "All not done": "All not done",
+  "All sessions": "All sessions",
+  "All system users": "All system users",
+  "All time visits in sessions": "All time visits in sessions",
+  "All time visits outside sessions": "All time visits outside sessions",
+  "All time visits total": "All time visits total",
+  "All users": "All users",
+  "All users?": "All users?",
+  "All versions": "All versions",
+  "Allow files or online text": "Allow files or online text",
+  "Allow members to leave group": "Allow members to leave group",
+  "Allow only files": "Allow only files",
+  "Allow only text": "Allow only text",
+  "Allow self-registration": "Allow self-registration",
+  "Allow self-registration as a trainer": "Allow self-registration as a trainer",
+  "Allow subscriptions": "Allow subscriptions",
+  "Allowed file formats: {0}": "Allowed file formats: {0}",
+  "Already exists": "Already exists",
+  "Already invited": "Already invited",
+  "Also delete documents that are only used in this course (if any).": "Also delete documents that are only used in this course (if any).",
+  "Always visible": "Always visible",
+  "Amount": "Amount",
+  "An error occurred": "An error occurred",
+  "An error occurred while copying the course": "An error occurred while copying the course",
+  "An error occurred while sending the course": "An error occurred while sending the course",
+  "An error occurred while sending the notification message": "An error occurred while sending the notification message",
+  "An error occurred while unifying users.": "An error occurred while unifying users.",
+  "An error occurred.": "An error occurred.",
+  "An error occurred. Please try again.": "An error occurred. Please try again.",
+  "An unexpected error occurred.": "An unexpected error occurred.",
+  "An update is available": "An update is available",
+  "Annotation": "Annotation",
+  "Announcements": "Announcements",
+  "Anonymize": "Anonymize",
+  "Anonymous access link": "Anonymous access link",
+  "Answer": "Answer",
+  "Answer list": "Answer list",
+  "Answer survey": "Answer survey",
+  "Answer type": "Answer type",
+  "Answered": "Answered",
+  "Answered anonymously": "Answered anonymously",
+  "Answers": "Answers",
+  "Apply": "Apply",
+  "Apply advanced filters": "Apply advanced filters",
+  "Apply score": "Apply score",
+  "Apply suggestion": "Apply suggestion",
+  "Apply to comment": "Apply to comment",
+  "Approve post": "Approve post",
+  "Are you sure to copy": "Are you sure to copy",
+  "Are you sure to delete all test's results ?": "Are you sure to delete all test's results ?",
+  "Are you sure to delete results": "Are you sure to delete results",
+  "Are you sure to delete the friendship?": "Are you sure to delete the friendship?",
+  "Are you sure you want to clean results for this test before the selected date ?": "Are you sure you want to clean results for this test before the selected date ?",
+  "Are you sure you want to clear this conversation?": "Are you sure you want to clear this conversation?",
+  "Are you sure you want to delete": "Are you sure you want to delete",
+  "Are you sure you want to delete %s?": "Are you sure you want to delete {0}?",
+  "Are you sure you want to delete all calendar events?": "Are you sure you want to delete all calendar events?",
+  "Are you sure you want to delete all corrections?": "Are you sure you want to delete all corrections?",
+  "Are you sure you want to delete the question?": "Are you sure you want to delete the question?",
+  "Are you sure you want to delete the selected courses?": "Are you sure you want to delete the selected courses?",
+  "Are you sure you want to delete the selected items?": "Are you sure you want to delete the selected items?",
+  "Are you sure you want to delete this attachment?": "Are you sure you want to delete this attachment?",
+  "Are you sure you want to delete this category?": "Are you sure you want to delete this category?",
+  "Are you sure you want to delete this comment?": "Are you sure you want to delete this comment?",
+  "Are you sure you want to delete this course?": "Are you sure you want to delete this course?",
+  "Are you sure you want to delete this event?": "Are you sure you want to delete this event?",
+  "Are you sure you want to delete this forum category?": "Are you sure you want to delete this forum category?",
+  "Are you sure you want to delete this forum?": "Are you sure you want to delete this forum?",
+  "Are you sure you want to delete this item?": "Are you sure you want to delete this item?",
+  "Are you sure you want to delete this layout?": "Are you sure you want to delete this layout?",
+  "Are you sure you want to delete this post?": "Are you sure you want to delete this post?",
+  "Are you sure you want to delete this submission?": "Are you sure you want to delete this submission?",
+  "Are you sure you want to delete this template?": "Are you sure you want to delete this template?",
+  "Are you sure you want to delete this third party? This action cannot be undone.": "Are you sure you want to delete this third party? This action cannot be undone.",
+  "Are you sure you want to delete this thread?": "Are you sure you want to delete this thread?",
+  "Are you sure you want to delete this?": "Are you sure you want to delete this?",
+  "Are you sure you want to delete {0}?": "Are you sure you want to delete {0}?",
+  "Are you sure you want to lock this user?": "Are you sure you want to lock this user?",
+  "Are you sure you want to reject this post?": "Are you sure you want to reject this post?",
+  "Are you sure you want to remove the class without removing users?": "Are you sure you want to remove the class without removing users?",
+  "Are you sure you want to remove the class?": "Are you sure you want to remove the class?",
+  "Are you sure you want to remove this user from the class?": "Are you sure you want to remove this user from the class?",
+  "Are you sure you want to report this post?": "Are you sure you want to report this post?",
+  "Are you sure you want to unlock this user?": "Are you sure you want to unlock this user?",
+  "Area to avoid": "Area to avoid",
+  "As read": "As read",
+  "As unread": "As unread",
+  "Assessment": "Assessment",
+  "Assessments": "Assessments",
+  "Assign authentication sources": "Assign authentication sources",
+  "Assign authentication sources to users": "Assign authentication sources to users",
+  "Assign courses": "Assign courses",
+  "Assign sessions": "Assign sessions",
+  "Assign skill": "Assign skill",
+  "Assign task": "Assign task",
+  "Assign users": "Assign users",
+  "Assignment": "Assignment",
+  "Assignment created": "Assignment created",
+  "Assignment details": "Assignment details",
+  "Assignment name": "Assignment name",
+  "Assignment title + instructions": "Assignment title + instructions",
+  "Assignment updated": "Assignment updated",
+  "Assignments": "Assignments",
+  "Assignments deleted": "Assignments deleted",
+  "Associated URL": "Associated URL",
+  "Attach file (optional)": "Attach file (optional)",
+  "Attach files": "Attach files",
+  "Attach to media": "Attach to media",
+  "Attachment": "Attachment",
+  "Attachment deleted": "Attachment deleted",
+  "Attachments": "Attachments",
+  "Attachments are disabled for this forum": "Attachments are disabled for this forum",
+  "Attempt": "Attempt",
+  "Attempting to login as %s (id %d)": "Attempting to login as {0} (id {1})",
+  "Attempts": "Attempts",
+  "Attendance": "Attendance",
+  "Attendance saved successfully": "Attendance saved successfully",
+  "Attendances": "Attendances",
+  "Attendances (tablet)": "Attendances (tablet)",
+  "Attended": "Attended",
+  "Authentication failed.": "Authentication failed.",
+  "Authentication source": "Authentication source",
+  "Authentication sources assigned successfully": "Authentication sources assigned successfully",
+  "Author": "Author",
+  "Auto (recommended)": "Auto (recommended)",
+  "Auto billing cancelled": "Auto billing cancelled",
+  "Auto billing disabled": "Auto billing disabled",
+  "Auto billing enabled": "Auto billing enabled",
+  "Auto billing suspended": "Auto billing suspended",
+  "Auto-launch": "Auto-launch",
+  "Autosaved drafts available": "Autosaved drafts available",
+  "Availability": "Availability",
+  "Available courses in this URL": "Available courses in this URL",
+  "Available documents": "Available documents",
+  "Available friends": "Available friends",
+  "Available from": "Available from",
+  "Available percentage": "Available percentage",
+  "Available rooms": "Available rooms",
+  "Available space": "Available space",
+  "Avatar": "Avatar",
+  "Average score": "Average score",
+  "Back": "Back",
+  "Back to Documents": "Back to Documents",
+  "Back to Tests tool": "Back to Tests tool",
+  "Back to attendance sheet": "Back to attendance sheet",
+  "Back to classes": "Back to classes",
+  "Back to forums": "Back to forums",
+  "Back to layouts": "Back to layouts",
+  "Back to learning path": "Back to learning path",
+  "Back to list": "Back to list",
+  "Back to posts": "Back to posts",
+  "Back to survey list": "Back to survey list",
+  "Back to surveys": "Back to surveys",
+  "Back to the questions": "Back to the questions",
+  "Back to third parties": "Back to third parties",
+  "Back to threads": "Back to threads",
+  "Back to user assignment page": "Back to user assignment page",
+  "Backspace": "Backspace",
+  "Backup scope": "Backup scope",
+  "Basic information": "Basic information",
+  "Basic skills": "Basic skills",
+  "Because the <code>newscorm</code> and <code>exercice</code> directories were renamed to <code>lp</code> and <code>exercise</code> respectively, is necessary to delete or rename to <code>newscorm_old</code> and <code>exercice_old</code>": "Because the <code>newscorm</code> and <code>exercice</code> directories were renamed to <code>lp</code> and <code>exercise</code> respectively, is necessary to delete or rename to <code>newscorm_old</code> and <code>exercice_old</code>",
+  "Before": "Before",
+  "Bi-weekly": "Bi-weekly",
+  "Blocks": "Blocks",
+  "Blocks Palette": "Blocks Palette",
+  "Blog": "Blog",
+  "Blogs": "Blogs",
+  "Branch": "Branch",
+  "Branch type": "Branch type",
+  "Branches": "Branches",
+  "Branding (logos)": "Branding (logos)",
+  "Browse and publish new posts": "Browse and publish new posts",
+  "Browse courses": "Browse courses",
+  "Business card": "Business card",
+  "Buttons": "Buttons",
+  "Buy service": "Buy service",
+  "By accepting this invitation, you will become linked to the requesting user in a way that will make some or all of your profile data available for reading by the requesting user": "By accepting this invitation, you will become linked to the requesting user in a way that will make some or all of your profile data available for reading by the requesting user",
+  "By email": "By email",
+  "By extra field": "By extra field",
+  "By filling this form, you agree that the editor of Chamilo, the {0} company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.": "By filling this form, you agree that the editor of Chamilo, the {0} company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.",
+  "By geolocalization": "By geolocalization",
+  "By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.": "By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.",
+  "CREATE TABLE works": "CREATE TABLE works",
+  "CSV export": "CSV export",
+  "CSV file": "CSV file",
+  "Calendar": "Calendar",
+  "Can not change visibility": "Can not change visibility",
+  "Cancel": "Cancel",
+  "Cancel auto billing": "Cancel auto billing",
+  "Cancel auto billing for this service?": "Cancel auto billing for this service?",
+  "Cancel revision request": "Cancel revision request",
+  "Cancelled": "Cancelled",
+  "Cannot delete branch with rooms attached": "Cannot delete branch with rooms attached",
+  "Cannot delete room with courses attached": "Cannot delete room with courses attached",
+  "Cannot find your language in the list? Contact us at info@chamilo.org to contribute as a translator.": "Cannot find your language in the list? Contact us at info{'@'}chamilo.org to contribute as a translator.",
+  "Cannot find your language in the list? Contact us at {0} to contribute as a translator": "Cannot find your language in the list? Contact us at {0} to contribute as a translator",
+  "Captcha is temporarily blocked. Please try again later.": "Captcha is temporarily blocked. Please try again later.",
+  "Case insensitive": "Case insensitive",
+  "Categories": "Categories",
+  "Category": "Category",
+  "Category deleted": "Category deleted",
+  "Category description": "Category description",
+  "Category name": "Category name",
+  "Category options": "Category options",
+  "Category reordering is not enabled": "Category reordering is not enabled",
+  "Category saved": "Category saved",
+  "Cc": "Cc",
+  "Certificate set as default successfully": "Certificate set as default successfully",
+  "Certificate tags": "Certificate tags",
+  "Chamilo URL": "Chamilo URL",
+  "Chamilo installation wizard": "Chamilo installation wizard",
+  "Chamilo is free software distributed under the GNU General Public licence (GPL).": "Chamilo is free software distributed under the GNU General Public licence (GPL).",
+  "Change Password": "Change Password",
+  "Change password": "Change password",
+  "Change status": "Change status",
+  "Change title to selected filename": "Change title to selected filename",
+  "Change visibility": "Change visibility",
+  "Chat": "Chat",
+  "Check database connection": "Check database connection",
+  "Check link": "Check link",
+  "Check passwords too easy to guess": "Check passwords too easy to guess",
+  "Check requirements": "Check requirements",
+  "Checkbox 1": "Checkbox 1",
+  "Checkbox 2": "Checkbox 2",
+  "Checkbox and radio buttons": "Checkbox and radio buttons",
+  "Checking course creation options...": "Checking course creation options...",
+  "Checking push subscription": "Checking push subscription",
+  "Choose an action": "Choose an action",
+  "Choose file": "Choose file",
+  "Choose orientation": "Choose orientation",
+  "Choose recipients": "Choose recipients",
+  "Choose the destination course": "Choose the destination course",
+  "Choose the type of question you want to add.": "Choose the type of question you want to add.",
+  "Choose whether this course uses the standard platform limits or benefits from a purchased service.": "Choose whether this course uses the standard platform limits or benefits from a purchased service.",
+  "Class": "Class",
+  "Class list": "Class list",
+  "Class members": "Class members",
+  "Class not found": "Class not found",
+  "Class overview": "Class overview",
+  "Class users": "Class users",
+  "ClassName": "ClassName",
+  "Classes": "Classes",
+  "Clean all results before a selected date": "Clean all results before a selected date",
+  "Clean temporary files": "Clean temporary files",
+  "Clear": "Clear",
+  "Clear all": "Clear all",
+  "Clear all learners results for every exercises ?": "Clear all learners results for every exercises ?",
+  "Clear all learners results for this exercise": "Clear all learners results for this exercise",
+  "Clear filter results": "Clear filter results",
+  "Clear filters": "Clear filters",
+  "Clear search": "Clear search",
+  "Clear selection": "Clear selection",
+  "Click the drawing area to place this text": "Click the drawing area to place this text",
+  "Click the image to crop it (1:1 ratio, 120x120 px recommended)": "Click the image to crop it (1:1 ratio, 120x120 px recommended)",
+  "Click to insert": "Click to insert",
+  "Close": "Close",
+  "Close thread": "Close thread",
+  "Closed": "Closed",
+  "Closed sessions": "Closed sessions",
+  "Cloud link": "Cloud link",
+  "Cloud links cannot be downloaded.": "Cloud links cannot be downloaded.",
+  "Co-generated with AI": "Co-generated with AI",
+  "Code": "Code",
+  "Collapse": "Collapse",
+  "Collapse all": "Collapse all",
+  "Color": "Color",
+  "Color theme": "Color theme",
+  "Color theme created": "Color theme created",
+  "Color updated": "Color updated",
+  "Colors": "Colors",
+  "Column": "Column",
+  "Column is locked or read-only": "Column is locked or read-only",
+  "Columns": "Columns",
+  "Comment": "Comment",
+  "Comment added successfully": "Comment added successfully",
+  "Comments": "Comments",
+  "Company city": "Company city",
+  "Compare your progress": "Compare your progress",
+  "Complete": "Complete",
+  "Completed": "Completed",
+  "Completed courses": "Completed courses",
+  "Completely delete this course": "Completely delete this course",
+  "Completion": "Completion",
+  "Compose": "Compose",
+  "Conference Room": "Conference Room",
+  "Confidentiality warning": "Confidentiality warning",
+  "Config settings": "Config settings",
+  "Configure": "Configure",
+  "Configure Chamilo colors": "Configure Chamilo colors",
+  "Configure the main survey information before managing questions and invitations.": "Configure the main survey information before managing questions and invitations.",
+  "Configure your platform, view reports, publish and send announcements globally": "Configure your platform, view reports, publish and send announcements globally",
+  "Confirm": "Confirm",
+  "Confirm deletion": "Confirm deletion",
+  "Confirmation": "Confirmation",
+  "Conflicts": "Conflicts",
+  "Constant name": "Constant name",
+  "Contact": "Contact",
+  "Contact information": "Contact information",
+  "Contact information has been sent": "Contact information has been sent",
+  "Contact support": "Contact support",
+  "Content": "Content",
+  "Continue": "Continue",
+  "Continue with {0}": "Continue with {0}",
+  "Convert to multiple answer": "Convert to multiple answer",
+  "Convert to unique answer": "Convert to unique answer",
+  "Copied": "Copied",
+  "Copy": "Copy",
+  "Copy all": "Copy all",
+  "Copy answer to clipboard": "Copy answer to clipboard",
+  "Copy completed": "Copy completed",
+  "Copy course": "Copy course",
+  "Copy link": "Copy link",
+  "Copy options": "Copy options",
+  "Copy selected": "Copy selected",
+  "Copy the full course content from the selected session course.": "Copy the full course content from the selected session course.",
+  "Copy this exercise as a new one": "Copy this exercise as a new one",
+  "Copy this survey to another course or session": "Copy this survey to another course or session",
+  "Copy to My Files": "Copy to My Files",
+  "Correct": "Correct",
+  "Correct and rate": "Correct and grade",
+  "Correct answer": "Correct answer",
+  "Correct score": "Correct score",
+  "Correction uploaded successfully!": "Correction uploaded successfully!",
+  "Could not add reply": "Could not add reply",
+  "Could not approve post": "Could not approve post",
+  "Could not change visibility of category": "Could not change visibility of category",
+  "Could not change visibility of link": "Could not change visibility of link",
+  "Could not complete survey action": "Could not complete survey action",
+  "Could not copy survey": "Could not copy survey",
+  "Could not copy survey question": "Could not copy survey question",
+  "Could not copy the file to My Files": "Could not copy the file to My Files",
+  "Could not copy the link": "Could not copy the link",
+  "Could not create glossary term": "Could not create glossary term",
+  "Could not create thread": "Could not create thread",
+  "Could not create user": "Could not create user",
+  "Could not delete attachment": "Could not delete attachment",
+  "Could not delete category": "Could not delete category",
+  "Could not delete forum": "Could not delete forum",
+  "Could not delete forum category": "Could not delete forum category",
+  "Could not delete link": "Could not delete link",
+  "Could not delete post": "Could not delete post",
+  "Could not delete selected surveys": "Could not delete selected surveys",
+  "Could not delete survey question": "Could not delete survey question",
+  "Could not delete term": "Could not delete term",
+  "Could not delete thread": "Could not delete thread",
+  "Could not export": "Could not export",
+  "Could not export glossary": "Could not export glossary",
+  "Could not export to documents": "Could not export to documents",
+  "Could not fetch glossary term": "Could not fetch glossary term",
+  "Could not fetch glossary terms": "Could not fetch glossary terms",
+  "Could not import terms": "Could not import terms",
+  "Could not load copy form": "Could not load copy form",
+  "Could not load data": "Could not load data",
+  "Could not load exportable items.": "Could not load exportable items.",
+  "Could not load meeting poll": "Could not load meeting poll",
+  "Could not load options.": "Could not load options.",
+  "Could not load survey": "Could not load survey",
+  "Could not load survey configuration": "Could not load survey configuration",
+  "Could not load survey invitations": "Could not load survey invitations",
+  "Could not load survey questions": "Could not load survey questions",
+  "Could not load survey reporting": "Could not load survey reporting",
+  "Could not load surveys": "Could not load surveys",
+  "Could not move forum": "Could not move forum",
+  "Could not move forum category": "Could not move forum category",
+  "Could not move link": "Could not move link",
+  "Could not move link down": "Could not move link down",
+  "Could not move link up": "Could not move link up",
+  "Could not move post": "Could not move post",
+  "Could not move survey question": "Could not move survey question",
+  "Could not move thread": "Could not move thread",
+  "Could not publish survey": "Could not publish survey",
+  "Could not reject post": "Could not reject post",
+  "Could not report post": "Could not report post",
+  "Could not retrieve forums": "Could not retrieve forums",
+  "Could not retrieve links": "Could not retrieve links",
+  "Could not retrieve posts": "Could not retrieve posts",
+  "Could not retrieve thread grading": "Could not retrieve thread grading",
+  "Could not retrieve threads": "Could not retrieve threads",
+  "Could not save forum": "Could not save forum",
+  "Could not save forum category": "Could not save forum category",
+  "Could not save meeting availability": "Could not save meeting availability",
+  "Could not save meeting poll": "Could not save meeting poll",
+  "Could not save survey answers": "Could not save survey answers",
+  "Could not save survey configuration": "Could not save survey configuration",
+  "Could not save survey question": "Could not save survey question",
+  "Could not save the new category order.": "Could not save the new category order.",
+  "Could not save the new order.": "Could not save the new order.",
+  "Could not save thread score": "Could not save thread score",
+  "Could not search forums": "Could not search forums",
+  "Could not update forum": "Could not update forum",
+  "Could not update forum category": "Could not update forum category",
+  "Could not update forum notification": "Could not update forum notification",
+  "Could not update post": "Could not update post",
+  "Could not update revision request": "Could not update revision request",
+  "Could not update thread": "Could not update thread",
+  "Could not update thread grading": "Could not update thread grading",
+  "Could not update thread notification": "Could not update thread notification",
+  "Course": "Course",
+  "Course ID is missing": "Course ID is missing",
+  "Course catalogue": "Course catalogue",
+  "Course categories": "Course categories",
+  "Course code": "Course code",
+  "Course completed": "Course completed",
+  "Course created successfully": "Course created successfully",
+  "Course deleted successfully.": "Course deleted successfully.",
+  "Course description": "Course description",
+  "Course home": "Course home",
+  "Course introduction": "Course introduction",
+  "Course language": "Course language",
+  "Course list": "Course list",
+  "Course maintenance": "Course maintenance",
+  "Course management": "Course management",
+  "Course name": "Course name",
+  "Course progress": "Course progress",
+  "Course sent to": "Course sent to",
+  "Course sessions": "Course sessions",
+  "Course settings": "Course settings",
+  "Course template": "Course template",
+  "Course to copy from": "Course to copy from",
+  "Course type": "Course type",
+  "Course users": "Course users",
+  "Courses": "Courses",
+  "Courses in group": "Courses in group",
+  "Courses linked to {0}": "Courses linked to {0}",
+  "Courses on the platform": "Courses on the platform",
+  "Courses reports": "Courses reports",
+  "Courses with these benefits": "Courses with these benefits",
+  "Create": "Create",
+  "Create .mbz": "Create .mbz",
+  "Create Assignment": "Create Assignment",
+  "Create a backup": "Create a backup",
+  "Create a new document": "Create a new document",
+  "Create a new test": "Create a new test",
+  "Create a question": "Create a question",
+  "Create and assign tasks": "Create and assign tasks",
+  "Create and manage your courses in a simple way": "Create and manage your courses in a simple way",
+  "Create assignment": "Create assignment",
+  "Create backup": "Create backup",
+  "Create category": "Create category",
+  "Create certificate": "Create certificate",
+  "Create child skill": "Create child skill",
+  "Create course": "Create course",
+  "Create course packages for a certain time with training sessions": "Create course packages for a certain time with training sessions",
+  "Create file": "Create file",
+  "Create group": "Create group",
+  "Create layout": "Create layout",
+  "Create layout template": "Create layout template",
+  "Create link": "Create link",
+  "Create new learning path": "Create new learning path",
+  "Create new user": "Create new user",
+  "Create page layout": "Create page layout",
+  "Create template": "Create template",
+  "Create this course": "Create this course",
+  "Create thread": "Create thread",
+  "Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:": "Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:",
+  "Create your first forum category or forum to start discussions.": "Create your first forum category or forum to start discussions.",
+  "Create your first learning path to start organizing course content.": "Create your first learning path to start organizing course content.",
+  "Created": "Created",
+  "Created at": "Created at",
+  "Created with Chamilo copyright year": "Created with Chamilo © {0}",
+  "Creation date": "Creation date",
+  "Creator": "Creator",
+  "Current icon": "Current icon",
+  "Current members": "Current members",
+  "Current session tab": "Current",
+  "Current variations": "Current variations",
+  "Currently": "Currently",
+  "Currently learning": "Currently learning",
+  "Custom URL": "Custom URL",
+  "Custom extensions (separated by space)": "Custom extensions (separated by space)",
+  "Custom list": "Custom list",
+  "Customize": "Customize",
+  "DROP COLUMN works": "DROP COLUMN works",
+  "Daily": "Daily",
+  "Danger": "Danger",
+  "Danger color": "Danger color",
+  "Danger color hover/background": "Danger color hover/background",
+  "Danger zone: deleting a course is permanent.": "Danger zone: deleting a course is permanent.",
+  "Danger zone: deleting an access URL is permanent.": "Danger zone: deleting an access URL is permanent.",
+  "Dashboard": "Dashboard",
+  "Data exchange": "Data exchange",
+  "Data exchange successfully saved": "Data exchange successfully saved",
+  "Data exchange updated successfully.": "Data exchange updated successfully.",
+  "Data exchanges": "Data exchanges",
+  "Data exchanges (GDPR)": "Data exchanges (GDPR)",
+  "Database": "Database",
+  "Database Host": "Database Host",
+  "Database Password": "Database Password",
+  "Database driver": "Database driver",
+  "Database host": "Database host",
+  "Database name": "Database name",
+  "Database port": "Database port",
+  "Database settings": "Database settings",
+  "Database user": "Database user",
+  "Date": "Date",
+  "Date sent": "Date sent",
+  "Dates": "Dates",
+  "Days": "Days",
+  "Deactivate": "Deactivate",
+  "Deactivate this user?": "Deactivate this user?",
+  "Deadline": "Deadline",
+  "Dear user": "Dear user",
+  "Default": "Default",
+  "Default (No URL)": "Default (No URL)",
+  "Default room": "Default room",
+  "Definition": "Definition",
+  "Degree of certainty that my answer will be considered correct": "Degree of certainty that my answer will be considered correct",
+  "Delay (ms)": "Delay (ms)",
+  "Delete": "Delete",
+  "Delete access": "Delete access",
+  "Delete account": "Delete account",
+  "Delete all corrections": "Delete all corrections",
+  "Delete all terms before import.": "Delete all terms before import.",
+  "Delete attempt?": "Delete attempt?",
+  "Delete calendar event": "Delete calendar event",
+  "Delete course": "Delete course",
+  "Delete draft": "Delete draft",
+  "Delete everything": "Delete everything",
+  "Delete legal agreement": "Delete legal agreement",
+  "Delete permanently": "Delete permanently",
+  "Delete post": "Delete post",
+  "Delete selected": "Delete selected",
+  "Delete selected surveys": "Delete selected surveys",
+  "Delete skill profile": "Delete skill profile",
+  "Delete third party": "Delete third party",
+  "Delete this comment?": "Delete this comment?",
+  "Delete this folder? All files inside will be permanently deleted.": "Delete this folder? All files inside will be permanently deleted.",
+  "Delete this post? This action cannot be undone.": "Delete this post? This action cannot be undone.",
+  "Delete this project? This action cannot be undone.": "Delete this project? This action cannot be undone.",
+  "Delete this task?": "Delete this task?",
+  "Delete thread": "Delete thread",
+  "Deleted": "Deleted",
+  "Deleted users": "Deleted users",
+  "Deletion failed": "Deletion failed",
+  "Delivered": "Delivered",
+  "Demo": "Demo",
+  "Department": "Department",
+  "Department URL": "Department URL",
+  "Dependencies": "Dependencies",
+  "Describe what you want to generate...": "Describe what you want to generate...",
+  "Description": "Description",
+  "Deselect all": "Deselect all",
+  "Destination folder": "Destination folder",
+  "Destination of test e-mail": "Destination of test e-mail",
+  "Detail": "Detail",
+  "Details": "Details",
+  "Diagnosis": "Diagnosis",
+  "Diagnosis Management": "Diagnosis Management",
+  "Diagnosis management": "Diagnosis management",
+  "DiagnosticfinalizationmessageContent": "Hi {0}, I'm {1} and I'm reviewing your diagnostic to define the course you will be following.",
+  "DiagnosticfinalizationmessageTitle": "Diagnostic finalization",
+  "Dialog example": "Dialog example",
+  "Dialogs": "Dialogs",
+  "Difficulty": "Difficulty",
+  "Directory and files permissions": "Directory and files permissions",
+  "Disable / Enable": "Disable / Enable",
+  "Disabled": "Disabled",
+  "Discussions": "Discussions",
+  "Dislike": "Dislike",
+  "Display a Terms & Conditions statement on the registration page, require visitor to accept the T&C to register": "Display a Terms & Conditions statement on the registration page, require visitor to accept the T&C to register",
+  "Display questions category": "Display questions category",
+  "Distribution": "Distribution",
+  "Do not include the base (non-session) course content.": "Do not include the base (non-session) course content.",
+  "Do nothing": "Do nothing",
+  "Do we have another system with which Chamilo interacts? What is the interconnection process? What are the data pieces exchanged and in what way?": "Do we have another system with which Chamilo interacts? What is the interconnection process? What are the data pieces exchanged and in what way?",
+  "Do you have the power to take financial decisions on behalf of your company?": "Do you have the power to take financial decisions on behalf of your company?",
+  "Do you still want to delete them?": "Do you still want to delete them",
+  "Document IRI": "Document IRI",
+  "Document added": "Document added",
+  "Document moved successfully": "Document moved successfully",
+  "Document not saved": "Document not saved",
+  "Document options change how uploaded files are processed after saving.": "Document options change how uploaded files are processed after saving.",
+  "Document quota": "Document quota",
+  "Document removed": "Document removed",
+  "Document title": "Document title",
+  "Documents": "Documents",
+  "Documents added": "Documents added",
+  "Documents deleted": "Documents deleted",
+  "Does not have enough contrast against background": "Does not have enough contrast against background",
+  "Don't know": "Don't know",
+  "Download": "Download",
+  "Download all": "Download all",
+  "Download as ZIP": "Download as ZIP",
+  "Download assignments package": "Download assignments package",
+  "Download file": "Download file",
+  "Download selected items as ZIP": "Download selected items as ZIP",
+  "Download speed (KB/s)": "Download speed (KB/s)",
+  "Download started": "Download started",
+  "Download the Excel Template": "Download the Excel Template",
+  "Draft": "Draft",
+  "Drafts are stored only in this browser and are removed after saving the document.": "Drafts are stored only in this browser and are removed after saving the document.",
+  "Drag & drop files here or click to select": "Drag & drop files here or click to select",
+  "Drag & drop or browse to add files": "Drag & drop or browse to add files",
+  "Drag links to reorder": "Drag links to reorder",
+  "Drag to reorder": "Drag to reorder",
+  "Draw a new SVG, import an existing SVG or embed an image, then save it as a reusable document.": "Draw a new SVG, import an existing SVG or embed an image, then save it as a reusable document.",
+  "Drh": "Drh",
+  "Drop links here to keep them without category": "Drop links here to keep them without category",
+  "Dropbox": "Dropbox",
+  "Dropdowns": "Dropdowns",
+  "Duplicate users": "Duplicate users",
+  "Duration": "Duration",
+  "Duration (minutes)": "Duration (minutes)",
+  "Duration in minutes": "Duration in minutes",
+  "E-mail": "E-mail",
+  "E-mail notifications": "E-mail notifications",
+  "Each file name must match: YYYY-MM-DD_HH-MM_username_originalTitle.ext": "Each file name must match: YYYY-MM-DD_HH-MM_username_originalTitle.ext",
+  "Edit": "Edit",
+  "Edit Comment": "Edit Comment",
+  "Edit Terms and Conditions": "Edit Terms and Conditions",
+  "Edit assignment": "Edit assignment",
+  "Edit attendance": "Edit attendance",
+  "Edit calendar event": "Edit calendar event",
+  "Edit category": "Edit category",
+  "Edit event": "Edit event",
+  "Edit glossary term": "Edit glossary term",
+  "Edit group": "Edit group",
+  "Edit group restriction": "Edit group restriction",
+  "Edit introduction": "Edit introduction",
+  "Edit item": "Edit item",
+  "Edit layout template": "Edit layout template",
+  "Edit learnpath": "Edit learnpath",
+  "Edit meeting poll": "Edit meeting poll",
+  "Edit page layout": "Edit page layout",
+  "Edit post": "Edit post",
+  "Edit profile": "Edit profile",
+  "Edit questions": "Edit questions",
+  "Edit submission": "Edit submission",
+  "Edit task": "Edit task",
+  "Edit template": "Edit template",
+  "Edit test name and settings": "Edit test name and settings",
+  "Edit this group": "Edit this group",
+  "Edit user restriction": "Edit user restriction",
+  "Editable content": "Editable content",
+  "Editor demo": "Editor demo",
+  "Effective preview": "Effective preview",
+  "Email": "Email",
+  "Email Settings": "Email Settings",
+  "Email logo": "Email logo",
+  "Email reply header": "The {0}, {1} ({2}) wrote:",
+  "Email sent to all unsubmitted users": "Email sent to all unsubmitted users",
+  "Email to use in the archive metadata": "Email to use in the archive metadata",
+  "Enable auto billing": "Enable auto billing",
+  "Enable end time": "Enable end time",
+  "Enable final acceptance date (invisible to learners)": "Enable final acceptance date (invisible to learners)",
+  "Enable handing over deadline (visible to learners)": "Enable handing over deadline (visible to learners)",
+  "Enable notifications": "Enable notifications",
+  "Enable start time": "Enable start time",
+  "Enable this user?": "Enable this user?",
+  "Enable time control": "Enable time control",
+  "Enable version check": "Enable version check",
+  "Enabled": "Enabled",
+  "Encryption method": "Encryption method",
+  "End Date": "End Date",
+  "End date": "End date",
+  "End date to display": "End date to display",
+  "End test": "End test",
+  "Ended": "Ended",
+  "Endpoint": "Endpoint",
+  "Ends at (completely closed)": "Ends at (completely closed)",
+  "Ends today": "Ends today",
+  "Ends tomorrow": "Ends tomorrow",
+  "Enrich question": "Enrich question",
+  "Enrolment by classes": "Enrolment by classes",
+  "Enter 2FA code": "Enter 2FA code",
+  "Enter a title for your submission": "Enter a title for your submission",
+  "Enter a value here": "Enter a value here",
+  "Enter captcha code": "Enter captcha code",
+  "Enter filename here": "Enter filename here",
+  "Enter the skill name to search": "Enter the skill name to search",
+  "Enter to send · Shift+Enter for newline": "Enter to send · Shift+Enter for newline",
+  "EntraID ID": "EntraID ID",
+  "EntraID UID": "EntraID UID",
+  "Error": "Error",
+  "Error adding document": "Error adding document",
+  "Error adding user": "Error adding user",
+  "Error creating the template": "Error creating the template",
+  "Error creating third party. Please verify the data.": "Error creating third party. Please verify the data.",
+  "Error deleting data exchange.": "Error deleting data exchange.",
+  "Error deleting document(s)": "Error deleting document(s)",
+  "Error deleting message": "Error deleting message",
+  "Error deleting the template": "Error deleting the template",
+  "Error deleting third party.": "Error deleting third party.",
+  "Error downloading all documents.": "Error downloading all documents.",
+  "Error downloading selected items.": "Error downloading selected items.",
+  "Error during test email: ": "Error during test email: ",
+  "Error exporting to Excel": "Error exporting to Excel",
+  "Error exporting to PDF": "Error exporting to PDF",
+  "Error fetching friends list": "Error fetching friends list",
+  "Error fetching users": "Error fetching users",
+  "Error loading learning paths.": "Error loading learning paths.",
+  "Error loading resources.": "Error loading resources.",
+  "Error message": "Error message",
+  "Error moving the document": "Error moving the document",
+  "Error removing document": "Error removing document",
+  "Error removing user": "Error removing user",
+  "Error replacing file.": "Error replacing file.",
+  "Error saving data exchange": "Error saving data exchange",
+  "Error saving the link": "Error saving the link",
+  "Error selecting source.": "Error selecting source.",
+  "Error setting certificate as default": "Error setting certificate as default",
+  "Error submitting the form": "Error submitting the form",
+  "Error updating third party. Please verify the data.": "Error updating third party. Please verify the data.",
+  "Error while creating the document": "Error while creating the document",
+  "Event": "Event",
+  "Event details": "Event details",
+  "Event editable by the invitees": "Event editable by the invitees",
+  "Events": "Events",
+  "Events list": "Events list",
+  "Every x days": "Every x days",
+  "Example: generated_media": "Example: generated_media",
+  "Excel export": "Excel export",
+  "Exercise results": "Exercise results",
+  "Exit tablet mode": "Exit tablet mode",
+  "Expand": "Expand",
+  "Expand all": "Expand all",
+  "Expected": "Expected",
+  "Expected choice": "Expected choice",
+  "Expiration date": "Expiration date",
+  "Expired": "Expired",
+  "Explain in this box why you want your account deleted": "Explain in this box why you want your account deleted",
+  "Explore more courses": "Explore more courses",
+  "Export": "Export",
+  "Export CSV": "Export CSV",
+  "Export Common Cartridge v1.3": "Export Common Cartridge v1.3",
+  "Export Excel": "Export Excel",
+  "Export all attempts": "Export all attempts",
+  "Export as CSV": "Export as CSV",
+  "Export as XLS": "Export as XLS",
+  "Export compact CSV": "Export compact CSV",
+  "Export completed": "Export completed",
+  "Export courses reports complete": "Export courses reports complete",
+  "Export failed.": "Export failed.",
+  "Export finished.": "Export finished.",
+  "Export format": "Export format",
+  "Export glossary": "Export glossary",
+  "Export package": "Export package",
+  "Export to Excel": "Export to Excel",
+  "Export to PDF": "Export to PDF",
+  "Export to documents": "Export to documents",
+  "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.": "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.",
+  "Exported to documents": "Exported to documents",
+  "Exporting...": "Exporting...",
+  "Extend one week": "Extend one week",
+  "External user": "External user",
+  "Extra fields": "Extra fields",
+  "Extra menu": "Extra menu",
+  "FAQ": "FAQ",
+  "Failed": "Failed",
+  "Failed to check video status.": "Failed to check video status.",
+  "Failed to create Moodle backup.": "Failed to create Moodle backup.",
+  "Failed to create the post. Please try again.": "Failed to create the post. Please try again.",
+  "Failed to delete corrections": "Failed to delete corrections",
+  "Failed to delete course.": "Failed to delete course.",
+  "Failed to delete the comment.": "Failed to delete the comment.",
+  "Failed to delete the post.": "Failed to delete the post.",
+  "Failed to delete the task.": "Failed to delete the task.",
+  "Failed to download package": "Failed to download package",
+  "Failed to export PDF": "Failed to export PDF",
+  "Failed to generate QR code": "Failed to generate QR code",
+  "Failed to load attendance. Please try again later.": "Failed to load attendance. Please try again later.",
+  "Failed to load events": "Failed to load events",
+  "Failed to load resources.": "Failed to load resources.",
+  "Failed to load sessions": "Failed to load sessions",
+  "Failed to load this report. Please try again.": "Failed to load this report. Please try again.",
+  "Failed to recycle course.": "Failed to recycle course.",
+  "Failed to save attendance": "Failed to save attendance",
+  "Failed to save signature. Please try again.": "Failed to save signature. Please try again.",
+  "Failed to send email": "Failed to send email",
+  "Failed to send friend request": "Failed to send friend request",
+  "Failed to send notification message": "Failed to send notification message",
+  "Failed to update status.": "Failed to update status.",
+  "Failed to update the comment.": "Failed to update the comment.",
+  "Failed to update the post.": "Failed to update the post.",
+  "Failed to upload corrections": "Failed to upload corrections",
+  "Failed to upload file": "Failed to upload file",
+  "False": "False",
+  "Favorite courses": "Favorite courses",
+  "Favourite courses": "Favourite courses",
+  "Featured courses": "Featured courses",
+  "Feedback": "Feedback",
+  "File": "File",
+  "File copied to My Files": "File copied to My Files",
+  "File manager": "File manager",
+  "File replaced": "File replaced",
+  "File type": "File type",
+  "File type not allowed. Allowed extensions: {0}": "File type not allowed. Allowed extensions: {0}",
+  "File upload": "File upload",
+  "File upload succeeded!": "File upload succeeded!",
+  "File uploaded successfully": "File uploaded successfully",
+  "Filename": "Filename",
+  "Files": "Files",
+  "Files in current theme": "Files in current theme",
+  "Fill": "Fill",
+  "Fill with demo content": "Fill with demo content",
+  "Filled": "Filled",
+  "Filter": "Filter",
+  "Filter by category": "Filter by category",
+  "Filter by language": "Filter by language",
+  "Filter by title": "Filter by title",
+  "Filtered by {0}": "Filtered by {0}",
+  "Filters": "Filters",
+  "Final item": "Final item",
+  "Find available rooms": "Find available rooms",
+  "Finished": "Finished",
+  "First letter (last name)": "First letter (last name)",
+  "First name": "First name",
+  "Firstname": "Firstname",
+  "Folder name": "Folder name",
+  "For more details {0}": "For more details {0}",
+  "For what purpose do we process personal data? Do we use it to filter the access users have to certain parts of our application? (negative or positive discrimination)": "For what purpose do we process personal data? Do we use it to filter the access users have to certain parts of our application? (negative or positive discrimination)",
+  "Forbidden": "Forbidden",
+  "Forgot your password?": "Forgot your password?",
+  "Form outline color": "Form outline color",
+  "Format": "Format",
+  "Format:": "Format:",
+  "Forms": "Forms",
+  "Formula": "Formula",
+  "Formula notation": "Formula notation",
+  "Formula sample: sqrt( [x] / [y] ) * ( e ^ ( ln(pi) ) )": "Formula sample: sqrt( [x] / [y] ) * ( e ^ ( ln(pi) ) )",
+  "Forum": "Forum",
+  "Forum category created": "Forum category created",
+  "Forum category hidden": "Forum category hidden",
+  "Forum category locked": "Forum category locked",
+  "Forum category moved": "Forum category moved",
+  "Forum category shown": "Forum category shown",
+  "Forum category unlocked": "Forum category unlocked",
+  "Forum category updated": "Forum category updated",
+  "Forum created": "Forum created",
+  "Forum for current group": "Forum for current group",
+  "Forum hidden": "Forum hidden",
+  "Forum locked": "Forum locked",
+  "Forum moved": "Forum moved",
+  "Forum notifications disabled": "Forum notifications disabled",
+  "Forum notifications enabled": "Forum notifications enabled",
+  "Forum shown": "Forum shown",
+  "Forum unlocked": "Forum unlocked",
+  "Forum updated": "Forum updated",
+  "Free": "Free",
+  "Freehand": "Freehand",
+  "Friend added successfully": "Friend added successfully",
+  "Friend request rejected": "Friend request rejected",
+  "Friend request sent successfully": "Friend request sent successfully",
+  "Friendly URL": "Friendly URL",
+  "Friends": "Friends",
+  "Friends of {0}": "Friends of {0}",
+  "From": "From",
+  "From {0} to {1}": "From {0} to {1}",
+  "Full copy": "Full copy",
+  "Full course": "Full course",
+  "Full name": "Full name",
+  "GDPRTitle": "GDPRTitle",
+  "General": "General",
+  "GeneralResourcesCourse": "GeneralResourcesCourse",
+  "Generate": "Generate",
+  "Generate AI media": "Generate AI media",
+  "Generate Aiken": "Generate Aiken",
+  "Generate QR code": "Generate QR code",
+  "Generate an Aiken quiz from a topic or from one course document.": "Generate an Aiken quiz from a topic or from one course document.",
+  "Generate default content": "Generate default content",
+  "Generate from document": "Generate from document",
+  "Generate from topic": "Generate from topic",
+  "Generate glossary terms": "Generate glossary terms",
+  "Generate media": "Generate media",
+  "Generate terms": "Generate terms",
+  "Generated Aiken content": "Generated Aiken content",
+  "Generated multiplied questions will be removed from this survey: {0}": "Generated multiplied questions will be removed from this survey: {0}",
+  "Generated successfully. Review the preview and save when ready.": "Generated successfully. Review the preview and save when ready.",
+  "Generated successfully. Saving is disabled because the provider returned a URL.": "Generated successfully. Saving is disabled because the provider returned a URL.",
+  "Generating...": "Generating...",
+  "Generation failed.": "Generation failed.",
+  "Geolocation": "Geolocation",
+  "Get AI feedback": "Get AI feedback",
+  "Give a context to the test": "Give a context to the test",
+  "Glossary": "Glossary",
+  "Glossary exported": "Glossary exported",
+  "Glossary term saved": "Glossary term saved",
+  "Go": "Go",
+  "Go back": "Go back",
+  "Go back to standard view": "Go back to standard view",
+  "Go to \"Explore\" to find a topic of interest, or wait for someone to subscribe you.": "Go to \"Explore\" to find a topic of interest, or wait for someone to subscribe you.",
+  "Go to Explore to find a topic of interest, or wait for someone to subscribe you": "Go to Explore to find a topic of interest, or wait for someone to subscribe you",
+  "Go to branding (logos)": "Go to branding (logos)",
+  "Go to calendar": "Go to calendar",
+  "Go to folder": "Go to folder",
+  "Go to friends list": "Go to friends list",
+  "Go to session": "Go to session",
+  "Go to the course": "Go to the course",
+  "Go to the session": "Go to the session",
+  "Go to your newly created portal.": "Go to your newly created portal.",
+  "Grade peers": "Grade peers",
+  "Grade weight": "Grade weight",
+  "Gradebook column title": "Gradebook column title",
+  "Gradebook options": "Gradebook options",
+  "Graded": "Graded",
+  "Granted benefits": "Granted benefits",
+  "Group": "Group",
+  "Group forum visibility": "Group forum visibility",
+  "Group image": "Group image",
+  "Group permissions": "Group permissions",
+  "Groups": "Groups",
+  "HTML": "HTML",
+  "Header PNG must be \\u2264 {0}px.": "Header PNG must be \\u2264 {0}px.",
+  "Header PNG must be ≤ {0}px.": "Header PNG must be ≤ {0}px.",
+  "Header logo": "Header logo",
+  "Health check": "Health check",
+  "Height": "Height",
+  "Helper text": "Helper text",
+  "Here are the values you entered": "Here are the values you entered",
+  "Here you can manage registered users within your platform": "Here you can manage registered users within your platform",
+  "Hidden": "Hidden",
+  "Hide advanced mode": "Hide advanced mode",
+  "Hide advanced settings": "Hide advanced settings",
+  "Hide all": "Hide all",
+  "Hide attempts table on start page": "Hide attempts table on start page",
+  "Hide campus from public platforms list": "Hide campus from public platforms list",
+  "Hide category table": "Hide category table",
+  "Hide comments": "Hide comments",
+  "Hide correct answered questions": "Hide correct answered questions",
+  "Hide drafts": "Hide drafts",
+  "Hide expected answers column": "Hide expected answers column",
+  "Hide password": "Hide password",
+  "Hide question number": "Hide question number",
+  "Hide question score": "Hide question score",
+  "Hide question title": "Hide question title",
+  "Hide search": "Hide search",
+  "Hide total score": "Hide total score",
+  "Highest score": "Highest score",
+  "Hold Ctrl (or Cmd) to select multiple items": "Hold Ctrl (or Cmd) to select multiple items",
+  "Home": "Home",
+  "Horizontal": "Horizontal",
+  "Hosting limit": "Hosting limit",
+  "Hotspot": "Hotspot",
+  "Hotspot delineation": "Hotspot delineation",
+  "Hours": "Hours",
+  "How and for what can we use the personal data?": "How and for what can we use the personal data?",
+  "How is the data structured in this software? (one tab for all the data, it has some categorization / label, ...)": "How is the data structured in this software? (one tab for all the data, it has some categorization / label, ...)",
+  "How is the data structured? To what extent does the organization of the data protect your security? ... Do you have established processes that ensure that a hacker will not be able to collect all the personal data on the first attempt? Are they encrypted?": "How is the data structured? To what extent does the organization of the data protect your security? ... Do you have established processes that ensure that a hacker will not be able to collect all the personal data on the first attempt? Are they encrypted?",
+  "How long do we save the data? Is there data that expires even though the account is still active? How much time do we keep the data after the last use of the system?": "How long do we save the data? Is there data that expires even though the account is still active? How much time do we keep the data after the last use of the system?",
+  "How to use this report": "How to use this report",
+  "Human Resources Manager": "Human Resources Manager",
+  "I accept": "I accept",
+  "ID": "ID",
+  "ID of last synch transaction": "ID of last synch transaction",
+  "IMS Common Cartridge v1.3": "IMS Common Cartridge v1.3",
+  "IP": "IP",
+  "IP address": "IP address",
+  "IP mask": "IP mask",
+  "IPv4 or IPv6": "IPv4 or IPv6",
+  "Icon": "Icon",
+  "Icons": "Icons",
+  "If enabled, the gradebook will give a learner 100% when present at least once.": "If enabled, the gradebook will give a learner 100% when present at least once.",
+  "If file exists": "If file exists",
+  "If you plan to upgrade from an older version of Chamilo, you might want to": "If you plan to upgrade from an older version of Chamilo, you might want to",
+  "If you want only integer values write both limits without decimals": "If you want only integer values write both limits without decimals",
+  "If your LPs have audio files included you should select them from the documents": "If your LPs have audio files included you should select them from the documents",
+  "If your quiz have hotspot questions included you should select the images from the documents": "If your quiz have hotspot questions included you should select the images from the documents",
+  "Image": "Image",
+  "Image generation is not enabled for this course.": "Image generation is not enabled for this course.",
+  "Images": "Images",
+  "Images will be resized (up or down) to 200x150 pixels. For a better rendering of the question, we recommend you upload only images of this size.": "Images will be resized (up or down) to 200x150 pixels. For a better rendering of the question, we recommend you upload only images of this size.",
+  "Import": "Import",
+  "Import Aiken quiz": "Import Aiken quiz",
+  "Import Common Cartridge v1.3": "Import Common Cartridge v1.3",
+  "Import SVG": "Import SVG",
+  "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.": "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.",
+  "Import backup": "Import backup",
+  "Import classes": "Import classes",
+  "Import completed": "Import completed",
+  "Import exercises Qti2": "Import exercises Qti2",
+  "Import failed.": "Import failed.",
+  "Import finished": "Import finished",
+  "Import from a CSV": "Import from a CSV",
+  "Import full backup": "Import full backup",
+  "Import glossary": "Import glossary",
+  "Import image": "Import image",
+  "Import options": "Import options",
+  "Import quiz from Excel": "Import quiz from Excel",
+  "Import selection": "Import selection",
+  "Imported Aiken quiz": "Imported Aiken quiz",
+  "In order to enable the automatic version checking you have to register your portal on chamilo.org. The information obtained by clicking this button is only for internal use and only aggregated data will be publicly available (total number of portals, total number of Chamilo course, total number of Chamilo users, ...) (see {0}). When registering you will also appear on the worldwide list ({1}). If you do not want to appear in this list you have to check the checkbox below. The registration is as easy as it can be: you only have to click this button:": "In order to enable the automatic version checking you have to register your portal on chamilo.org. The information obtained by clicking this button is only for internal use and only aggregated data will be publicly available (total number of portals, total number of Chamilo course, total number of Chamilo users, ...) (see {0}). When registering you will also appear on the worldwide list ({1}). If you do not want to appear in this list you have to check the checkbox below. The registration is as easy as it can be: you only have to click this button:",
+  "In progress": "In progress",
+  "In this section, when clicking on 'Register student' for a course, you will be asked to select the user on the next page. When validated, it will create a new session with the selected course and user, and send a subscription notification to the user.": "In this section, when clicking on 'Register student' for a course, you will be asked to select the user on the next page. When validated, it will create a new session with the selected course and user, and send a subscription notification to the user.",
+  "Inactive": "Inactive",
+  "Inbox": "Inbox",
+  "Include all users": "Include all users",
+  "Include users (enrollments)": "Include users (enrollments)",
+  "Incomplete": "Incomplete",
+  "Incomplete courses": "Incomplete courses",
+  "Incorrect": "Incorrect",
+  "Incorrect score": "Incorrect score",
+  "Index document content?": "Index document content?",
+  "Info": "Info",
+  "Info color": "Info color",
+  "Info color button text": "Info color button text",
+  "Info color hover/background": "Info color hover/background",
+  "Information": "Information",
+  "Information about AI-assisted documents": "Information about AI-assisted documents",
+  "Information about indexing document content": "Information about indexing document content",
+  "Information about uncompressing zip files": "Information about uncompressing zip files",
+  "Install": "Install",
+  "Install Chamilo": "Install Chamilo",
+  "Installation guide": "Installation guide",
+  "Installation language": "Installation language",
+  "Installer data is missing.": "Installer data is missing.",
+  "Internal integer user id": "Internal integer user id",
+  "Introduction created successfully!": "Introduction created successfully!",
+  "Introduction updated successfully!": "Introduction updated successfully!",
+  "Invalid format": "Invalid format",
+  "Invalid id": "Invalid id",
+  "Invalid login request.": "Invalid login request.",
+  "Invalid question type": "Invalid question type",
+  "Invalid resource link ID": "Invalid resource link ID",
+  "Invalid submission": "Invalid submission",
+  "InvalidId": "InvalidId",
+  "Invitations": "Invitations",
+  "Invite": "Invite",
+  "Invite friends": "Invite friends",
+  "Invite friends to group": "Invite friends to group",
+  "Invitee": "Invitee",
+  "Invitees": "Invitees",
+  "Is administrator": "Is administrator",
+  "Is not administrator": "Is not administrator",
+  "Is recruiter?": "Is recruiter?",
+  "Is this what you were looking for?": "Is this what you were looking for?",
+  "Is used for data exchange?": "Is used for data exchange?",
+  "Issued at": "Issued at",
+  "Item 1": "Item 1",
+  "Item 2": "Item 2",
+  "Item 3": "Item 3",
+  "Item Details": "Item Details",
+  "Item added": "Item added",
+  "Item details": "Item details",
+  "Items": "Items",
+  "Job": "Job",
+  "Join group": "Join group",
+  "Keyword": "Keyword",
+  "Language": "Language",
+  "Last access": "Last access",
+  "Last login in platform": "Last login in platform",
+  "Last name": "Last name",
+  "Last saved": "Last saved",
+  "Last synchronization type": "Last synchronization type",
+  "Last upload": "Last upload",
+  "Last week": "Last week",
+  "Lastname": "Lastname",
+  "Latest access in course": "Latest access in course",
+  "Latest attempt": "Latest attempt",
+  "Latest login": "Latest login",
+  "Latest sent on": "Latest sent on",
+  "Latitude": "Latitude",
+  "Latitude, Longitude (e.g. 48.8566, 2.3522)": "Latitude, Longitude (e.g. 48.8566, 2.3522)",
+  "Layout JSON details": "Layout JSON details",
+  "Layout template": "Layout template",
+  "Layout template name": "Layout template name",
+  "Layout templates": "Layout templates",
+  "Layout type": "Layout type",
+  "Layouts": "Layouts",
+  "Learn more about Chamilo and its use, official references links": "Learn more about Chamilo and its use, official references links",
+  "Learner": "Learner",
+  "Learner answers": "Learner answers",
+  "Learner score": "Learner score",
+  "Learners": "Learners",
+  "Learners who're taking the exercise right now": "Learners who're taking the exercise right now",
+  "Learning analytics": "Learning analytics",
+  "Learning path": "Learning path",
+  "Learning path only visible to selected learners": "Learning path only visible to selected learners",
+  "Learning paths": "Learning paths",
+  "Leave group": "Leave group",
+  "Legal agreement accepted": "Legal agreement accepted",
+  "Legend": "Legend",
+  "Let me select learning objects": "Let me select learning objects",
+  "License": "License",
+  "Like": "Like",
+  "Limiting quota": "Limiting quota",
+  "Line": "Line",
+  "Link deleted": "Link deleted",
+  "Link is not valid": "Link is not valid",
+  "Link is valid": "Link is valid",
+  "Link moved": "Link moved",
+  "Link moved down": "Link moved down",
+  "Link moved up": "Link moved up",
+  "Link name": "Link name",
+  "Link saved": "Link saved",
+  "Link visibility updated": "Link visibility updated",
+  "Link's target": "Link's target",
+  "Linked": "Linked",
+  "Links": "Links",
+  "List": "List",
+  "List icons": "List icons",
+  "List view": "List view",
+  "Live results": "Live results",
+  "Load": "Load",
+  "Load more": "Load more",
+  "Loading": "Loading",
+  "Loading attendance data": "Loading attendance data",
+  "Loading comments...": "Loading comments...",
+  "Loading courses": "Loading courses",
+  "Loading courses. Please wait.": "Loading courses. Please wait.",
+  "Loading documents...": "Loading documents...",
+  "Loading failed.": "Loading failed.",
+  "Loading layout": "Loading layout",
+  "Loading more courses": "Loading more courses",
+  "Loading more sessions": "Loading more sessions",
+  "Loading report...": "Loading report...",
+  "Loading resources...": "Loading resources...",
+  "Loading sessions. Please wait.": "Loading sessions. Please wait.",
+  "Loading templates": "Loading templates",
+  "Loading...": "Loading...",
+  "Local file (.zip, .mbz, .tgz, .gz)": "Local file (.zip, .mbz, .tgz, .gz)",
+  "Local user": "Local user",
+  "Location": "Location",
+  "Locations": "Locations",
+  "Lock": "Lock",
+  "Lock column": "Lock column",
+  "Locked": "Locked",
+  "Login": "Login",
+  "Login %status% for username %username%": "Login {0}tatus% for username %username%",
+  "Login as": "Login as",
+  "Login successful. Go to %s": "Login successful. Go to {0}",
+  "Logos will be applied to the current visual theme: ": "Logos will be applied to the current visual theme: ",
+  "Longitude": "Longitude",
+  "Lowest score": "Lowest score",
+  "MDI icon name": "MDI icon name",
+  "Mail DSN": "Mail DSN",
+  "Mail subject and message are required when sending mail.": "Mail subject and message are required when sending mail.",
+  "Mail: 'From' address": "Mail: 'From' address",
+  "Mail: 'From' name": "Mail: 'From' name",
+  "Mailing cannot be combined with other recipients.": "Mailing cannot be combined with other recipients.",
+  "Main language": "Main language",
+  "Make sticky": "Make sticky",
+  "Make sure you have enough questions in your categories.": "Make sure you have enough questions in your categories.",
+  "Manage all questions": "Manage all questions",
+  "Manage backups, restore, copy, recycle and delete course data.": "Manage backups, restore, copy, recycle and delete course data.",
+  "Manage templates": "Manage templates",
+  "Manage the skills of your users, through courses and badges": "Manage the skills of your users, through courses and badges",
+  "Manage your personal files and course documents.": "Manage your personal files and course documents.",
+  "Management list": "Management list",
+  "Mandatory": "Mandatory",
+  "Mark as": "Mark as",
+  "Mark as promoted message": "Mark as promoted message",
+  "Mark favorite": "Mark favorite",
+  "Match them": "Match them",
+  "Matches To": "Matches To",
+  "Matching courses": "Matching courses",
+  "Matching sessions": "Matching sessions",
+  "Matching students": "Matching students",
+  "Max number of attempts": "Max number of attempts",
+  "Max score": "Max score",
+  "Maximum number of subscriptions": "Maximum number of subscriptions",
+  "Maximum number of subscriptions allowed": "Maximum number of subscriptions allowed",
+  "Maximum score": "Maximum score",
+  "Media": "Media",
+  "Meeting dates": "Meeting dates",
+  "Meeting poll": "Meeting poll",
+  "Meeting poll results": "Meeting poll results",
+  "Meeting polls let invited users select the dates when they are available.": "Meeting polls let invited users select the dates when they are available.",
+  "Members": "Members",
+  "Menu": "Menu",
+  "Merged accounts will be permanently deleted and will disappear from this report.": "Merged accounts will be permanently deleted and will disappear from this report.",
+  "Message": "Message",
+  "Message Sent": "Message Sent",
+  "Message deleted": "Message deleted",
+  "Message is required": "Message is required",
+  "Message sent successfully.": "Message sent successfully.",
+  "Messages": "Messages",
+  "Metadata": "Metadata",
+  "Migration completed successfully!": "Migration completed successfully!",
+  "Migration failed!": "Migration failed!",
+  "Minutes": "Minutes",
+  "Missing assignments": "Missing assignments",
+  "Missing learning path or course identifier": "Missing learning path or course identifier",
+  "Moderated": "Moderated",
+  "Moderator": "Moderator",
+  "Modified": "Modified",
+  "Modified prompt": "Modified prompt",
+  "Modify color theme": "Modify color theme",
+  "Monthly, by date": "Monthly, by date",
+  "Moodle export": "Moodle export",
+  "Moodle requires an internal user id stored in XML. If in doubt, use 1.": "Moodle requires an internal user id stored in XML. If in doubt, use 1.",
+  "Moodle version": "Moodle version",
+  "More actions": "More actions",
+  "Move": "Move",
+  "Move document": "Move document",
+  "Move down": "Move down",
+  "Move the file": "Move the file",
+  "Move thread": "Move thread",
+  "Move up": "Move up",
+  "Move {0}": "Move {0}",
+  "Multilingual": "Multilingual",
+  "My General Certificate": "My General Certificate",
+  "My account": "My account",
+  "My availability": "My availability",
+  "My certificates": "My certificates",
+  "My communities": "My communities",
+  "My courses": "My courses",
+  "My custom certificate": "My custom certificate",
+  "My files": "My files",
+  "My friends": "My friends",
+  "My groups": "My groups",
+  "My invitations": "My invitations",
+  "My justifications": "My justifications",
+  "My profile": "My profile",
+  "My services": "My services",
+  "My sessions": "My sessions",
+  "My skills": "My skills",
+  "My students schedule": "My students schedule",
+  "Name": "Name",
+  "New branch": "New branch",
+  "New cloud file": "New cloud file",
+  "New color theme": "New color theme",
+  "New content available for this course.": "New content available for this course.",
+  "New document": "New document",
+  "New drawing": "New drawing",
+  "New folder": "New folder",
+  "New installation": "New installation",
+  "New message": "New message",
+  "New messages": "New messages",
+  "New name": "New name",
+  "New page": "New page",
+  "New post": "New post",
+  "New project": "New project",
+  "New room": "New room",
+  "New task": "New task",
+  "New thread": "New thread",
+  "New threads are not allowed in this forum.": "New threads are not allowed in this forum.",
+  "New title": "New title",
+  "New version": "New version",
+  "Newest first": "Newest first",
+  "News from Chamilo": "News from Chamilo",
+  "Next": "Next",
+  "Next charge": "Next charge",
+  "Next page": "Next page",
+  "Next question": "Next question",
+  "Next week": "Next week",
+  "No": "No",
+  "No AI media providers available.": "No AI media providers available.",
+  "No AI text providers configured.": "No AI text providers configured.",
+  "No PNG uploaded": "No PNG uploaded",
+  "No SVG uploaded": "No SVG uploaded",
+  "No accounts were merged.": "No accounts were merged.",
+  "No active services": "No active services",
+  "No additional details available for this skill.": "No additional details available for this skill.",
+  "No answers found": "No answers found",
+  "No assignments available": "No assignments available",
+  "No attendance assigned yet": "No attendance assigned yet",
+  "No attendance data for today": "No attendance data for today",
+  "No attendance data to save": "No attendance data to save",
+  "No audio or video files were found in this folder.": "No audio or video files were found in this folder.",
+  "No available documents": "No available documents",
+  "No available documents.": "No available documents.",
+  "No available options": "No available options",
+  "No available rooms found for this time range": "No available rooms found for this time range",
+  "No available users": "No available users",
+  "No available users.": "No available users.",
+  "No branches have been created yet": "No branches have been created yet",
+  "No category": "No category",
+  "No category selected": "No category selected",
+  "No classes found": "No classes found",
+  "No comment": "No comment",
+  "No comments yet.": "No comments yet.",
+  "No communities": "No communities",
+  "No compatible PDF or TXT document was found in this course.": "No compatible PDF or TXT document was found in this course.",
+  "No contacts found": "No contacts found",
+  "No course available": "No course available",
+  "No course currently allows you to obtain this skill.": "No course currently allows you to obtain this skill.",
+  "No courses available": "No courses available",
+  "No courses found": "No courses found",
+  "No courses match your search.": "No courses match your search.",
+  "No data available": "No data available",
+  "No data to export": "No data to export",
+  "No date": "No date",
+  "No dependencies": "No dependencies",
+  "No description": "No description",
+  "No description available": "No description available",
+  "No detailed feedback is available for this question.": "No detailed feedback is available for this question.",
+  "No document-processing AI providers available.": "No document-processing AI providers available.",
+  "No documents added yet": "No documents added yet",
+  "No documents added yet.": "No documents added yet.",
+  "No documents available.": "No documents available.",
+  "No download available": "No download available",
+  "No email": "No email",
+  "No end date": "No end date",
+  "No events found": "No events found",
+  "No favorite courses.": "No favorite courses.",
+  "No feedback yet.": "No feedback yet.",
+  "No file selected.": "No file selected.",
+  "No forums found": "No forums found",
+  "No forums in this category": "No forums in this category",
+  "No friends found": "No friends found",
+  "No groups found": "No groups found",
+  "No image files were found in this folder.": "No image files were found in this folder.",
+  "No invitations found": "No invitations found",
+  "No invitations or records found": "No invitations or records found",
+  "No items selected.": "No items selected.",
+  "No matching files were found in this folder.": "No matching files were found in this folder.",
+  "No members found": "No members found",
+  "No members found.": "No members found.",
+  "No messages yet": "No messages yet",
+  "No missing submissions found for this assignment or data is not available": "No missing submissions found for this assignment or data is not available",
+  "No negative score": "No negative score",
+  "No new content found.": "No new content found.",
+  "No new notifications.": "No new notifications.",
+  "No other duplicates found for this user.": "No other duplicates found for this user.",
+  "No peers available to grade.": "No peers available to grade.",
+  "No posts": "No posts",
+  "No posts found": "No posts found",
+  "No profile fields are currently available.": "No profile fields are currently available.",
+  "No purchases yet": "No purchases yet",
+  "No questions found": "No questions found",
+  "No resource link entity found": "No resource link entity found",
+  "No resources available in this backup.": "No resources available in this backup.",
+  "No resources available in this course.": "No resources available in this course.",
+  "No restriction": "No restriction",
+  "No results found": "No results found",
+  "No rooms have been created yet": "No rooms have been created yet",
+  "No sender": "No sender",
+  "No session available": "No session available",
+  "No skill profile": "No skill profile",
+  "No specific language": "No specific language",
+  "No students found": "No students found",
+  "No surveys found": "No surveys found",
+  "No target courses found": "No target courses found",
+  "No tasks": "No tasks",
+  "No text AI providers available.": "No text AI providers available.",
+  "No threads found": "No threads found",
+  "No tool details available yet.": "No tool details available yet.",
+  "No tutored sessions found": "No tutored sessions found",
+  "No user locations were found.": "No user locations were found.",
+  "No users added yet": "No users added yet",
+  "No users added yet.": "No users added yet.",
+  "No users available.": "No users available.",
+  "No users found": "No users found",
+  "None": "None",
+  "Not a SCORM learning path": "Not a SCORM learning path",
+  "Not attempted": "Not attempted",
+  "Not attended": "Not attended",
+  "Not available": "Not available",
+  "Not found": "Not found",
+  "Not graded yet": "Not graded yet",
+  "Not linked to media": "Not linked to media",
+  "Not qualified": "Not qualified",
+  "Not started": "Not started",
+  "Not validated": "Not validated",
+  "Not writable": "Not writable",
+  "NotAllowed": "NotAllowed",
+  "Notebook": "Notebook",
+  "Nothing to save": "Nothing to save",
+  "Nothing to save yet.": "Nothing to save yet.",
+  "Notification message sent successfully": "Notification message sent successfully",
+  "Notification to remind the event": "Notification to remind the event",
+  "Number of days": "Number of days",
+  "Number of questions": "Number of questions",
+  "Number of times the question was answered": "Number of times the question was answered",
+  "Number of times this answer was selected": "Number of times this answer was selected",
+  "Number submitted": "Number submitted",
+  "N°": "N°",
+  "OK": "OK",
+  "Occupation": "Occupation",
+  "Occupied rooms": "Occupied rooms",
+  "Official code": "Official code",
+  "Old version's root path": "Old version's root path",
+  "Oldest first": "Oldest first",
+  "On failure": "On failure",
+  "On success": "On success",
+  "Once you click on \"Create a course\", a course is created with a section for Tests, Project based learning, Assessments, Courses, Dropbox, Agenda and much more. Logging in as teacher provides you with editing privileges for this course.": "Once you click on \"Create a course\", a course is created with a section for Tests, Project based learning, Assessments, Courses, Dropbox, Agenda and much more. Logging in as teacher provides you with editing privileges for this course.",
+  "One question per page": "One question per page",
+  "Ongoing": "Ongoing",
+  "Online": "Online",
+  "Only PNG, JPG or GIF images allowed": "Only PNG, JPG or GIF images allowed",
+  "Only PNG, JPG, WEBP or GIF images are supported.": "Only PNG, JPG, WEBP or GIF images are supported.",
+  "Only SVG files are supported.": "Only SVG files are supported.",
+  "Only audio and video files are allowed in this upload screen.": "Only audio and video files are allowed in this upload screen.",
+  "Only best attempts": "Only best attempts",
+  "Only blocks or restores login. It does not delete the user and does not remove subscriptions.": "Only blocks or restores login. It does not delete the user and does not remove subscriptions.",
+  "Only files can be replaced.": "Only files can be replaced.",
+  "Only image files are allowed in this upload screen.": "Only image files are allowed in this upload screen.",
+  "Only letters (a-z) and numbers (0-9)": "Only letters (a-z) and numbers (0-9)",
+  "Only letters, digits and underscore (_) are allowed in the database name. Invalid characters will be removed automatically.": "Only letters, digits and underscore (_) are allowed in the database name. Invalid characters will be removed automatically.",
+  "Only non-root folders are shown to avoid leaving items in root.": "Only non-root folders are shown to avoid leaving items in root.",
+  "Only supported documents will be listed here.": "Only supported documents will be listed here.",
+  "Only visible": "Only visible",
+  "Open": "Open",
+  "Open File": "Open File",
+  "Open a section to edit its content.": "Open a section to edit its content.",
+  "Open course": "Open course",
+  "Open file": "Open file",
+  "Open in a new tab": "Open in a new tab",
+  "Open map": "Open map",
+  "Open platform": "Open platform",
+  "Open this section to load the editor.": "Open this section to load the editor.",
+  "Open thread": "Open thread",
+  "Open with ONLYOFFICE": "Open with ONLYOFFICE",
+  "OpenStreetMap needs coordinates to display an embedded marker. Address-only locations are listed below.": "OpenStreetMap needs coordinates to display an embedded marker. Address-only locations are listed below.",
+  "Option": "Option",
+  "Optional - e": "Optional - e",
+  "Optional correction attachment (this is not the student's submission).": "Optional correction attachment (this is not the student's submission).",
+  "Options": "Options",
+  "Or": "Or",
+  "Order": "Order",
+  "Original assignment": "Original assignment",
+  "Original file": "Original file",
+  "Other extensions": "Other extensions",
+  "Overview students and courses subscribed to the class": "Overview students and courses subscribed to the class",
+  "Overwrite file": "Overwrite file",
+  "Overwrite previous versions of same document?": "Overwrite previous versions of same document?",
+  "Overwrite the existing file": "Overwrite the existing file",
+  "PHP version": "PHP version",
+  "PNG format required": "PNG format required",
+  "Page": "Page",
+  "Page Link": "Page Link",
+  "Page break": "Page break",
+  "Page layout details": "Page layout details",
+  "Page layouts": "Page layouts",
+  "Pages": "Pages",
+  "Pages deleted": "Pages deleted",
+  "Parent": "Parent",
+  "Parent branch": "Parent branch",
+  "Partially correct": "Partially correct",
+  "Pass percentage": "Pass percentage",
+  "Passed": "Passed",
+  "Password": "Password",
+  "Password (leave blank to auto)": "Password (leave blank to auto)",
+  "Password must be at least %length% characters long.": "Password must be at least %length% characters long.",
+  "Password must contain at least %count% lowercase characters.": "Password must contain at least %count% lowercase characters.",
+  "Password must contain at least %count% numerical (0-9) characters.": "Password must contain at least %count% numerical (0-9) characters.",
+  "Password must contain at least %count% special characters.": "Password must contain at least %count% special characters.",
+  "Password must contain at least %count% uppercase characters.": "Password must contain at least %count% uppercase characters.",
+  "Past session tab": "Past",
+  "Path": "Path",
+  "Pending group invitations": "Pending group invitations",
+  "Pending invitation": "Pending invitation",
+  "Pending tests": "Pending tests",
+  "Pending validation": "Pending validation",
+  "Percentage": "Percentage",
+  "Permission to use the microphone is not enabled, please enable it in your browser to record audio": "Permission to use the microphone is not enabled, please enable it in your browser to record audio",
+  "Permissions you gave us": "Permissions you gave us",
+  "Personal": "Personal",
+  "Personal agenda": "Personal agenda",
+  "Personal data": "Personal data",
+  "Personal data collection": "Personal data collection",
+  "Personal data protection": "Personal data protection",
+  "Personal data we keep about you": "Personal data we keep about you",
+  "Personal data: introduction": "Personal data: introduction",
+  "Personal files": "Personal files",
+  "Photo": "Photo",
+  "Pick someone in the left box to start chatting": "Pick someone in the left box to start chatting",
+  "Picture": "Picture",
+  "Planned": "Planned",
+  "Platform management": "Platform management",
+  "Please add a comment, a grade or a file": "Please add a comment, a grade or a file",
+  "Please answer all mandatory questions.": "Please answer all mandatory questions.",
+  "Please answer this survey using the following link": "Please answer this survey using the following link",
+  "Please check the following error:": "Please check the following error:",
+  "Please choose a .imscc or .zip file.": "Please choose a .imscc or .zip file.",
+  "Please choose a backup from the server": "Please choose a backup from the server",
+  "Please click on the link below corresponding to the URL you wish to access": "Please click on the link below corresponding to the URL you wish to access",
+  "Please complete all fields.": "Please complete all fields.",
+  "Please complete all required fields.": "Please complete all required fields.",
+  "Please complete the required fields": "Please complete the required fields",
+  "Please complete the required profile fields.": "Please complete the required profile fields.",
+  "Please confirm your choice": "Please confirm your choice",
+  "Please contact support with the error details": "Please contact support with the error details",
+  "Please define at least one blank with the selected marker": "Please define at least one blank with the selected marker",
+  "Please enter a search query": "Please enter a search query",
+  "Please enter a search term.": "Please enter a search term.",
+  "Please fill all answer options.": "Please fill all answer options.",
+  "Please fix the errors before saving.": "Please fix the errors before saving.",
+  "Please note that you are NOT REQUIRED to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click Next.": "Please note that you are NOT REQUIRED to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click Next.",
+  "Please place the cursor inside a paragraph first.": "Please place the cursor inside a paragraph first.",
+  "Please provide a title and some text": "Please provide a title and some text",
+  "Please read the following requirements thoroughly.": "Please read the following requirements thoroughly.",
+  "Please remember that modifications to the terms related to GDPR require you to report those modifications to third parties to whom you have provided personal information about your users, as stated in Article 19 of GDPR": "Please remember that modifications to the terms related to GDPR require you to report those modifications to third parties to whom you have provided personal information about your users, as stated in Article 19 of GDPR",
+  "Please review the requested profile fields before answering the survey.": "Please review the requested profile fields before answering the survey.",
+  "Please select a CSV file to import.": "Please select a CSV file to import.",
+  "Please select a backup file (.zip, .mbz, .tgz, .gz)": "Please select a backup file (.zip, .mbz, .tgz, .gz)",
+  "Please select a different destination": "Please select a different destination",
+  "Please select a language": "Please select a language",
+  "Please select a parent option.": "Please select a parent option.",
+  "Please select a target assignment": "Please select a target assignment",
+  "Please select an image": "Please select an image",
+  "Please select an option": "Please select an option",
+  "Please select at least one exportable resource (document, web link, discussion,...).": "Please select at least one exportable resource (document, web link, discussion,...).",
+  "Please select at least one recipient (“— Just upload —” or any user)": "Please select at least one recipient (“— Just upload —” or any user)",
+  "Please select at least one user.": "Please select at least one user.",
+  "Please select installation language": "Please select installation language",
+  "Please specify": "Please specify",
+  "Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible": "Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible",
+  "Please try again later or contact the administrator.": "Please try again later or contact the administrator.",
+  "Please type the text": "Please type the text",
+  "Please wait, this could take a while...": "Please wait, this could take a while...",
+  "Please, write the formula": "Please, write the formula",
+  "Points": "Points",
+  "Popular": "Popular",
+  "Port": "Port",
+  "Portal": "Portal",
+  "Position": "Position",
+  "Post": "Post",
+  "Post approved": "Post approved",
+  "Post deleted": "Post deleted",
+  "Post hidden": "Post hidden",
+  "Post moved": "Post moved",
+  "Post rejected": "Post rejected",
+  "Post reply": "Post reply",
+  "Post shown": "Post shown",
+  "Post updated": "Post updated",
+  "Posted sending deadline": "Posted sending deadline",
+  "Posts require approval": "Posts require approval",
+  "Preferred contact language": "Preferred contact language",
+  "Preferred: SVG. PNG max size: {0}px.": "Preferred: SVG. PNG max size: {0}px.",
+  "Preferred: SVG. PNG recommended width: {0}px.": "Preferred: SVG. PNG recommended width: {0}px.",
+  "Prerequisites": "Prerequisites",
+  "Present": "Present",
+  "Press Ctrl+Enter to send": "Press Ctrl+Enter to send",
+  "Prevent moving backwards between questions": "Prevent moving backwards between questions",
+  "Preview": "Preview",
+  "Preview class members and courses": "Preview class members and courses",
+  "Preview mode does not save answers.": "Preview mode does not save answers.",
+  "Preview only": "Preview only",
+  "Previous": "Previous",
+  "Previous page": "Previous page",
+  "Previous question": "Previous question",
+  "Price": "Price",
+  "Primary": "Primary",
+  "Primary alternative": "Primary alternative",
+  "Primary color": "Primary color",
+  "Primary color button alternative text": "Primary color button alternative text",
+  "Primary color button text": "Primary color button text",
+  "Primary color hover/background": "Primary color hover/background",
+  "Printable version": "Printable version",
+  "Private course": "Private course",
+  "Proceed to questions": "Proceed to questions",
+  "Proceed with the test": "Proceed with the test",
+  "Product": "Product",
+  "Professional support": "Professional support",
+  "Profile field": "Profile field",
+  "Profile field selection is available only for non-anonymous surveys.": "Profile field selection is available only for non-anonymous surveys.",
+  "Profile fields selected here will be shown before the survey questions.": "Profile fields selected here will be shown before the survey questions.",
+  "Profile information": "Profile information",
+  "Progress": "Progress",
+  "Projects": "Projects",
+  "Promoted Messages": "Promoted Messages",
+  "Promoted messages": "Promoted messages",
+  "Prompt": "Prompt",
+  "Propagate negative results between questions": "Propagate negative results between questions",
+  "Provider": "Provider",
+  "Provider used": "Provider used",
+  "Provider: Google Maps": "Provider: Google Maps",
+  "Provider: OpenStreetMap": "Provider: OpenStreetMap",
+  "Public": "Public",
+  "Public link": "Public link",
+  "Publish / Hide": "Publish / Hide",
+  "Published": "Published",
+  "Purchase history": "Purchase history",
+  "Push notifications are not enabled in this browser": "Push notifications are not enabled in this browser",
+  "Qualified": "Qualified",
+  "Qualify attendance gradebook": "Qualify attendance gradebook",
+  "Question": "Question",
+  "Question lower case": "Question lower case",
+  "Question manager": "Question manager",
+  "Question selection type": "Question selection type",
+  "Question statistics": "Question statistics",
+  "Question stats": "Question stats",
+  "Question type": "Question type",
+  "Question variations": "Question variations",
+  "QuestionUpdated": "QuestionUpdated",
+  "Questions": "Questions",
+  "Questions already answered": "Questions already answered",
+  "Questions and options will be copied. Answers, invitations and reports will stay only in the original survey.": "Questions and options will be copied. Answers, invitations and reports will stay only in the original survey.",
+  "Questions category": "Questions category",
+  "Questions list (there is no question so far).": "Questions list (there is no question so far).",
+  "Questions per page": "Questions per page",
+  "Questions to be reviewed": "Questions to be reviewed",
+  "Questions topic": "Questions topic",
+  "Questions without answer": "Questions without answer",
+  "Quick navigation": "Quick navigation",
+  "Quiz title": "Quiz title",
+  "Random questions": "Random questions",
+  "Range value": "Range value",
+  "Rank": "Rank",
+  "Ranking": "Ranking",
+  "Re:": "Re:",
+  "Read Only": "Read Only",
+  "Read the Terms and Conditions": "Read the Terms and Conditions",
+  "Read the installation guide": "Read the installation guide",
+  "Read-only view": "Read-only view",
+  "Reader": "Reader",
+  "Reading comprehension": "Reading comprehension",
+  "Ready to copy": "Ready to copy",
+  "Ready to import": "Ready to import",
+  "Recalculate results": "Recalculate results",
+  "Receipt": "Receipt",
+  "Received": "Received",
+  "Received Files": "Received Files",
+  "Recipients": "Recipients",
+  "Recommended settings": "Recommended settings",
+  "Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.": "Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.",
+  "Record answer": "Record answer",
+  "Record audio": "Record audio",
+  "Recruiter": "Recruiter",
+  "Recurring payment": "Recurring payment",
+  "Recycle course": "Recycle course",
+  "Recycle existing questions": "Recycle existing questions",
+  "Recycle is finished": "Recycle is finished",
+  "Recycle selected": "Recycle selected",
+  "Recycling options": "Recycling options",
+  "Reference": "Reference",
+  "Refresh": "Refresh",
+  "Refresh captcha": "Refresh captcha",
+  "Refresh terms": "Refresh terms",
+  "Regenerate": "Regenerate",
+  "Register Student": "Register Student",
+  "Register student": "Register student",
+  "Registered": "Registered",
+  "Registr. allowed": "Registr. allowed",
+  "Registration": "Registration",
+  "Registration date": "Registration date",
+  "Reject invitation": "Reject invitation",
+  "Reject post": "Reject post",
+  "Relation type": "Relation type",
+  "Relative score": "Relative score",
+  "Remaining space": "Remaining space",
+  "Remember me": "Remember me",
+  "Remind all selected users": "Remind all selected users",
+  "Reminder for event : %s": "Reminder for event : {0}",
+  "Reminders": "Reminders",
+  "Remove": "Remove",
+  "Remove PNG": "Remove PNG",
+  "Remove SVG": "Remove SVG",
+  "Remove all": "Remove all",
+  "Remove all date restrictions for this learning path?": "Remove all date restrictions for this learning path?",
+  "Remove answer option": "Remove answer option",
+  "Remove current icon": "Remove current icon",
+  "Remove date restrictions": "Remove date restrictions",
+  "Remove element": "Remove element",
+  "Remove from catalogue": "Remove from catalogue",
+  "Remove picture": "Remove picture",
+  "Remove selection context": "Remove selection context",
+  "Remove state": "Remove state",
+  "Remove sticky": "Remove sticky",
+  "Remove the class without removing students": "Remove the class without removing students",
+  "Remove user": "Remove user",
+  "Remove user from all group-related entities if not in the list": "Remove user from all group-related entities if not in the list",
+  "Rename file (eg file.pdf becomes file_1.pdf)": "Rename file (eg file.pdf becomes file_1.pdf)",
+  "Rename folder": "Rename folder",
+  "Rename project": "Rename project",
+  "Rename the uploaded file if it exists": "Rename the uploaded file if it exists",
+  "Repeat date": "Repeat date",
+  "Repeat end date": "Repeat end date",
+  "Repeat end date must be after start date.": "Repeat end date must be after start date.",
+  "Repeat type": "Repeat type",
+  "Replace (files or videos only)": "Replace (files or videos only)",
+  "Replace file": "Replace file",
+  "Replace layout with predefined type?": "Replace layout with predefined type?",
+  "Replace video": "Replace video",
+  "Replication": "Replication",
+  "Replies": "Replies",
+  "Reply": "Reply",
+  "Reply added": "Reply added",
+  "Reply to all": "Reply to all",
+  "Reply to this message": "Reply to this message",
+  "Report by question": "Report by question",
+  "Report of attendance sheets": "Report of attendance sheets",
+  "Reporting": "Reporting",
+  "Request withdrawal of legal consent": "Request withdrawal of legal consent",
+  "Requests": "Requests",
+  "Require specific file format": "Require specific file format",
+  "Require unique presence": "Require unique presence",
+  "Required field": "Required field",
+  "Required fields": "Required fields",
+  "Requirements": "Requirements",
+  "Reset": "Reset",
+  "Reset dates": "Reset dates",
+  "Restart courses": "Restart courses",
+  "Restartable courses": "Restartable courses",
+  "Restore": "Restore",
+  "Restore draft": "Restore draft",
+  "Result (you can apply it to the comment)": "Result (you can apply it to the comment)",
+  "Results": "Results",
+  "Results and feedback": "Results and feedback",
+  "Results for": "Results for",
+  "Results page configuration": "Results page configuration",
+  "Results recalculated": "Results recalculated",
+  "Results summary": "Results summary",
+  "Return to Course Homepage": "Return to Course Homepage",
+  "Return to exercises list": "Return to exercises list",
+  "Review my answers": "Review my answers",
+  "Review selected questions": "Review selected questions",
+  "Review the generated content before importing it as a new exercise.": "Review the generated content before importing it as a new exercise.",
+  "Review your active service benefits, purchase history and available receipts.": "Review your active service benefits, purchase history and available receipts.",
+  "Revise question later": "Revise question later",
+  "Revision": "Revision",
+  "Revision request removed": "Revision request removed",
+  "Revision requested": "Revision requested",
+  "Revoke Acceptance": "Revoke Acceptance",
+  "Roles": "Roles",
+  "Room": "Room",
+  "Room availability finder": "Room availability finder",
+  "Room occupation: {0}": "Room occupation: {0}",
+  "Rooms": "Rooms",
+  "Root": "Root",
+  "SSL public key": "SSL public key",
+  "SVG format required": "SVG format required",
+  "Save": "Save",
+  "Save and insert": "Save and insert",
+  "Save answer to my inbox": "Save answer to my inbox",
+  "Save answers": "Save answers",
+  "Save as new theme": "Save as new theme",
+  "Save attendance": "Save attendance",
+  "Save changes": "Save changes",
+  "Save email logo": "Save email logo",
+  "Save header logo": "Save header logo",
+  "Save link": "Save link",
+  "Save recorded audio": "Save recorded audio",
+  "Save restriction": "Save restriction",
+  "Save template": "Save template",
+  "Save term": "Save term",
+  "Save the category": "Save the category",
+  "Save the question": "Save the question",
+  "Save this search": "Save this search",
+  "Save to Documents": "Save to Documents",
+  "Saved": "Saved",
+  "Saved in Documents": "Saved in Documents",
+  "Saving": "Saving",
+  "Saving failed.": "Saving failed.",
+  "Saving is only supported when the provider returns base64 content. If you only received a URL, saving is disabled to avoid downloading in the browser.": "Saving is only supported when the provider returns base64 content. If you only received a URL, saving is disabled to avoid downloading in the browser.",
+  "Saving...": "Saving...",
+  "Scope": "Scope",
+  "Score": "Score",
+  "Score updated successfully": "Score updated successfully",
+  "Search": "Search",
+  "Search by code or title...": "Search by code or title...",
+  "Search by course title, course code or session name.": "Search by course title, course code or session name.",
+  "Search by name, email, username or course title": "Search by name, email, username or course title",
+  "Search by name, email, username or group": "Search by name, email, username or group",
+  "Search by name, username, email": "Search by name, username, email",
+  "Search by survey title, code or description.": "Search by survey title, code or description.",
+  "Search by title": "Search by title",
+  "Search by title or code": "Search by title or code",
+  "Search by title or path...": "Search by title or path...",
+  "Search classes": "Search classes",
+  "Search courses": "Search courses",
+  "Search for members...": "Search for members...",
+  "Search for projects...": "Search for projects...",
+  "Search for student...": "Search for student...",
+  "Search for users in course/session...": "Search for users in course/session...",
+  "Search groups": "Search groups",
+  "Search members or courses": "Search members or courses",
+  "Search profile matches": "Search profile matches",
+  "Search sessions": "Search sessions",
+  "Search student": "Search student",
+  "Search surveys": "Search surveys",
+  "Search term": "Search term",
+  "Search term is too short": "Search term is too short",
+  "Search users": "Search users",
+  "Search users by username": "Search users by username",
+  "Search users for friends": "Search users for friends",
+  "SearchTCC": "SearchTCC",
+  "Searching": "Searching",
+  "Searching by": "Searching by",
+  "Secondary": "Secondary",
+  "Secondary color": "Secondary color",
+  "Secondary color button text": "Secondary color button text",
+  "Secondary color hover/background": "Secondary color hover/background",
+  "Security": "Security",
+  "Security advice": "Security advice",
+  "Security breach avoid restart": "Security breach avoid restart",
+  "Security tools and reports": "Security tools and reports",
+  "See all communities": "See all communities",
+  "See more": "See more",
+  "See notifications": "See notifications",
+  "Select": "Select",
+  "Select a PDF or TXT document to generate terms only from that document.": "Select a PDF or TXT document to generate terms only from that document.",
+  "Select a backup file": "Select a backup file",
+  "Select a blanks marker": "Select a blanks marker",
+  "Select a category": "Select a category",
+  "Select a contact": "Select a contact",
+  "Select a course": "Select a course",
+  "Select a date from the calendar": "Select a date from the calendar",
+  "Select a date range and grouping type to review the learner access details.": "Select a date range and grouping type to review the learner access details.",
+  "Select a destination session.": "Select a destination session.",
+  "Select a document": "Select a document",
+  "Select a file to insert into the editor.": "Select a file to insert into the editor.",
+  "Select a folder": "Select a folder",
+  "Select a provider": "Select a provider",
+  "Select a score": "Select a score",
+  "Select a session": "Select a session",
+  "Select a session to load its courses.": "Select a session to load its courses.",
+  "Select a task": "Select a task",
+  "Select a template": "Select a template",
+  "Select a user": "Select a user",
+  "Select a user or a group first": "Select a user or a group first",
+  "Select a user or group": "Select a user or group",
+  "Select all": "Select all",
+  "Select allowed file formats": "Select allowed file formats",
+  "Select an action": "Select an action",
+  "Select an available course type before creating the course.": "Select an available course type before creating the course.",
+  "Select an option": "Select an option",
+  "Select and move": "Select and move",
+  "Select as current theme": "Select as current theme",
+  "Select assessment": "Select assessment",
+  "Select at least one file": "Select at least one file",
+  "Select destination sessions": "Select destination sessions",
+  "Select exercise": "Select exercise",
+  "Select gradebook option": "Select gradebook option",
+  "Select items": "Select items",
+  "Select one course document and generate questions based only on its contents.": "Select one course document and generate questions based only on its contents.",
+  "Select one or more sessions to copy trainers from and choose the destination course": "Select one or more sessions to copy trainers from and choose the destination course",
+  "Select one or more source sessions and one or more destination sessions to copy students": "Select one or more source sessions and one or more destination sessions to copy students",
+  "Select permission": "Select permission",
+  "Select replacement file": "Select replacement file",
+  "Select resources to copy": "Select resources to copy",
+  "Select resources to import": "Select resources to import",
+  "Select resources to include": "Select resources to include",
+  "Select resources to recycle": "Select resources to recycle",
+  "Select role": "Select role",
+  "Select source": "Select source",
+  "Select source course": "Select source course",
+  "Select the destination course.": "Select the destination course.",
+  "Select the destination folder": "Select the destination folder",
+  "Select the link above and press Ctrl+C to copy it": "Select the link above and press Ctrl+C to copy it",
+  "Select the source course.": "Select the source course.",
+  "Select user": "Select user",
+  "Select users": "Select users",
+  "Select which items to include in the PDF": "Select which items to include in the PDF",
+  "Select which tools/items to copy.": "Select which tools/items to copy.",
+  "Selected": "Selected",
+  "Selected files": "Selected files",
+  "Selected friends": "Selected friends",
+  "Selected items": "Selected items",
+  "Selected items will be the only ones included in the exported file.": "Selected items will be the only ones included in the exported file.",
+  "Selected paragraph": "Selected paragraph",
+  "Selected target": "Selected target",
+  "Selection": "Selection",
+  "Send": "Send",
+  "Send access details to user by email": "Send access details to user by email",
+  "Send all results/corrections by email": "Send all results/corrections by email",
+  "Send course invitation": "Send course invitation",
+  "Send data": "Send data",
+  "Send email": "Send email",
+  "Send email to all": "Send email to all",
+  "Send information": "Send information",
+  "Send mail to student": "Send mail to student",
+  "Send message": "Send message",
+  "Sending": "Sending",
+  "Sent": "Sent",
+  "Sent date": "Sent date",
+  "Sent invitations": "Sent invitations",
+  "Sequence ordering": "Sequence ordering",
+  "Server requirements": "Server requirements",
+  "Session": "Session",
+  "Session Item": "Session Item",
+  "Session administrator": "Session administrator",
+  "Session extended": "Session extended",
+  "Session list": "Session list",
+  "Session period": "Session period",
+  "Session requirements and dependencies": "Session requirements and dependencies",
+  "Session status": "Session status",
+  "SessionAdmin": "SessionAdmin",
+  "Sessions": "Sessions",
+  "Sessions catalogue": "Sessions catalogue",
+  "Sessions in group": "Sessions in group",
+  "Sessions management": "Sessions management",
+  "Sessions not subscribed": "Sessions not subscribed",
+  "Sessions plan calendar": "Sessions plan calendar",
+  "Set all Absent": "Set all Absent",
+  "Set all Present": "Set all Present",
+  "Set as default certificate": "Set as default certificate",
+  "Setting": "Setting",
+  "Settings": "Settings",
+  "Share a new file": "Share a new file",
+  "Share with user": "Share with user",
+  "Shared files": "Shared files",
+  "Sharing": "Sharing",
+  "Show": "Show",
+  "Show Overview": "Show Overview",
+  "Show advanced mode": "Show advanced mode",
+  "Show advanced settings": "Show advanced settings",
+  "Show all": "Show all",
+  "Show dialog": "Show dialog",
+  "Show drafts": "Show drafts",
+  "Show full description": "Show full description",
+  "Show less": "Show less",
+  "Show link on course homepage": "Show link on course homepage",
+  "Show more courses": "Show more courses",
+  "Show password": "Show password",
+  "Show previous button": "Show previous button",
+  "Show public link": "Show public link",
+  "Show score to learner": "Show score to learner",
+  "Showing results for: %s": "Showing results for: {0}",
+  "Showing results for: {0}": "Showing results for: {0}",
+  "Shuffle answers": "Shuffle answers",
+  "Sign": "Sign",
+  "Sign in": "Sign in",
+  "Sign out": "Sign out",
+  "Sign up": "Sign up",
+  "Signature": "Signature",
+  "Size": "Size",
+  "Size:": "Size:",
+  "Skill linkage will be migrated in a dedicated batch.": "Skill linkage will be migrated in a dedicated batch.",
+  "Skill profile": "Skill profile",
+  "Skill profile deleted": "Skill profile deleted",
+  "Skill profiles": "Skill profiles",
+  "Skill wheel": "Skill wheel",
+  "Skills": "Skills",
+  "Skills acquired": "Skills acquired",
+  "Skills ranking": "Skills ranking",
+  "Skills searched for": "Skills searched for",
+  "Skills wheel": "Skills wheel",
+  "Skills you can learn": "Skills you can learn",
+  "Skip same file name": "Skip same file name",
+  "Slideshow": "Slideshow",
+  "Social": "Social",
+  "Social group": "Social group",
+  "Social groups": "Social groups",
+  "Social map": "Social map",
+  "Social network": "Social network",
+  "Social wall": "Social wall",
+  "Social wall...": "Social wall...",
+  "Some configured extra fields were not found": "Some configured extra fields were not found",
+  "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).": "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).",
+  "Some files or folders don't have writing permission": "Some files or folders don't have writing permission",
+  "Some more elements": "Some more elements",
+  "Sort": "Sort",
+  "Sort by": "Sort by",
+  "Source Chamilo version": "Source Chamilo version",
+  "Source document": "Source document",
+  "Space": "Space",
+  "Space available": "Space available",
+  "Standard course": "Standard course",
+  "Standard list": "Standard list",
+  "Start Date": "Start Date",
+  "Start copying": "Start copying",
+  "Start date": "Start date",
+  "Start date must be before end date": "Start date must be before end date",
+  "Start date to display": "Start date to display",
+  "Start recording": "Start recording",
+  "Start test": "Start test",
+  "Status": "Status",
+  "Step 1 - Installation Language": "Step 1 - Installation Language",
+  "Step 2 - Requirements": "Step 2 - Requirements",
+  "Step 3 - License": "Step 3 - License",
+  "Step 4 - Database settings": "Step 4 - Database settings",
+  "Step 5 - Configuration settings": "Step 5 - Configuration settings",
+  "Step 6 - Last check before install": "Step 6 - Last check before install",
+  "Step 7 - Installation process execution": "Step 7 - Installation process execution",
+  "Step 7 - Update process execution": "Step 7 - Update process execution",
+  "Sticky": "Sticky",
+  "Sticky courses": "Special courses",
+  "Sticky thread": "Sticky thread",
+  "Stop recording": "Stop recording",
+  "Storage usage unavailable": "Storage usage unavailable",
+  "Stroke": "Stroke",
+  "Stroke width": "Stroke width",
+  "Student": "Student",
+  "Student attachment": "Student attachment",
+  "Student attachment: none": "Student attachment: none",
+  "Student progress": "Student progress",
+  "Student submission (text)": "Student submission (text)",
+  "Student submission (text): none": "Student submission (text): none",
+  "Student visits per period, per course": "Student visits per period, per course",
+  "Student's submission": "Student's submission",
+  "Students": "Students",
+  "Subject": "Subject",
+  "Submission deleted successfully!": "Submission deleted successfully!",
+  "Submission moved successfully": "Submission moved successfully",
+  "Submission title": "Submission title",
+  "Submission updated!": "Submission updated!",
+  "Submit": "Submit",
+  "Submit answers": "Submit answers",
+  "Submit code": "Submit code",
+  "Submitting request...": "Submitting request...",
+  "Submitting your acceptance...": "Submitting your acceptance...",
+  "Submitting your account deletion request...": "Submitting your account deletion request...",
+  "Submitting your legal consent withdrawal request...": "Submitting your legal consent withdrawal request...",
+  "Subscribe": "Subscribe",
+  "Subscribe class to courses": "Subscribe class to courses",
+  "Subscribe class to sessions": "Subscribe class to sessions",
+  "Subscribe users to class": "Subscribe users to class",
+  "Subscribe users to this session": "Subscribe users to this session",
+  "Subscribers": "Subscribers",
+  "Subscribing...": "Subscribing...",
+  "Subscription limit reached": "Subscription limit reached",
+  "Subscription not allowed": "Subscription not allowed",
+  "Subscriptions": "Subscriptions",
+  "Subscriptions count": "Subscriptions count",
+  "Success": "Success",
+  "Success color": "Success color",
+  "Success color button text": "Success color button text",
+  "Success color hover/background": "Success color hover/background",
+  "Suggested feedback": "Suggested feedback",
+  "Suggested score": "Suggested score",
+  "Superior (n+1)": "Superior (n+1)",
+  "Survey action": "Survey action",
+  "Survey behavior": "Survey behavior",
+  "Survey completed": "Survey completed",
+  "Survey copied.": "Survey copied.",
+  "Survey messages": "Survey messages",
+  "Survey questions": "Survey questions",
+  "Surveys": "Surveys",
+  "Switch the active theme if you want to upload logos for a different one.": "Switch the active theme if you want to upload logos for a different one.",
+  "Switch to student view": "Switch to student view",
+  "Switch to teacher view": "Switch to teacher view",
+  "System": "System",
+  "Table view": "Table view",
+  "Tags": "Tags",
+  "Target date": "Target date",
+  "Target forum": "Target forum",
+  "Target forum is required": "Target forum is required",
+  "Target thread is required": "Target thread is required",
+  "Task list": "Task list",
+  "Teacher": "Teacher",
+  "Teacher user ID": "Teacher user ID",
+  "Teachers": "Teachers",
+  "Template created successfully": "Template created successfully",
+  "Template name is required": "Template name is required",
+  "Template options": "Template options",
+  "Template successfully deleted": "Template successfully deleted",
+  "Template type": "Template type",
+  "Templates": "Templates",
+  "Term": "Term",
+  "Term removed": "Term removed",
+  "Terms and Conditions": "Terms and Conditions",
+  "Terms and conditions": "Terms and conditions",
+  "Terms imported successfully": "Terms imported successfully",
+  "Terms sections": "Terms sections",
+  "Tertiary": "Tertiary",
+  "Tertiary alternative": "Tertiary alternative",
+  "Tertiary color": "Tertiary color",
+  "Tertiary color hover/background": "Tertiary color hover/background",
+  "Test": "Test",
+  "Test e-mail sending": "Test e-mail sending",
+  "Test email failed: ": "Test email failed: ",
+  "Test email sent successfully": "Test email sent successfully",
+  "Test from document": "Test from document",
+  "Test from topic": "Test from topic",
+  "Test name": "Test name",
+  "Tests": "Tests",
+  "Text": "Text",
+  "Text appearing at the end of the test when the user has failed.": "Text appearing at the end of the test when the user has failed.",
+  "Text appearing at the end of the test when the user has succeeded or if no pass percentage was set.": "Text appearing at the end of the test when the user has succeeded or if no pass percentage was set.",
+  "Text submitted successfully": "Text submitted successfully",
+  "Thank you for answering the survey.": "Thank you for answering the survey.",
+  "The DSN fully includes all parameters needed to connect to the mail service. You can learn more at {0}. The default value is null://null and will disable e-mail sending. Use native://default to use the default PHP configuration on your server. Here are a few examples of supported DSN syntaxes: {1}.": "The DSN fully includes all parameters needed to connect to the mail service. You can learn more at {0}. The default value is null://null and will disable e-mail sending. Use native://default to use the default PHP configuration on your server. Here are a few examples of supported DSN syntaxes: {1}.",
+  "The SVG file is empty or invalid.": "The SVG file is empty or invalid.",
+  "The URL is required.": "The URL is required.",
+  "The account has been removed temporarily.": "The account has been removed temporarily.",
+  "The attendance calendar allows you to register attendance lists (one per real session the students need to attend)": "The attendance calendar allows you to register attendance lists (one per real session the students need to attend)",
+  "The code must match '{0}' exactly.": "The code must match '{0}' exactly.",
+  "The comment is required": "The comment is required",
+  "The database connection has failed. This is generally due to the wrong user, the wrong password or the wrong database prefix being set above. Please review these settings and try again.": "The database connection has failed. This is generally due to the wrong user, the wrong password or the wrong database prefix being set above. Please review these settings and try again.",
+  "The destination folder is missing.": "The destination folder is missing.",
+  "The document auto-launch feature configuration is enabled": "The document auto-launch feature configuration is enabled",
+  "The document auto-launch feature configuration is enabled. Learners will be automatically redirected to document tool.": "The document auto-launch feature configuration is enabled. Learners will be automatically redirected to document tool.",
+  "The document is already in this folder": "The document is already in this folder",
+  "The drawing is empty or invalid.": "The drawing is empty or invalid.",
+  "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header": "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header",
+  "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header. We recommend using a 'no-reply' e-mail address here, to avoid excessive filling of an e-mail box. The support e-mail address defined in the Platform section should be used to contact you, but replying to automatic notifications should not be encouraged.": "The e-mail address from which e-mails will be sent when the platform sends an e-mail, also used as 'reply-to' header. We recommend using a 'no-reply' e-mail address here, to avoid excessive filling of an e-mail box. The support e-mail address defined in the Platform section should be used to contact you, but replying to automatic notifications should not be encouraged.",
+  "The editor is not available.": "The editor is not available.",
+  "The end date must be after the start date.": "The end date must be after the start date.",
+  "The exercises auto-launch feature configuration is enabled": "The exercises auto-launch feature configuration is enabled",
+  "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to exercise list.": "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to exercise list.",
+  "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to the selected exercise.": "The exercises auto-launch feature configuration is enabled. Learners will be automatically redirected to the selected exercise.",
+  "The file was saved, but its URL could not be resolved.": "The file was saved, but its URL could not be resolved.",
+  "The following documents are used in learning paths:": "The following documents are used in learning paths:",
+  "The following errors occurred during import:": "The following errors occurred during import:",
+  "The form contains incorrect or incomplete data": "The form contains incorrect or incomplete data",
+  "The forum is closed.": "The forum is closed.",
+  "The forum is locked.": "The forum is locked.",
+  "The forum is not open yet.": "The forum is not open yet.",
+  "The forum's auto-launch setting is on": "The forum's auto-launch setting is on",
+  "The forum's auto-launch setting is on. Students will be redirected to the forum tool when entering this course.": "The forum's auto-launch setting is on. Students will be redirected to the forum tool when entering this course.",
+  "The free text option is added automatically.": "The free text option is added automatically.",
+  "The icon must be 120x120 pixels.": "The icon must be 120x120 pixels.",
+  "The install script will create (or use) the Chamilo database using the database name given here. Please make sure the user you give has the right to create the database by the name given here. If a database with this name exists, it will be overwritten. Please do not use the root user as the Chamilo database user. This can lead to serious security issues.": "The install script will create (or use) the Chamilo database using the database name given here. Please make sure the user you give has the right to create the database by the name given here. If a database with this name exists, it will be overwritten. Please do not use the root user as the Chamilo database user. This can lead to serious security issues.",
+  "The install script will erase all tables of the selected database. We heavily recommend you do a full backup of them before confirming this last install step.": "The install script will erase all tables of the selected database. We heavily recommend you do a full backup of them before confirming this last install step.",
+  "The last migration executed successfully was:": "The last migration executed successfully was:",
+  "The learning path auto-launch setting is ON": "The learning path auto-launch setting is ON",
+  "The learning path auto-launch setting is ON. When learners enter this course, they will be automatically redirected to the learning path marked as auto-launch.": "The learning path auto-launch setting is ON. When learners enter this course, they will be automatically redirected to the learning path marked as auto-launch.",
+  "The map plugin is not enabled or configured.": "The map plugin is not enabled or configured.",
+  "The maximum score is required.": "The maximum score is required.",
+  "The name is not added to the prompt; it is only used to save the file.": "The name is not added to the prompt; it is only used to save the file.",
+  "The name that appears as the sender (next to the From e-mail address) when the platform sends an e-mail.": "The name that appears as the sender (next to the From e-mail address) when the platform sends an e-mail.",
+  "The percentage options from 1 to 100 are generated automatically.": "The percentage options from 1 to 100 are generated automatically.",
+  "The question text is required.": "The question text is required.",
+  "The selected paragraph is empty.": "The selected paragraph is empty.",
+  "The selected surveys and their questions will be deleted. This action cannot be undone.": "The selected surveys and their questions will be deleted. This action cannot be undone.",
+  "The standard course limit has been reached.": "The standard course limit has been reached.",
+  "The submission deadline has passed. You can no longer submit.": "The submission deadline has passed. You can no longer submit.",
+  "The subscription limit for this course has been reached.": "The subscription limit for this course has been reached.",
+  "The survey code cannot be changed after creation.": "The survey code cannot be changed after creation.",
+  "The survey code is required.": "The survey code is required.",
+  "The survey has been saved successfully": "The survey has been saved successfully",
+  "The survey title is required.": "The survey title is required.",
+  "The survey will be copied to: {0}": "The survey will be copied to: {0}",
+  "The survey will be copied without answers or invitations.": "The survey will be copied without answers or invitations.",
+  "The thread is locked.": "The thread is locked.",
+  "The title and thumbnail are required": "The title and thumbnail are required",
+  "The title is required.": "The title is required.",
+  "The value must match exactly: {0}": "The value must match exactly: {0}",
+  "Theme selected as current": "Theme selected as current",
+  "Theme title": "Theme title",
+  "There are no links in this category": "There are no links in this category",
+  "There are no terms that match the search: {0}": "There are no terms that match the search: {0}",
+  "There is no class scheduled today, try picking another day or add your attendance entry yourself using the action icons": "There is no class scheduled today, try picking another day or add your attendance entry yourself using the action icons",
+  "Third parties": "Third parties",
+  "Third parties (GDPR)": "Third parties (GDPR)",
+  "Third party": "Third party",
+  "This action cannot be undone.": "This action cannot be undone.",
+  "This action cannot be undone. Continue?": "This action cannot be undone. Continue?",
+  "This course is locked": "This course is locked",
+  "This course will be created using the platform default course template.": "This course will be created using the platform default course template.",
+  "This date is locked or read-only.": "This date is locked or read-only.",
+  "This decision is saved with the correction (ExtraField) and cannot be changed later.": "This decision is saved with the correction (ExtraField) and cannot be changed later.",
+  "This field cannot be empty": "This field cannot be empty",
+  "This field is required": "This field is required",
+  "This file type is not allowed in this upload screen.": "This file type is not allowed in this upload screen.",
+  "This icon will show for the link displayed as a tool on the course homepage.": "This icon will show for the link displayed as a tool on the course homepage.",
+  "This is a closed group": "This is a closed group",
+  "This is a form with an error": "This is a form with an error",
+  "This is an open group": "This is an open group",
+  "This is not a valid URL. Example: https://example.com": "This is not a valid URL. Example: https://example.com",
+  "This is the default form": "This is the default form",
+  "This list displays users from all access URLs because the setting \"session_admin_access_to_all_users_on_all_urls\" is enabled.": "This list displays users from all access URLs because the setting \"session_admin_access_to_all_users_on_all_urls\" is enabled.",
+  "This option is not available because this activity is contained by an assessment, which is currently locked. To unlock the assessment, ask your platform administrator.": "This option is not available because this activity is contained by an assessment, which is currently locked. To unlock the assessment, ask your platform administrator.",
+  "This option is not available.": "This option is not available.",
+  "This profile field is read-only.": "This profile field is read-only.",
+  "This provider did not return base64 content. Please try another provider.": "This provider did not return base64 content. Please try another provider.",
+  "This question is shown conditionally while answering the survey.": "This question is shown conditionally while answering the survey.",
+  "This question type is not supported in the modern survey view.": "This question type is not supported in the modern survey view.",
+  "This reply will be stored as a revision.": "This reply will be stored as a revision.",
+  "This report only lists users that have the same e-mail address.": "This report only lists users that have the same e-mail address.",
+  "This report only lists users that share the same value for the selected profile field.": "This report only lists users that share the same value for the selected profile field.",
+  "This skill can be obtained through:": "This skill can be obtained through:",
+  "This survey already has answers. Question editing is disabled by configuration.": "This survey already has answers. Question editing is disabled by configuration.",
+  "This survey and its questions will be deleted: {0}": "This survey and its questions will be deleted: {0}",
+  "This survey will be published for the linked group tutors: {0}": "This survey will be published for the linked group tutors: {0}",
+  "This thread is hidden from learners.": "This thread is hidden from learners.",
+  "This video result cannot be saved yet": "This video result cannot be saved yet",
+  "This view shows the migrated reporting data for this survey.": "This view shows the migrated reporting data for this survey.",
+  "This will create a survey of type meeting poll. Answers and invitations are handled separately.": "This will create a survey of type meeting poll. Answers and invitations are handled separately.",
+  "This will merge all other accounts in the same group into this account.": "This will merge all other accounts in the same group into this account.",
+  "This will remove or reset selected resources. This action cannot be undone.": "This will remove or reset selected resources. This action cannot be undone.",
+  "Thread closed": "Thread closed",
+  "Thread created": "Thread created",
+  "Thread grading updated": "Thread grading updated",
+  "Thread hidden": "Thread hidden",
+  "Thread marked as sticky": "Thread marked as sticky",
+  "Thread notifications disabled": "Thread notifications disabled",
+  "Thread notifications enabled": "Thread notifications enabled",
+  "Thread opened": "Thread opened",
+  "Thread score saved": "Thread score saved",
+  "Thread shown": "Thread shown",
+  "Thread title": "Thread title",
+  "Thread unmarked as sticky": "Thread unmarked as sticky",
+  "Thread updated": "Thread updated",
+  "Time of last synchronization": "Time of last synchronization",
+  "Tip": "Tip",
+  "Tip: choose “— Just upload —” to store without sending to anyone.": "Tip: choose “— Just upload —” to store without sending to anyone.",
+  "Tip: click a preset to quickly set the size.": "Tip: click a preset to quickly set the size.",
+  "Title": "Title",
+  "Title A–Z": "Title A–Z",
+  "Title Z–A": "Title Z–A",
+  "Title is required": "Title is required",
+  "Title:": "Title:",
+  "To": "To",
+  "To attend": "To attend",
+  "To export courses with quiz you have to select quiz": "To export courses with quiz you have to select quiz",
+  "To protect your site, make the whole {0} directory read-only (chmod -R 0555 on Linux) and delete the {1} directory.": "To protect your site, make the whole {0} directory read-only (chmod -R 0555 on Linux) and delete the {1} directory.",
+  "Today": "Today",
+  "Toggle": "Toggle",
+  "Toggle visibility": "Toggle visibility",
+  "Tool introduction": "Tool introduction",
+  "Tools": "Tools",
+  "Total": "Total",
+  "Total duration in minutes of the test": "Total duration in minutes of the test",
+  "Total number of courses": "Total number of courses",
+  "Total number of sessions": "Total number of sessions",
+  "Total space used by portal %s limit is %s MB": "Total space used by portal {0} limit is {1} MB",
+  "Total weight": "Total weight",
+  "Tour": "Tour",
+  "Tracking": "Tracking",
+  "Transparent fill": "Transparent fill",
+  "True": "True",
+  "Try again": "Try again",
+  "Tutors": "Tutors",
+  "Type": "Type",
+  "Type of terms": "Type of terms",
+  "Type the course code to confirm": "Type the course code to confirm",
+  "Type the course code to confirm. All data will be permanently removed.": "Type the course code to confirm. All data will be permanently removed.",
+  "Type the full URL to confirm. The URL and its relations will be permanently removed.": "Type the full URL to confirm. The URL and its relations will be permanently removed.",
+  "URL": "URL",
+  "URL deleted.": "URL deleted.",
+  "URL is required": "URL is required",
+  "URL of this company": "URL of this company",
+  "Unable to create cloud link.": "Unable to create cloud link.",
+  "Unable to load the drawing": "Unable to load the drawing",
+  "Unable to load your services right now.": "Unable to load your services right now.",
+  "Unable to read the SVG file.": "Unable to read the SVG file.",
+  "Unable to read the image file.": "Unable to read the image file.",
+  "Unable to save the drawing": "Unable to save the drawing",
+  "Unable to verify whether you can create a new course right now.": "Unable to verify whether you can create a new course right now.",
+  "Uncompress zip": "Uncompress zip",
+  "Undo": "Undo",
+  "Unify": "Unify",
+  "Unify this duplicate group into user #%s?": "Unify this duplicate group into user #{0}?",
+  "Unique identifier": "Unique identifier",
+  "Unknown": "Unknown",
+  "Unknown attendance": "Unknown attendance",
+  "Unlock": "Unlock",
+  "Unlock column": "Unlock column",
+  "Unmark favorite": "Unmark favorite",
+  "Unread": "Unread",
+  "Unreg. allowed": "Unreg. allowed",
+  "Unselect all": "Unselect all",
+  "Unsubscribe": "Unsubscribe",
+  "Unsupported": "Unsupported",
+  "Unsupported question type": "Unsupported question type",
+  "Until": "Until",
+  "Untitled": "Untitled",
+  "Untitled thread": "Untitled thread",
+  "Upcoming session tab": "Upcoming",
+  "Update": "Update",
+  "Update Chamilo": "Update Chamilo",
+  "Update SCORM": "Update SCORM",
+  "Update category": "Update category",
+  "Update existing terms.": "Update existing terms.",
+  "Update failed": "Update failed",
+  "Update failed. %s": "Update failed. {0}",
+  "Update failed. Invalid uploaded file payload.": "Update failed. Invalid uploaded file payload.",
+  "Update failed. No file received by the server.": "Update failed. No file received by the server.",
+  "Update failed. The uploaded ZIP file name must match the original SCORM package name.": "Update failed. The uploaded ZIP file name must match the original SCORM package name.",
+  "Update introduction links": "Update introduction links",
+  "Update link": "Update link",
+  "Update successful": "Update successful",
+  "Update this title in learning paths": "Update this title in learning paths",
+  "Updated": "Updated",
+  "Updated at": "Updated at",
+  "Upgrade Chamilo LMS version": "Upgrade Chamilo LMS version",
+  "Upload": "Upload",
+  "Upload PNG logo for e-mails (~{0}px width)": "Upload PNG logo for e-mails (~{0}px width)",
+  "Upload PNG logo to platform header ({0})": "Upload PNG logo to platform header ({0})",
+  "Upload SVG logo for e-mails": "Upload SVG logo for e-mails",
+  "Upload SVG logo to platform header": "Upload SVG logo to platform header",
+  "Upload correction": "Upload correction",
+  "Upload corrections package": "Upload corrections package",
+  "Upload failed": "Upload failed",
+  "Upload failed. The file is likely larger than the server limit (post_max_size).": "Upload failed. The file is likely larger than the server limit (post_max_size).",
+  "Upload file": "Upload file",
+  "Upload files to your personal storage.": "Upload files to your personal storage.",
+  "Upload first, organize later": "Upload first, organize later",
+  "Upload image": "Upload image",
+  "Upload image (jpg, png or gif) to apply hotspots.": "Upload image (jpg, png or gif) to apply hotspots.",
+  "Upload media": "Upload media",
+  "Upload new variation": "Upload new variation",
+  "Upload optional header and email logos. SVG is preferred; PNG is used as fallback.": "Upload optional header and email logos. SVG is preferred; PNG is used as fallback.",
+  "Upload optional header and email logos. The SVG format is preferred. PNG is used as fallback.": "Upload optional header and email logos. The SVG format is preferred. PNG is used as fallback.",
+  "Upload speed (KB/s)": "Upload speed (KB/s)",
+  "Upload your assignment": "Upload your assignment",
+  "Uploading... please keep this tab open.": "Uploading... please keep this tab open.",
+  "Usage": "Usage",
+  "Use **link** where the survey link should appear.": "Use **link** where the survey link should appear.",
+  "Use 0 for no time limit.": "Use 0 for no time limit.",
+  "Use Duplicate survey when you want a copy in the same course.": "Use Duplicate survey when you want a copy in the same course.",
+  "Use Select and move to reposition or resize elements added in this editor.": "Use Select and move to reposition or resize elements added in this editor.",
+  "Use a topic prompt to generate a new Aiken questionnaire.": "Use a topic prompt to generate a new Aiken questionnaire.",
+  "Use custom score for all questions": "Use custom score for all questions",
+  "Use the benefits granted by this service.": "Use the benefits granted by this service.",
+  "Use the crop tool to select a 1:1 region": "Use the crop tool to select a 1:1 region",
+  "Use the current course context": "Use the current course context",
+  "Use the editor toolbar to format your content.": "Use the editor toolbar to format your content.",
+  "Use the filters above to load the learner access details.": "Use the filters above to load the learner access details.",
+  "Use the search box to find courses quickly": "Use the search box to find courses quickly",
+  "Use the search box to find users quickly": "Use the search box to find users quickly",
+  "Use the standard platform limits.": "Use the standard platform limits.",
+  "Use this question in the test as a link (not a copy)": "Use this question in the test as a link (not a copy)",
+  "Used space": "Used space",
+  "User": "User",
+  "User added": "User added",
+  "User created": "User created",
+  "User deactivated": "User deactivated",
+  "User enabled": "User enabled",
+  "User groups": "User groups",
+  "User list": "User list",
+  "User management": "User management",
+  "User not found": "User not found",
+  "User removed": "User removed",
+  "UserName": "UserName",
+  "Username": "Username",
+  "Username to appear as owner of imported items": "Username to appear as owner of imported items",
+  "Users": "Users",
+  "Users added": "Users added",
+  "Users already invited": "Users already invited",
+  "Users in class": "Users in class",
+  "Users in group": "Users in group",
+  "Users inside the class": "Users inside the class",
+  "Users on platform": "Users on platform",
+  "Users to add": "Users to add",
+  "Users unified: merged %s account(s) into user #%s. Merged accounts were permanently deleted.": "Users unified: merged {0} account(s) into user #{1}. Merged accounts were permanently deleted.",
+  "Users unified: merged user #%s into user #%s. Merged account was permanently deleted.": "Users unified: merged user #{0} into user #{1}. Merged account was permanently deleted.",
+  "Users who are not invited can use this link to take the survey.": "Users who are not invited can use this link to take the survey.",
+  "Users without submission": "Users without submission",
+  "Users without submission for assignment": "Users without submission for assignment",
+  "Users, Groups": "Users, Groups",
+  "Using default theme logo": "Using default theme logo",
+  "Valid until": "Valid until",
+  "Validated": "Validated",
+  "Value 1": "Value 1",
+  "Value 2": "Value 2",
+  "Value 3": "Value 3",
+  "Variable ranges": "Variable ranges",
+  "Verifying migration:": "Verifying migration:",
+  "Version check": "Version check",
+  "Version check enabled": "Version check enabled",
+  "Version currently loaded": "Version currently loaded",
+  "Vertical": "Vertical",
+  "Video": "Video",
+  "Video generated successfully, but saving is disabled because the provider returned a URL.": "Video generated successfully, but saving is disabled because the provider returned a URL.",
+  "Video generated successfully. You can now save it.": "Video generated successfully. You can now save it.",
+  "Video generation completed, but no playable content was returned.": "Video generation completed, but no playable content was returned.",
+  "Video generation failed.": "Video generation failed.",
+  "Video generation is in progress": "Video generation is in progress",
+  "Video generation is not enabled for this course.": "Video generation is not enabled for this course.",
+  "Video generation is taking too long. Please try again later.": "Video generation is taking too long. Please try again later.",
+  "Video generation started. Waiting for the result...": "Video generation started. Waiting for the result...",
+  "Video polling was stopped because the provider changed.": "Video polling was stopped because the provider changed.",
+  "Videoconference": "Videoconference",
+  "View": "View",
+  "View JSON": "View JSON",
+  "View all friends": "View all friends",
+  "View badge": "View badge",
+  "View comment": "View comment",
+  "View meeting poll": "View meeting poll",
+  "View reports, statistics and tracking data": "View reports, statistics and tracking data",
+  "View skills wheel": "View skills wheel",
+  "View the status of your server, perform performance tests": "View the status of your server, perform performance tests",
+  "View threads": "View threads",
+  "Virtual keyboard": "Virtual keyboard",
+  "Visibility": "Visibility",
+  "Visibility of category changed": "Visibility of category changed",
+  "Visibility updated successfully!": "Visibility updated successfully!",
+  "Visible": "Visible",
+  "Visual overview of your skills": "Visual overview of your skills",
+  "Visual theme (assets)": "Visual theme (assets)",
+  "Waiting": "Waiting",
+  "Waiting for the video to be ready...": "Waiting for the video to be ready...",
+  "Waiting for validation": "Waiting for validation",
+  "Waiting list": "Waiting list",
+  "Wall of {0}": "Wall of {0}",
+  "Warning": "Warning",
+  "Warning color": "Warning color",
+  "Warning color button text": "Warning color button text",
+  "Warning color hover/background": "Warning color hover/background",
+  "Warning!": "Warning!",
+  "Warning! The installer has detected an existing Chamilo platform on your system": "Warning! The installer has detected an existing Chamilo platform on your system",
+  "We are sorry, your browser does not support using a microphone": "We are sorry, your browser does not support using a microphone",
+  "We could not retrieve the themes": "We could not retrieve the themes",
+  "We have detected that your PHP installation does not define the date": "We have detected that your PHP installation does not define the date",
+  "We respect your privacy!": "We respect your privacy!",
+  "We will copy content from the selected course into this course. You can go back to change options.": "We will copy content from the selected course into this course. You can go back to change options.",
+  "We will restore the backup into this course. You can go back to change options.": "We will restore the backup into this course. You can go back to change options.",
+  "Website": "Website",
+  "Weekly": "Weekly",
+  "Weeks are displayed from 1 to 52": "Weeks are displayed from 1 to 52",
+  "Weight": "Weight",
+  "Weight inside assessment": "Weight inside assessment",
+  "What are the limits that we will always respect when using personal data? How far can we go?": "What are the limits that we will always respect when using personal data? How far can we go?",
+  "What are you thinking about?": "What are you thinking about?",
+  "What changes can we make to the data? What changes can be made to the data without affecting the service?": "What changes can we make to the data? What changes can be made to the data without affecting the service?",
+  "What do we extract data for (towards other internal processes) and which data is it?": "What do we extract data for (towards other internal processes) and which data is it?",
+  "What general terms and conditions are given to users to use this platform?": "What general terms and conditions are given to users to use this platform?",
+  "What happens if the data is destroyed as a result of a technical failure? (unauthorized deletion or loss of material, for example)": "What happens if the data is destroyed as a result of a technical failure? (unauthorized deletion or loss of material, for example)",
+  "What should be done with imported files with the same file name as existing files?": "What should be done with imported files with the same file name as existing files?",
+  "What skills are you looking for?": "What skills are you looking for?",
+  "What will be sent to the AI": "What will be sent to the AI",
+  "When a document is selected, the prompt is fixed so the generation uses only that document content.": "When a document is selected, the prompt is fixed so the generation uses only that document content.",
+  "When a file with the same name exists": "When a file with the same name exists",
+  "When enabled, ZIP files are extracted into the current document folder after upload.": "When enabled, ZIP files are extracted into the current document folder after upload.",
+  "When enabled, the document text is indexed by the search engine so users can find it from platform search.": "When enabled, the document text is indexed by the search engine so users can find it from platform search.",
+  "When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.",
+  "Where do we record the data? (in which system, hosted where, accessible by which company that handles the servers, etc.)": "Where do we record the data? (in which system, hosted where, accessible by which company that handles the servers, etc.)",
+  "Who can consult the personal data? For what purpose?": "Who can consult the personal data? For what purpose?",
+  "Why do we collect this data?": "Why do we collect this data?",
+  "Why do you want to request the withdrawal of your legal consent?": "Why do you want to request the withdrawal of your legal consent?",
+  "Why you want to delete your Legal Agreement": "Why you want to delete your Legal Agreement",
+  "Width": "Width",
+  "Wiki": "Wiki",
+  "With links": "With links",
+  "With whom can we share them? In what opportunities? Through what processes (safe or not)?": "With whom can we share them? In what opportunities? Through what processes (safe or not)?",
+  "Without achieved skills": "No achieved skills yet",
+  "Writable": "Writable",
+  "Write a message": "Write a message",
+  "Write a short and striking course name, for example: Innovation Management": "Write a short and striking course name, for example: Innovation Management",
+  "Write a title...": "Write a title...",
+  "Write my submission": "Write my submission",
+  "Write new comment": "Write new comment",
+  "Write something": "Write something",
+  "Write something to {0}": "Write something to {0}",
+  "Write your answer here": "Write your answer here",
+  "Write your comment here...": "Write your comment here...",
+  "Write your comment...": "Write your comment...",
+  "Wrong": "Wrong",
+  "Wrong answer": "Wrong answer",
+  "Years": "Years",
+  "Yes": "Yes",
+  "You accepted these terms on": "You accepted these terms on",
+  "You already filled this survey.": "You already filled this survey.",
+  "You already used all courses available with this service.": "You already used all courses available with this service.",
+  "You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.": "You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.",
+  "You are adding calendar events for attendance": "You are adding calendar events for attendance",
+  "You are editing logos for visual theme": "You are editing logos for visual theme",
+  "You are registered on {0}": "You are registered on {0}",
+  "You can close this message to continue.": "You can close this message to continue.",
+  "You can edit the prompt before asking for feedback.": "You can edit the prompt before asking for feedback.",
+  "You can no longer submit": "You can no longer submit",
+  "You can replace the file, move it to another folder, or both.": "You can replace the file, move it to another folder, or both.",
+  "You can see examples of how chamilo will look here": "You can see examples of how Chamilo will look here",
+  "You can select multiple items": "You can select multiple items",
+  "You can select multiple users": "You can select multiple users",
+  "You can share or copy this link:": "You can share or copy this link:",
+  "You can use the tags {{class_name}} and {{student_full_name}} in the question.": "You can use the tags {'{'}{'{'}class_name{'}'}{'}'} and {'{'}{'{'}student_full_name{'}'}{'}'} in the question.",
+  "You cannot access the linked course from this view.": "You cannot access the linked course from this view.",
+  "You cannot create a new course right now.": "You cannot create a new course right now.",
+  "You cannot create more courses right now.": "You cannot create more courses right now.",
+  "You do not currently have access to any URL": "You do not currently have access to any URL",
+  "You do not have permission to generate AI media in this course.": "You do not have permission to generate AI media in this course.",
+  "You do not have permission to generate glossary terms.": "You do not have permission to generate glossary terms.",
+  "You do not have permission to view this page": "You do not have permission to view this page",
+  "You don't have any course content yet": "You don't have any course content yet",
+  "You don't have any course content yet.": "You don't have any course content yet.",
+  "You don't have any course yet": "You don't have any course yet",
+  "You don't have any course yet.": "You don't have any course yet.",
+  "You don't have any learning path.": "You don't have any learning path.",
+  "You don't have any session yet.": "You don't have any session yet.",
+  "You have a new friend request": "You have a new friend request",
+  "You have access to multiple URLs": "You have access to multiple URLs",
+  "You have been enrolled in a new course": "You have been enrolled in a new course",
+  "You have been invited to join this group": "You have been invited to join this group",
+  "You have left the group successfully": "You have left the group successfully",
+  "You have received a new friend request": "You have received a new friend request",
+  "You have to select a test": "You have to select a test",
+  "You have unsaved changes. Leave anyway?": "You have unsaved changes. Leave anyway?",
+  "You may want to change this": "You may want to change this",
+  "You must accept the licence": "You must accept the licence",
+  "You must give a positive score for each hotspots": "You must give a positive score for each hotspots",
+  "You must move or remove all learning paths from this category before deleting it.": "You must move or remove all learning paths from this category before deleting it.",
+  "You must select a destination course": "You must select a destination course",
+  "You need to be a admin or teacher to manage projects.": "You need to be a admin or teacher to manage projects.",
+  "You need to buy this service before using these benefits.": "You need to buy this service before using these benefits.",
+  "You only have access to the URL {0}": "You only have access to the URL {0}",
+  "You should create the \"Term and Conditions\" for all the available languages": "You should create the \"Term and Conditions\" for all the available languages",
+  "You will therefore be automatically redirected to this URL": "You will therefore be automatically redirected to this URL",
+  "You're subscribed to push notifications in this browser": "You're subscribed to push notifications in this browser",
+  "Your Moodle backup has been created. You can find it in the course backups list.": "Your Moodle backup has been created. You can find it in the course backups list.",
+  "Your PHP version does not match the requirements for this software": "Your PHP version does not match the requirements for this software",
+  "Your PHP version matches the minimum requirement:": "Your PHP version matches the minimum requirement:",
+  "Your account deletion request is pending review.": "Your account deletion request is pending review.",
+  "Your answer": "Your answer",
+  "Your browser does not support Javascript": "Your browser does not support Javascript",
+  "Your company short name": "Your company short name",
+  "Your company's activity": "Your company's activity",
+  "Your company's home country": "Your company's home country",
+  "Your company's name": "Your company's name",
+  "Your contact information could not be sent": "Your contact information could not be sent",
+  "Your job's description": "Your job's description",
+  "Your legal agreement remains active until any withdrawal request has been reviewed and processed.": "Your legal agreement remains active until any withdrawal request has been reviewed and processed.",
+  "Your legal consent withdrawal request is pending review.": "Your legal consent withdrawal request is pending review.",
+  "Your portal name": "Your portal name",
+  "Your skill ranking": "Your skill ranking",
+  "Your vote": "Your vote",
+  "admin@example.com": "admin{'@'}example.com",
+  "answers": "answers",
+  "are optional.": "are optional.",
+  "are required for each row.": "are required for each row.",
+  "available": "available",
+  "description": "description",
+  "e": "e",
+  "e.g. /24": "e.g. /24",
+  "e.g. 2.3522": "e.g. 2.3522",
+  "e.g. 48.8566": "e.g. 48.8566",
+  "ex": "ex",
+  "ex. 3306": "ex. 3306",
+  "ex. localhost": "ex. localhost",
+  "ex. root": "ex. root",
+  "ex. {0}": "ex. {0}",
+  "has not been found in that directory": "has not been found in that directory",
+  "have a look at the changelog": "have a look at the changelog",
+  "here": "here",
+  "is required.": "is required.",
+  "members": "members",
+  "messages": "messages",
+  "not supported for document analysis": "not supported for document analysis",
+  "of": "of",
+  "selected": "selected",
+  "sender": "sender",
+  "server file": "server file",
+  "subtitle": "subtitle",
+  "supported": "supported",
+  "title": "title",
+  "to know what's new and what has been changed": "to know what's new and what has been changed",
+  "to know what's new and what has been changed.": "to know what's new and what has been changed.",
+  "users": "users",
+  "{0} (current)": "{0} (current)",
+  "{0} classes imported": "{0} classes imported",
+  "{0} comment(s)": "{0} comment(s)",
+  "{0} courses": "{0} courses",
+  "{0} created": "{0} created",
+  "{0} min": "{0} min",
+  "{0} selected": "{0} selected",
+  "{0} sessions": "{0} sessions",
+  "{0} surveys selected": "{0} surveys selected",
+  "{0} updated": "{0} updated",
+  "{0} user-class links imported": "{0} user-class links imported",
+  "{0}'s picture": "{0}'s picture"
+}
diff --git a/assets/vue/views/exercise/ExerciseCategoryManagerView.vue b/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
index 6f2c24c781c..af1f27afbe7 100644
--- a/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
+++ b/assets/vue/views/exercise/ExerciseCategoryManagerView.vue
@@ -3,7 +3,7 @@
     <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
       <BaseButton
         class="exercise-category-toolbar__button"
-        :label="t('Back to exercises')"
+        :label="t('Return to exercises list')"
         :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
         icon="back"
         only-icon
@@ -252,7 +252,7 @@ const pageDescription = computed(() =>
     ? t("Manage categories used to classify questions.")
     : t("Manage categories used to classify exercises."),
 )
-const usageHeader = computed(() => (isQuestionCategoryPage.value ? t("Questions") : t("Exercises")))
+const usageHeader = computed(() => (isQuestionCategoryPage.value ? t("Questions") : t("Tests")))
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -364,7 +364,7 @@ function readFileAsText(file) {
 
 async function importCategories() {
   if (!importFile.value) {
-    errorMessage.value = t("CSV file is required")
+    errorMessage.value = t("This field is required")
     return
   }
 
@@ -403,7 +403,7 @@ async function importCategories() {
 async function saveCategory() {
   const title = form.title.trim()
   if (!title) {
-    errorMessage.value = t("Category name is required")
+    errorMessage.value = t("This field is required")
     return
   }
 
diff --git a/assets/vue/views/exercise/ExerciseConfigurationView.vue b/assets/vue/views/exercise/ExerciseConfigurationView.vue
index ab5b9a718dd..db5bc71a19f 100644
--- a/assets/vue/views/exercise/ExerciseConfigurationView.vue
+++ b/assets/vue/views/exercise/ExerciseConfigurationView.vue
@@ -59,7 +59,7 @@
         id="exercise-title"
         v-model="form.title"
         :is-invalid="formSubmitted && !form.title.trim()"
-        :label="t('* Test name')"
+        :label="t('Test name') + ' *'"
         name="title"
         required
       />
@@ -319,7 +319,7 @@
             <BaseCheckbox
               id="exercise-auto-launch"
               v-model="form.autoLaunch"
-              :label="t('Auto launch')"
+              :label="t('Auto-launch')"
               name="autoLaunch"
             />
           </div>
@@ -853,7 +853,7 @@ const questionsRoute = computed(() => ({
 }))
 const learningPathContext = computed(() => isLearningPathContext())
 const learningPathBackUrl = computed(() => buildLearningPathBackUrl())
-const backButtonLabel = computed(() => (learningPathContext.value ? t("Back to learning path") : t("Back to exercises")))
+const backButtonLabel = computed(() => (learningPathContext.value ? t("Back to learning path") : t("Return to exercises list")))
 const typeOptions = computed(() => {
   const items = (options.value.typeOptions || []).map((option) => ({
     value: Number(option.value),
@@ -1275,7 +1275,7 @@ async function saveConfiguration() {
   errorMessage.value = ""
 
   if (!form.title.trim()) {
-    errorMessage.value = t("The exercise title is required.")
+    errorMessage.value = t("The title is required.")
     return
   }
 
diff --git a/assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue b/assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue
index 4b2135defb1..e8a34c5a615 100644
--- a/assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue
+++ b/assets/vue/views/exercise/ExerciseGlobalQuestionSelectorView.vue
@@ -3,7 +3,7 @@
     <div class="exercise-question-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
       <BaseButton
         class="exercise-question-toolbar__button"
-        :label="t('Back to exercises')"
+        :label="t('Return to exercises list')"
         :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
         icon="back"
         only-icon
@@ -51,7 +51,7 @@
         <BaseSelect
           id="exercise-global-question-exercise"
           v-model="selectedExerciseId"
-          :label="t('* Test')"
+          :label="t('Test') + ' *'"
           name="exercise"
           :options="exerciseOptions"
         />
diff --git a/assets/vue/views/exercise/ExerciseListView.vue b/assets/vue/views/exercise/ExerciseListView.vue
index b0ef4eaa830..421eac4557b 100644
--- a/assets/vue/views/exercise/ExerciseListView.vue
+++ b/assets/vue/views/exercise/ExerciseListView.vue
@@ -58,7 +58,7 @@
         <BaseButton
           v-if="canManage"
           class="exercise-list-toolbar__button"
-          :label="t('Import exercises QTI2')"
+          :label="t('Import exercises Qti2')"
           :route="{ name: 'ExerciseImportQti2', params: route.params, query: getContextParams() }"
           icon="import"
           only-icon
@@ -127,7 +127,7 @@
       v-if="canManage && activeSearch && !isSearchVisible"
       class="flex flex-wrap items-center gap-2 rounded-xl border border-gray-20 bg-white px-4 py-3 text-sm text-gray-700 shadow-sm"
     >
-      <span>{{ t("Showing results for: {0}", [activeSearch]) }}</span>
+      <span>{{ t("Showing results for: %s", [activeSearch]) }}</span>
       <BaseButton
         :label="t('Clear search')"
         icon="close"
@@ -862,7 +862,7 @@ function toggleAutoLaunch(exercise) {
 function confirmCopyExercise(exercise) {
   requireConfirmation({
     title: t("Copy exercise"),
-    message: t("Are you sure to copy {0}?", [displayText(exercise.title, t("Untitled"))]),
+    message: `${t("Are you sure to copy")} ${displayText(exercise.title, t("Untitled"))}?`,
     accept: () => runExerciseAction(exercise, "copy"),
   })
 }
@@ -870,7 +870,7 @@ function confirmCopyExercise(exercise) {
 function confirmDeleteExercise(exercise) {
   requireConfirmation({
     title: t("Delete exercise"),
-    message: t("Are you sure you want to delete {0}?", [displayText(exercise.title, t("Untitled"))]),
+    message: t("Are you sure you want to delete %s?", [displayText(exercise.title, t("Untitled"))]),
     accept: () => runExerciseAction(exercise, "delete"),
   })
 }
diff --git a/assets/vue/views/exercise/ExerciseLiveResultsView.vue b/assets/vue/views/exercise/ExerciseLiveResultsView.vue
index f54872b58b2..68abceb34d9 100644
--- a/assets/vue/views/exercise/ExerciseLiveResultsView.vue
+++ b/assets/vue/views/exercise/ExerciseLiveResultsView.vue
@@ -131,7 +131,7 @@
 
     <BaseTable
       :is-loading="isLoading"
-      :text-for-empty="t('No live results found')"
+      :text-for-empty="t('No results found')"
       :total-items="attempts.length"
       :values="attempts"
       data-key="id"
diff --git a/assets/vue/views/exercise/ExerciseOverviewView.vue b/assets/vue/views/exercise/ExerciseOverviewView.vue
index 244d68bda25..7c3c0e68d51 100644
--- a/assets/vue/views/exercise/ExerciseOverviewView.vue
+++ b/assets/vue/views/exercise/ExerciseOverviewView.vue
@@ -6,7 +6,7 @@
         class="exercise-overview-toolbar flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm"
       >
         <BaseButton
-          :label="t('Back to exercises')"
+          :label="t('Return to exercises list')"
           :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
           icon="back"
           only-icon
diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index 22b21a950d5..52fb1738814 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -5,7 +5,7 @@
       class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit"
     >
       <BaseButton
-        :label="t('Back to exercises')"
+        :label="t('Return to exercises list')"
         :route="{ name: 'ExerciseList', params: route.params, query: getContextParams() }"
         icon="back"
         only-icon
@@ -775,13 +775,13 @@
                 v-if="answers[question.id]?.uploadFileName"
                 class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4"
               >
-                {{ t("Selected file") }}: {{ answers[question.id].uploadFileName }}
+                {{ t("Selected files") }}: {{ answers[question.id].uploadFileName }}
               </div>
               <div
                 v-if="answers[question.id]?.uploadedFiles?.length"
                 class="space-y-2 rounded-lg border border-success/30 bg-success/10 p-3 text-sm text-success"
               >
-                <div class="font-semibold">{{ t("Uploaded file") }}</div>
+                <div class="font-semibold">{{ t("Upload file") }}</div>
                 <div
                   v-for="file in answers[question.id].uploadedFiles"
                   :key="file.id || file.name"
@@ -793,9 +793,9 @@
                     target="_blank"
                     rel="noopener"
                   >
-                    {{ file.name || t("Uploaded file") }}
+                    {{ file.name || t("Upload file") }}
                   </a>
-                  <span v-else>{{ file.name || t("Uploaded file") }}</span>
+                  <span v-else>{{ file.name || t("Upload file") }}</span>
                 </div>
               </div>
             </div>
@@ -803,7 +803,7 @@
             <div v-else-if="isOralQuestion(question)" class="space-y-3">
               <div class="rounded-lg border border-gray-20 bg-gray-10 p-3">
                 <div class="mb-2 text-sm font-semibold text-gray-800">
-                  {{ t("Record oral answer") }}
+                  {{ t("Record answer") }}
                 </div>
                 <AudioRecorder
                   :multiple="false"
@@ -983,8 +983,8 @@
                     <div class="font-semibold text-gray-90">
                       {{ t("Current annotations") }}
                     </div>
-                    <div>{{ t("Paths") }}: {{ annotationPaths(question).length }}</div>
-                    <div>{{ t("Texts") }}: {{ annotationTexts(question).length }}</div>
+                    <div>{{ t("Path") }}: {{ annotationPaths(question).length }}</div>
+                    <div>{{ t("Text") }}: {{ annotationTexts(question).length }}</div>
                   </div>
                 </aside>
               </div>
@@ -1079,7 +1079,7 @@
 
             <div v-else-if="isReadingQuestion(question)" class="space-y-3">
               <div class="rounded-lg border border-gray-20 p-3 text-sm text-gray-700">
-                {{ t("Reading speed") }}: {{ question.reading.speed }} {{ t("words per minute") }}
+                {{ t("Reading speed") }}: {{ t("%s words per minute", [question.reading.speed]) }}
               </div>
               <div
                 class="exercise-runtime-html rounded-lg border border-gray-20 p-4 text-gray-800"
@@ -2974,7 +2974,7 @@ function applySavedAnswer(question, rows) {
 
   if (isUploadQuestion(question)) {
     const files = extractSavedAttemptFiles(rows)
-    questionAnswer.uploadedFiles = files.length > 0 ? files : (rows.length > 0 ? [{ name: t("Uploaded file") }] : [])
+    questionAnswer.uploadedFiles = files.length > 0 ? files : (rows.length > 0 ? [{ name: t("Upload file") }] : [])
     return
   }
 
diff --git a/assets/vue/views/exercise/ExerciseQuestionBankView.vue b/assets/vue/views/exercise/ExerciseQuestionBankView.vue
index 3e0ba658333..c6e579840aa 100644
--- a/assets/vue/views/exercise/ExerciseQuestionBankView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionBankView.vue
@@ -2,7 +2,7 @@
   <section class="space-y-5">
     <div class="flex flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm w-fit">
       <BaseButton
-        :label="isGlobalMode ? t('Back to exercises') : t('Back to questions')"
+        :label="isGlobalMode ? t('Return to exercises list') : t('Back to the questions')"
         :route="backRoute"
         icon="back"
         only-icon
@@ -469,7 +469,7 @@ function toggleAllQuestions(event) {
 
 function confirmDeleteQuestion(question) {
   requireConfirmation({
-    message: t("Are you sure you want to delete this question?"),
+    message: t("Are you sure you want to delete the question?"),
     accept: () => deleteQuestion(question),
   })
 }
diff --git a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
index 23c22133ba2..edd7d145191 100644
--- a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
@@ -2,7 +2,7 @@
   <section class="space-y-5">
     <div class="flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
       <BaseButton
-        :label="t('Back to questions')"
+        :label="t('Back to the questions')"
         :route="questionsRoute"
         icon="back"
         only-icon
@@ -55,7 +55,7 @@
         <BaseInputText
           id="exercise-question-title"
           v-model="form.title"
-          :label="t('* Question')"
+          :label="t('Question') + ' *'"
           name="question"
         />
       </div>
@@ -423,7 +423,7 @@
 
         <div class="space-y-3">
           <div class="flex flex-wrap items-center justify-between gap-2">
-            <h3 class="text-lg font-semibold text-gray-90">{{ t("Hotspots") }}</h3>
+            <h3 class="text-lg font-semibold text-gray-90">{{ t("Hotspot") }}</h3>
             <div class="flex flex-wrap gap-2">
               <BaseButton
                 v-if="isPolygonHotspotType(currentHotspotItem?.hotspotType)"
@@ -443,7 +443,7 @@
               />
               <BaseButton
                 v-if="isHotspotDelineationQuestion"
-                :label="t('Add area to avoid')"
+                :label="t('Area to avoid')"
                 icon="plus"
                 size="small"
                 type="secondary"
@@ -629,7 +629,7 @@
         />
 
         <div class="rounded-lg border border-info/30 bg-support-1 px-4 py-3 text-sm text-support-4">
-          {{ t("If you want only integer values write both limits without decimals.") }}
+          {{ t("If you want only integer values write both limits without decimals") }}
         </div>
 
         <div
@@ -1002,7 +1002,7 @@
               <tr>
                 <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
                 <th class="min-w-[380px] border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Answer") }}</th>
-                <th class="w-72 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Matches to") }}</th>
+                <th class="w-72 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Matches To") }}</th>
                 <th
                   v-if="!isMatchingCombinationQuestion"
                   class="w-36 border-r border-gray-25 px-3 py-2 font-semibold"
@@ -1034,7 +1034,7 @@
                   <BaseSelect
                     :id="`exercise-matching-pair-option-${pair.localId}`"
                     v-model="pair.optionLocalId"
-                    :label="t('Matches to')"
+                    :label="t('Matches To')"
                     :name="`matching_pair_option_${index}`"
                     :options="matchingOptionSelectOptions"
                   />
@@ -1167,7 +1167,7 @@
               <tr>
                 <th class="w-16 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("N°") }}</th>
                 <th class="min-w-[520px] border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Answer") }}</th>
-                <th class="w-52 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Matches to") }}</th>
+                <th class="w-52 border-r border-gray-25 px-3 py-2 font-semibold">{{ t("Matches To") }}</th>
                 <th class="w-36 px-3 py-2 font-semibold">{{ t("Score") }}</th>
               </tr>
             </thead>
@@ -1193,7 +1193,7 @@
                   <BaseSelect
                     :id="`exercise-draggable-target-${item.localId}`"
                     v-model="item.targetPosition"
-                    :label="t('Matches to')"
+                    :label="t('Matches To')"
                     :name="`draggable_target_${index}`"
                     :options="draggablePositionSelectOptions"
                   />
@@ -1647,11 +1647,11 @@ const difficultyOptions = [
 ]
 
 const readingSpeedOptions = computed(() => [
-  { label: t("{0} words per minute", [50]), value: 1 },
-  { label: t("{0} words per minute", [100]), value: 2 },
-  { label: t("{0} words per minute", [175]), value: 3 },
-  { label: t("{0} words per minute", [300]), value: 4 },
-  { label: t("{0} words per minute", [600]), value: 5 },
+  { label: t("%s words per minute", [50]), value: 1 },
+  { label: t("%s words per minute", [100]), value: 2 },
+  { label: t("%s words per minute", [175]), value: 3 },
+  { label: t("%s words per minute", [300]), value: 4 },
+  { label: t("%s words per minute", [600]), value: 5 },
 ])
 
 const fillBlanksSeparatorOptions = [
@@ -3168,7 +3168,7 @@ function buildPayload() {
 
 function validateForm() {
   if (!stripHtml(form.title)) {
-    errorMessage.value = t("The question title is required.")
+    errorMessage.value = t("The title is required.")
     return false
   }
 
@@ -3351,7 +3351,7 @@ function validateForm() {
 
     const score = filledItems.reduce((total, item) => total + Math.max(0, Number(item.score || 0)), 0)
     if (score <= 0) {
-      errorMessage.value = t("Required field.")
+      errorMessage.value = t("Required field")
       return false
     }
 
diff --git a/assets/vue/views/exercise/ExerciseQuestionImportView.vue b/assets/vue/views/exercise/ExerciseQuestionImportView.vue
index f4770f74a83..4ce0a863998 100644
--- a/assets/vue/views/exercise/ExerciseQuestionImportView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionImportView.vue
@@ -292,7 +292,7 @@ async function loadImportData() {
     actionUrls.value = response.actionUrls || {}
   } catch (error) {
     console.error("Error loading exercise question import data", error)
-    errorMessage.value = t("Could not load import data")
+    errorMessage.value = t("Could not load data")
   } finally {
     isLoading.value = false
   }
@@ -300,7 +300,7 @@ async function loadImportData() {
 
 async function submitImport() {
   if (!selectedFile.value) {
-    errorMessage.value = t("A file is required")
+    errorMessage.value = t("This field is required")
     return
   }
 
diff --git a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
index f223ec1b9e9..3176ee72988 100644
--- a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
@@ -473,7 +473,7 @@
                               <tr>
                                 <th class="w-16 border border-gray-20 px-2 py-2 text-left">{{ t("N°") }}</th>
                                 <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Question") }}</th>
-                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Matches to") }}</th>
+                                <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Matches To") }}</th>
                                 <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Feedback") }}</th>
                                 <th
                                   v-if="!isMatchingCombinationQuestionType(question.type)"
@@ -539,7 +539,7 @@
                               <tr>
                                 <th class="w-16 border border-gray-20 px-2 py-2 text-left">{{ t("N°") }}</th>
                                 <th class="border border-gray-20 px-2 py-2 text-left">{{ t("Answer") }}</th>
-                                <th class="w-32 border border-gray-20 px-2 py-2 text-center">{{ t("Matches to") }}</th>
+                                <th class="w-32 border border-gray-20 px-2 py-2 text-center">{{ t("Matches To") }}</th>
                                 <th class="w-24 border border-gray-20 px-2 py-2 text-right">{{ t("Score") }}</th>
                               </tr>
                             </thead>
@@ -669,7 +669,7 @@ const summaryText = computed(() =>
 )
 const learningPathContext = computed(() => isLearningPathContext())
 const learningPathBackUrl = computed(() => buildLearningPathBackUrl())
-const backButtonLabel = computed(() => (learningPathContext.value ? t("Back to learning path") : t("Back to exercises")))
+const backButtonLabel = computed(() => (learningPathContext.value ? t("Back to learning path") : t("Return to exercises list")))
 
 function getQueryValue(value) {
   return Array.isArray(value) ? value[0] : value
@@ -1039,7 +1039,7 @@ function confirmDeleteQuestion(question) {
 
   requireConfirmation({
     title: t("Delete question"),
-    message: t("Are you sure you want to delete this question?"),
+    message: t("Are you sure you want to delete the question?"),
     accept: () => deleteQuestion(question),
   })
 }
diff --git a/assets/vue/views/exercise/ExerciseQuestionStatsView.vue b/assets/vue/views/exercise/ExerciseQuestionStatsView.vue
index 268b30d1cf9..847041d8041 100644
--- a/assets/vue/views/exercise/ExerciseQuestionStatsView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionStatsView.vue
@@ -22,7 +22,7 @@
       <BaseButton
         v-if="actionUrls.questionStatsPdf"
         class="exercise-question-stats-toolbar__button"
-        :label="t('Export PDF')"
+        :label="t('Export to PDF')"
         :to-url="actionUrls.questionStatsPdf"
         :icon="safeIcon('file-pdf', 'file-excel')"
         only-icon
@@ -66,7 +66,7 @@
               {{ t('Answered') }}: {{ summary.totalAnswered || 0 }}
             </span>
             <span class="rounded-full bg-warning/10 px-3 py-1 text-sm font-semibold text-warning">
-              {{ t('Wrong answers') }}: {{ summary.totalWrong || 0 }}
+              {{ t('Wrong answer') }}: {{ summary.totalWrong || 0 }}
             </span>
           </div>
         </div>
diff --git a/assets/vue/views/exercise/ExerciseReportByQuestionView.vue b/assets/vue/views/exercise/ExerciseReportByQuestionView.vue
index f2d657b3fc4..c0f78f59f88 100644
--- a/assets/vue/views/exercise/ExerciseReportByQuestionView.vue
+++ b/assets/vue/views/exercise/ExerciseReportByQuestionView.vue
@@ -22,7 +22,7 @@
       <BaseButton
         v-if="actionUrls.reportByQuestionPdf"
         class="exercise-report-by-question-toolbar__button"
-        :label="t('Export PDF')"
+        :label="t('Export to PDF')"
         :to-url="actionUrls.reportByQuestionPdf"
         :icon="safeIcon('file-pdf', 'file-excel')"
         only-icon
@@ -66,7 +66,7 @@
               {{ t('Configured answers') }}: {{ summary.totalAnswers || 0 }}
             </span>
             <span class="rounded-full bg-warning/10 px-3 py-1 text-sm font-semibold text-warning">
-              {{ t('Selections') }}: {{ summary.totalSelections || 0 }}
+              {{ t('Selection') }}: {{ summary.totalSelections || 0 }}
             </span>
           </div>
         </div>
@@ -118,7 +118,7 @@
             </p>
           </div>
           <span class="w-fit rounded-full bg-gray-15 px-3 py-1 text-sm font-semibold text-gray-700">
-            {{ t('Selections') }}: {{ question.totalSelections || 0 }}
+            {{ t('Selection') }}: {{ question.totalSelections || 0 }}
           </span>
         </div>
       </div>
@@ -165,7 +165,7 @@
             </span>
           </template>
         </Column>
-        <Column :header="t('Selection %')" field="selectedPercentage" sortable>
+        <Column :header="t('Selection')" field="selectedPercentage" sortable>
           <template #body="{ data }">
             {{ data.selectedCount === null ? '—' : `${formatNumber(data.selectedPercentage)} %` }}
           </template>
diff --git a/assets/vue/views/exercise/ExerciseReportView.vue b/assets/vue/views/exercise/ExerciseReportView.vue
index b61eb8f4add..26fa0594335 100644
--- a/assets/vue/views/exercise/ExerciseReportView.vue
+++ b/assets/vue/views/exercise/ExerciseReportView.vue
@@ -3,7 +3,7 @@
     <div class="exercise-report-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm">
       <BaseButton
         class="exercise-report-toolbar__button"
-        :label="t('Back to exercises')"
+        :label="t('Return to exercises list')"
         :route="{ name: 'ExerciseList', params: getBaseRouteParams(), query: getContextParams() }"
         :icon="safeIcon('back')"
         only-icon
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index 8b6788543d7..62c4eca37f6 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -8,7 +8,7 @@
       class="exercise-result-toolbar flex w-fit flex-wrap items-center gap-1 rounded-xl border border-gray-20 bg-white px-2 py-1 shadow-sm"
     >
       <BaseButton
-        :label="t('Back to exercises')"
+        :label="t('Return to exercises list')"
         :route="{ name: 'ExerciseList', params: getBaseRouteParams(), query: getContextParams() }"
         icon="back"
         only-icon
@@ -24,7 +24,7 @@
         type="primary-text"
       />
       <BaseButton
-        :label="t('Export PDF')"
+        :label="t('Export to PDF')"
         icon="file-pdf"
         only-icon
         size="small"
@@ -69,7 +69,7 @@
           <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
             <div class="space-y-2">
               <h1 class="text-2xl font-semibold text-gray-90">
-                {{ displayText(title, t("Exercise result")) }}
+                {{ displayText(title, t("Exercise results")) }}
               </h1>
               <div
                 v-if="description"
@@ -228,7 +228,7 @@
                   class="px-3 py-3 text-center text-gray-500"
                   colspan="4"
                 >
-                  {{ t("No ranking data available") }}
+                  {{ t("No data available") }}
                 </td>
               </tr>
             </tbody>
@@ -832,7 +832,7 @@
                       v-model="correctionForms[question.id].marks"
                       :disabled="correctionSavingQuestionId === question.id"
                       :id="correctionScoreInputId(question)"
-                      :label="t('Correction score')"
+                      :label="t('Correct score')"
                       :max="Number(question.maxScore || 0)"
                       :min="0"
                       :step="0.5"
@@ -1036,7 +1036,7 @@
                       v-model="correctionForms[question.id].marks"
                       :disabled="correctionSavingQuestionId === question.id"
                       :id="correctionScoreInputId(question)"
-                      :label="t('Correction score')"
+                      :label="t('Correct score')"
                       :max="Number(question.maxScore || 0)"
                       :min="0"
                       :step="0.5"
@@ -1231,7 +1231,7 @@
                       v-model="correctionForms[question.id].marks"
                       :disabled="correctionSavingQuestionId === question.id"
                       :id="correctionScoreInputId(question)"
-                      :label="t('Correction score')"
+                      :label="t('Correct score')"
                       :max="Number(question.maxScore || 0)"
                       :min="0"
                       :step="0.5"
@@ -1302,7 +1302,7 @@
                   class="rounded-lg border border-gray-20 bg-gray-10 p-3"
                 >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
-                    {{ t("Learner answer") }}
+                    {{ t("Learner answers") }}
                   </div>
                   <div class="whitespace-pre-wrap text-sm text-gray-800">
                     {{ question.answer.studentAnswer || t("No answer") }}
@@ -1421,7 +1421,7 @@
                       v-model="correctionForms[question.id].marks"
                       :disabled="correctionSavingQuestionId === question.id"
                       :id="correctionScoreInputId(question)"
-                      :label="t('Correction score')"
+                      :label="t('Correct score')"
                       :max="Number(question.maxScore || 0)"
                       :min="0"
                       :step="0.5"

From d2c2ed853faf7615b01b81d2bd57ecb4ab9e2232 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Wed, 17 Jun 2026 16:31:56 -0500
Subject: [PATCH 17/21] Exercise: Address PR review feedback

---
 .../components/basecomponents/ChamiloIcons.js |  5 +-
 assets/vue/components/course/CourseTool.vue   | 23 +------
 assets/vue/router/index.js                    | 22 ++++---
 assets/vue/services/exerciseService.js        |  1 -
 assets/vue/views/course/CourseHome.vue        | 63 +------------------
 .../exercise/ExerciseAiAikenGeneratorView.vue | 11 +---
 .../vue/views/exercise/ExerciseListView.vue   |  2 +-
 public/main/inc/lib/exercise.lib.php          | 29 ++++++---
 .../Api/ExerciseQti2ExportController.php      |  2 +-
 .../ExerciseRuntimeUploadAnswerProcessor.php  | 38 +++++------
 10 files changed, 58 insertions(+), 138 deletions(-)

diff --git a/assets/vue/components/basecomponents/ChamiloIcons.js b/assets/vue/components/basecomponents/ChamiloIcons.js
index b5898e65a9c..1e5b7f4038a 100644
--- a/assets/vue/components/basecomponents/ChamiloIcons.js
+++ b/assets/vue/components/basecomponents/ChamiloIcons.js
@@ -103,11 +103,10 @@ export const chamiloIconToClass = {
   "reply": "mdi mdi-reply",
   "reply-all": "mdi mdi-reply-all",
   "restart": "mdi mdi-restart",
-  "rocket": "mdi mdi-rocket",
   "rocket-launch": "mdi mdi-rocket-launch",
   "rocket-launch-outline": "mdi mdi-rocket-launch-outline",
-  "autolunch": "mdi mdi-rocket-launch",
-  "autolunch-off": "mdi mdi-rocket-launch-outline",
+  "autolaunch": "mdi mdi-rocket-launch",
+  "autolaunch-off": "mdi mdi-rocket-launch-outline",
   "select-all": "mdi mdi-select-group",
   "send": "mdi mdi-send",
   "sent": "mdi mdi-send-check",
diff --git a/assets/vue/components/course/CourseTool.vue b/assets/vue/components/course/CourseTool.vue
index 3bbd5e719d9..7fde3f34a1f 100644
--- a/assets/vue/components/course/CourseTool.vue
+++ b/assets/vue/components/course/CourseTool.vue
@@ -127,29 +127,8 @@ const titleCustomClass = computed(() => {
   return ""
 })
 
-function extractIdFromIri(value) {
-  if (!value) {
-    return 0
-  }
-
-  const match = String(value).match(/\/(\d+)$/)
-
-  return match ? Number(match[1]) : 0
-}
-
 function getCourseResourceNodeId() {
-  const courseNode = course.value?.resourceNode
-  const toolNode = props.tool?.resourceNode
-
-  return (
-    Number(courseNode?.id) ||
-    extractIdFromIri(courseNode?.["@id"]) ||
-    Number(toolNode?.parent?.id) ||
-    extractIdFromIri(toolNode?.parent?.["@id"]) ||
-    Number(toolNode?.id) ||
-    extractIdFromIri(toolNode?.["@id"]) ||
-    0
-  )
+  return Number(cidReqStore.course?.resourceNode?.id) || Number(course.value?.resourceNode?.id) || 0
 }
 
 const isExerciseTool = computed(() => {
diff --git a/assets/vue/router/index.js b/assets/vue/router/index.js
index a07f9c35ba5..887b8567b12 100644
--- a/assets/vue/router/index.js
+++ b/assets/vue/router/index.js
@@ -293,6 +293,11 @@ async function courseHomeBeforeEnter(to) {
 
     const courseSettingsStore = useCourseSettings()
     const sid = sessionId ? `&sid=${sessionId}` : ""
+    const courseContextQuery = {
+      cid: courseId,
+      sid: sessionId || 0,
+      gid: 0,
+    }
 
     // Document auto-launch
     const documentAutoLaunch = parseInt(courseSettingsStore.getSetting("enable_document_auto_launch"), 10) || 0
@@ -307,22 +312,25 @@ async function courseHomeBeforeEnter(to) {
     // Exercise auto-launch
     const exerciseAutoLaunch = parseInt(courseSettingsStore.getSetting("enable_exercise_auto_launch"), 10) || 0
     const exerciseResourceNodeId = cidReqStore.course?.resourceNode?.id
-    const gid = "&gid=0"
-
     if (exerciseAutoLaunch === 2 && exerciseResourceNodeId) {
       sessionStorage.setItem(autoLaunchKey, "true")
-      window.location.href = `/resources/exercise/${exerciseResourceNodeId}/?cid=${courseId}` + sid + gid
 
-      return false
+      return {
+        name: "ExerciseList",
+        params: { node: exerciseResourceNodeId },
+        query: courseContextQuery,
+      }
     } else if (exerciseAutoLaunch === 1) {
       const exerciseId = await courseService.getAutoLaunchExerciseId(courseId, sessionId)
 
       if (exerciseId && exerciseResourceNodeId) {
         sessionStorage.setItem(autoLaunchKey, "true")
-        window.location.href =
-          `/resources/exercise/${exerciseResourceNodeId}/${exerciseId}/overview?cid=${courseId}` + sid + gid
 
-        return false
+        return {
+          name: "ExerciseOverview",
+          params: { node: exerciseResourceNodeId, exerciseId },
+          query: courseContextQuery,
+        }
       }
     }
 
diff --git a/assets/vue/services/exerciseService.js b/assets/vue/services/exerciseService.js
index 7df26e3d939..8888684ec6f 100644
--- a/assets/vue/services/exerciseService.js
+++ b/assets/vue/services/exerciseService.js
@@ -26,7 +26,6 @@ function buildQueryString(params = {}) {
 
 function exerciseRequestConfig(config = {}) {
   return {
-    skipCourseContext: true,
     ...config,
   }
 }
diff --git a/assets/vue/views/course/CourseHome.vue b/assets/vue/views/course/CourseHome.vue
index b5b47c90bd8..767c83d65b7 100644
--- a/assets/vue/views/course/CourseHome.vue
+++ b/assets/vue/views/course/CourseHome.vue
@@ -368,70 +368,11 @@ const courseSettingsStore = useCourseSettings()
 
 const TOOL_VISIBILITY_VISIBLE = 2
 
-function extractIdFromIri(value) {
-  if (!value) {
-    return 0
-  }
-
-  const match = String(value).match(/\/(\d+)$/)
-
-  return match ? Number(match[1]) : 0
-}
-
-function getCourseResourceNodeId() {
-  return Number(course.value?.resourceNode?.id) || extractIdFromIri(course.value?.resourceNode?.["@id"])
-}
-
-function getCourseContextQuery() {
-  return {
-    cid: Number(course.value?.id) || 0,
-    sid: Number(session.value?.id) || 0,
-    gid: 0,
-  }
-}
-
-function isExerciseTool(tool) {
-  const toolTitle = String(tool?.title || tool?.tool?.title || "").toLowerCase()
-  const toolUrl = String(tool?.url || "").toLowerCase()
-
-  return ["quiz", "exercise", "exercises"].includes(toolTitle) || toolUrl.includes("/main/exercise/exercise.php") || toolUrl.includes("exercise/exercise.php")
-}
-
-function getExerciseToolUrl() {
-  const nodeId = getCourseResourceNodeId()
-
-  if (nodeId <= 0) {
-    return null
-  }
-
-  const query = getCourseContextQuery()
-  const params = new URLSearchParams()
-
-  params.set("cid", String(query.cid))
-  params.set("sid", String(query.sid))
-  params.set("gid", String(query.gid))
-
-  return `/resources/exercise/${nodeId}/?${params.toString()}`
-}
-
 function normalizeToolNavigation(tool) {
-  if (!isExerciseTool(tool)) {
-    if (routerTools.includes(tool.title)) {
-      tool.to = tool.url
-    }
-
-    return tool
-  }
-
-  const exerciseUrl = getExerciseToolUrl()
-
-  if (!exerciseUrl) {
-    return tool
+  if (routerTools.includes(tool.title)) {
+    tool.to = tool.url
   }
 
-  tool.to = null
-  tool.url = exerciseUrl
-
   return tool
 }
 
diff --git a/assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue b/assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue
index 6d1954140bf..bb2f895d3c3 100644
--- a/assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue
+++ b/assets/vue/views/exercise/ExerciseAiAikenGeneratorView.vue
@@ -377,6 +377,7 @@
 import { computed, nextTick, onMounted, reactive, ref, watch } from "vue"
 import { useI18n } from "vue-i18n"
 import { useRoute } from "vue-router"
+import { getCourseContext } from "../../utils/courseContext"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
 import BaseInputText from "../../components/basecomponents/BaseInputText.vue"
 import BaseSelect from "../../components/basecomponents/BaseSelect.vue"
@@ -453,16 +454,8 @@ function safeIcon(icon, fallback = "information") {
   return availableIcons[0] || "information"
 }
 
-function getQueryValue(value) {
-  return Array.isArray(value) ? value[0] : value
-}
-
 function getContextParams() {
-  return {
-    cid: getQueryValue(route.query.cid),
-    sid: getQueryValue(route.query.sid),
-    gid: getQueryValue(route.query.gid),
-  }
+  return getCourseContext(route)
 }
 
 function normalizePositiveInt(value, fallback = 1, max = 100) {
diff --git a/assets/vue/views/exercise/ExerciseListView.vue b/assets/vue/views/exercise/ExerciseListView.vue
index 421eac4557b..3f8b421e251 100644
--- a/assets/vue/views/exercise/ExerciseListView.vue
+++ b/assets/vue/views/exercise/ExerciseListView.vue
@@ -734,7 +734,7 @@ function buildQueryString(params = {}) {
 }
 
 function qti2ExportUrl(exerciseId) {
-  return `/api/exercise/${exerciseId}/qti2-export.zip${buildQueryString(getContextParams())}`
+  return `/api/exercise/${exerciseId}/qti2-export${buildQueryString(getContextParams())}`
 }
 
 function toggleSearchForm() {
diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php
index 60e18184c99..680374e0e98 100644
--- a/public/main/inc/lib/exercise.lib.php
+++ b/public/main/inc/lib/exercise.lib.php
@@ -7282,6 +7282,23 @@ public static function updateAttemptDataTrackingIfNeeded(int $exeId, array $ques
         $exerciseStatInfo['data_tracking'] = $newTracking;
     }
 
+
+    private static function getCourseResourceNodeId(int $courseId): int
+    {
+        if ($courseId <= 0) {
+            return 0;
+        }
+
+        $course = Container::getEntityManager()->getRepository(CourseEntity::class)->find($courseId);
+        if (!$course instanceof CourseEntity) {
+            return 0;
+        }
+
+        $resourceNode = $course->getResourceNode();
+
+        return null !== $resourceNode ? (int) $resourceNode->getId() : 0;
+    }
+
     /**
      * Build the modern Vue create URL for an exercise when a legacy integration
      * still needs to create a test without showing legacy exercise UI.
@@ -7297,11 +7314,7 @@ public static function buildVueCreateUrl(
             return null;
         }
 
-        $courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "SELECT resource_node_id FROM $courseTable WHERE id = $courseId LIMIT 1";
-        $result = Database::query($sql);
-        $row = Database::fetch_assoc($result);
-        $nodeId = isset($row['resource_node_id']) ? (int) $row['resource_node_id'] : 0;
+        $nodeId = self::getCourseResourceNodeId($courseId);
         if ($nodeId <= 0) {
             return null;
         }
@@ -7344,11 +7357,7 @@ public static function buildVueOverviewUrl(
             return null;
         }
 
-        $courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "SELECT resource_node_id FROM $courseTable WHERE id = $courseId LIMIT 1";
-        $result = Database::query($sql);
-        $row = Database::fetch_assoc($result);
-        $nodeId = isset($row['resource_node_id']) ? (int) $row['resource_node_id'] : 0;
+        $nodeId = self::getCourseResourceNodeId($courseId);
         if ($nodeId <= 0) {
             return null;
         }
diff --git a/src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php b/src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php
index f8bb43f1d8f..1608d498bd1 100644
--- a/src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php
+++ b/src/CoreBundle/Controller/Api/ExerciseQti2ExportController.php
@@ -21,7 +21,7 @@ public function __construct(
     ) {}
 
     #[Route(
-        '/api/exercise/{exerciseId}/qti2-export.zip',
+        '/api/exercise/{exerciseId}/qti2-export',
         name: 'chamilo_core_exercise_qti2_export_zip',
         requirements: ['exerciseId' => '\\d+'],
         methods: ['GET']
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
index 8916963c563..d76e1bea73d 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeUploadAnswerProcessor.php
@@ -19,6 +19,7 @@
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Helpers\CidReqHelper;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
 use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CLpItemView;
@@ -59,6 +60,7 @@ public function __construct(
         private CQuizRepository $quizRepository,
         private ResourceNodeRepository $resourceNodeRepository,
         private Security $security,
+        private CidReqHelper $cidReqHelper,
     ) {}
 
     /**
@@ -81,8 +83,8 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new AccessDeniedHttpException('A valid authenticated user is required.');
         }
 
-        $course = $this->getCourse($request);
-        $session = $this->getSession($request);
+        $course = $this->getCourse();
+        $session = $this->getSession();
         $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : $request->request->getInt('exerciseId');
         $attemptId = isset($uriVariables['attemptId']) ? (int) $uriVariables['attemptId'] : $request->request->getInt('attemptId');
         $questionId = $request->request->getInt('questionId');
@@ -258,8 +260,7 @@ private function syncReviewQuestion(TrackEExercise $attempt, int $questionId, bo
     private function canUploadAnswer(): bool
     {
         return $this->security->isGranted('ROLE_CURRENT_COURSE_STUDENT')
-            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT')
-            || $this->canManageExercises();
+            || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_STUDENT');
     }
 
     private function canManageExercises(): bool
@@ -268,34 +269,21 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
-    private function getCourse(Request $request): Course
+    private function getCourse(): Course
     {
-        $courseId = $request->query->getInt('cid');
-        if (0 >= $courseId) {
-            throw new BadRequestHttpException('A valid course id is required.');
-        }
-
-        $course = $this->entityManager->getRepository(Course::class)->find($courseId);
+        $course = $this->cidReqHelper->getCourseEntity();
         if (!$course instanceof Course) {
-            throw new BadRequestHttpException('The requested course was not found.');
+            throw new BadRequestHttpException('A valid course context is required.');
         }
 
         return $course;
     }
 
-    private function getSession(Request $request): ?Session
+    private function getSession(): ?Session
     {
-        $sessionId = $request->query->getInt('sid');
-        if (0 >= $sessionId) {
-            return null;
-        }
+        $session = $this->cidReqHelper->getSessionEntity();
 
-        $session = $this->entityManager->getRepository(Session::class)->find($sessionId);
-        if (!$session instanceof Session) {
-            throw new BadRequestHttpException('The requested session was not found.');
-        }
-
-        return $session;
+        return $session instanceof Session ? $session : null;
     }
 
 
@@ -417,6 +405,10 @@ private function getQueryPositiveInt(Request $request, array $names): int
     {
         foreach ($names as $name) {
             $value = $request->query->get($name);
+            if (null === $value || '' === (string) $value) {
+                $value = $request->request->get($name);
+            }
+
             if (\is_array($value)) {
                 $value = $value[0] ?? null;
             }

From ef4136279b8b97039cea9bf6bd88dfa8ba2d1eb4 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Wed, 17 Jun 2026 20:51:27 -0500
Subject: [PATCH 18/21] Exercise: Add adaptive hotspot delineation flow

---
 .../vue/views/exercise/ExercisePlayerView.vue | 250 +++++++++---
 .../exercise/ExerciseQuestionEditorView.vue   | 217 +++++++++-
 .../exercise/ExerciseQuestionSelectorView.vue |   7 +-
 .../vue/views/exercise/ExerciseResultView.vue |  77 +++-
 .../ApiResource/Exercise/ExerciseQuestion.php |   6 +
 .../Exercise/ExerciseQuestionEditor.php       |   3 +
 .../ExerciseQuestionBankProcessor.php         |  11 +-
 .../Exercise/ExerciseQuestionBankProvider.php |  11 +-
 .../ExerciseQuestionEditorProcessor.php       | 129 +++++-
 .../ExerciseQuestionEditorProvider.php        | 119 +++++-
 .../Exercise/ExerciseQuestionProvider.php     |  14 +-
 .../ExerciseRuntimeAnswerProcessor.php        | 379 +++++++++++++++++-
 .../ExerciseRuntimeAttemptProcessor.php       |   2 +-
 .../ExerciseRuntimeFinishProcessor.php        | 312 ++++++++++++++
 .../Exercise/ExerciseRuntimeProvider.php      |  12 +-
 .../ExerciseRuntimeResultProvider.php         |  42 +-
 16 files changed, 1505 insertions(+), 86 deletions(-)

diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index 52fb1738814..95d360cd37a 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -294,7 +294,7 @@
             :label="isFinishingAttempt ? t('Finishing') : t('End test')"
             icon="check"
             type="primary"
-            @click="finishAttempt({ skipDraftSave: true, skipReviewAnswers: true })"
+            @click="finishAttempt({ skipDraftSave: true, skipReviewAnswers: true, ignoreFeedback: true })"
           />
         </div>
       </div>
@@ -1004,14 +1004,37 @@
                       @click="onHotspotImageClick(question, $event)"
                       @load="onHotspotImageLoad(question, $event)"
                     />
+                    <svg
+                      v-if="isHotspotDelineationQuestion(question) && hotspotPlacedPoints(question).length"
+                      class="pointer-events-none absolute inset-0 h-full w-full text-primary"
+                      :viewBox="hotspotImageViewBox(question)"
+                    >
+                      <polygon
+                        v-if="hotspotPlacedPoints(question).length >= 3"
+                        class="fill-primary/20 stroke-primary"
+                        :points="hotspotDelineationSvgPoints(question)"
+                        stroke-linejoin="round"
+                        stroke-width="3"
+                        vector-effect="non-scaling-stroke"
+                      />
+                      <polyline
+                        v-else-if="hotspotPlacedPoints(question).length >= 2"
+                        class="stroke-primary"
+                        fill="none"
+                        :points="hotspotDelineationSvgPoints(question)"
+                        stroke-linejoin="round"
+                        stroke-width="3"
+                        vector-effect="non-scaling-stroke"
+                      />
+                    </svg>
                     <button
                       v-for="point in hotspotPlacedPoints(question)"
-                      :key="`${question.id}-hotspot-point-${point.answerId || point.label}`"
+                      :key="`${question.id}-hotspot-point-${point.answerId || 0}-${point.index ?? point.label}`"
                       class="absolute flex h-7 w-7 -translate-x-1/2 -translate-y-1/2 items-center justify-center rounded-full border-2 border-white bg-primary text-xs font-bold text-white shadow"
                       :style="hotspotPointStyle(question, point)"
                       type="button"
                       :title="t('Remove point')"
-                      @click.stop="removeHotspotPoint(question, point.answerId)"
+                      @click.stop="removeHotspotPoint(question, point.answerId, point.index)"
                     >
                       {{ hotspotPointLabel(question, point) }}
                     </button>
@@ -1025,40 +1048,72 @@
                 </div>
 
                 <aside class="space-y-3 rounded-lg border border-gray-20 bg-white p-3">
-                  <div class="text-sm font-semibold text-gray-90">
-                    {{ t("Answers") }}
-                  </div>
-                  <div class="space-y-2">
-                    <button
-                      v-for="(zone, zoneIndex) in hotspotZones(question)"
-                      :key="zone.id"
-                      class="w-full rounded-lg border px-3 py-2 text-left text-sm transition hover:bg-gray-10"
-                      :class="Number(answers[question.id].selectedHotspotAnswerId) === Number(zone.id) ? 'border-primary bg-primary/5 text-primary' : 'border-gray-20 text-gray-700'"
-                      type="button"
-                      @click="selectHotspotZone(question, zone.id)"
-                    >
-                      <div class="flex items-start gap-2">
-                        <span class="mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-primary text-xs font-bold text-white">
-                          {{ zone.position || zoneIndex + 1 }}
-                        </span>
-                        <span class="min-w-0 flex-1">
-                          <span class="exercise-runtime-html block font-medium" v-html="zone.answer" />
-                          <span
-                            v-if="hotspotPointByAnswer(question, zone.id)"
-                            class="mt-1 block text-xs text-success"
-                          >
-                            {{ t("Placed") }}
+                  <template v-if="isHotspotDelineationQuestion(question)">
+                    <div class="text-sm font-semibold text-gray-90">
+                      {{ t("Delineation") }}
+                    </div>
+                    <div class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4">
+                      {{ t("Click the image to draw the delineation polygon.") }}
+                      <span v-if="hotspotPlacedPoints(question).length">
+                        {{ t("Click a marker to remove it.") }}
+                      </span>
+                    </div>
+                    <div class="flex flex-wrap gap-2">
+                      <button
+                        class="rounded border border-gray-30 px-3 py-2 text-xs font-semibold text-gray-700 hover:bg-gray-10"
+                        type="button"
+                        @click="undoHotspotDelineation(question)"
+                      >
+                        {{ t("Undo") }}
+                      </button>
+                      <button
+                        class="rounded border border-danger/30 px-3 py-2 text-xs font-semibold text-danger hover:bg-danger/10"
+                        type="button"
+                        @click="clearHotspotDelineation(question)"
+                      >
+                        {{ t("Clear") }}
+                      </button>
+                    </div>
+                    <div class="text-xs text-gray-70">
+                      {{ t("Points") }}: {{ hotspotPlacedPoints(question).length }}
+                    </div>
+                  </template>
+                  <template v-else>
+                    <div class="text-sm font-semibold text-gray-90">
+                      {{ t("Answers") }}
+                    </div>
+                    <div class="space-y-2">
+                      <button
+                        v-for="(zone, zoneIndex) in hotspotZones(question)"
+                        :key="zone.id"
+                        class="w-full rounded-lg border px-3 py-2 text-left text-sm transition hover:bg-gray-10"
+                        :class="Number(answers[question.id].selectedHotspotAnswerId) === Number(zone.id) ? 'border-primary bg-primary/5 text-primary' : 'border-gray-20 text-gray-700'"
+                        type="button"
+                        @click="selectHotspotZone(question, zone.id)"
+                      >
+                        <div class="flex items-start gap-2">
+                          <span class="mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-primary text-xs font-bold text-white">
+                            {{ zone.position || zoneIndex + 1 }}
                           </span>
-                        </span>
-                      </div>
-                    </button>
-                  </div>
-                  <div class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4">
-                    {{ t("Select an answer, then click on the image to mark it.") }}
-                    <span v-if="hotspotPlacedPoints(question).length">
-                      {{ t("Click a marker to remove it.") }}
-                    </span>
-                  </div>
+                          <span class="min-w-0 flex-1">
+                            <span class="exercise-runtime-html block font-medium" v-html="zone.answer" />
+                            <span
+                              v-if="hotspotPointByAnswer(question, zone.id)"
+                              class="mt-1 block text-xs text-success"
+                            >
+                              {{ t("Placed") }}
+                            </span>
+                          </span>
+                        </div>
+                      </button>
+                    </div>
+                    <div class="rounded-lg border border-info/30 bg-support-1 p-3 text-sm text-support-4">
+                      {{ t("Select an answer, then click on the image to mark it.") }}
+                      <span v-if="hotspotPlacedPoints(question).length">
+                        {{ t("Click a marker to remove it.") }}
+                      </span>
+                    </div>
+                  </template>
                 </aside>
               </div>
             </div>
@@ -1196,7 +1251,10 @@
           </label>
         </div>
 
-        <div class="flex flex-wrap justify-between gap-2 rounded-xl border border-gray-20 bg-white p-4 shadow-sm">
+        <div
+          v-if="showRuntimeNavigationControls"
+          class="flex flex-wrap justify-between gap-2 rounded-xl border border-gray-20 bg-white p-4 shadow-sm"
+        >
           <BaseButton
             v-if="showPreviousNavigationButton"
             :disabled="!canMovePrevious || isSavingAnswer || isQuestionTimeExpired || isAutoAdvancingTimedQuestion"
@@ -1454,9 +1512,10 @@ const visibleQuestions = computed(() => {
 })
 
 const visibleQuestionTotal = computed(() => answerableQuestions.value.length)
-const isReviewAnswersEnabled = computed(() => Number(settings.value.reviewAnswers || 0) > 0)
-const isCheckAnswersBeforeFinishEnabled = computed(() => true === settings.value.checkAllAnswersBeforeEndTest)
-const isFinalAnswerChecklistEnabled = computed(() => isReviewAnswersEnabled.value || isCheckAnswersBeforeFinishEnabled.value)
+const isImmediateFeedbackRuntime = computed(() => [1, 3].includes(Number(settings.value.feedbackType || 0)))
+const isReviewAnswersEnabled = computed(() => !isImmediateFeedbackRuntime.value && Number(settings.value.reviewAnswers || 0) > 0)
+const isCheckAnswersBeforeFinishEnabled = computed(() => !isImmediateFeedbackRuntime.value && true === settings.value.checkAllAnswersBeforeEndTest)
+const isFinalAnswerChecklistEnabled = computed(() => !isImmediateFeedbackRuntime.value && (isReviewAnswersEnabled.value || isCheckAnswersBeforeFinishEnabled.value))
 const isReviewingMarkedQuestions = computed(() => reviewQueue.value.length > 0)
 const showReviewReminderScreen = computed(() => {
   return !canManage.value
@@ -1569,8 +1628,12 @@ const reviewReminderTitle = computed(() => {
   return isReviewAnswersEnabled.value ? t("Questions to be reviewed") : t("Review my answers")
 })
 const feedbackDialogTitle = computed(() => t(feedbackDialog.value?.title || "Feedback"))
+const hasVisibleDirectFeedback = computed(() => {
+  return visibleQuestions.value.some((question) => Boolean(directFeedbackForQuestion(question)))
+})
+const showRuntimeNavigationControls = computed(() => !hasVisibleDirectFeedback.value)
 const requiresSavedAnswerConfirmation = computed(() => {
-  return !canManage.value && Boolean(activeAttempt.value?.attemptId) && true === settings.value.confirmSavedAnswers
+  return !isImmediateFeedbackRuntime.value && !canManage.value && Boolean(activeAttempt.value?.attemptId) && true === settings.value.confirmSavedAnswers
 })
 const canFinishWithConfirmation = computed(() => {
   return !requiresSavedAnswerConfirmation.value || true === confirmedSavedAnswers.value
@@ -2550,7 +2613,9 @@ function handleRuntimeFeedback(question, feedback, afterAction = "none") {
   const normalizedFeedback = {
     ...feedback,
     questionId: Number(feedback.questionId || question.id || 0),
-    afterAction,
+    afterAction: feedback.afterAction || afterAction,
+    targetQuestionId: Number(feedback.targetQuestionId || 0),
+    targetUrl: feedback.targetUrl || "",
   }
 
   feedbackShownOnLastSave.value = true
@@ -2611,7 +2676,7 @@ async function proceedAfterFeedback(feedback) {
   feedbackDialog.value = null
 
   if (feedback.afterAction === "finish") {
-    await finishAttempt({ skipDraftSave: true, ignoreFeedback: true })
+    await finishAttempt({ skipDraftSave: true, skipReviewAnswers: true, ignoreFeedback: true })
     return
   }
 
@@ -2624,6 +2689,22 @@ async function proceedAfterFeedback(feedback) {
   if (feedback.afterAction === "previous" && canMovePrevious.value) {
     currentQuestionIndex.value -= 1
     syncQuestionCountdown()
+    return
+  }
+
+  if (feedback.afterAction === "question" && Number(feedback.targetQuestionId || 0) > 0) {
+    setCurrentQuestionById(Number(feedback.targetQuestionId))
+    syncQuestionCountdown()
+    return
+  }
+
+  if (feedback.afterAction === "repeat") {
+    syncQuestionCountdown()
+    return
+  }
+
+  if (feedback.afterAction === "url" && feedback.targetUrl) {
+    window.location.href = feedback.targetUrl
   }
 }
 
@@ -2963,7 +3044,9 @@ function applySavedAnswer(question, rows) {
 
   if (isHotspotQuestion(question)) {
     questionAnswer.hotspotPoints = parseSavedHotspotPoints(rows[0]?.answer || "")
-    questionAnswer.selectedHotspotAnswerId = firstMissingHotspotZoneId(question) || hotspotZones(question)[0]?.id || null
+    questionAnswer.selectedHotspotAnswerId = isHotspotDelineationQuestion(question)
+      ? null
+      : (firstMissingHotspotZoneId(question) || hotspotZones(question)[0]?.id || null)
     return
   }
 
@@ -3073,7 +3156,7 @@ function initializeAnswerState() {
       annotationImageSize: null,
       hotspotPoints: [],
       hotspotImageSize: null,
-      selectedHotspotAnswerId: hotspotZones(question)[0]?.id || null,
+      selectedHotspotAnswerId: isHotspotDelineationQuestion(question) ? null : (hotspotZones(question)[0]?.id || null),
       reviewLater: reviewQuestionIds.value.has(Number(question.id || 0)),
     }
 
@@ -3362,8 +3445,7 @@ function onHotspotImageLoad(question, event) {
 function onHotspotImageClick(question, event) {
   const questionAnswer = answers.value[question.id]
   const image = event?.target
-  const selectedAnswerId = Number(questionAnswer?.selectedHotspotAnswerId || 0)
-  if (!questionAnswer || !image || selectedAnswerId <= 0) {
+  if (!questionAnswer || !image) {
     return
   }
 
@@ -3378,6 +3460,19 @@ function onHotspotImageClick(question, event) {
   const y = Math.round(((event.clientY - rect.top) / rect.height) * naturalHeight)
   questionAnswer.hotspotImageSize = { width: naturalWidth, height: naturalHeight }
 
+  if (isHotspotDelineationQuestion(question)) {
+    questionAnswer.hotspotPoints.push({
+      x: Math.max(0, x),
+      y: Math.max(0, y),
+    })
+    return
+  }
+
+  const selectedAnswerId = Number(questionAnswer?.selectedHotspotAnswerId || 0)
+  if (selectedAnswerId <= 0) {
+    return
+  }
+
   const nextPoint = {
     answerId: selectedAnswerId,
     x: Math.max(0, x),
@@ -3402,12 +3497,23 @@ function selectHotspotZone(question, answerId) {
   questionAnswer.selectedHotspotAnswerId = Number(answerId || 0) || null
 }
 
-function removeHotspotPoint(question, answerId) {
+function removeHotspotPoint(question, answerId, pointIndex = null) {
   const questionAnswer = answers.value[question.id]
   if (!questionAnswer) {
     return
   }
 
+  if (isHotspotDelineationQuestion(question)) {
+    const numericIndex = Number(pointIndex)
+    if (Number.isInteger(numericIndex) && numericIndex >= 0) {
+      questionAnswer.hotspotPoints.splice(numericIndex, 1)
+      return
+    }
+
+    questionAnswer.hotspotPoints.pop()
+    return
+  }
+
   const numericAnswerId = Number(answerId || 0)
   if (numericAnswerId > 0) {
     questionAnswer.hotspotPoints = questionAnswer.hotspotPoints.filter((point) => Number(point.answerId || 0) !== numericAnswerId)
@@ -3418,6 +3524,19 @@ function removeHotspotPoint(question, answerId) {
   questionAnswer.hotspotPoints.pop()
 }
 
+function undoHotspotDelineation(question) {
+  removeHotspotPoint(question, 0)
+}
+
+function clearHotspotDelineation(question) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer) {
+    return
+  }
+
+  questionAnswer.hotspotPoints = []
+}
+
 function hotspotZones(question) {
   const zones = Array.isArray(question?.hotspot?.zones) ? question.hotspot.zones : []
 
@@ -3435,6 +3554,16 @@ function hotspotPlacedPoints(question) {
   const questionAnswer = answers.value[question.id] || {}
   const zones = hotspotZones(question)
   const rawPoints = questionAnswer.hotspotPoints || []
+
+  if (isHotspotDelineationQuestion(question)) {
+    return rawPoints.map((point, index) => ({
+      ...point,
+      answerId: 0,
+      index,
+      label: index + 1,
+    }))
+  }
+
   const orderedPoints = []
 
   for (const [zoneIndex, zone] of zones.entries()) {
@@ -3472,6 +3601,10 @@ function hotspotPointLabel(question, point) {
 }
 
 function firstMissingHotspotZoneId(question) {
+  if (isHotspotDelineationQuestion(question)) {
+    return null
+  }
+
   const questionAnswer = answers.value[question.id] || {}
   const placedAnswerIds = new Set((questionAnswer.hotspotPoints || []).map((point) => Number(point.answerId || 0)).filter((value) => value > 0))
   const missingZone = hotspotZones(question).find((zone) => !placedAnswerIds.has(Number(zone.id || 0)))
@@ -3498,6 +3631,21 @@ function hotspotPointStyle(question, point) {
   }
 }
 
+function hotspotImageViewBox(question) {
+  const questionAnswer = answers.value[question.id] || {}
+  const size = questionAnswer.hotspotImageSize || {}
+  const width = Number(size.width || 0) || 1
+  const height = Number(size.height || 0) || 1
+
+  return `0 0 ${width} ${height}`
+}
+
+function hotspotDelineationSvgPoints(question) {
+  return hotspotPlacedPoints(question)
+    .map((point) => `${Number(point.x || 0)},${Number(point.y || 0)}`)
+    .join(' ')
+}
+
 function parseSavedHotspotPoints(value) {
   return String(value || "")
     .split("|")
@@ -3711,7 +3859,11 @@ function isAnnotationQuestion(question) {
 }
 
 function isHotspotQuestion(question) {
-  return [6, 26].includes(Number(question.type)) && question.hotspot
+  return [6, 8, 26].includes(Number(question.type)) && question.hotspot
+}
+
+function isHotspotDelineationQuestion(question) {
+  return Number(question.type) === 8 && question.hotspot
 }
 
 function isReadingQuestion(question) {
diff --git a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
index edd7d145191..46d79382c22 100644
--- a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
@@ -383,7 +383,7 @@
         </div>
 
         <section
-          v-if="isHotspotDelineationQuestion"
+          v-if="showHotspotDelineationScenario"
           class="space-y-3 rounded-lg border border-info/30 bg-support-1 px-4 py-3"
         >
           <h3 class="text-sm font-semibold uppercase tracking-wide text-support-4">
@@ -419,6 +419,27 @@
               name="hotspot_failure_url"
             />
           </div>
+
+          <div class="rounded-lg border border-info/20 bg-white p-3 text-sm text-gray-80">
+            <div class="mb-2 font-semibold text-gray-90">
+              {{ t("Dependency tree") }}
+            </div>
+            <div class="flex flex-col gap-2 md:flex-row md:items-center">
+              <div class="rounded border border-gray-20 bg-gray-10 px-3 py-2 font-medium">
+                {{ t("Current question") }}
+              </div>
+              <div class="flex flex-1 flex-col gap-2">
+                <div
+                  v-for="item in hotspotDependencyTreeItems"
+                  :key="item.key"
+                  class="rounded border border-gray-20 bg-gray-10 px-3 py-2"
+                >
+                  <span class="font-semibold">{{ item.label }}:</span>
+                  <span>{{ item.destination }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
         </section>
 
         <div class="space-y-3">
@@ -466,6 +487,24 @@
                   >
                     {{ t("Score") }}
                   </th>
+                  <th
+                    v-if="isHotspotDelineationQuestion"
+                    class="w-36 border border-gray-20 px-2 py-2 text-right"
+                  >
+                    {{ t("Minimum overlap") }}
+                  </th>
+                  <th
+                    v-if="isHotspotDelineationQuestion"
+                    class="w-36 border border-gray-20 px-2 py-2 text-right"
+                  >
+                    {{ t("Maximum excess") }}
+                  </th>
+                  <th
+                    v-if="isHotspotDelineationQuestion"
+                    class="w-36 border border-gray-20 px-2 py-2 text-right"
+                  >
+                    {{ t("Maximum missing") }}
+                  </th>
                   <th class="min-w-[220px] border border-gray-20 px-2 py-2 text-left">{{ t("Feedback") }}</th>
                   <th class="w-28 border border-gray-20 px-2 py-2 text-right">{{ t("Actions") }}</th>
                 </tr>
@@ -523,6 +562,66 @@
                       {{ t("Area to avoid") }}: 0
                     </div>
                   </td>
+                  <td
+                    v-if="isHotspotDelineationQuestion"
+                    class="border border-gray-20 px-2 py-2 align-top"
+                  >
+                    <BaseInputNumber
+                      v-if="item.hotspotType === 'delineation'"
+                      :id="`exercise-hotspot-min-overlap-${item.localId}`"
+                      v-model="item.minOverlap"
+                      :label="t('Minimum overlap')"
+                      :name="`hotspot_min_overlap_${index}`"
+                      :min="0"
+                      :step="1"
+                    />
+                    <div
+                      v-else
+                      class="rounded border border-gray-20 bg-gray-15 px-3 py-2 text-sm text-gray-70"
+                    >
+                      {{ t("Area to avoid") }}
+                    </div>
+                  </td>
+                  <td
+                    v-if="isHotspotDelineationQuestion"
+                    class="border border-gray-20 px-2 py-2 align-top"
+                  >
+                    <BaseInputNumber
+                      v-if="item.hotspotType === 'delineation'"
+                      :id="`exercise-hotspot-max-excess-${item.localId}`"
+                      v-model="item.maxExcess"
+                      :label="t('Maximum excess')"
+                      :name="`hotspot_max_excess_${index}`"
+                      :min="0"
+                      :step="1"
+                    />
+                    <div
+                      v-else
+                      class="rounded border border-gray-20 bg-gray-15 px-3 py-2 text-sm text-gray-70"
+                    >
+                      {{ t("Area to avoid") }}
+                    </div>
+                  </td>
+                  <td
+                    v-if="isHotspotDelineationQuestion"
+                    class="border border-gray-20 px-2 py-2 align-top"
+                  >
+                    <BaseInputNumber
+                      v-if="item.hotspotType === 'delineation'"
+                      :id="`exercise-hotspot-max-missing-${item.localId}`"
+                      v-model="item.maxMissing"
+                      :label="t('Maximum missing')"
+                      :name="`hotspot_max_missing_${index}`"
+                      :min="0"
+                      :step="1"
+                    />
+                    <div
+                      v-else
+                      class="rounded border border-gray-20 bg-gray-15 px-3 py-2 text-sm text-gray-70"
+                    >
+                      {{ t("Area to avoid") }}
+                    </div>
+                  </td>
                   <td class="border border-gray-20 px-2 py-2 align-top">
                     <BaseTextArea
                       :id="`exercise-hotspot-comment-${item.localId}`"
@@ -1238,6 +1337,66 @@
         </div>
       </section>
 
+      <section
+        v-if="showUniqueAnswerAdaptiveScenario"
+        class="space-y-3 rounded-lg border border-info/30 bg-support-1 px-4 py-3"
+      >
+        <h3 class="text-sm font-semibold uppercase tracking-wide text-support-4">
+          {{ t("Adaptive behavior (success/failure)") }}
+        </h3>
+        <div class="grid gap-4 md:grid-cols-2">
+          <BaseSelect
+            id="exercise-adaptive-success-destination"
+            v-model="form.hotspotScenarioSuccessType"
+            :label="t('On success')"
+            name="adaptive_success_destination"
+            :options="form.hotspotScenarioOptions"
+          />
+          <BaseInputText
+            v-if="form.hotspotScenarioSuccessType === 'url'"
+            id="exercise-adaptive-success-url"
+            v-model="form.hotspotScenarioSuccessUrl"
+            :label="t('Custom URL')"
+            name="adaptive_success_url"
+          />
+          <BaseSelect
+            id="exercise-adaptive-failure-destination"
+            v-model="form.hotspotScenarioFailureType"
+            :label="t('On failure')"
+            name="adaptive_failure_destination"
+            :options="form.hotspotScenarioOptions"
+          />
+          <BaseInputText
+            v-if="form.hotspotScenarioFailureType === 'url'"
+            id="exercise-adaptive-failure-url"
+            v-model="form.hotspotScenarioFailureUrl"
+            :label="t('Custom URL')"
+            name="adaptive_failure_url"
+          />
+        </div>
+
+        <div class="rounded-lg border border-info/20 bg-white p-3 text-sm text-gray-80">
+          <div class="mb-2 font-semibold text-gray-90">
+            {{ t("Dependency tree") }}
+          </div>
+          <div class="flex flex-col gap-2 md:flex-row md:items-center">
+            <div class="rounded border border-gray-20 bg-gray-10 px-3 py-2 font-medium">
+              {{ t("Current question") }}
+            </div>
+            <div class="flex flex-1 flex-col gap-2">
+              <div
+                v-for="item in hotspotDependencyTreeItems"
+                :key="item.key"
+                class="rounded border border-gray-20 bg-gray-10 px-3 py-2"
+              >
+                <span class="font-semibold">{{ item.label }}:</span>
+                <span>{{ item.destination }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+
       <div
         v-if="!isMatchingQuestion && !isDraggableOrderingQuestion"
         class="flex flex-wrap items-center gap-2"
@@ -1550,6 +1709,7 @@ const showAdvancedSettings = ref(false)
 const allowQuestionFeedback = ref(false)
 const imageZoomEnabled = ref(false)
 const allowMandatoryQuestion = ref(false)
+const canUseHotspotDelineationScenario = ref(false)
 const isReadOnlyFromLearningPath = ref(false)
 const learningPathReadOnlyMessage = ref(
   "This exercise has been included in a learning path, so it cannot be accessed by students directly from here. If you want to put the same exercise available through the exercises tool, please make a copy of the current exercise using the copy icon.",
@@ -1724,6 +1884,9 @@ const isUniqueAnswerImage = computed(() => UNIQUE_ANSWER_IMAGE === Number(form.t
 const isAnnotationQuestion = computed(() => ANNOTATION === Number(form.type))
 const isHotspotQuestion = computed(() => [HOT_SPOT, HOT_SPOT_DELINEATION, HOT_SPOT_COMBINATION].includes(Number(form.type)))
 const isHotspotDelineationQuestion = computed(() => HOT_SPOT_DELINEATION === Number(form.type))
+const showAdaptiveQuestionScenario = computed(() => canUseHotspotDelineationScenario.value && [UNIQUE_ANSWER, HOT_SPOT_DELINEATION].includes(Number(form.type)))
+const showHotspotDelineationScenario = computed(() => isHotspotDelineationQuestion.value && showAdaptiveQuestionScenario.value)
+const showUniqueAnswerAdaptiveScenario = computed(() => isUniqueAnswer.value && showAdaptiveQuestionScenario.value)
 const isHotspotCombinationQuestion = computed(() => HOT_SPOT_COMBINATION === Number(form.type))
 const isCalculatedAnswerQuestion = computed(() => CALCULATED_ANSWER === Number(form.type))
 const isOpenQuestion = computed(() => FREE_ANSWER === Number(form.type))
@@ -1764,6 +1927,18 @@ const hotspotEditorTitle = computed(() => {
   return isHotspotCombinationQuestion.value ? t("Hotspot combination") : t("Hotspot")
 })
 const addHotspotLabel = computed(() => isHotspotDelineationQuestion.value ? t("Add delineation") : t("Add hotspot"))
+const hotspotDependencyTreeItems = computed(() => [
+  {
+    key: "success",
+    label: t("On success"),
+    destination: getScenarioOptionLabel(form.hotspotScenarioSuccessType, form.hotspotScenarioSuccessUrl),
+  },
+  {
+    key: "failure",
+    label: t("On failure"),
+    destination: getScenarioOptionLabel(form.hotspotScenarioFailureType, form.hotspotScenarioFailureUrl),
+  },
+])
 const regularAnswerCount = computed(() => form.answers.filter((answer) => !answer.isUnknown).length)
 const dropdownOptionCount = computed(() => form.answers.length)
 const editorTitle = computed(() => {
@@ -2277,6 +2452,7 @@ function fillForm(data) {
   allowQuestionFeedback.value = true === data.allowQuestionFeedback
   imageZoomEnabled.value = true === data.imageZoomEnabled
   allowMandatoryQuestion.value = true === data.allowMandatoryQuestion
+  canUseHotspotDelineationScenario.value = true === data.canUseHotspotDelineationScenario
 
   if (isDropdownQuestion.value) {
     form.matchingOptions = []
@@ -2678,6 +2854,9 @@ function normalizeHotspotItems(items = []) {
       position: index + 1,
       hotspotType,
       coordinates: item.coordinates || "0;0|0|0",
+      minOverlap: normalizePercentage(item.minOverlap ?? 1, 1),
+      maxExcess: normalizePercentage(item.maxExcess ?? 100, 100),
+      maxMissing: normalizePercentage(item.maxMissing ?? 100, 100),
     }
   })
 }
@@ -2688,6 +2867,28 @@ function normalizeScenarioOptions(options = []) {
     .map((option) => ({ label: t(option.label || String(option.value)), value: String(option.value) }))
 }
 
+function normalizePercentage(value, fallback) {
+  const numericValue = Number(value)
+
+  if (!Number.isFinite(numericValue)) {
+    return fallback
+  }
+
+  return Math.min(100, Math.max(0, Math.round(numericValue)))
+}
+
+function getScenarioOptionLabel(value, urlFallback = "") {
+  const normalizedValue = String(value || "")
+
+  if (normalizedValue === "url") {
+    return urlFallback || t("Custom URL")
+  }
+
+  const option = form.hotspotScenarioOptions.find((item) => String(item.value) === normalizedValue)
+
+  return option?.label || t("None")
+}
+
 function normalizeHotspotTypeValue(type) {
   const value = String(type || "")
   if (["square", "circle", "poly"].includes(value) && !isHotspotDelineationQuestion.value) {
@@ -2729,6 +2930,9 @@ function createEmptyHotspotItem(index = 0, forcedType = "") {
     position: index + 1,
     hotspotType,
     coordinates: "0;0|0|0",
+    minOverlap: 1,
+    maxExcess: 100,
+    maxMissing: 100,
   }
 }
 
@@ -3109,12 +3313,15 @@ function buildPayload() {
           position: index + 1,
           hotspotType: normalizeHotspotTypeValue(item.hotspotType),
           coordinates: item.coordinates || "",
+          minOverlap: normalizePercentage(item.minOverlap ?? 1, 1),
+          maxExcess: normalizePercentage(item.maxExcess ?? 100, 100),
+          maxMissing: normalizePercentage(item.maxMissing ?? 100, 100),
         }))
       : [],
-    hotspotScenarioSuccessType: isHotspotDelineationQuestion.value ? form.hotspotScenarioSuccessType : "",
-    hotspotScenarioSuccessUrl: isHotspotDelineationQuestion.value ? form.hotspotScenarioSuccessUrl : "",
-    hotspotScenarioFailureType: isHotspotDelineationQuestion.value ? form.hotspotScenarioFailureType : "",
-    hotspotScenarioFailureUrl: isHotspotDelineationQuestion.value ? form.hotspotScenarioFailureUrl : "",
+    hotspotScenarioSuccessType: showAdaptiveQuestionScenario.value ? form.hotspotScenarioSuccessType : "",
+    hotspotScenarioSuccessUrl: showAdaptiveQuestionScenario.value ? form.hotspotScenarioSuccessUrl : "",
+    hotspotScenarioFailureType: showAdaptiveQuestionScenario.value ? form.hotspotScenarioFailureType : "",
+    hotspotScenarioFailureUrl: showAdaptiveQuestionScenario.value ? form.hotspotScenarioFailureUrl : "",
     score: Number(form.score || 0),
     globalScore: Number(form.globalScore || 0),
     correctScore: Number(form.correctScore || 0),
diff --git a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
index 3176ee72988..abc764b73d5 100644
--- a/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionSelectorView.vue
@@ -84,6 +84,7 @@
               @click="finishLearningPathCreation"
             />
             <BaseButton
+              v-if="canRecycleQuestions"
               :disabled="isReadOnlyFromLearningPath"
               :label="t('Recycle existing questions')"
               :route="
@@ -656,6 +657,7 @@ const totalScore = ref(0)
 const questionTypes = ref([])
 const questions = ref([])
 const csrfToken = ref("")
+const canRecycleQuestions = ref(true)
 const isReadOnlyFromLearningPath = ref(false)
 const learningPathReadOnlyMessage = ref(
   "This exercise has been included in a learning path, so it cannot be accessed by students directly from here. If you want to put the same exercise available through the exercises tool, please make a copy of the current exercise using the copy icon.",
@@ -759,7 +761,7 @@ function isVueQuestionType(questionTypeOrId) {
     return true
   }
 
-  return [1, 2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31].includes(getQuestionTypeId(questionTypeOrId))
+  return [1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31].includes(getQuestionTypeId(questionTypeOrId))
 }
 
 function questionTypeHelp(questionTypeOrId) {
@@ -870,7 +872,7 @@ function isAnnotationQuestionType(type) {
 }
 
 function isHotspotQuestionType(type) {
-  return [6, 26].includes(Number(type))
+  return [6, 8, 26].includes(Number(type))
 }
 
 function isHotspotCombinationQuestionType(type) {
@@ -1140,6 +1142,7 @@ async function loadQuestionSelector() {
     totalScore.value = Number(response.totalScore || 0)
     questionTypes.value = Array.isArray(response.questionTypes) ? response.questionTypes : []
     questions.value = Array.isArray(response.questions) ? response.questions : []
+    canRecycleQuestions.value = response.canRecycleQuestions !== false
     csrfToken.value = response.csrfToken || ""
   } catch (error) {
     console.error("Error loading exercise questions", error)
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index 62c4eca37f6..3aba15f52a4 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -602,7 +602,7 @@
                   class="rounded-lg border border-gray-20 bg-gray-10 p-3"
                 >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
-                    {{ t("Learner clicks") }}
+                    {{ question.answer.delineation ? t("Delineation review") : t("Learner clicks") }}
                   </div>
                   <div
                     v-if="question.answer.imageUrl"
@@ -615,6 +615,32 @@
                         :src="question.answer.imageUrl"
                         @load="onResultHotspotImageLoad(question, $event)"
                       />
+                      <svg
+                        v-if="question.answer.delineation && resultHotspotImageReady(question)"
+                        class="pointer-events-none absolute inset-0 h-full w-full"
+                        :viewBox="resultHotspotViewBox(question)"
+                        preserveAspectRatio="none"
+                      >
+                        <polygon
+                          v-for="zone in resultHotspotPolygonZones(question)"
+                          :key="`${question.id}-result-zone-${zone.id}`"
+                          :class="resultHotspotZoneClass(zone)"
+                          :points="resultHotspotPolylinePoints(zone.points)"
+                          fill="currentColor"
+                          fill-opacity="0.18"
+                          stroke="currentColor"
+                          stroke-width="3"
+                        />
+                        <polygon
+                          v-if="question.answer.studentPoints?.length >= 3"
+                          class="text-primary"
+                          :points="resultHotspotPolylinePoints(question.answer.studentPoints)"
+                          fill="currentColor"
+                          fill-opacity="0.22"
+                          stroke="currentColor"
+                          stroke-width="4"
+                        />
+                      </svg>
                       <span
                         v-for="point in question.answer.studentPoints"
                         :key="`${question.id}-result-hotspot-${point.label}`"
@@ -637,6 +663,24 @@
                   >
                     {{ t("No answer") }}
                   </div>
+                  <div
+                    v-if="question.answer.delineation && question.answer.studentPoints?.length"
+                    class="mt-2 flex flex-wrap gap-2 text-xs"
+                  >
+                    <span class="rounded bg-primary/10 px-2 py-1 text-primary">{{ t("Learner delineation") }}</span>
+                    <span
+                      v-if="hasResultHotspotZoneType(question, 'delineation')"
+                      class="rounded bg-success/10 px-2 py-1 text-success"
+                    >
+                      {{ t("Expected delineation") }}
+                    </span>
+                    <span
+                      v-if="hasResultHotspotZoneType(question, 'oar')"
+                      class="rounded bg-danger/10 px-2 py-1 text-danger"
+                    >
+                      {{ t("Area to avoid") }}
+                    </span>
+                  </div>
                 </div>
 
                 <div
@@ -1812,6 +1856,37 @@ function resultHotspotPointStyle(question, point) {
   }
 }
 
+function resultHotspotImageReady(question) {
+  const size = resultHotspotImageSizes.value[question.id] || {}
+
+  return Number(size.width || 0) > 0 && Number(size.height || 0) > 0
+}
+
+function resultHotspotViewBox(question) {
+  const size = resultHotspotImageSizes.value[question.id] || {}
+
+  return `0 0 ${Number(size.width || 1)} ${Number(size.height || 1)}`
+}
+
+function resultHotspotPolylinePoints(points) {
+  return (Array.isArray(points) ? points : [])
+    .map((point) => `${Number(point.x || 0)},${Number(point.y || 0)}`)
+    .join(" ")
+}
+
+function resultHotspotPolygonZones(question) {
+  return (Array.isArray(question?.answer?.zones) ? question.answer.zones : [])
+    .filter((zone) => Array.isArray(zone.points) && zone.points.length >= 3)
+}
+
+function resultHotspotZoneClass(zone) {
+  return zone?.hotspotType === "oar" ? "text-danger" : "text-success"
+}
+
+function hasResultHotspotZoneType(question, hotspotType) {
+  return resultHotspotPolygonZones(question).some((zone) => zone.hotspotType === hotspotType)
+}
+
 function resultAnnotationImageReady(question) {
   const size = resultHotspotImageSizes.value[question.id] || {}
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
index 4036372c8f8..44bda49c919 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestion.php
@@ -72,6 +72,12 @@ final class ExerciseQuestion
     #[Groups(['exercise_question:read'])]
     public bool $canManage = false;
 
+    #[Groups(['exercise_question:read'])]
+    public bool $isAdaptiveFeedback = false;
+
+    #[Groups(['exercise_question:read'])]
+    public bool $canRecycleQuestions = true;
+
     #[Groups(['exercise_question:read'])]
     public bool $usesLegacyQuestionEditors = true;
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
index 5db11cb00e9..f3ef5a68e87 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
@@ -367,6 +367,9 @@ final class ExerciseQuestionEditor
     #[Groups(['exercise_question_editor:read'])]
     public bool $allowMandatoryQuestion = false;
 
+    #[Groups(['exercise_question_editor:read'])]
+    public bool $canUseHotspotDelineationScenario = false;
+
     #[Groups(['exercise_question_editor:read'])]
     public bool $isLinkedToLearningPath = false;
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
index 998cb62b62b..8ee9891e7a3 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProcessor.php
@@ -83,6 +83,10 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         if (self::ACTION_REUSE === $action) {
+            if ($quiz instanceof CQuiz && $this->isAdaptiveFeedbackExercise($quiz)) {
+                throw new AccessDeniedHttpException('Question recycling is not available in adaptive/direct feedback exercises.');
+            }
+
             [$addedCount, $skippedCount] = $this->reuseQuestions($quiz, $data, $course, $session);
         } else {
             $addedCount = $this->deleteQuestions($data, $course, $session);
@@ -391,7 +395,7 @@ private function getNextQuestionOrder(CQuiz $quiz): int
     private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType): bool
     {
         if (1 === $feedbackType) {
-            return !\in_array($type, [5, 13, 20, 22, 23, 31], true);
+            return \in_array($type, [1, 8], true);
         }
 
         if (3 === $feedbackType) {
@@ -401,6 +405,11 @@ private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType):
         return true;
     }
 
+    private function isAdaptiveFeedbackExercise(CQuiz $quiz): bool
+    {
+        return 1 === (int) $quiz->getFeedbackType();
+    }
+
     /**
      * @return array<int, CQuizAnswer>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
index aab4f604c96..d4320b09c06 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionBankProvider.php
@@ -65,6 +65,10 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $session = $this->getSession($request);
         $exerciseId = isset($uriVariables['exerciseId']) ? (int) $uriVariables['exerciseId'] : 0;
         $quiz = 0 < $exerciseId ? $this->getExerciseFromCurrentContext($exerciseId, $course, $session) : null;
+        if ($quiz instanceof CQuiz && $this->isAdaptiveFeedbackExercise($quiz)) {
+            throw new AccessDeniedHttpException('Question recycling is not available in adaptive/direct feedback exercises.');
+        }
+
         $filters = $this->getFilters($request);
         $page = max(1, (int) $filters['page']);
         $itemsPerPage = min(100, max(5, (int) $filters['itemsPerPage']));
@@ -545,7 +549,7 @@ private function getFirstCategoryTitle(CQuizQuestion $question): string
     private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType): bool
     {
         if (1 === $feedbackType) {
-            return !\in_array($type, [5, 13, 20, 22, 23, 31], true);
+            return \in_array($type, [1, 8], true);
         }
 
         if (3 === $feedbackType) {
@@ -556,6 +560,11 @@ private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType):
     }
 
 
+    private function isAdaptiveFeedbackExercise(CQuiz $quiz): bool
+    {
+        return 1 === (int) $quiz->getFeedbackType();
+    }
+
     private function canRunRestrictedAction(): bool
     {
         if ($this->security->isGranted('ROLE_ADMIN')) {
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
index c38ed375077..b6b1c530b97 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
@@ -49,6 +49,7 @@
     private const FREE_ANSWER = 5;
     private const HOT_SPOT = 6;
     private const HOT_SPOT_DELINEATION = 8;
+    private const EXERCISE_FEEDBACK_TYPE_DIRECT = 1;
     private const MULTIPLE_ANSWER_COMBINATION = 9;
     private const UNIQUE_ANSWER_NO_OPTION = 10;
     private const MULTIPLE_ANSWER_TRUE_FALSE = 11;
@@ -114,6 +115,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $questionId = isset($uriVariables['questionId']) ? (int) $uriVariables['questionId'] : (int) ($data->questionId ?? 0);
+        $this->assertQuestionTypeAllowedByFeedback($quiz, (int) $data->type);
         $this->validatePayload($data);
         $this->validateAnnotationImageOnCreate($data, 0 >= $questionId);
         $this->validateHotspotImageOnCreate($data, 0 >= $questionId);
@@ -164,6 +166,37 @@ private function isSettingEnabled(string $settingName): bool
         return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
     }
 
+    private function isHotspotDelineationQuestionAllowed(?CQuiz $quiz): bool
+    {
+        return $quiz instanceof CQuiz
+            && self::EXERCISE_FEEDBACK_TYPE_DIRECT === (int) $quiz->getFeedbackType()
+            && $this->isSettingEnabled('enable_quiz_scenario');
+    }
+
+    private function assertQuestionTypeAllowedByFeedback(?CQuiz $quiz, int $type): void
+    {
+        if (!$quiz instanceof CQuiz) {
+            return;
+        }
+
+        $feedbackType = (int) $quiz->getFeedbackType();
+        if (self::EXERCISE_FEEDBACK_TYPE_DIRECT === $feedbackType) {
+            if (self::UNIQUE_ANSWER === $type) {
+                return;
+            }
+
+            if (self::HOT_SPOT_DELINEATION === $type && $this->isHotspotDelineationQuestionAllowed($quiz)) {
+                return;
+            }
+
+            throw new BadRequestHttpException('Only unique answer and hotspot delineation questions are available in adaptive exercises with immediate feedback.');
+        }
+
+        if (self::HOT_SPOT_DELINEATION === $type) {
+            throw new BadRequestHttpException('Hotspot delineation questions are only available in adaptive exercises with immediate feedback.');
+        }
+    }
+
     private function createQuestion(CQuiz $quiz, ExerciseQuestionEditor $data, Course $course, ?Session $session): CQuizQuestion
     {
         $question = new CQuizQuestion();
@@ -185,7 +218,7 @@ private function createQuestion(CQuiz $quiz, ExerciseQuestionEditor $data, Cours
             ->setQuestion($question)
             ->setQuestionOrder($this->getNextQuestionOrder($quiz))
         ;
-        $this->applyHotspotDelineationDestination($relation, $data);
+        $this->applyAdaptiveQuestionDestination($relation, $data);
         $this->entityManager->persist($relation);
 
         return $question;
@@ -228,7 +261,7 @@ private function updateQuestion(CQuiz $quiz, int $questionId, ExerciseQuestionEd
         $this->updateQuestionCategory($question, $data, $course, $session);
         $relation = $this->getQuestionRelation($quiz, $question);
         if ($relation instanceof CQuizRelQuestion) {
-            $this->applyHotspotDelineationDestination($relation, $data);
+            $this->applyAdaptiveQuestionDestination($relation, $data);
         }
         $this->entityManager->persist($question);
 
@@ -1142,6 +1175,7 @@ private function isVueSupportedQuestionType(int $type): bool
             self::MATCHING,
             self::FREE_ANSWER,
             self::HOT_SPOT,
+            self::HOT_SPOT_DELINEATION,
             self::ORAL_EXPRESSION,
             self::MULTIPLE_ANSWER_COMBINATION,
             self::UNIQUE_ANSWER_NO_OPTION,
@@ -1203,6 +1237,11 @@ private function getQuestionTypeLabel(int $type): string
         };
     }
 
+    private function isAdaptiveScenarioQuestionType(int $type): bool
+    {
+        return \in_array($type, [self::UNIQUE_ANSWER, self::HOT_SPOT_DELINEATION], true);
+    }
+
     private function usesSingleCorrectAnswer(int $type): bool
     {
         return \in_array($type, [self::UNIQUE_ANSWER, self::UNIQUE_ANSWER_NO_OPTION, self::UNIQUE_ANSWER_IMAGE], true);
@@ -1885,21 +1924,32 @@ private function addHotspotData(ExerciseQuestionEditor $response, CQuiz $quiz, C
             }
         }
 
+        $thresholds = self::HOT_SPOT_DELINEATION === (int) $question->getType()
+            ? $this->getHotspotDelineationThresholds($quiz, $question)
+            : [];
+
         $items = [];
         foreach ($this->getExistingAnswers($question) as $answer) {
             if ('noerror' === (string) $answer->getHotspotType()) {
                 continue;
             }
 
-            $items[] = [
+            $position = (int) $answer->getPosition();
+            $item = [
                 'id' => $answer->getIid(),
                 'answer' => $answer->getAnswer(),
                 'comment' => (string) $answer->getComment(),
                 'score' => (float) $answer->getPonderation(),
-                'position' => (int) $answer->getPosition(),
+                'position' => $position,
                 'hotspotType' => (string) ($answer->getHotspotType() ?: 'square'),
                 'coordinates' => (string) ($answer->getHotspotCoordinates() ?: '0;0|0|0'),
             ];
+
+            if (isset($thresholds[$position])) {
+                $item += $thresholds[$position];
+            }
+
+            $items[] = $item;
         }
 
         $response->hotspotItems = [] !== $items ? $items : $this->getDefaultHotspotItems((int) $question->getType());
@@ -1981,6 +2031,38 @@ private function getScenarioQuestionOptions(CQuiz $quiz): array
         return $options;
     }
 
+    /**
+     * @return array<int, array{minOverlap: int, maxExcess: int, maxMissing: int}>
+     */
+    private function getHotspotDelineationThresholds(CQuiz $quiz, CQuizQuestion $question): array
+    {
+        $relation = $this->getQuestionRelation($quiz, $question);
+        if (!$relation instanceof CQuizRelQuestion || '' === (string) $relation->getDestination()) {
+            return [];
+        }
+
+        $destination = json_decode((string) $relation->getDestination(), true);
+        if (!\is_array($destination)) {
+            return [];
+        }
+
+        $thresholds = \is_array($destination['thresholds'] ?? null) ? $destination['thresholds'] : [];
+        $result = [];
+        foreach ($thresholds as $position => $values) {
+            if (!\is_array($values)) {
+                continue;
+            }
+
+            $result[(int) $position] = [
+                'minOverlap' => $this->normalizePercentage($values['minOverlap'] ?? 1, 1),
+                'maxExcess' => $this->normalizePercentage($values['maxExcess'] ?? 100, 100),
+                'maxMissing' => $this->normalizePercentage($values['maxMissing'] ?? 100, 100),
+            ];
+        }
+
+        return $result;
+    }
+
     private function getQuestionRelation(CQuiz $quiz, CQuizQuestion $question): ?CQuizRelQuestion
     {
         $relation = $this->entityManager->getRepository(CQuizRelQuestion::class)->findOneBy([
@@ -1991,15 +2073,16 @@ private function getQuestionRelation(CQuiz $quiz, CQuizQuestion $question): ?CQu
         return $relation instanceof CQuizRelQuestion ? $relation : null;
     }
 
-    private function applyHotspotDelineationDestination(CQuizRelQuestion $relation, ExerciseQuestionEditor $data): void
+    private function applyAdaptiveQuestionDestination(CQuizRelQuestion $relation, ExerciseQuestionEditor $data): void
     {
-        if (self::HOT_SPOT_DELINEATION !== (int) $data->type) {
+        $type = (int) $data->type;
+        if (!$this->isAdaptiveScenarioQuestionType($type) || !$this->isHotspotDelineationQuestionAllowed($relation->getQuiz())) {
             $relation->setDestination(null);
 
             return;
         }
 
-        $destination = json_encode([
+        $destinationData = [
             'success' => [
                 'type' => $this->normalizeScenarioDestinationType($data->hotspotScenarioSuccessType),
                 'url' => trim($data->hotspotScenarioSuccessUrl),
@@ -2008,11 +2091,38 @@ private function applyHotspotDelineationDestination(CQuizRelQuestion $relation,
                 'type' => $this->normalizeScenarioDestinationType($data->hotspotScenarioFailureType),
                 'url' => trim($data->hotspotScenarioFailureUrl),
             ],
-        ]);
+        ];
+
+        if (self::HOT_SPOT_DELINEATION === $type) {
+            $thresholds = [];
+            foreach ($this->getCleanHotspotItems($data) as $item) {
+                if ('delineation' !== (string) ($item['hotspotType'] ?? '')) {
+                    continue;
+                }
+
+                $thresholds[(string) (int) ($item['position'] ?? 1)] = [
+                    'minOverlap' => (int) ($item['minOverlap'] ?? 1),
+                    'maxExcess' => (int) ($item['maxExcess'] ?? 100),
+                    'maxMissing' => (int) ($item['maxMissing'] ?? 100),
+                ];
+            }
+            $destinationData['thresholds'] = $thresholds;
+        }
+
+        $destination = json_encode($destinationData);
 
         $relation->setDestination(false === $destination ? null : $destination);
     }
 
+    private function normalizePercentage(mixed $value, int $default): int
+    {
+        if (!is_numeric($value)) {
+            return $default;
+        }
+
+        return min(100, max(0, (int) $value));
+    }
+
     private function normalizeScenarioDestinationType(string $value): string
     {
         $value = trim($value);
@@ -2060,6 +2170,9 @@ private function getCleanHotspotItems(ExerciseQuestionEditor $data): array
                 'position' => $index + 1,
                 'hotspotType' => $hotspotType,
                 'coordinates' => $coordinates,
+                'minOverlap' => $this->normalizePercentage($item['minOverlap'] ?? 1, 1),
+                'maxExcess' => $this->normalizePercentage($item['maxExcess'] ?? 100, 100),
+                'maxMissing' => $this->normalizePercentage($item['maxMissing'] ?? 100, 100),
             ];
         }
 
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
index 98f7a54da13..8ff2bd11513 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
@@ -47,6 +47,7 @@
     private const FREE_ANSWER = 5;
     private const HOT_SPOT = 6;
     private const HOT_SPOT_DELINEATION = 8;
+    private const EXERCISE_FEEDBACK_TYPE_DIRECT = 1;
     private const MULTIPLE_ANSWER_COMBINATION = 9;
     private const UNIQUE_ANSWER_NO_OPTION = 10;
     private const MULTIPLE_ANSWER_TRUE_FALSE = 11;
@@ -116,6 +117,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         if (!$this->isVueSupportedQuestionType($type)) {
             throw new BadRequestHttpException('This question type is still managed by the legacy exercise tool.');
         }
+        $this->assertQuestionTypeAllowedByFeedback($quiz, $type);
 
         $response = $this->buildNewQuestionResponse($quiz, $type, $course, $session);
         if (!$this->shouldGenerateDefaultContent($request)) {
@@ -185,11 +187,14 @@ private function buildNewQuestionResponse(?CQuiz $quiz, int $type, Course $cours
             $response->score = self::HOT_SPOT_COMBINATION === $type ? 0.0 : 10.0;
             $response->globalScore = self::HOT_SPOT_COMBINATION === $type ? 10.0 : 0.0;
             $response->hotspotItems = $this->getDefaultHotspotItems($type);
-            if (self::HOT_SPOT_DELINEATION === $type && $quiz instanceof CQuiz) {
+            if (self::HOT_SPOT_DELINEATION === $type && $this->isHotspotDelineationQuestionAllowed($quiz)) {
                 $this->addHotspotScenarioOptions($response, $quiz, null);
             }
             $response->answers = [];
         }
+        if (!$this->usesHotspot($type) && $this->isAdaptiveScenarioQuestionType($type) && $this->isHotspotDelineationQuestionAllowed($quiz)) {
+            $this->addHotspotScenarioOptions($response, $quiz, null);
+        }
         if ($this->usesMatching($type)) {
             $response->score = $this->usesGlobalScore($type) ? 0.0 : 20.0;
             $response->globalScore = $this->usesGlobalScore($type) ? 10.0 : 0.0;
@@ -252,6 +257,7 @@ private function buildExistingQuestionResponse(CQuiz $quiz, int $questionId, Cou
         $response->questionId = $questionId;
         $response->type = $type;
         $response->typeLabel = $this->getQuestionTypeLabel($type);
+        $this->assertQuestionTypeAllowedByFeedback($quiz, $type);
         $response->title = $question->getQuestion();
         $response->description = (string) $question->getDescription();
         $response->feedback = (string) $question->getFeedback();
@@ -269,6 +275,9 @@ private function buildExistingQuestionResponse(CQuiz $quiz, int $questionId, Cou
         $response->answers = $this->getAnswers($question);
         $this->addAnnotationData($response, $question, $course, $session);
         $this->addHotspotData($response, $quiz, $question, $course, $session);
+        if (!$this->usesHotspot($type) && $this->isAdaptiveScenarioQuestionType($type) && $this->isHotspotDelineationQuestionAllowed($quiz)) {
+            $this->addHotspotScenarioOptions($response, $quiz, $question);
+        }
         $this->addCalculatedData($response, $question);
         $this->addFillBlanksData($response, $question);
         $this->addMatchingData($response, $question);
@@ -296,6 +305,7 @@ private function addSharedEditorData(
         $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
         $response->imageZoomEnabled = $this->isImageZoomEnabled();
         $response->allowMandatoryQuestion = $this->isMandatoryQuestionInCategoryEnabled($quiz);
+        $response->canUseHotspotDelineationScenario = $this->isHotspotDelineationQuestionAllowed($quiz);
         $response->isLinkedToLearningPath = $this->isExerciseLinkedToLearningPath((int) $quiz->getIid());
         $response->isReadOnlyFromLearningPath = $response->isLinkedToLearningPath && !$this->isSettingEnabled('lp.force_edit_exercise_in_lp');
         $response->learningPathReadOnlyMessage = $response->isLinkedToLearningPath ? self::LP_READ_ONLY_MESSAGE : '';
@@ -315,6 +325,7 @@ private function addGlobalSharedEditorData(
         $response->allowQuestionFeedback = $this->isQuestionFeedbackEnabled();
         $response->imageZoomEnabled = $this->isImageZoomEnabled();
         $response->allowMandatoryQuestion = false;
+        $response->canUseHotspotDelineationScenario = false;
         $response->isLinkedToLearningPath = false;
         $response->isReadOnlyFromLearningPath = false;
         $response->learningPathReadOnlyMessage = '';
@@ -342,6 +353,37 @@ private function isSettingEnabled(string $settingName): bool
         return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
     }
 
+    private function isHotspotDelineationQuestionAllowed(?CQuiz $quiz): bool
+    {
+        return $quiz instanceof CQuiz
+            && self::EXERCISE_FEEDBACK_TYPE_DIRECT === (int) $quiz->getFeedbackType()
+            && $this->isSettingEnabled('enable_quiz_scenario');
+    }
+
+    private function assertQuestionTypeAllowedByFeedback(?CQuiz $quiz, int $type): void
+    {
+        if (!$quiz instanceof CQuiz) {
+            return;
+        }
+
+        $feedbackType = (int) $quiz->getFeedbackType();
+        if (self::EXERCISE_FEEDBACK_TYPE_DIRECT === $feedbackType) {
+            if (self::UNIQUE_ANSWER === $type) {
+                return;
+            }
+
+            if (self::HOT_SPOT_DELINEATION === $type && $this->isHotspotDelineationQuestionAllowed($quiz)) {
+                return;
+            }
+
+            throw new BadRequestHttpException('Only unique answer and hotspot delineation questions are available in adaptive exercises with immediate feedback.');
+        }
+
+        if (self::HOT_SPOT_DELINEATION === $type) {
+            throw new BadRequestHttpException('Hotspot delineation questions are only available in adaptive exercises with immediate feedback.');
+        }
+    }
+
     private function isMandatoryQuestionInCategoryEnabled(CQuiz $quiz): bool
     {
         return 5 === (int) ($quiz->getQuestionSelectionType() ?? 0)
@@ -791,6 +833,7 @@ private function isVueSupportedQuestionType(int $type): bool
             self::MATCHING,
             self::FREE_ANSWER,
             self::HOT_SPOT,
+            self::HOT_SPOT_DELINEATION,
             self::ORAL_EXPRESSION,
             self::MULTIPLE_ANSWER_COMBINATION,
             self::UNIQUE_ANSWER_NO_OPTION,
@@ -852,6 +895,11 @@ private function getQuestionTypeLabel(int $type): string
         };
     }
 
+    private function isAdaptiveScenarioQuestionType(int $type): bool
+    {
+        return \in_array($type, [self::UNIQUE_ANSWER, self::HOT_SPOT_DELINEATION], true);
+    }
+
     private function usesSingleCorrectAnswer(int $type): bool
     {
         return \in_array($type, [self::UNIQUE_ANSWER, self::UNIQUE_ANSWER_NO_OPTION, self::UNIQUE_ANSWER_IMAGE], true);
@@ -953,8 +1001,8 @@ private function addHotspotData(ExerciseQuestionEditor $response, CQuiz $quiz, C
             }
         }
 
-        $response->hotspotItems = $this->getHotspotItems($question);
-        if (self::HOT_SPOT_DELINEATION === (int) $question->getType()) {
+        $response->hotspotItems = $this->getHotspotItems($question, $quiz);
+        if (self::HOT_SPOT_DELINEATION === (int) $question->getType() && $this->isHotspotDelineationQuestionAllowed($quiz)) {
             $this->addHotspotScenarioOptions($response, $quiz, $question);
         }
         $response->answers = [];
@@ -1044,7 +1092,7 @@ private function plainText(string $value): string
     /**
      * @return array<int, array<string, mixed>>
      */
-    private function getHotspotItems(CQuizQuestion $question): array
+    private function getHotspotItems(CQuizQuestion $question, ?CQuiz $quiz = null): array
     {
         $answers = $this->entityManager->createQueryBuilder()
             ->select('answer')
@@ -1056,6 +1104,10 @@ private function getHotspotItems(CQuizQuestion $question): array
             ->getResult()
         ;
 
+        $thresholds = self::HOT_SPOT_DELINEATION === (int) $question->getType() && $quiz instanceof CQuiz
+            ? $this->getHotspotDelineationThresholds($quiz, $question)
+            : [];
+
         $items = [];
         foreach ($answers as $answer) {
             if (!$answer instanceof CQuizAnswer) {
@@ -1066,15 +1118,22 @@ private function getHotspotItems(CQuizQuestion $question): array
                 continue;
             }
 
-            $items[] = [
+            $position = (int) $answer->getPosition();
+            $item = [
                 'id' => (int) $answer->getIid(),
                 'answer' => $answer->getAnswer(),
                 'comment' => (string) $answer->getComment(),
                 'score' => (float) $answer->getPonderation(),
-                'position' => (int) $answer->getPosition(),
+                'position' => $position,
                 'hotspotType' => (string) ($answer->getHotspotType() ?: 'square'),
                 'coordinates' => (string) ($answer->getHotspotCoordinates() ?: '0;0|0|0'),
             ];
+
+            if (isset($thresholds[$position])) {
+                $item += $thresholds[$position];
+            }
+
+            $items[] = $item;
         }
 
         return [] !== $items ? $items : $this->getDefaultHotspotItems((int) $question->getType());
@@ -1095,6 +1154,9 @@ private function getDefaultHotspotItems(int $type): array
                     'position' => 1,
                     'hotspotType' => 'delineation',
                     'coordinates' => '0;0|0|0',
+                    'minOverlap' => 1,
+                    'maxExcess' => 100,
+                    'maxMissing' => 100,
                 ],
             ];
         }
@@ -1112,6 +1174,51 @@ private function getDefaultHotspotItems(int $type): array
         ];
     }
 
+    /**
+     * @return array<int, array{minOverlap: int, maxExcess: int, maxMissing: int}>
+     */
+    private function getHotspotDelineationThresholds(CQuiz $quiz, CQuizQuestion $question): array
+    {
+        $relation = $this->entityManager->getRepository(CQuizRelQuestion::class)->findOneBy([
+            'quiz' => $quiz,
+            'question' => $question,
+        ]);
+
+        if (!$relation instanceof CQuizRelQuestion || '' === (string) $relation->getDestination()) {
+            return [];
+        }
+
+        $destination = json_decode((string) $relation->getDestination(), true);
+        if (!\is_array($destination)) {
+            return [];
+        }
+
+        $thresholds = \is_array($destination['thresholds'] ?? null) ? $destination['thresholds'] : [];
+        $result = [];
+        foreach ($thresholds as $position => $values) {
+            if (!\is_array($values)) {
+                continue;
+            }
+
+            $result[(int) $position] = [
+                'minOverlap' => $this->normalizePercentage($values['minOverlap'] ?? 1, 1),
+                'maxExcess' => $this->normalizePercentage($values['maxExcess'] ?? 100, 100),
+                'maxMissing' => $this->normalizePercentage($values['maxMissing'] ?? 100, 100),
+            ];
+        }
+
+        return $result;
+    }
+
+    private function normalizePercentage(mixed $value, int $default): int
+    {
+        if (!is_numeric($value)) {
+            return $default;
+        }
+
+        return min(100, max(0, (int) $value));
+    }
+
     private function usesHotspot(int $type): bool
     {
         return \in_array($type, [self::HOT_SPOT, self::HOT_SPOT_DELINEATION, self::HOT_SPOT_COMBINATION], true);
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
index 118f062f1c7..2b0658cc1b1 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
@@ -85,6 +85,8 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $response->totalScore = $this->getTotalScore($questions);
         $response->legacyUrls = [];
         $response->canManage = true;
+        $response->isAdaptiveFeedback = 1 === (int) $quiz->getFeedbackType();
+        $response->canRecycleQuestions = !$response->isAdaptiveFeedback;
         $response->isLinkedToLearningPath = $isLinkedToLearningPath;
         $response->isReadOnlyFromLearningPath = $isReadOnlyFromLearningPath;
         $response->learningPathReadOnlyMessage = $isLinkedToLearningPath ? self::LP_READ_ONLY_MESSAGE : '';
@@ -796,13 +798,19 @@ private function getLegacyQuestionTypeDefinitions(): array
 
     private function isQuestionTypeVisibleInSelector(int $type, int $feedbackType): bool
     {
-        return 8 !== $type;
+        if (8 === $type) {
+            return 1 === $feedbackType && $this->isSettingEnabled('enable_quiz_scenario');
+        }
+
+        return true;
     }
 
     private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType): bool
     {
         if (1 === $feedbackType) {
-            return !\in_array($type, [5, 13, 20, 22, 23, 31], true);
+            // Legacy question_create.php only allows Unique answer and Hotspot delineation
+            // in direct-feedback/adaptive exercises.
+            return \in_array($type, [1, 8], true);
         }
 
         if (3 === $feedbackType) {
@@ -814,7 +822,7 @@ private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType):
 
     private function isVueQuestionEditorType(int $type): bool
     {
-        return \in_array($type, [1, 2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31], true);
+        return \in_array($type, [1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31], true);
     }
 
     private function getQuestionTypeLabel(int $type): string
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index f900b30b871..d4660580f21 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -63,7 +63,8 @@
     private const CALCULATED_TYPES = [16];
     private const FREE_ANSWER_TYPES = [5];
     private const ANNOTATION_TYPES = [20];
-    private const HOTSPOT_TYPES = [6, 26];
+    private const HOTSPOT_DELINEATION = 8;
+    private const HOTSPOT_TYPES = [6, self::HOTSPOT_DELINEATION, 26];
 
     public function __construct(
         private RequestStack $requestStack,
@@ -1292,6 +1293,7 @@ private function buildFeedback(CQuiz $quiz, CQuizQuestion $question, array $rows
             'score' => $score,
             'maxScore' => $maxScore,
             'entries' => $this->buildFeedbackEntries($question, $answers, $rows),
+            ...$this->resolveAdaptiveFeedbackAction($quiz, $question, $status),
         ];
     }
 
@@ -1330,6 +1332,68 @@ private function getQuestionOptionMap(CQuizQuestion $question): array
      * @param array<int, CQuizQuestionOption> $options
      * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
      */
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function resolveAdaptiveFeedbackAction(CQuiz $quiz, CQuizQuestion $question, string $status): array
+    {
+        if (self::FEEDBACK_TYPE_DIRECT !== (int) $quiz->getFeedbackType()) {
+            return [];
+        }
+
+        $relation = $this->entityManager->getRepository(CQuizRelQuestion::class)->findOneBy([
+            'quiz' => $quiz,
+            'question' => $question,
+        ]);
+
+        if (!$relation instanceof CQuizRelQuestion || '' === trim((string) $relation->getDestination())) {
+            return [];
+        }
+
+        $destination = json_decode((string) $relation->getDestination(), true);
+        if (!\is_array($destination)) {
+            return [];
+        }
+
+        $key = 'correct' === $status ? 'success' : 'failure';
+        $scenario = \is_array($destination[$key] ?? null) ? $destination[$key] : [];
+        $type = trim((string) ($scenario['type'] ?? ''));
+        $url = trim((string) ($scenario['url'] ?? ''));
+
+        if ('' === $type) {
+            return [];
+        }
+
+        if ('-1' === $type) {
+            return ['afterAction' => 'finish'];
+        }
+
+        if ('repeat' === $type) {
+            return ['afterAction' => 'repeat'];
+        }
+
+        if ('url' === $type) {
+            if ('' === $url) {
+                return [];
+            }
+
+            return [
+                'afterAction' => 'url',
+                'targetUrl' => $url,
+            ];
+        }
+
+        if (ctype_digit($type) && 0 < (int) $type) {
+            return [
+                'afterAction' => 'question',
+                'targetQuestionId' => (int) $type,
+            ];
+        }
+
+        return [];
+    }
+
     private function scoreFeedbackQuestion(CQuiz $quiz, CQuizQuestion $question, array $answers, array $options, array $rows): float
     {
         $type = (int) $question->getType();
@@ -1374,6 +1438,10 @@ private function scoreFeedbackQuestion(CQuiz $quiz, CQuizQuestion $question, arr
             return $this->scoreCalculatedRowsForFeedback($question, $answers, $rows);
         }
 
+        if (self::HOTSPOT_DELINEATION === $type) {
+            return $this->scoreHotspotDelineationRowsForFeedback($quiz, $question, $answers, $rows);
+        }
+
         return 0.0;
     }
 
@@ -1726,6 +1794,315 @@ private function extractCalculatedExpectedAnswer(string $answer): string
         return '';
     }
 
+    /**
+     * @param array<int, CQuizAnswer> $answers
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     */
+    private function scoreHotspotDelineationRowsForFeedback(CQuiz $quiz, CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $studentPolygon = $this->getSavedDelineationPolygonFromRows($rows);
+        if (3 > \count($studentPolygon)) {
+            return 0.0;
+        }
+
+        $teacherDelineation = null;
+        $organsAtRisk = [];
+        foreach ($answers as $answer) {
+            $hotspotType = (string) $answer->getHotspotType();
+            if ('delineation' === $hotspotType && null === $teacherDelineation) {
+                $teacherDelineation = $answer;
+                continue;
+            }
+
+            if ('oar' === $hotspotType) {
+                $organsAtRisk[] = $answer;
+            }
+        }
+
+        if (!$teacherDelineation instanceof CQuizAnswer) {
+            return 0.0;
+        }
+
+        $teacherPolygon = $this->parseDelineationPolygon((string) $teacherDelineation->getHotspotCoordinates());
+        if (3 > \count($teacherPolygon)) {
+            return 0.0;
+        }
+
+        $metrics = $this->getDelineationOverlapMetrics($teacherPolygon, $studentPolygon);
+        $thresholds = $this->getDelineationThresholds($quiz, $question, (int) $teacherDelineation->getPosition());
+
+        if ($metrics['overlap'] < $thresholds['minOverlap']) {
+            return 0.0;
+        }
+
+        if ($metrics['excess'] > $thresholds['maxExcess']) {
+            return 0.0;
+        }
+
+        if ($metrics['missing'] > $thresholds['maxMissing']) {
+            return 0.0;
+        }
+
+        foreach ($organsAtRisk as $organAtRisk) {
+            $organPolygon = $this->parseDelineationPolygon((string) $organAtRisk->getHotspotCoordinates());
+            if (3 <= \count($organPolygon) && $this->polygonsOverlap($studentPolygon, $organPolygon)) {
+                return 0.0;
+            }
+        }
+
+        $score = (float) $teacherDelineation->getPonderation();
+
+        return 0.0 < $score ? $score : (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $rows
+     *
+     * @return array<int, array{x: float, y: float}>
+     */
+    private function getSavedDelineationPolygonFromRows(array $rows): array
+    {
+        $row = $rows[0] ?? null;
+        if (!\is_array($row)) {
+            return [];
+        }
+
+        return $this->parseDelineationPolygon((string) ($row['answer'] ?? ''));
+    }
+
+    /**
+     * @return array<int, array{x: float, y: float}>
+     */
+    private function parseDelineationPolygon(string $coordinates): array
+    {
+        $normalizedCoordinates = str_replace('/', '|', trim($coordinates));
+        $points = [];
+        foreach (explode('|', $normalizedCoordinates) as $coordinate) {
+            $point = $this->decodeHotspotPoint($coordinate);
+            if (null !== $point) {
+                $points[] = ['x' => $point['x'], 'y' => $point['y']];
+            }
+        }
+
+        return $this->removeDuplicateClosingPoint($points);
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $points
+     *
+     * @return array<int, array{x: float, y: float}>
+     */
+    private function removeDuplicateClosingPoint(array $points): array
+    {
+        $count = \count($points);
+        if (4 > $count) {
+            return $points;
+        }
+
+        $first = $points[0];
+        $last = $points[$count - 1];
+        if (abs($first['x'] - $last['x']) < 0.0001 && abs($first['y'] - $last['y']) < 0.0001) {
+            array_pop($points);
+        }
+
+        return $points;
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $expectedPolygon
+     * @param array<int, array{x: float, y: float}> $studentPolygon
+     *
+     * @return array{overlap: float, missing: float, excess: float}
+     */
+    private function getDelineationOverlapMetrics(array $expectedPolygon, array $studentPolygon): array
+    {
+        $bounds = $this->getPolygonUnionBounds($expectedPolygon, $studentPolygon);
+        if (null === $bounds) {
+            return ['overlap' => 0.0, 'missing' => 100.0, 'excess' => 100.0];
+        }
+
+        $maxDimension = max($bounds['maxX'] - $bounds['minX'], $bounds['maxY'] - $bounds['minY']);
+        $step = max(1.0, ceil($maxDimension / 500.0));
+        $expectedArea = 0;
+        $studentArea = 0;
+        $overlapArea = 0;
+        $expectedCoordinates = $this->encodePolygonCoordinates($expectedPolygon);
+        $studentCoordinates = $this->encodePolygonCoordinates($studentPolygon);
+
+        for ($x = $bounds['minX']; $x <= $bounds['maxX']; $x += $step) {
+            for ($y = $bounds['minY']; $y <= $bounds['maxY']; $y += $step) {
+                $point = ['x' => $x + ($step / 2), 'y' => $y + ($step / 2)];
+                $insideExpected = $this->isPointInPolygon($point, $expectedCoordinates);
+                $insideStudent = $this->isPointInPolygon($point, $studentCoordinates);
+
+                if ($insideExpected) {
+                    ++$expectedArea;
+                }
+                if ($insideStudent) {
+                    ++$studentArea;
+                }
+                if ($insideExpected && $insideStudent) {
+                    ++$overlapArea;
+                }
+            }
+        }
+
+        if (0 >= $expectedArea) {
+            return ['overlap' => 0.0, 'missing' => 100.0, 'excess' => 100.0];
+        }
+
+        $overlap = round(($overlapArea / $expectedArea) * 100.0, 2);
+        $missing = max(0.0, 100.0 - $overlap);
+        $excess = round((max(0, $studentArea - $overlapArea) / $expectedArea) * 100.0, 2);
+
+        return [
+            'overlap' => min(100.0, $overlap),
+            'missing' => min(100.0, $missing),
+            'excess' => min(100.0, $excess),
+        ];
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $firstPolygon
+     * @param array<int, array{x: float, y: float}> $secondPolygon
+     */
+    private function polygonsOverlap(array $firstPolygon, array $secondPolygon): bool
+    {
+        $metrics = $this->getDelineationOverlapMetrics($secondPolygon, $firstPolygon);
+
+        return $metrics['overlap'] > 0.0;
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $firstPolygon
+     * @param array<int, array{x: float, y: float}> $secondPolygon
+     *
+     * @return array{minX: float, maxX: float, minY: float, maxY: float}|null
+     */
+    private function getPolygonUnionBounds(array $firstPolygon, array $secondPolygon): ?array
+    {
+        $points = [...$firstPolygon, ...$secondPolygon];
+        if ([] === $points) {
+            return null;
+        }
+
+        $xValues = array_map(static fn (array $point): float => $point['x'], $points);
+        $yValues = array_map(static fn (array $point): float => $point['y'], $points);
+
+        return [
+            'minX' => min($xValues),
+            'maxX' => max($xValues),
+            'minY' => min($yValues),
+            'maxY' => max($yValues),
+        ];
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $polygon
+     */
+    private function encodePolygonCoordinates(array $polygon): string
+    {
+        return implode('|', array_map(static fn (array $point): string => $point['x'].';'.$point['y'], $polygon));
+    }
+
+    /**
+     * @return array{minOverlap: float, maxExcess: float, maxMissing: float}
+     */
+    private function getDelineationThresholds(CQuiz $quiz, CQuizQuestion $question, int $position): array
+    {
+        $relation = $this->entityManager->getRepository(CQuizRelQuestion::class)->findOneBy([
+            'quiz' => $quiz,
+            'question' => $question,
+        ]);
+
+        if (!$relation instanceof CQuizRelQuestion || '' === (string) $relation->getDestination()) {
+            return ['minOverlap' => 1.0, 'maxExcess' => 100.0, 'maxMissing' => 100.0];
+        }
+
+        $destination = json_decode((string) $relation->getDestination(), true);
+        if (!\is_array($destination)) {
+            return ['minOverlap' => 1.0, 'maxExcess' => 100.0, 'maxMissing' => 100.0];
+        }
+
+        $thresholds = \is_array($destination['thresholds'] ?? null) ? $destination['thresholds'] : [];
+        $positionThresholds = \is_array($thresholds[(string) $position] ?? null) ? $thresholds[(string) $position] : [];
+
+        return [
+            'minOverlap' => $this->normalizePercentage($positionThresholds['minOverlap'] ?? 1.0, 1.0),
+            'maxExcess' => $this->normalizePercentage($positionThresholds['maxExcess'] ?? 100.0, 100.0),
+            'maxMissing' => $this->normalizePercentage($positionThresholds['maxMissing'] ?? 100.0, 100.0),
+        ];
+    }
+
+    private function normalizePercentage(mixed $value, float $default): float
+    {
+        if (!is_numeric($value)) {
+            return $default;
+        }
+
+        return min(100.0, max(0.0, (float) $value));
+    }
+
+    /**
+     * @return array{x: float, y: float, answerId?: int}|null
+     */
+    private function decodeHotspotPoint(string $coordinate): ?array
+    {
+        $answerId = 0;
+        $coordinateValue = trim($coordinate);
+        if (str_contains($coordinateValue, ':')) {
+            [$answerIdValue, $coordinateValue] = explode(':', $coordinateValue, 2);
+            $answerId = (int) $answerIdValue;
+        }
+
+        $parts = array_map('trim', explode(';', $coordinateValue));
+        if (2 > \count($parts) || !is_numeric($parts[0]) || !is_numeric($parts[1])) {
+            return null;
+        }
+
+        $point = ['x' => (float) $parts[0], 'y' => (float) $parts[1]];
+        if (0 < $answerId) {
+            $point['answerId'] = $answerId;
+        }
+
+        return $point;
+    }
+
+    /**
+     * @param array{x: float, y: float} $point
+     */
+    private function isPointInPolygon(array $point, string $coordinates): bool
+    {
+        $vertices = [];
+        foreach (explode('|', $coordinates) as $coordinate) {
+            $decoded = $this->decodeHotspotPoint($coordinate);
+            if (null !== $decoded) {
+                $vertices[] = $decoded;
+            }
+        }
+
+        $count = \count($vertices);
+        if (3 > $count) {
+            return false;
+        }
+
+        $inside = false;
+        for ($i = 0, $j = $count - 1; $i < $count; $j = $i++) {
+            $xi = $vertices[$i]['x'];
+            $yi = $vertices[$i]['y'];
+            $xj = $vertices[$j]['x'];
+            $yj = $vertices[$j]['y'];
+
+            $intersects = (($yi > $point['y']) !== ($yj > $point['y']))
+                && ($point['x'] < ($xj - $xi) * ($point['y'] - $yi) / (($yj - $yi) ?: 0.000001) + $xi);
+            if ($intersects) {
+                $inside = !$inside;
+            }
+        }
+
+        return $inside;
+    }
+
     /**
      * @param array<int, CQuizAnswer> $answers
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index f58010cda54..c3034d76daa 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -66,7 +66,7 @@
     private const ORAL_EXPRESSION_TYPES = [13];
     private const UPLOAD_ANSWER_TYPES = [23];
     private const ANNOTATION_TYPES = [20];
-    private const HOTSPOT_TYPES = [6, 26];
+    private const HOTSPOT_TYPES = [6, 8, 26];
     private const PAGE_BREAK = 31;
     private const MEDIA_QUESTION = 15;
     private const STRUCTURAL_CONTENT_TYPES = [self::MEDIA_QUESTION, self::PAGE_BREAK];
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
index 43b0d8c2271..1693880cf98 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -57,6 +57,7 @@
     private const MATCHING = 4;
     private const FREE_ANSWER = 5;
     private const HOT_SPOT = 6;
+    private const HOT_SPOT_DELINEATION = 8;
     private const CALCULATED_ANSWER = 16;
     private const DRAGGABLE = 18;
     private const MEDIA_QUESTION = 15;
@@ -100,6 +101,7 @@
         self::MATCHING_COMBINATION => 'Matching combination',
         self::MATCHING_DRAGGABLE_COMBINATION => 'Matching draggable combination',
         self::HOT_SPOT_COMBINATION => 'Hotspot combination',
+        self::HOT_SPOT_DELINEATION => 'Hotspot delineation',
         self::MULTIPLE_ANSWER_DROPDOWN => 'Multiple answer dropdown',
         self::MULTIPLE_ANSWER_DROPDOWN_COMBINATION => 'Multiple answer dropdown combination',
         self::FREE_ANSWER => 'Free answer',
@@ -162,6 +164,11 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             throw new BadRequestHttpException('The attempt does not contain a persisted question list.');
         }
 
+        $questionIds = $this->normalizeCompletedQuestionIds($quiz, $attempt, $questionIds);
+        if ([] === $questionIds) {
+            throw new BadRequestHttpException('The attempt does not contain answered questions.');
+        }
+
         $questions = $this->getQuestions($quiz, $questionIds);
         $unsupportedTypes = $this->getUnsupportedQuestionTypes($questions);
         if ([] !== $unsupportedTypes) {
@@ -208,6 +215,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $attempt
             ->setScore($totalScore)
             ->setMaxScore($totalWeight)
+            ->setDataTracking(implode(',', $questionIds))
             ->setStatus(self::STATUS_COMPLETED)
             ->setExeDate($finishedAt)
             ->setExeDuration($duration)
@@ -847,6 +855,60 @@ private function isSupportedQuestionType(int $type): bool
         return isset(self::SUPPORTED_TYPE_NAMES[$type]);
     }
 
+    /**
+     * In direct feedback/adaptive exercises, only questions really reached by the learner must be scored.
+     * Branch-only questions that were not visited must not lower the final score.
+     *
+     * @param array<int, int> $questionIds
+     *
+     * @return array<int, int>
+     */
+    private function normalizeCompletedQuestionIds(CQuiz $quiz, TrackEExercise $attempt, array $questionIds): array
+    {
+        if (self::FEEDBACK_TYPE_DIRECT !== (int) $quiz->getFeedbackType()) {
+            return $questionIds;
+        }
+
+        $answeredQuestionIds = $this->getAnsweredQuestionIds((int) $attempt->getExeId());
+        if ([] === $answeredQuestionIds) {
+            return $questionIds;
+        }
+
+        return array_values(array_filter(
+            $questionIds,
+            static fn (int $questionId): bool => \in_array($questionId, $answeredQuestionIds, true)
+        ));
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getAnsweredQuestionIds(int $attemptId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('DISTINCT saved.questionId AS questionId')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        $questionIds = [];
+        foreach ($rows as $row) {
+            if (!\is_array($row)) {
+                continue;
+            }
+
+            $questionId = (int) ($row['questionId'] ?? 0);
+            if (0 < $questionId && !\in_array($questionId, $questionIds, true)) {
+                $questionIds[] = $questionId;
+            }
+        }
+
+        return $questionIds;
+    }
+
     /**
      * @return array<int, TrackEAttempt>
      */
@@ -957,6 +1019,7 @@ private function scoreQuestion(CQuiz $quiz, CQuizQuestion $question, array $answ
             self::MATCHING_DRAGGABLE_COMBINATION => $this->scoreMatchingCombination($question, $answers, $rows),
             self::CALCULATED_ANSWER => $this->scoreCalculatedAnswer($question, $answers, $rows),
             self::HOT_SPOT => $this->scoreHotspotAnswer($answers, $rows, false, (float) $question->getPonderation()),
+            self::HOT_SPOT_DELINEATION => $this->scoreHotspotDelineationAnswer($quiz, $question, $answers, $rows),
             self::HOT_SPOT_COMBINATION => $this->scoreHotspotAnswer($answers, $rows, true, (float) $question->getPonderation()),
             self::FREE_ANSWER,
             self::ORAL_EXPRESSION,
@@ -1579,6 +1642,255 @@ private function scoreHotspotAnswer(array $answers, array $rows, bool $combinati
         return 0 < $scoringZoneCount && \count($matchedAnswerIds) >= $scoringZoneCount ? $questionWeight : 0.0;
     }
 
+    /**
+     * @param array<int, CQuizAnswer>   $answers
+     * @param array<int, TrackEAttempt> $rows
+     */
+    private function scoreHotspotDelineationAnswer(CQuiz $quiz, CQuizQuestion $question, array $answers, array $rows): float
+    {
+        $studentPolygon = $this->getSavedDelineationPolygon($rows);
+        if (3 > \count($studentPolygon)) {
+            return 0.0;
+        }
+
+        $teacherDelineation = null;
+        $organsAtRisk = [];
+        foreach ($answers as $answer) {
+            $hotspotType = (string) $answer->getHotspotType();
+            if ('delineation' === $hotspotType && null === $teacherDelineation) {
+                $teacherDelineation = $answer;
+                continue;
+            }
+
+            if ('oar' === $hotspotType) {
+                $organsAtRisk[] = $answer;
+            }
+        }
+
+        if (!$teacherDelineation instanceof CQuizAnswer) {
+            return 0.0;
+        }
+
+        $teacherPolygon = $this->parseDelineationPolygon((string) $teacherDelineation->getHotspotCoordinates());
+        if (3 > \count($teacherPolygon)) {
+            return 0.0;
+        }
+
+        $metrics = $this->getDelineationOverlapMetrics($teacherPolygon, $studentPolygon);
+        $thresholds = $this->getDelineationThresholds($quiz, $question, (int) $teacherDelineation->getPosition());
+
+        if ($metrics['overlap'] < $thresholds['minOverlap']) {
+            return 0.0;
+        }
+
+        if ($metrics['excess'] > $thresholds['maxExcess']) {
+            return 0.0;
+        }
+
+        if ($metrics['missing'] > $thresholds['maxMissing']) {
+            return 0.0;
+        }
+
+        foreach ($organsAtRisk as $organAtRisk) {
+            $organPolygon = $this->parseDelineationPolygon((string) $organAtRisk->getHotspotCoordinates());
+            if (3 <= \count($organPolygon) && $this->polygonsOverlap($studentPolygon, $organPolygon)) {
+                return 0.0;
+            }
+        }
+
+        $score = (float) $teacherDelineation->getPonderation();
+
+        return 0.0 < $score ? $score : (float) $question->getPonderation();
+    }
+
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     *
+     * @return array<int, array{x: float, y: float}>
+     */
+    private function getSavedDelineationPolygon(array $rows): array
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return [];
+        }
+
+        return $this->parseDelineationPolygon((string) $row->getAnswer());
+    }
+
+    /**
+     * @return array<int, array{x: float, y: float}>
+     */
+    private function parseDelineationPolygon(string $coordinates): array
+    {
+        $normalizedCoordinates = str_replace('/', '|', trim($coordinates));
+        $points = [];
+        foreach (explode('|', $normalizedCoordinates) as $coordinate) {
+            $point = $this->decodeHotspotPoint($coordinate);
+            if (null !== $point) {
+                $points[] = ['x' => $point['x'], 'y' => $point['y']];
+            }
+        }
+
+        return $this->removeDuplicateClosingPoint($points);
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $points
+     *
+     * @return array<int, array{x: float, y: float}>
+     */
+    private function removeDuplicateClosingPoint(array $points): array
+    {
+        $count = \count($points);
+        if (4 > $count) {
+            return $points;
+        }
+
+        $first = $points[0];
+        $last = $points[$count - 1];
+        if (abs($first['x'] - $last['x']) < 0.0001 && abs($first['y'] - $last['y']) < 0.0001) {
+            array_pop($points);
+        }
+
+        return $points;
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $expectedPolygon
+     * @param array<int, array{x: float, y: float}> $studentPolygon
+     *
+     * @return array{overlap: float, missing: float, excess: float}
+     */
+    private function getDelineationOverlapMetrics(array $expectedPolygon, array $studentPolygon): array
+    {
+        $bounds = $this->getPolygonUnionBounds($expectedPolygon, $studentPolygon);
+        if (null === $bounds) {
+            return ['overlap' => 0.0, 'missing' => 100.0, 'excess' => 100.0];
+        }
+
+        $maxDimension = max($bounds['maxX'] - $bounds['minX'], $bounds['maxY'] - $bounds['minY']);
+        $step = max(1.0, ceil($maxDimension / 500.0));
+        $expectedArea = 0;
+        $studentArea = 0;
+        $overlapArea = 0;
+        $expectedCoordinates = $this->encodePolygonCoordinates($expectedPolygon);
+        $studentCoordinates = $this->encodePolygonCoordinates($studentPolygon);
+
+        for ($x = $bounds['minX']; $x <= $bounds['maxX']; $x += $step) {
+            for ($y = $bounds['minY']; $y <= $bounds['maxY']; $y += $step) {
+                $point = ['x' => $x + ($step / 2), 'y' => $y + ($step / 2)];
+                $insideExpected = $this->isPointInPolygon($point, $expectedCoordinates);
+                $insideStudent = $this->isPointInPolygon($point, $studentCoordinates);
+
+                if ($insideExpected) {
+                    ++$expectedArea;
+                }
+                if ($insideStudent) {
+                    ++$studentArea;
+                }
+                if ($insideExpected && $insideStudent) {
+                    ++$overlapArea;
+                }
+            }
+        }
+
+        if (0 >= $expectedArea) {
+            return ['overlap' => 0.0, 'missing' => 100.0, 'excess' => 100.0];
+        }
+
+        $overlap = round(($overlapArea / $expectedArea) * 100.0, 2);
+        $missing = max(0.0, 100.0 - $overlap);
+        $excess = round((max(0, $studentArea - $overlapArea) / $expectedArea) * 100.0, 2);
+
+        return [
+            'overlap' => min(100.0, $overlap),
+            'missing' => min(100.0, $missing),
+            'excess' => min(100.0, $excess),
+        ];
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $firstPolygon
+     * @param array<int, array{x: float, y: float}> $secondPolygon
+     */
+    private function polygonsOverlap(array $firstPolygon, array $secondPolygon): bool
+    {
+        $metrics = $this->getDelineationOverlapMetrics($secondPolygon, $firstPolygon);
+
+        return $metrics['overlap'] > 0.0;
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $firstPolygon
+     * @param array<int, array{x: float, y: float}> $secondPolygon
+     *
+     * @return array{minX: float, maxX: float, minY: float, maxY: float}|null
+     */
+    private function getPolygonUnionBounds(array $firstPolygon, array $secondPolygon): ?array
+    {
+        $points = [...$firstPolygon, ...$secondPolygon];
+        if ([] === $points) {
+            return null;
+        }
+
+        $xValues = array_map(static fn (array $point): float => $point['x'], $points);
+        $yValues = array_map(static fn (array $point): float => $point['y'], $points);
+
+        return [
+            'minX' => min($xValues),
+            'maxX' => max($xValues),
+            'minY' => min($yValues),
+            'maxY' => max($yValues),
+        ];
+    }
+
+    /**
+     * @param array<int, array{x: float, y: float}> $polygon
+     */
+    private function encodePolygonCoordinates(array $polygon): string
+    {
+        return implode('|', array_map(static fn (array $point): string => $point['x'].';'.$point['y'], $polygon));
+    }
+
+    /**
+     * @return array{minOverlap: float, maxExcess: float, maxMissing: float}
+     */
+    private function getDelineationThresholds(CQuiz $quiz, CQuizQuestion $question, int $position): array
+    {
+        $relation = $this->entityManager->getRepository(CQuizRelQuestion::class)->findOneBy([
+            'quiz' => $quiz,
+            'question' => $question,
+        ]);
+
+        if (!$relation instanceof CQuizRelQuestion || '' === (string) $relation->getDestination()) {
+            return ['minOverlap' => 1.0, 'maxExcess' => 100.0, 'maxMissing' => 100.0];
+        }
+
+        $destination = json_decode((string) $relation->getDestination(), true);
+        if (!\is_array($destination)) {
+            return ['minOverlap' => 1.0, 'maxExcess' => 100.0, 'maxMissing' => 100.0];
+        }
+
+        $thresholds = \is_array($destination['thresholds'] ?? null) ? $destination['thresholds'] : [];
+        $positionThresholds = \is_array($thresholds[(string) $position] ?? null) ? $thresholds[(string) $position] : [];
+
+        return [
+            'minOverlap' => $this->normalizePercentage($positionThresholds['minOverlap'] ?? 1.0, 1.0),
+            'maxExcess' => $this->normalizePercentage($positionThresholds['maxExcess'] ?? 100.0, 100.0),
+            'maxMissing' => $this->normalizePercentage($positionThresholds['maxMissing'] ?? 100.0, 100.0),
+        ];
+    }
+
+    private function normalizePercentage(mixed $value, float $default): float
+    {
+        if (!is_numeric($value)) {
+            return $default;
+        }
+
+        return min(100.0, max(0.0, (float) $value));
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      *
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index f9e04662489..d070db8fd2c 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -70,7 +70,7 @@
     private const ORAL_EXPRESSION_TYPES = [13];
     private const UPLOAD_ANSWER_TYPES = [23];
     private const ANNOTATION_TYPES = [20];
-    private const HOTSPOT_TYPES = [6, 26];
+    private const HOTSPOT_TYPES = [6, 8, 26];
     private const MEDIA_QUESTION = 15;
     private const PAGE_BREAK = 31;
     private const QUESTION_SELECTION_RANDOM = 2;
@@ -1817,7 +1817,8 @@ private function getQuestionCategorySummary(CQuizQuestion $question): array
      */
     private function getHotspotRuntime(CQuizQuestion $question, Course $course, ?Session $session, bool $canManage): ?array
     {
-        if (!\in_array((int) $question->getType(), self::HOTSPOT_TYPES, true)) {
+        $questionType = (int) $question->getType();
+        if (!\in_array($questionType, self::HOTSPOT_TYPES, true)) {
             return null;
         }
 
@@ -1830,7 +1831,8 @@ private function getHotspotRuntime(CQuizQuestion $question, Course $course, ?Ses
 
         foreach ($this->getOrderedAnswers($question) as $answer) {
             $hotspotType = (string) ($answer->getHotspotType() ?: 'square');
-            if (!\in_array($hotspotType, ['square', 'circle', 'poly'], true)) {
+            $allowedTypes = 8 === $questionType ? ['delineation', 'oar'] : ['square', 'circle', 'poly'];
+            if (!\in_array($hotspotType, $allowedTypes, true)) {
                 continue;
             }
 
@@ -1857,7 +1859,8 @@ private function getHotspotRuntime(CQuizQuestion $question, Course $course, ?Ses
             'imageName' => (string) ($image['imageName'] ?? ''),
             'imageUrl' => (string) ($image['imageUrl'] ?? ''),
             'maxClicks' => max(1, $maxClicks),
-            'combination' => 26 === (int) $question->getType(),
+            'combination' => 26 === $questionType,
+            'delineation' => 8 === $questionType,
             'zones' => $zones,
         ];
     }
@@ -2097,6 +2100,7 @@ private function getQuestionTypeLabel(int $type): string
             4 => 'Matching',
             5 => 'Open question',
             6 => 'Hotspot',
+            8 => 'Hotspot delineation',
             9 => 'Exact Selection',
             10 => 'Unique answer with unknown',
             11 => 'Multiple answer true/false',
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index d63001d4e38..84afd5b4832 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -49,9 +49,11 @@
 {
     private const STATUS_COMPLETED = 'completed';
     private const ANNOTATION = 20;
+    private const HOTSPOT_DELINEATION = 8;
     private const DRAGGABLE = 18;
     private const VISIBILITY_PUBLISHED = 2;
     private const LP_ITEM_TYPE_QUIZ = 'quiz';
+    private const FEEDBACK_TYPE_DIRECT = 1;
     private const FEEDBACK_TYPE_EXAM = 2;
     private const RESULT_SHOW_SCORE_AND_EXPECTED_ANSWERS = 0;
     private const RESULT_NO_SCORE_AND_EXPECTED_ANSWERS = 1;
@@ -110,6 +112,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $rowsByQuestion = $this->getAttemptRowsByQuestion((int) $attempt->getExeId());
+        $questionIds = $this->normalizeResultQuestionIds($quiz, $questionIds, $rowsByQuestion);
         $pendingQuestionIds = $this->parseQuestionIds((string) $attempt->getQuestionsToCheck());
         $isReviewMode = $this->isReviewMode($attempt, $canManage, $request);
         $isLastAllowedAttempt = $this->isLastAllowedAttempt($quiz, $attempt, $course, $session);
@@ -506,6 +509,32 @@ private function getExerciseQuestionIds(CQuiz $quiz): array
         return $questionIds;
     }
 
+    /**
+     * Direct feedback/adaptive exercises can end before visiting every question.
+     * Result details must only show questions that were actually reached by the learner.
+     *
+     * @param array<int, int>                       $questionIds
+     * @param array<int, array<int, TrackEAttempt>> $rowsByQuestion
+     *
+     * @return array<int, int>
+     */
+    private function normalizeResultQuestionIds(CQuiz $quiz, array $questionIds, array $rowsByQuestion): array
+    {
+        if (self::FEEDBACK_TYPE_DIRECT !== (int) $quiz->getFeedbackType()) {
+            return $questionIds;
+        }
+
+        $answeredQuestionIds = array_map('intval', array_keys($rowsByQuestion));
+        if ([] === $answeredQuestionIds) {
+            return $questionIds;
+        }
+
+        return array_values(array_filter(
+            $questionIds,
+            static fn (int $questionId): bool => \in_array($questionId, $answeredQuestionIds, true)
+        ));
+    }
+
     /**
      * @return array<int, array<int, TrackEAttempt>>
      */
@@ -1118,7 +1147,7 @@ private function normalizeQuestionAnswer(CQuizQuestion $question, array $rows, a
             return $this->normalizeCalculatedAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
-        if (\in_array($type, [6, 26], true)) {
+        if (\in_array($type, [6, self::HOTSPOT_DELINEATION, 26], true)) {
             return $this->normalizeHotspotAnswer($question, $rows, $visibility, $showQuestionCorrection);
         }
 
@@ -1545,14 +1574,17 @@ private function normalizeHotspotAnswer(CQuizQuestion $question, array $rows, ar
         $showExpectedAnswers = $showQuestionCorrection && true === ($visibility['showExpectedAnswers'] ?? false);
         $studentPoints = $showStudentAnswers && $row instanceof TrackEAttempt ? $this->parseHotspotCoordinates((string) $row->getAnswer()) : [];
         $zones = [];
+        $isDelineation = self::HOTSPOT_DELINEATION === (int) $question->getType();
+        $allowedHotspotTypes = $isDelineation ? ['delineation', 'oar'] : ['square', 'circle', 'poly'];
 
         if ($showExpectedAnswers) {
             foreach ($this->getOrderedAnswers($question) as $answer) {
-                $hotspotType = (string) ($answer->getHotspotType() ?: 'square');
-                if (!\in_array($hotspotType, ['square', 'circle', 'poly'], true)) {
+                $hotspotType = (string) ($answer->getHotspotType() ?: ($isDelineation ? 'delineation' : 'square'));
+                if (!\in_array($hotspotType, $allowedHotspotTypes, true)) {
                     continue;
                 }
 
+                $coordinates = (string) ($answer->getHotspotCoordinates() ?: '');
                 $zones[] = [
                     'id' => (int) $answer->getIid(),
                     'answer' => $answer->getAnswer(),
@@ -1560,7 +1592,8 @@ private function normalizeHotspotAnswer(CQuizQuestion $question, array $rows, ar
                     'score' => (float) $answer->getPonderation(),
                     'position' => (int) $answer->getPosition(),
                     'hotspotType' => $hotspotType,
-                    'coordinates' => (string) ($answer->getHotspotCoordinates() ?: ''),
+                    'coordinates' => $coordinates,
+                    'points' => $this->parseHotspotCoordinates($coordinates),
                 ];
             }
         }
@@ -1572,6 +1605,7 @@ private function normalizeHotspotAnswer(CQuizQuestion $question, array $rows, ar
             'studentPoints' => $studentPoints,
             'zones' => $zones,
             'combination' => 26 === (int) $question->getType(),
+            'delineation' => $isDelineation,
         ];
     }
 

From fa24da96fd19f93a73476ab9dff546d6487c08d9 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Thu, 18 Jun 2026 09:12:55 -0500
Subject: [PATCH 19/21] Exercise: Add OnlyOffice runtime editor

---
 .../vue/views/exercise/ExercisePlayerView.vue | 175 ++++++++++-
 .../exercise/ExerciseQuestionEditorView.vue   | 138 ++++++++-
 .../vue/views/exercise/ExerciseResultView.vue |  10 +-
 public/plugin/Onlyoffice/callback.php         | 106 ++++++-
 public/plugin/Onlyoffice/editor.php           | 228 +++++++++++++-
 .../Exercise/ExerciseQuestionEditor.php       |  12 +
 .../ExerciseQuestionEditorProcessor.php       | 163 +++++++++-
 .../ExerciseQuestionEditorProvider.php        |  73 ++++-
 .../Exercise/ExerciseQuestionProvider.php     |  33 +-
 .../ExerciseRuntimeAnswerProcessor.php        | 282 ++++++++++++++++++
 .../ExerciseRuntimeAttemptProcessor.php       |   2 +
 .../ExerciseRuntimeFinishProcessor.php        |   5 +-
 .../Exercise/ExerciseRuntimeProvider.php      |  96 ++++++
 .../ExerciseRuntimeResultProvider.php         |  34 +++
 14 files changed, 1336 insertions(+), 21 deletions(-)

diff --git a/assets/vue/views/exercise/ExercisePlayerView.vue b/assets/vue/views/exercise/ExercisePlayerView.vue
index 95d360cd37a..bd117cb61da 100644
--- a/assets/vue/views/exercise/ExercisePlayerView.vue
+++ b/assets/vue/views/exercise/ExercisePlayerView.vue
@@ -861,6 +861,84 @@
               </div>
             </div>
 
+            <div v-else-if="isOnlyofficeQuestion(question)" class="space-y-3">
+              <div class="rounded-lg border border-info/30 bg-support-1 p-4 text-sm text-support-4">
+                <div class="mb-2 font-semibold text-gray-90">
+                  {{ t("Office document") }}
+                </div>
+                <p v-if="question.onlyoffice?.templateName" class="mb-3">
+                  {{ t("Template") }}: {{ question.onlyoffice.templateName }}
+                </p>
+                <p class="mb-3">
+                  {{ t("Complete the document in the editor below. The file will be attached to this attempt for teacher correction.") }}
+                </p>
+                <div class="flex flex-wrap gap-2">
+                  <BaseButton
+                    :disabled="answers[question.id]?.onlyofficePreparing || isSavingDraft"
+                    :label="onlyofficeEditorUrl(question) ? t('Reload Office editor') : t('Prepare Office document')"
+                    icon="onlyoffice"
+                    size="small"
+                    type="primary"
+                    @click="prepareOnlyofficeDocument(question, true)"
+                  />
+                  <BaseButton
+                    v-if="onlyofficeEditorUrl(question)"
+                    :label="t('Open in new tab')"
+                    icon="link-external"
+                    size="small"
+                    type="primary-text"
+                    @click="openOnlyofficeDocumentInNewTab(question)"
+                  />
+                </div>
+                <p
+                  v-if="answers[question.id]?.onlyofficePreparing"
+                  class="mt-3 text-xs text-gray-600"
+                >
+                  {{ t("Preparing Office document") }}
+                </p>
+                <p
+                  v-if="answers[question.id]?.onlyofficeError"
+                  class="mt-3 text-xs text-danger"
+                >
+                  {{ answers[question.id].onlyofficeError }}
+                </p>
+              </div>
+
+              <div
+                v-if="onlyofficeEditorUrl(question)"
+                class="overflow-hidden rounded-lg border border-gray-20 bg-white shadow-sm"
+              >
+                <iframe
+                  :key="onlyofficeEditorUrl(question)"
+                  :src="onlyofficeEditorUrl(question)"
+                  class="h-[72vh] min-h-[560px] w-full"
+                  :title="question.onlyoffice?.templateName || t('Office document')"
+                />
+              </div>
+
+              <div
+                v-if="onlyofficeAttemptFiles(question).length"
+                class="space-y-2 rounded-lg border border-success/30 bg-success/10 p-3 text-sm text-success"
+              >
+                <div class="font-semibold">{{ t("Submitted document") }}</div>
+                <div
+                  v-for="file in onlyofficeAttemptFiles(question)"
+                  :key="file.id || file.name"
+                >
+                  <a
+                    v-if="file.url"
+                    class="text-primary underline"
+                    :href="file.url"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    {{ file.name || t("Office document") }}
+                  </a>
+                  <span v-else>{{ file.name || t("Office document") }}</span>
+                </div>
+              </div>
+            </div>
+
             <div v-else-if="isAnnotationQuestion(question)" class="space-y-3">
               <div class="grid gap-4 lg:grid-cols-[minmax(0,1fr)_20rem]">
                 <div
@@ -2250,6 +2328,8 @@ async function loadRuntime() {
     syncRuntimeSettingsEffects()
     syncQuestionCountdown()
     scheduleRuntimeHtmlEnhancement()
+    await nextTick()
+    prepareVisibleOnlyofficeDocuments()
   } catch (error) {
     console.error("Error loading exercise runtime", error)
     errorMessage.value = t("Could not load exercise")
@@ -2288,6 +2368,8 @@ async function startAttempt() {
       syncCountdownFromAttempt(response)
       syncRuntimeSettingsEffects()
       syncQuestionCountdown()
+      await nextTick()
+      prepareVisibleOnlyofficeDocuments()
       return
     }
 
@@ -2559,6 +2641,11 @@ async function saveQuestionDraftAnswer(question, afterFeedback = "none") {
     savedQuestionIds.value = nextSavedQuestionIds
   }
 
+  const onlyofficeEditor = response?.feedback?.onlyoffice?.editorUrl || ""
+  if (isOnlyofficeQuestion(question) && onlyofficeEditor && answers.value[question.id]) {
+    answers.value[question.id].onlyofficeEditorUrl = onlyofficeEditor
+  }
+
   rememberQuestionSecondsSpent(question)
   updateQuestionCountdown()
   handleRuntimeFeedback(question, response.feedback || null, afterFeedback)
@@ -2908,6 +2995,10 @@ function buildAnswerPayload(question) {
     return { text: questionAnswer.text || "" }
   }
 
+  if (isOnlyofficeQuestion(question)) {
+    return { onlyoffice: true }
+  }
+
   return {}
 }
 
@@ -2923,6 +3014,7 @@ function isDraftSaveSupported(question) {
     || isHotspotQuestion(question)
     || isAnnotationQuestion(question)
     || isDraftFreeAnswerQuestion(question)
+    || isOnlyofficeQuestion(question)
     || isUploadQuestion(question)
     || isOralQuestion(question)
 }
@@ -3055,6 +3147,13 @@ function applySavedAnswer(question, rows) {
     return
   }
 
+  if (isOnlyofficeQuestion(question)) {
+    const files = extractSavedAttemptFiles(rows)
+    questionAnswer.onlyofficeFiles = files
+    questionAnswer.onlyofficeEditorUrl = files.find((file) => file?.onlyofficeEditorUrl)?.onlyofficeEditorUrl || question.onlyoffice?.editorUrl || ""
+    return
+  }
+
   if (isUploadQuestion(question)) {
     const files = extractSavedAttemptFiles(rows)
     questionAnswer.uploadedFiles = files.length > 0 ? files : (rows.length > 0 ? [{ name: t("Upload file") }] : [])
@@ -3146,6 +3245,10 @@ function initializeAnswerState() {
       uploadFile: null,
       uploadFileName: "",
       uploadedFiles: [],
+      onlyofficeEditorUrl: question.onlyoffice?.editorUrl || "",
+      onlyofficeFiles: [],
+      onlyofficePreparing: false,
+      onlyofficeError: "",
       oralFile: null,
       oralFileName: "",
       oralPreviewUrl: "",
@@ -3170,6 +3273,69 @@ function initializeAnswerState() {
 }
 
 
+async function prepareOnlyofficeDocument(question, forceReload = false) {
+  const questionAnswer = answers.value[question.id]
+  if (!questionAnswer || canManage.value || !activeAttempt.value?.attemptId) {
+    return
+  }
+
+  if (!forceReload && (questionAnswer.onlyofficeEditorUrl || questionAnswer.onlyofficePreparing)) {
+    return
+  }
+
+  questionAnswer.onlyofficePreparing = true
+  questionAnswer.onlyofficeError = ""
+
+  try {
+    const response = await saveQuestionDraftAnswer(question, "none")
+    const editorUrl = response?.feedback?.onlyoffice?.editorUrl || onlyofficeEditorUrl(question)
+    if (editorUrl) {
+      questionAnswer.onlyofficeEditorUrl = editorUrl
+    }
+
+    const files = extractSavedAttemptFiles(response?.savedAnswer || [])
+    if (files.length > 0) {
+      questionAnswer.onlyofficeFiles = files
+    }
+  } catch (error) {
+    console.error("Error preparing OnlyOffice document", error)
+    questionAnswer.onlyofficeError = t("Could not prepare Office document")
+  } finally {
+    questionAnswer.onlyofficePreparing = false
+  }
+}
+
+function prepareVisibleOnlyofficeDocuments() {
+  if (canManage.value || !activeAttempt.value?.attemptId) {
+    return
+  }
+
+  for (const question of visibleQuestions.value) {
+    if (isOnlyofficeQuestion(question)) {
+      void prepareOnlyofficeDocument(question)
+    }
+  }
+}
+
+function openOnlyofficeDocumentInNewTab(question) {
+  const editorUrl = onlyofficeEditorUrl(question)
+  if (editorUrl) {
+    window.open(editorUrl, "_blank", "noopener")
+  }
+}
+
+function onlyofficeEditorUrl(question) {
+  const questionAnswer = answers.value[question.id] || {}
+
+  return questionAnswer.onlyofficeEditorUrl || question.onlyoffice?.editorUrl || ""
+}
+
+function onlyofficeAttemptFiles(question) {
+  const questionAnswer = answers.value[question.id] || {}
+
+  return Array.isArray(questionAnswer.onlyofficeFiles) ? questionAnswer.onlyofficeFiles : []
+}
+
 function onUploadAnswerFileChange(question, event) {
   const file = event?.target?.files?.[0] || null
   const questionAnswer = answers.value[question.id]
@@ -3838,6 +4004,10 @@ function isOpenQuestion(question) {
   return Number(question.type) === 5
 }
 
+function isOnlyofficeQuestion(question) {
+  return Number(question?.type) === 30
+}
+
 function isUploadQuestion(question) {
   return Number(question.type) === 23
 }
@@ -4220,7 +4390,10 @@ watch(
     glossaryTerms.value.length,
     visibleQuestions.value.map((question) => question.id).join(","),
   ],
-  () => scheduleRuntimeHtmlEnhancement(),
+  () => {
+    scheduleRuntimeHtmlEnhancement()
+    prepareVisibleOnlyofficeDocuments()
+  },
 )
 </script>
 
diff --git a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
index 46d79382c22..2b3ec2c3d0d 100644
--- a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
@@ -188,7 +188,7 @@
       </section>
 
       <section
-        v-if="isOpenQuestion || isOralExpressionQuestion || isUploadAnswerQuestion"
+        v-if="isOpenQuestion || isOralExpressionQuestion || isUploadAnswerQuestion || isOnlyofficeQuestion"
         class="grid gap-4 rounded-lg border border-gray-20 bg-white p-4 md:grid-cols-3"
       >
         <BaseInputNumber
@@ -204,6 +204,46 @@
         </p>
       </section>
 
+      <section
+        v-if="isOnlyofficeQuestion"
+        class="space-y-4 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
+      >
+        <div class="space-y-1">
+          <h2 class="text-xl font-semibold text-gray-90">{{ t("Office document") }}</h2>
+          <p class="text-sm text-gray-70">
+            {{ t("Upload the Office document template that learners will edit with OnlyOffice.") }}
+          </p>
+        </div>
+
+        <BaseFileUpload
+          accept=".doc,.docx,.xls,.xlsx,application/msword,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+          :label="form.onlyofficeTemplateName ? t('Replace Office document') : t('Office document')"
+          size="small"
+          @file-selected="selectOnlyofficeTemplate"
+        />
+
+        <div
+          v-if="form.onlyofficeTemplateName"
+          class="rounded-lg border border-gray-20 bg-gray-10 px-4 py-3 text-sm text-gray-80"
+        >
+          <p class="font-semibold">{{ t("Current Office document") }}</p>
+          <a
+            v-if="form.onlyofficeTemplateUrl"
+            class="text-primary hover:underline"
+            :href="form.onlyofficeTemplateUrl"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            {{ form.onlyofficeTemplateName }}
+          </a>
+          <span v-else>{{ form.onlyofficeTemplateName }}</span>
+        </div>
+
+        <div class="rounded-lg border border-yellow-100 bg-yellow-50 px-4 py-3 text-sm text-yellow-800">
+          {{ t("This question is corrected manually after the learner submits the edited document.") }}
+        </div>
+      </section>
+
       <section
         v-if="isHotspotQuestion"
         class="space-y-4 rounded-lg border border-gray-20 bg-white p-4 shadow-sm"
@@ -1693,6 +1733,7 @@ const HOT_SPOT_COMBINATION = 26
 const FILL_IN_BLANKS_COMBINATION = 27
 const MULTIPLE_ANSWER_DROPDOWN_COMBINATION = 28
 const MULTIPLE_ANSWER_DROPDOWN = 29
+const ANSWER_IN_OFFICE_DOC = 30
 const PAGE_BREAK = 31
 const UNKNOWN_ANSWER_POSITION = 666
 
@@ -1854,6 +1895,10 @@ const form = reactive({
   hotspotScenarioSuccessUrl: "",
   hotspotScenarioFailureType: "",
   hotspotScenarioFailureUrl: "",
+  onlyofficeTemplateUrl: "",
+  onlyofficeTemplateName: "",
+  onlyofficeTemplateData: "",
+  onlyofficeTemplateMimeType: "",
   score: 1,
   globalScore: 0,
   correctScore: 1,
@@ -1892,6 +1937,7 @@ const isCalculatedAnswerQuestion = computed(() => CALCULATED_ANSWER === Number(f
 const isOpenQuestion = computed(() => FREE_ANSWER === Number(form.type))
 const isOralExpressionQuestion = computed(() => ORAL_EXPRESSION === Number(form.type))
 const isUploadAnswerQuestion = computed(() => UPLOAD_ANSWER === Number(form.type))
+const isOnlyofficeQuestion = computed(() => ANSWER_IN_OFFICE_DOC === Number(form.type))
 const isMediaQuestion = computed(() => MEDIA_QUESTION === Number(form.type))
 const isReadingComprehensionQuestion = computed(() => READING_COMPREHENSION === Number(form.type))
 const isPageBreakQuestion = computed(() => PAGE_BREAK === Number(form.type))
@@ -1904,7 +1950,7 @@ const isDropdownCombinationQuestion = computed(() => MULTIPLE_ANSWER_DROPDOWN_CO
 const isMatchingQuestion = computed(() => [MATCHING, MATCHING_COMBINATION, MATCHING_DRAGGABLE, MATCHING_DRAGGABLE_COMBINATION].includes(Number(form.type)))
 const isMatchingCombinationQuestion = computed(() => [MATCHING_COMBINATION, MATCHING_DRAGGABLE_COMBINATION].includes(Number(form.type)))
 const isDraggableOrderingQuestion = computed(() => DRAGGABLE === Number(form.type))
-const hasAnswerOptions = computed(() => !isOpenQuestion.value && !isOralExpressionQuestion.value && !isAnnotationQuestion.value && !isHotspotQuestion.value && !isUploadAnswerQuestion.value && !isCalculatedAnswerQuestion.value && !isStructuralQuestion.value && !isFillBlanksQuestion.value && !isDropdownQuestion.value && !isMatchingQuestion.value && !isDraggableOrderingQuestion.value)
+const hasAnswerOptions = computed(() => !isOpenQuestion.value && !isOralExpressionQuestion.value && !isAnnotationQuestion.value && !isHotspotQuestion.value && !isUploadAnswerQuestion.value && !isOnlyofficeQuestion.value && !isCalculatedAnswerQuestion.value && !isStructuralQuestion.value && !isFillBlanksQuestion.value && !isDropdownQuestion.value && !isMatchingQuestion.value && !isDraggableOrderingQuestion.value)
 const isGlobalMultipleAnswer = computed(() => GLOBAL_MULTIPLE_ANSWER === Number(form.type))
 const isDegreeCertaintyQuestion = computed(() => MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY === Number(form.type))
 const isTrueFalseQuestion = computed(() => [MULTIPLE_ANSWER_TRUE_FALSE, MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE, MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY].includes(Number(form.type)))
@@ -1960,6 +2006,10 @@ const summaryText = computed(() => {
   return formatTranslatedText("{0} questions, for a total score (all questions) of {1}.", [questionCount.value, totalScore.value])
 })
 const manualCorrectionHelpText = computed(() => {
+  if (isOnlyofficeQuestion.value) {
+    return t("This Office document question has no answer options. Its score is assigned during correction/results review.")
+  }
+
   if (isUploadAnswerQuestion.value) {
     return t("This upload question has no answer options. Its score is assigned during correction/results review.")
   }
@@ -2140,6 +2190,10 @@ function getTypeLabel(type) {
     return "Upload answer"
   }
 
+  if (ANSWER_IN_OFFICE_DOC === type) {
+    return "Answer in Office document"
+  }
+
   if (DRAGGABLE === type) {
     return "Draggable"
   }
@@ -2425,6 +2479,10 @@ function fillForm(data) {
   form.hotspotImageData = ""
   form.hotspotImageName = data.hotspotImageName || ""
   form.hotspotImageMimeType = ""
+  form.onlyofficeTemplateUrl = data.onlyofficeTemplateUrl || ""
+  form.onlyofficeTemplateName = data.onlyofficeTemplateName || ""
+  form.onlyofficeTemplateData = ""
+  form.onlyofficeTemplateMimeType = ""
   form.hotspotItems = normalizeHotspotItems(data.hotspotItems || [])
   form.hotspotScenarioOptions = Array.isArray(data.hotspotScenarioOptions) ? normalizeScenarioOptions(data.hotspotScenarioOptions) : []
   form.hotspotScenarioSuccessType = data.hotspotScenarioSuccessType || ""
@@ -2963,10 +3021,71 @@ function selectHotspotItem(index) {
   hotspotPolygonPoints.value = []
 }
 
+function isAllowedOnlyofficeTemplate(file) {
+  const extension = String(file.name || "").split(".").pop().toLowerCase()
+  const allowedExtensions = ["doc", "docx", "xls", "xlsx"]
+  const allowedMimeTypes = [
+    "",
+    "application/octet-stream",
+    "application/msword",
+    "application/vnd.ms-excel",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ]
+
+  return allowedExtensions.includes(extension) && allowedMimeTypes.includes(String(file.type || "").toLowerCase())
+}
+
+function getOnlyofficeMimeTypeFromExtension(fileName) {
+  const extension = String(fileName || "").split(".").pop().toLowerCase()
+
+  if ("doc" === extension) {
+    return "application/msword"
+  }
+
+  if ("xls" === extension) {
+    return "application/vnd.ms-excel"
+  }
+
+  if ("xlsx" === extension) {
+    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+  }
+
+  return "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+}
+
 function selectHotspotImage(file) {
   selectQuestionImage(file, "hotspot")
 }
 
+function selectOnlyofficeTemplate(file) {
+  if (!file) {
+    return
+  }
+
+  if (!isAllowedOnlyofficeTemplate(file)) {
+    errorMessage.value = t("Only DOC, DOCX, XLS or XLSX documents are allowed.")
+    form.onlyofficeTemplateData = ""
+    form.onlyofficeTemplateName = ""
+    form.onlyofficeTemplateMimeType = ""
+    form.onlyofficeTemplateUrl = ""
+    return
+  }
+
+  const reader = new FileReader()
+  reader.onload = () => {
+    form.onlyofficeTemplateData = String(reader.result || "")
+    form.onlyofficeTemplateName = file.name || "office_document"
+    form.onlyofficeTemplateUrl = ""
+    form.onlyofficeTemplateMimeType = file.type || getOnlyofficeMimeTypeFromExtension(file.name)
+    errorMessage.value = ""
+  }
+  reader.onerror = () => {
+    errorMessage.value = t("Could not save question")
+  }
+  reader.readAsDataURL(file)
+}
+
 function selectQuestionImage(file, target) {
   if (!file) {
     return
@@ -3305,6 +3424,9 @@ function buildPayload() {
     hotspotImageData: isHotspotQuestion.value && !isEditMode.value ? form.hotspotImageData : "",
     hotspotImageName: isHotspotQuestion.value && !isEditMode.value ? form.hotspotImageName : "",
     hotspotImageMimeType: isHotspotQuestion.value && !isEditMode.value ? form.hotspotImageMimeType : "",
+    onlyofficeTemplateData: isOnlyofficeQuestion.value ? form.onlyofficeTemplateData : "",
+    onlyofficeTemplateName: isOnlyofficeQuestion.value ? form.onlyofficeTemplateName : "",
+    onlyofficeTemplateMimeType: isOnlyofficeQuestion.value ? form.onlyofficeTemplateMimeType : "",
     hotspotItems: isHotspotQuestion.value
       ? form.hotspotItems.map((item, index) => ({
           answer: item.answer,
@@ -3383,12 +3505,22 @@ function validateForm() {
     return true
   }
 
-  if (isOpenQuestion.value || isOralExpressionQuestion.value || isUploadAnswerQuestion.value) {
+  if (isOpenQuestion.value || isOralExpressionQuestion.value || isUploadAnswerQuestion.value || isOnlyofficeQuestion.value) {
     if (Number(form.score || 0) <= 0) {
       errorMessage.value = t("Required field")
       return false
     }
 
+    if (isOnlyofficeQuestion.value && !form.onlyofficeTemplateName) {
+      errorMessage.value = t("Please select an Office document.")
+      return false
+    }
+
+    if (isOnlyofficeQuestion.value && !isEditMode.value && !form.onlyofficeTemplateData) {
+      errorMessage.value = t("Please select an Office document.")
+      return false
+    }
+
     return true
   }
 
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index 3aba15f52a4..835cba74f80 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -1130,14 +1130,14 @@
               </div>
             </template>
 
-            <template v-else-if="question.answer.kind === 'upload_answer'">
+            <template v-else-if="['upload_answer', 'onlyoffice'].includes(question.answer.kind)">
               <div class="space-y-3">
                 <div
                   v-if="visibility.showStudentAnswers !== false"
                   class="rounded-lg border border-gray-20 bg-gray-10 p-3"
                 >
                   <div class="mb-2 text-xs font-semibold uppercase tracking-wide text-gray-500">
-                    {{ t("Learner file") }}
+                    {{ question.answer.kind === 'onlyoffice' ? t("Learner Office document") : t("Learner file") }}
                   </div>
                   <div
                     v-if="question.answer.files?.length"
@@ -1152,14 +1152,14 @@
                       target="_blank"
                     >
                       <BaseIcon icon="download" size="small" />
-                      {{ file.name || t("Download file") }}
+                      {{ file.name || (question.answer.kind === 'onlyoffice' ? t("Download Office document") : t("Download file")) }}
                     </a>
                   </div>
                   <div
                     v-else
                     class="text-sm text-gray-600"
                   >
-                    {{ t("No uploaded file") }}
+                    {{ question.answer.kind === 'onlyoffice' ? t("No submitted document") : t("No uploaded file") }}
                   </div>
                 </div>
 
@@ -1923,7 +1923,7 @@ function questionLabel(position) {
 }
 
 function isManualCorrectionQuestion(question) {
-  return ["free_answer", "oral_expression", "upload_answer"].includes(question?.answer?.kind)
+  return ["free_answer", "oral_expression", "upload_answer", "onlyoffice"].includes(question?.answer?.kind)
 }
 
 function hasPartialManualScore(question) {
diff --git a/public/plugin/Onlyoffice/callback.php b/public/plugin/Onlyoffice/callback.php
index 901f076d5f7..0039614c2d3 100644
--- a/public/plugin/Onlyoffice/callback.php
+++ b/public/plugin/Onlyoffice/callback.php
@@ -18,6 +18,7 @@
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
 use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
 use Chamilo\CourseBundle\Entity\CDocument;
@@ -63,6 +64,7 @@
 $courseId = (int) getHashValue($hashData, 'courseId', 0);
 $userId = (int) getHashValue($hashData, 'userId', 0);
 $docId = (int) getHashValue($hashData, 'docId', 0);
+$resourceNodeId = (int) getHashValue($hashData, 'resourceNodeId', 0);
 $groupId = (int) getHashValue($hashData, 'groupId', 0);
 $sessionId = (int) getHashValue($hashData, 'sessionId', 0);
 
@@ -85,6 +87,7 @@
     'courseCode' => $courseCode,
     'userId' => $userId,
     'docId' => $docId,
+    'resourceNodeId' => $resourceNodeId,
     'groupId' => $groupId,
     'sessionId' => $sessionId,
     'docPath' => $docPath,
@@ -160,6 +163,7 @@ function track(): array
     global $jwtManager;
     global $courseCode;
     global $docId;
+    global $resourceNodeId;
     global $docPath;
     global $sessionId;
 
@@ -204,7 +208,7 @@ function track(): array
         return ['error' => 0];
     }
 
-    $resolved = resolveDocumentSource($docId, $courseCode, $sessionId, $docPath);
+    $resolved = resolveDocumentSource($docId, $resourceNodeId, $courseCode, $sessionId, $docPath);
     if (null === $resolved) {
         onlyofficeLog('ERROR', 'File not found for save', [
             'docId' => $docId,
@@ -265,10 +269,11 @@ function download(): void
 {
     global $courseCode;
     global $docId;
+    global $resourceNodeId;
     global $docPath;
     global $sessionId;
 
-    $resolved = resolveDocumentSource($docId, $courseCode, $sessionId, $docPath);
+    $resolved = resolveDocumentSource($docId, $resourceNodeId, $courseCode, $sessionId, $docPath);
 
     if (null === $resolved) {
         sendNoCacheHeaders();
@@ -365,7 +370,7 @@ function emptyFile(): void
 /**
  * Resolve a document source in C2 first, then legacy.
  */
-function resolveDocumentSource(int $docId, string $courseCode, int $sessionId, string $docPath): ?array
+function resolveDocumentSource(int $docId, int $resourceNodeId, string $courseCode, int $sessionId, string $docPath): ?array
 {
     if ('' !== $docPath) {
         $filePath = api_get_path(SYS_COURSE_PATH).$docPath;
@@ -397,6 +402,13 @@ function resolveDocumentSource(int $docId, string $courseCode, int $sessionId, s
         ]);
     }
 
+    if ($resourceNodeId > 0) {
+        $resolved = resolveResourceNodeSourceFromC2($resourceNodeId);
+        if (null !== $resolved) {
+            return $resolved;
+        }
+    }
+
     if ($docId > 0) {
         $resolved = resolveDocumentSourceFromC2($docId);
         if (null !== $resolved) {
@@ -435,6 +447,7 @@ function resolveDocumentSource(int $docId, string $courseCode, int $sessionId, s
 
     onlyofficeLog('ERROR', 'resolveDocumentSource failed', [
         'docId' => $docId,
+        'resourceNodeId' => $resourceNodeId,
         'docPath' => $docPath,
         'courseCode' => $courseCode,
         'sessionId' => $sessionId,
@@ -552,6 +565,93 @@ function resolveDocumentSourceFromC2(int $docId): ?array
     ];
 }
 
+/**
+ * Resolve a C2 ResourceNode directly. Used for exercise AttemptFile documents.
+ */
+function resolveResourceNodeSourceFromC2(int $resourceNodeId): ?array
+{
+    $entityManager = getEntityManager();
+    if (null === $entityManager) {
+        onlyofficeLog('ERROR', 'Entity manager could not be resolved');
+
+        return null;
+    }
+
+    /** @var ResourceNode|null $resourceNode */
+    $resourceNode = $entityManager->getRepository(ResourceNode::class)->find($resourceNodeId);
+    if (!$resourceNode instanceof ResourceNode) {
+        onlyofficeLog('ERROR', 'ResourceNode not found', [
+            'resourceNodeId' => $resourceNodeId,
+        ]);
+
+        return null;
+    }
+
+    $resourceFile = $resourceNode->getFirstResourceFile();
+    if (!$resourceFile instanceof ResourceFile) {
+        onlyofficeLog('ERROR', 'ResourceFile missing for ResourceNode', [
+            'resourceNodeId' => $resourceNodeId,
+        ]);
+
+        return null;
+    }
+
+    $resourceNodeRepository = getResourceNodeRepository();
+    if (null === $resourceNodeRepository) {
+        onlyofficeLog('ERROR', 'ResourceNodeRepository could not be resolved');
+
+        return null;
+    }
+
+    $storagePath = '';
+    try {
+        $storagePath = (string) $resourceNodeRepository->getFilename($resourceFile);
+    } catch (\Throwable $e) {
+        onlyofficeLog('WARNING', 'Failed to resolve storage filename', [
+            'message' => $e->getMessage(),
+        ]);
+    }
+
+    try {
+        $stream = $resourceNodeRepository->getResourceNodeFileStream($resourceNode, $resourceFile);
+    } catch (\Throwable $e) {
+        onlyofficeLog('ERROR', 'Failed to open resource stream', [
+            'message' => $e->getMessage(),
+            'resourceNodeId' => $resourceNodeId,
+        ]);
+
+        return null;
+    }
+
+    if (!\is_resource($stream)) {
+        onlyofficeLog('ERROR', 'Resource stream is not available', [
+            'resourceNodeId' => $resourceNodeId,
+            'resourceFileId' => (int) $resourceFile->getId(),
+            'storagePath' => $storagePath,
+        ]);
+
+        return null;
+    }
+
+    $title = (string) ($resourceFile->getOriginalName() ?: $resourceFile->getTitle() ?: $resourceNode->getTitle());
+    $size = (int) ($resourceFile->getSize() ?? 0);
+    $mimeType = (string) ($resourceFile->getMimeType() ?: getMimeTypeFromFilename($title));
+
+    return [
+        'filePath' => null,
+        'stream' => $stream,
+        'storagePath' => $storagePath,
+        'title' => $title,
+        'documentKey' => 'rn'.$resourceNodeId,
+        'resourceFileId' => (int) $resourceFile->getId(),
+        'resourceNodeId' => (int) $resourceNode->getId(),
+        'entityManager' => $entityManager,
+        'resourceNodeRepository' => $resourceNodeRepository,
+        'size' => $size,
+        'mimeType' => $mimeType,
+    ];
+}
+
 /**
  * Write content back to the resolved storage.
  */
diff --git a/public/plugin/Onlyoffice/editor.php b/public/plugin/Onlyoffice/editor.php
index b13a739445d..27591dd2f4e 100644
--- a/public/plugin/Onlyoffice/editor.php
+++ b/public/plugin/Onlyoffice/editor.php
@@ -18,6 +18,9 @@
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
 use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CoreBundle\Entity\TrackEAttempt;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\AttemptFile;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
 use Chamilo\CourseBundle\Entity\CDocument;
@@ -47,6 +50,7 @@
 
 $isMetaRequest = isset($_GET['meta']) && '1' === (string) $_GET['meta'];
 $docId = isset($_GET['docId']) ? (int) $_GET['docId'] : null;
+$resourceNodeId = isset($_GET['resourceNodeId']) ? (int) $_GET['resourceNodeId'] : null;
 $docPath = isset($_GET['doc']) ? urldecode((string) $_GET['doc']) : null;
 
 $groupId = isset($_GET['groupId']) && !empty($_GET['groupId'])
@@ -89,6 +93,7 @@
 
 onlyofficeEditorLog('DEBUG', 'Editor entry', [
     'docId' => $docId,
+    'resourceNodeId' => $resourceNodeId,
     'docPath' => $docPath,
     'courseId' => $courseId,
     'courseCode' => $courseCode,
@@ -107,7 +112,102 @@
     'learnpathEmbedded' => $isLearnpathEmbedded,
 ]);
 
-if (!empty($docPath)) {
+if (!empty($resourceNodeId)) {
+    if (!userCanOpenExerciseResourceNodeForOnlyofficeEditor($resourceNodeId, (int) $exerciseId, (int) $exeId, (int) $questionId, $userId)) {
+        onlyofficeEditorLog('ERROR', 'Resource node is not linked to the current exercise attempt', [
+            'resourceNodeId' => $resourceNodeId,
+            'exerciseId' => $exerciseId,
+            'exeId' => $exeId,
+            'questionId' => $questionId,
+            'userId' => $userId,
+        ]);
+        api_not_allowed(true);
+    }
+
+    $resolvedC2 = resolveResourceNodeSourceFromC2ForEditor($resourceNodeId);
+    if (null !== $resolvedC2) {
+        $fileId = 'rn'.$resourceNodeId;
+        $versionToken = $resolvedC2['versionToken'];
+
+        $downloadPayload = [
+            'type' => 'download',
+            'courseId' => $courseId,
+            'userId' => $userId,
+            'resourceNodeId' => $resourceNodeId,
+            'sessionId' => $sessionId,
+        ];
+
+        $trackPayload = [
+            'type' => 'track',
+            'courseId' => $courseId,
+            'userId' => $userId,
+            'resourceNodeId' => $resourceNodeId,
+            'sessionId' => $sessionId,
+        ];
+
+        if (!empty($groupId)) {
+            $downloadPayload['groupId'] = $groupId;
+            $trackPayload['groupId'] = $groupId;
+        }
+
+        $downloadHash = $jwtManager->getHash($downloadPayload);
+        $trackHash = $jwtManager->getHash($trackPayload);
+
+        $fileUrl = appendVersionTokenToUrl(
+            api_get_path(WEB_PLUGIN_PATH).'Onlyoffice/callback.php?hash='.$downloadHash,
+            $versionToken
+        );
+
+        $callbackUrl = appendVersionTokenToUrl(
+            api_get_path(WEB_PLUGIN_PATH).'Onlyoffice/callback.php?hash='.$trackHash,
+            $versionToken
+        );
+
+        $docInfo = [
+            'iid' => null,
+            'id' => null,
+            'c_id' => $courseId,
+            'path' => $resolvedC2['storagePath'],
+            'comment' => null,
+            'title' => $resolvedC2['title'],
+            'filetype' => 'file',
+            'size' => $resolvedC2['size'],
+            'readonly' => (int) $isReadOnly,
+            'session_id' => $sessionId,
+            'url' => api_get_path(WEB_PLUGIN_PATH).'Onlyoffice/editor.php?resourceNodeId='.$resourceNodeId
+                .($exerciseId ? '&exerciseId='.$exerciseId : '')
+                .($exeId ? '&exeId='.$exeId : '')
+                .($questionId ? '&questionId='.$questionId : '')
+                .($isReadOnly ? '&readOnly='.$isReadOnly : '')
+                .($groupId ? '&groupId='.$groupId : '')
+                .($forceEdit ? '&forceEdit=true' : '')
+                .($origin ? '&origin='.rawurlencode($origin) : '')
+                .($isEmbedded ? '&embedded=1' : '')
+                .($returnUrl ? '&returnUrl='.rawurlencode($returnUrl) : ''),
+            'document_url' => $callbackUrl,
+            'direct_url' => $fileUrl,
+            'basename' => basename((string) $resolvedC2['title']),
+            'parent_id' => 0,
+            'parents' => [],
+            'forceEdit' => $forceEdit,
+            'exercise_id' => $exerciseId,
+            'creator_id' => $resolvedC2['creatorId'],
+            'resource_node_id' => $resolvedC2['resourceNodeId'],
+            'resource_file_id' => $resolvedC2['resourceFileId'],
+            'version_token' => $versionToken,
+            'return_url' => $returnUrl,
+            'origin' => $origin,
+            'embedded' => $isEmbedded,
+        ];
+
+        onlyofficeEditorLog('DEBUG', 'Resolved C2 resource node for exercise', [
+            'resourceNodeId' => $resourceNodeId,
+            'title' => $resolvedC2['title'],
+            'storagePath' => $resolvedC2['storagePath'],
+            'versionToken' => $versionToken,
+        ]);
+    }
+} elseif (!empty($docPath)) {
     $resolvedDocPath = resolveOnlyofficeEditorDocPath($docPath);
     if (null === $resolvedDocPath) {
         onlyofficeEditorLog('ERROR', 'Invalid document path', [
@@ -374,6 +474,7 @@
 if (empty($docInfo) || empty($fileId)) {
     onlyofficeEditorLog('ERROR', 'Document not found', [
         'docId' => $docId,
+        'resourceNodeId' => $resourceNodeId,
         'docPath' => $docPath,
     ]);
     exit('Error: Document not found.');
@@ -394,13 +495,14 @@
     $exeId
 );
 
-$fileIdentifier = $docId ? (string) $docId : md5((string) $docPath);
+$fileIdentifier = $docId ? (string) $docId : (!empty($resourceNodeId) ? 'rn'.(string) $resourceNodeId : md5((string) $docPath));
 $versionToken = (string) ($docInfo['version_token'] ?? buildOnlyofficeVersionTokenFromLegacyDocInfo($docInfo, $fileIdentifier));
 $runtimeIdentifier = buildOnlyofficeRuntimeFileIdentifier($fileIdentifier, $versionToken);
 $runtimeKey = buildOnlyofficeRuntimeDocumentKey($fileIdentifier, $courseCode, $docInfo, $versionToken);
 $documentIdentity = buildOnlyofficeDocumentIdentity($courseId, $sessionId, $groupId, $fileIdentifier);
 $metaUrl = buildOnlyofficeMetaUrl(
     $docId,
+    $resourceNodeId,
     $docPath,
     $groupId,
     $exerciseId,
@@ -885,6 +987,121 @@ function resolveDocumentSourceFromC2ForEditor(int $docId): ?array
     ];
 }
 
+/**
+ * Resolve a C2 resource node directly. Used by exercise AttemptFile resources.
+ */
+function resolveResourceNodeSourceFromC2ForEditor(int $resourceNodeId): ?array
+{
+    $entityManager = getEntityManagerForOnlyofficeEditor();
+    if (null === $entityManager) {
+        onlyofficeEditorLog('ERROR', 'Entity manager could not be resolved');
+
+        return null;
+    }
+
+    /** @var ResourceNode|null $resourceNode */
+    $resourceNode = $entityManager->getRepository(ResourceNode::class)->find($resourceNodeId);
+    if (!$resourceNode instanceof ResourceNode) {
+        onlyofficeEditorLog('ERROR', 'ResourceNode not found', [
+            'resourceNodeId' => $resourceNodeId,
+        ]);
+
+        return null;
+    }
+
+    $resourceFile = $resourceNode->getFirstResourceFile();
+    if (!$resourceFile instanceof ResourceFile) {
+        onlyofficeEditorLog('ERROR', 'ResourceFile not found for ResourceNode', [
+            'resourceNodeId' => $resourceNodeId,
+        ]);
+
+        return null;
+    }
+
+    $resourceNodeRepository = getResourceNodeRepositoryForOnlyofficeEditor();
+    if (null === $resourceNodeRepository) {
+        onlyofficeEditorLog('ERROR', 'ResourceNodeRepository could not be resolved');
+
+        return null;
+    }
+
+    $storagePath = '';
+    try {
+        $storagePath = (string) $resourceNodeRepository->getFilename($resourceFile);
+    } catch (\Throwable $e) {
+        onlyofficeEditorLog('WARNING', 'Failed to resolve storage path', [
+            'message' => $e->getMessage(),
+        ]);
+    }
+
+    $title = (string) ($resourceFile->getOriginalName() ?: $resourceFile->getTitle() ?: $resourceNode->getTitle());
+    $size = (int) ($resourceFile->getSize() ?? 0);
+    $versionToken = buildOnlyofficeVersionTokenFromDatabase(
+        $entityManager,
+        (int) $resourceNode->getId(),
+        (int) $resourceFile->getId(),
+        $size,
+        $storagePath ?: $title
+    );
+
+    return [
+        'title' => $title,
+        'size' => $size,
+        'storagePath' => $storagePath,
+        'resourceNodeId' => (int) $resourceNode->getId(),
+        'resourceFileId' => (int) $resourceFile->getId(),
+        'creatorId' => $resourceNode->getCreator() ? (int) $resourceNode->getCreator()->getId() : (int) api_get_user_id(),
+        'versionToken' => $versionToken,
+    ];
+}
+
+function userCanOpenExerciseResourceNodeForOnlyofficeEditor(int $resourceNodeId, int $exerciseId, int $exeId, int $questionId, int $userId): bool
+{
+    if ($resourceNodeId <= 0 || $exerciseId <= 0 || $exeId <= 0 || $questionId <= 0 || $userId <= 0) {
+        return false;
+    }
+
+    $entityManager = getEntityManagerForOnlyofficeEditor();
+    if (null === $entityManager) {
+        return false;
+    }
+
+    try {
+        $row = $entityManager->createQueryBuilder()
+            ->select('saved.id')
+            ->from(TrackEAttempt::class, 'saved')
+            ->innerJoin('saved.trackExercise', 'exerciseAttempt')
+            ->innerJoin('saved.attemptFiles', 'attemptFile')
+            ->andWhere('saved.questionId = :questionId')
+            ->andWhere('IDENTITY(saved.trackExercise) = :exeId')
+            ->andWhere('IDENTITY(exerciseAttempt.quiz) = :exerciseId')
+            ->andWhere('IDENTITY(exerciseAttempt.user) = :userId')
+            ->andWhere('IDENTITY(attemptFile.resourceNode) = :resourceNodeId')
+            ->setParameter('questionId', $questionId)
+            ->setParameter('exeId', $exeId)
+            ->setParameter('exerciseId', $exerciseId)
+            ->setParameter('userId', $userId)
+            ->setParameter('resourceNodeId', $resourceNodeId)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return null !== $row;
+    } catch (\Throwable $exception) {
+        onlyofficeEditorLog('ERROR', 'Failed to validate exercise resource node ownership', [
+            'message' => $exception->getMessage(),
+            'resourceNodeId' => $resourceNodeId,
+            'exerciseId' => $exerciseId,
+            'exeId' => $exeId,
+            'questionId' => $questionId,
+            'userId' => $userId,
+        ]);
+
+        return false;
+    }
+}
+
 /**
  * Resolve Doctrine entity manager.
  */
@@ -1079,6 +1296,7 @@ function buildOnlyofficeDocumentIdentity(int $courseId, int $sessionId, int $gro
  */
 function buildOnlyofficeMetaUrl(
     ?int $docId,
+    ?int $resourceNodeId,
     ?string $docPath,
     int $groupId,
     ?int $exerciseId,
@@ -1098,7 +1316,11 @@ function buildOnlyofficeMetaUrl(
         $params['docId'] = (string) $docId;
     }
 
-    if (!empty($docPath)) {
+    if (!empty($resourceNodeId)) {
+        $params['resourceNodeId'] = (string) $resourceNodeId;
+    }
+
+    if (empty($resourceNodeId) && !empty($docPath)) {
         $params['doc'] = $docPath;
     }
 
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
index f3ef5a68e87..378dfd31317 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseQuestionEditor.php
@@ -241,6 +241,18 @@ final class ExerciseQuestionEditor
     #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
     public string $hotspotImageMimeType = '';
 
+    #[Groups(['exercise_question_editor:read'])]
+    public string $onlyofficeTemplateUrl = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $onlyofficeTemplateName = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $onlyofficeTemplateData = '';
+
+    #[Groups(['exercise_question_editor:read', 'exercise_question_editor:write'])]
+    public string $onlyofficeTemplateMimeType = '';
+
     /**
      * @var array<int, array<string, mixed>>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
index b6b1c530b97..74a98fdf000 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProcessor.php
@@ -63,6 +63,7 @@
     private const READING_COMPREHENSION = 21;
     private const MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY = 22;
     private const UPLOAD_ANSWER = 23;
+    private const ANSWER_IN_OFFICE_DOC = 30;
     private const PAGE_BREAK = 31;
     private const DRAGGABLE = 18;
     private const MATCHING_DRAGGABLE = 19;
@@ -119,6 +120,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $this->validatePayload($data);
         $this->validateAnnotationImageOnCreate($data, 0 >= $questionId);
         $this->validateHotspotImageOnCreate($data, 0 >= $questionId);
+        $this->validateOnlyofficeTemplateOnCreate($data, 0 >= $questionId);
 
         if (0 < $questionId) {
             $question = $quiz instanceof CQuiz
@@ -175,6 +177,16 @@ private function isHotspotDelineationQuestionAllowed(?CQuiz $quiz): bool
 
     private function assertQuestionTypeAllowedByFeedback(?CQuiz $quiz, int $type): void
     {
+        if (self::ANSWER_IN_OFFICE_DOC === $type) {
+            if (!$quiz instanceof CQuiz) {
+                throw new BadRequestHttpException('OnlyOffice questions must be linked to an exercise.');
+            }
+
+            if (!$this->isOnlyofficePluginEnabled()) {
+                throw new BadRequestHttpException('OnlyOffice plugin is not enabled.');
+            }
+        }
+
         if (!$quiz instanceof CQuiz) {
             return;
         }
@@ -209,6 +221,7 @@ private function createQuestion(CQuiz $quiz, ExerciseQuestionEditor $data, Cours
         $this->questionRepository->create($question);
         $this->addAnnotationImageOnCreate($question, $data);
         $this->addHotspotImageOnCreate($question, $data);
+        $this->addOnlyofficeTemplateOnSave($quiz, $question, $data, $course);
         $this->replaceAnswers($question, $data);
         $this->updateQuestionCategory($question, $data, $course, $session);
 
@@ -257,6 +270,7 @@ private function updateQuestion(CQuiz $quiz, int $questionId, ExerciseQuestionEd
     {
         $question = $this->getQuestionFromExercise($quiz, $questionId);
         $this->applyQuestionFields($quiz, $question, $data, (int) $question->getPosition());
+        $this->addOnlyofficeTemplateOnSave($quiz, $question, $data, $course);
         $this->replaceAnswers($question, $data);
         $this->updateQuestionCategory($question, $data, $course, $session);
         $relation = $this->getQuestionRelation($quiz, $question);
@@ -298,7 +312,7 @@ private function replaceAnswers(CQuizQuestion $question, ExerciseQuestionEditor
         }
 
         $type = (int) $data->type;
-        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER], true) || $this->isStructuralQuestionType($type)) {
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::ANSWER_IN_OFFICE_DOC], true) || $this->isStructuralQuestionType($type)) {
             return;
         }
 
@@ -374,7 +388,7 @@ private function validatePayload(ExerciseQuestionEditor $data): void
             return;
         }
 
-        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER], true)) {
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::ANSWER_IN_OFFICE_DOC], true)) {
             if (0 >= (float) $data->score) {
                 throw new BadRequestHttpException('Required field.');
             }
@@ -513,6 +527,146 @@ private function addHotspotImageOnCreate(CQuizQuestion $question, ExerciseQuesti
         );
     }
 
+
+    private function validateOnlyofficeTemplateOnCreate(ExerciseQuestionEditor $data, bool $isCreate): void
+    {
+        if (self::ANSWER_IN_OFFICE_DOC !== (int) $data->type) {
+            return;
+        }
+
+        if (!$this->isOnlyofficePluginEnabled()) {
+            throw new BadRequestHttpException('OnlyOffice plugin is not enabled.');
+        }
+
+        if (!$isCreate && '' === trim($data->onlyofficeTemplateData)) {
+            return;
+        }
+
+        if ('' === trim($data->onlyofficeTemplateData)) {
+            throw new BadRequestHttpException('Please select an Office document.');
+        }
+
+        $this->decodeOnlyofficeTemplate($data);
+    }
+
+    private function addOnlyofficeTemplateOnSave(CQuiz $quiz, CQuizQuestion $question, ExerciseQuestionEditor $data, Course $course): void
+    {
+        if (self::ANSWER_IN_OFFICE_DOC !== (int) $data->type) {
+            return;
+        }
+
+        if ('' === trim($data->onlyofficeTemplateData)) {
+            if (!$this->questionHasStoredOnlyofficeTemplate($question)) {
+                throw new BadRequestHttpException('Please select an Office document.');
+            }
+
+            return;
+        }
+
+        $template = $this->decodeOnlyofficeTemplate($data);
+        $questionId = (int) ($question->getIid() ?? 0);
+        if (0 >= $questionId) {
+            throw new BadRequestHttpException('A valid exercise question is required to store the Office document.');
+        }
+
+        $fileName = 'office_'.$questionId.'.'.$template['extension'];
+        $this->questionRepository->addFileFromString(
+            $question,
+            $fileName,
+            $template['mimeType'],
+            $template['content'],
+            true
+        );
+
+        $question->setExtra($fileName);
+    }
+
+    private function questionHasStoredOnlyofficeTemplate(CQuizQuestion $question): bool
+    {
+        $resourceNode = $question->getResourceNode();
+        if (null === $resourceNode) {
+            return false;
+        }
+
+        foreach ($resourceNode->getResourceFiles() as $resourceFile) {
+            if ($resourceFile instanceof ResourceFile) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @return array{fileName: string, mimeType: string, extension: string, content: string}
+     */
+    private function decodeOnlyofficeTemplate(ExerciseQuestionEditor $data): array
+    {
+        $rawData = trim($data->onlyofficeTemplateData);
+        $mimeType = strtolower(trim($data->onlyofficeTemplateMimeType));
+        $encodedContent = $rawData;
+
+        if (preg_match('/^data:([^;]+);base64,(.+)$/i', $rawData, $matches)) {
+            $mimeType = strtolower($matches[1]);
+            $encodedContent = $matches[2];
+        }
+
+        $fileName = basename(trim($data->onlyofficeTemplateName));
+        $extension = strtolower((string) pathinfo($fileName, PATHINFO_EXTENSION));
+        if (!\in_array($extension, ['doc', 'docx', 'xls', 'xlsx'], true)) {
+            throw new BadRequestHttpException('Only DOC, DOCX, XLS or XLSX documents are allowed.');
+        }
+
+        $allowedMimeTypes = [
+            '',
+            'application/octet-stream',
+            'application/msword',
+            'application/vnd.ms-excel',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        ];
+        if (!\in_array($mimeType, $allowedMimeTypes, true)) {
+            throw new BadRequestHttpException('Only DOC, DOCX, XLS or XLSX documents are allowed.');
+        }
+
+        $content = base64_decode($encodedContent, true);
+        if (false === $content || '' === $content) {
+            throw new BadRequestHttpException('Only DOC, DOCX, XLS or XLSX documents are allowed.');
+        }
+
+        return [
+            'fileName' => $fileName,
+            'mimeType' => $mimeType,
+            'extension' => $extension,
+            'content' => $content,
+        ];
+    }
+
+    private function isOnlyofficePluginEnabled(): bool
+    {
+        try {
+            if (!\class_exists('OnlyofficePlugin')) {
+                $pluginPath = \api_get_path(\SYS_PLUGIN_PATH).'Onlyoffice/lib/onlyofficePlugin.php';
+                if (is_file($pluginPath)) {
+                    require_once $pluginPath;
+                }
+            }
+
+            if (!\class_exists('OnlyofficePlugin')) {
+                return false;
+            }
+
+            $plugin = \OnlyofficePlugin::create();
+            if (method_exists($plugin, 'isEnabledForCurrentAccessUrl')) {
+                return (bool) $plugin->isEnabledForCurrentAccessUrl();
+            }
+
+            return 'true' === (string) $plugin->get('enable_onlyoffice_plugin');
+        } catch (\Throwable) {
+            return false;
+        }
+    }
+
     /**
      * @return array{fileName: string, mimeType: string, content: string}
      */
@@ -613,6 +767,7 @@ private function getCourse(Request $request): Course
         return $course;
     }
 
+
     private function getSession(Request $request): ?Session
     {
         $sessionId = $request->query->getInt('sid');
@@ -1075,7 +1230,7 @@ private function calculateQuestionScore(ExerciseQuestionEditor $data): float
             return $score;
         }
 
-        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::CALCULATED_ANSWER], true)) {
+        if (\in_array($type, [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::ANSWER_IN_OFFICE_DOC, self::CALCULATED_ANSWER], true)) {
             return max(0.0, (float) $data->score);
         }
 
@@ -1189,6 +1344,7 @@ private function isVueSupportedQuestionType(int $type): bool
             self::READING_COMPREHENSION,
             self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY,
             self::UPLOAD_ANSWER,
+            self::ANSWER_IN_OFFICE_DOC,
             self::DRAGGABLE,
             self::MATCHING_DRAGGABLE,
             self::MATCHING_COMBINATION,
@@ -1224,6 +1380,7 @@ private function getQuestionTypeLabel(int $type): string
             self::READING_COMPREHENSION => 'Reading comprehension',
             self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => 'Multiple answer true/false with degree of certainty',
             self::UPLOAD_ANSWER => 'Upload answer',
+            self::ANSWER_IN_OFFICE_DOC => 'Answer in Office document',
             self::DRAGGABLE => 'Draggable',
             self::MATCHING_DRAGGABLE => 'Matching draggable',
             self::MATCHING_COMBINATION => 'Matching combination',
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
index 8ff2bd11513..bb6297dde24 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionEditorProvider.php
@@ -61,6 +61,7 @@
     private const READING_COMPREHENSION = 21;
     private const MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY = 22;
     private const UPLOAD_ANSWER = 23;
+    private const ANSWER_IN_OFFICE_DOC = 30;
     private const PAGE_BREAK = 31;
     private const DRAGGABLE = 18;
     private const MATCHING_DRAGGABLE = 19;
@@ -209,7 +210,7 @@ private function buildNewQuestionResponse(?CQuiz $quiz, int $type, Course $cours
             $response->matchingOrientation = 'h';
             $response->answers = [];
         }
-        if (\in_array($type, [self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER], true)) {
+        if (\in_array($type, [self::ORAL_EXPRESSION, self::ANNOTATION, self::UPLOAD_ANSWER, self::ANSWER_IN_OFFICE_DOC], true)) {
             $response->score = 10.0;
             $response->globalScore = 0.0;
             $response->answers = [];
@@ -274,6 +275,7 @@ private function buildExistingQuestionResponse(CQuiz $quiz, int $questionId, Cou
         $response->parentMediaId = (int) ($question->getParentMediaId() ?? 0);
         $response->answers = $this->getAnswers($question);
         $this->addAnnotationData($response, $question, $course, $session);
+        $this->addOnlyofficeData($response, $quiz, $question, $course, $session);
         $this->addHotspotData($response, $quiz, $question, $course, $session);
         if (!$this->usesHotspot($type) && $this->isAdaptiveScenarioQuestionType($type) && $this->isHotspotDelineationQuestionAllowed($quiz)) {
             $this->addHotspotScenarioOptions($response, $quiz, $question);
@@ -362,6 +364,16 @@ private function isHotspotDelineationQuestionAllowed(?CQuiz $quiz): bool
 
     private function assertQuestionTypeAllowedByFeedback(?CQuiz $quiz, int $type): void
     {
+        if (self::ANSWER_IN_OFFICE_DOC === $type) {
+            if (!$quiz instanceof CQuiz) {
+                throw new BadRequestHttpException('OnlyOffice questions must be linked to an exercise.');
+            }
+
+            if (!$this->isOnlyofficePluginEnabled()) {
+                throw new BadRequestHttpException('OnlyOffice plugin is not enabled.');
+            }
+        }
+
         if (!$quiz instanceof CQuiz) {
             return;
         }
@@ -419,6 +431,7 @@ private function getCourse(Request $request): Course
         return $course;
     }
 
+
     private function getSession(Request $request): ?Session
     {
         $sessionId = $request->query->getInt('sid');
@@ -847,6 +860,7 @@ private function isVueSupportedQuestionType(int $type): bool
             self::READING_COMPREHENSION,
             self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY,
             self::UPLOAD_ANSWER,
+            self::ANSWER_IN_OFFICE_DOC,
             self::DRAGGABLE,
             self::MATCHING_DRAGGABLE,
             self::MATCHING_COMBINATION,
@@ -882,6 +896,7 @@ private function getQuestionTypeLabel(int $type): string
             self::READING_COMPREHENSION => 'Reading comprehension',
             self::MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY => 'Multiple answer true/false with degree of certainty',
             self::UPLOAD_ANSWER => 'Upload answer',
+            self::ANSWER_IN_OFFICE_DOC => 'Answer in Office document',
             self::DRAGGABLE => 'Draggable',
             self::MATCHING_DRAGGABLE => 'Matching draggable',
             self::MATCHING_COMBINATION => 'Matching combination',
@@ -1224,6 +1239,62 @@ private function usesHotspot(int $type): bool
         return \in_array($type, [self::HOT_SPOT, self::HOT_SPOT_DELINEATION, self::HOT_SPOT_COMBINATION], true);
     }
 
+
+    private function addOnlyofficeData(
+        ExerciseQuestionEditor $response,
+        CQuiz $quiz,
+        CQuizQuestion $question,
+        Course $course,
+        ?Session $session,
+    ): void {
+        if (self::ANSWER_IN_OFFICE_DOC !== (int) $question->getType()) {
+            return;
+        }
+
+        $resourceNode = $question->getResourceNode();
+        if (null === $resourceNode) {
+            return;
+        }
+
+        $resourceFile = $resourceNode->getResourceFiles()->first();
+        if (!$resourceFile instanceof ResourceFile) {
+            return;
+        }
+
+        $response->onlyofficeTemplateName = (string) ($resourceFile->getOriginalName() ?: $question->getExtra() ?: $resourceNode->getTitle());
+        $response->onlyofficeTemplateUrl = $this->appendCourseContextToUrl(
+            $this->questionRepository->getHotSpotImageUrl($question),
+            $course,
+            $session
+        );
+        $response->answers = [];
+    }
+
+    private function isOnlyofficePluginEnabled(): bool
+    {
+        try {
+            if (!\class_exists('OnlyofficePlugin')) {
+                $pluginPath = \api_get_path(\SYS_PLUGIN_PATH).'Onlyoffice/lib/onlyofficePlugin.php';
+                if (is_file($pluginPath)) {
+                    require_once $pluginPath;
+                }
+            }
+
+            if (!\class_exists('OnlyofficePlugin')) {
+                return false;
+            }
+
+            $plugin = \OnlyofficePlugin::create();
+            if (method_exists($plugin, 'isEnabledForCurrentAccessUrl')) {
+                return (bool) $plugin->isEnabledForCurrentAccessUrl();
+            }
+
+            return 'true' === (string) $plugin->get('enable_onlyoffice_plugin');
+        } catch (\Throwable) {
+            return false;
+        }
+    }
+
     private function addAnnotationData(ExerciseQuestionEditor $response, CQuizQuestion $question, Course $course, ?Session $session): void
     {
         if (self::ANNOTATION !== (int) $question->getType()) {
diff --git a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
index 2b0658cc1b1..f0f0a96b7bc 100644
--- a/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseQuestionProvider.php
@@ -785,6 +785,7 @@ private function getLegacyQuestionTypeDefinitions(): array
             ['type' => 21, 'label' => 'Reading comprehension', 'icon' => 'reading_comprehension.png'],
             ['type' => 22, 'label' => 'Multiple answer true/false with degree of certainty', 'icon' => 'mccert.png'],
             ['type' => 23, 'label' => 'Upload Answer', 'icon' => 'file_upload_question.png'],
+            ['type' => 30, 'label' => 'Answer in Office document', 'icon' => 'file_upload_question.png'],
             ['type' => 24, 'label' => 'Matching combination', 'icon' => 'matching_co.png'],
             ['type' => 25, 'label' => 'Matching draggable combination', 'icon' => 'matchingdrag_co.png'],
             ['type' => 26, 'label' => 'Hotspot combination', 'icon' => 'hotspot_co.png'],
@@ -802,6 +803,10 @@ private function isQuestionTypeVisibleInSelector(int $type, int $feedbackType):
             return 1 === $feedbackType && $this->isSettingEnabled('enable_quiz_scenario');
         }
 
+        if (30 === $type) {
+            return 1 !== $feedbackType && $this->isOnlyofficePluginEnabled();
+        }
+
         return true;
     }
 
@@ -822,7 +827,33 @@ private function isQuestionTypeAllowedByFeedback(int $type, int $feedbackType):
 
     private function isVueQuestionEditorType(int $type): bool
     {
-        return \in_array($type, [1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 31], true);
+        return \in_array($type, [1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31], true);
+    }
+
+
+    private function isOnlyofficePluginEnabled(): bool
+    {
+        try {
+            if (!\class_exists('OnlyofficePlugin')) {
+                $pluginPath = api_get_path(SYS_PLUGIN_PATH).'Onlyoffice/lib/onlyofficePlugin.php';
+                if (is_file($pluginPath)) {
+                    require_once $pluginPath;
+                }
+            }
+
+            if (!\class_exists('OnlyofficePlugin')) {
+                return false;
+            }
+
+            $plugin = \OnlyofficePlugin::create();
+            if (method_exists($plugin, 'isEnabledForCurrentAccessUrl')) {
+                return (bool) $plugin->isEnabledForCurrentAccessUrl();
+            }
+
+            return 'true' === (string) $plugin->get('enable_onlyoffice_plugin');
+        } catch (\Throwable) {
+            return false;
+        }
     }
 
     private function getQuestionTypeLabel(int $type): string
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index d4660580f21..166d28d2c9f 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -9,13 +9,19 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use Chamilo\CoreBundle\ApiResource\Exercise\ExerciseRuntimeAnswer;
+use Chamilo\CoreBundle\Entity\AttemptFile;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ExtraField;
 use Chamilo\CoreBundle\Entity\ExtraFieldValues;
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CoreBundle\Entity\ResourceType;
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\Tool;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CourseBundle\Entity\CLpItem;
 use Chamilo\CourseBundle\Entity\CLpItemView;
@@ -31,6 +37,7 @@
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -65,6 +72,9 @@
     private const ANNOTATION_TYPES = [20];
     private const HOTSPOT_DELINEATION = 8;
     private const HOTSPOT_TYPES = [6, self::HOTSPOT_DELINEATION, 26];
+    private const ANSWER_IN_OFFICE_DOC = 30;
+    private const ATTEMPT_FILE_RESOURCE_TYPE = 'attempt_file';
+    private const ONLYOFFICE_ALLOWED_EXTENSIONS = ['doc', 'docx', 'xls', 'xlsx'];
 
     public function __construct(
         private RequestStack $requestStack,
@@ -72,6 +82,7 @@ public function __construct(
         private CQuizRepository $quizRepository,
         private Security $security,
         private SettingsManager $settingsManager,
+        private ResourceNodeRepository $resourceNodeRepository,
     ) {}
 
     /**
@@ -136,6 +147,36 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             return $response;
         }
 
+        if (self::ANSWER_IN_OFFICE_DOC === (int) $question->getType()) {
+            $attemptRow = $this->createOrReuseOnlyofficeAttemptRow(
+                $attempt,
+                $question,
+                $user,
+                max(0, (int) $data->secondsSpent),
+                $course,
+                $session
+            );
+
+            if (null !== $data->reviewLater) {
+                $this->syncReviewQuestion($attempt, $questionId, true === $data->reviewLater);
+            }
+
+            $this->blockCategoryIfNeeded($attempt, $quiz, $question, $navigationAction);
+            $this->lockPreventBackwardsStepIfNeeded($attempt, $quiz, $questionId, $navigationAction);
+            $this->entityManager->flush();
+
+            $response = $this->createResponse($exerciseId, $attemptId, $questionId);
+            $response->message = 'Office document prepared';
+            $response->feedback = [
+                'onlyoffice' => [
+                    'editorUrl' => $this->getOnlyofficeEditorUrl($attemptRow, $course, $session),
+                    'manualCorrection' => true,
+                ],
+            ];
+
+            return $response;
+        }
+
         $rows = $this->buildDraftRows($question, $data->answer, max(0, (int) $data->secondsSpent));
         $feedback = $this->buildFeedback($quiz, $question, $rows);
         $marks = [] !== $feedback ? (float) ($feedback['score'] ?? 0.0) : 0.0;
@@ -685,6 +726,247 @@ private function parseQuestionIds(string $value): array
         return array_values(array_filter(array_map(static fn (string $id): int => (int) trim($id), explode(',', $value))));
     }
 
+    private function createOrReuseOnlyofficeAttemptRow(
+        TrackEExercise $attempt,
+        CQuizQuestion $question,
+        User $user,
+        int $secondsSpent,
+        Course $course,
+        ?Session $session,
+    ): TrackEAttempt {
+        $questionId = (int) ($question->getIid() ?? 0);
+        $existingRow = $this->getOnlyofficeAttemptRow((int) $attempt->getExeId(), $questionId);
+        if ($existingRow instanceof TrackEAttempt) {
+            $existingRow->setTms(new DateTime());
+            $existingRow->setSecondsSpent(max($existingRow->getSecondsSpent(), $secondsSpent));
+            $resourceNode = $this->getFirstAttemptResourceNode($existingRow);
+            if ($resourceNode instanceof ResourceNode && null !== $resourceNode->getId()) {
+                $existingRow->setAnswer('onlyoffice:'.(int) $resourceNode->getId());
+            }
+
+            return $existingRow;
+        }
+
+        $templateResourceFile = $this->getOnlyofficeQuestionTemplateFile($question);
+        $templateResourceNode = $question->getResourceNode();
+        if (!$templateResourceNode instanceof ResourceNode || !$templateResourceFile instanceof ResourceFile) {
+            throw new BadRequestHttpException('This Office document question does not have a template document.');
+        }
+
+        try {
+            $content = $this->resourceNodeRepository->getResourceNodeFileContent($templateResourceNode, $templateResourceFile);
+        } catch (\Throwable $exception) {
+            throw new BadRequestHttpException('The Office document template could not be read.', $exception);
+        }
+
+        if ('' === $content) {
+            throw new BadRequestHttpException('The Office document template is empty.');
+        }
+
+        $fileName = $this->sanitizeFileName((string) ($templateResourceFile->getOriginalName() ?: $templateResourceFile->getTitle() ?: $question->getExtra() ?: 'office_document.docx'));
+        $extension = strtolower((string) pathinfo($fileName, PATHINFO_EXTENSION));
+        if (!\in_array($extension, self::ONLYOFFICE_ALLOWED_EXTENSIONS, true)) {
+            throw new BadRequestHttpException('The Office document template format is not supported.');
+        }
+
+        $resourceNode = $this->createAttemptFileResourceNodeFromContent(
+            $content,
+            $fileName,
+            (string) ($templateResourceFile->getMimeType() ?: $this->getOfficeMimeType($extension)),
+            $user
+        );
+
+        $attemptRow = (new TrackEAttempt())
+            ->setTrackEExercise($attempt)
+            ->setUser($user)
+            ->setQuestionId($questionId)
+            ->setAnswer('onlyoffice:'.(int) $resourceNode->getId())
+            ->setTeacherComment('')
+            ->setMarks(0.0)
+            ->setPosition(0)
+            ->setTms(new DateTime())
+            ->setSecondsSpent($secondsSpent)
+        ;
+        $this->entityManager->persist($attemptRow);
+
+        $attemptFile = new AttemptFile();
+        $attemptFile->setResourceNode($resourceNode);
+        $attemptRow->addAttemptFile($attemptFile);
+        $this->entityManager->persist($attemptFile);
+
+        return $attemptRow;
+    }
+
+    private function getOnlyofficeAttemptRow(int $attemptId, int $questionId): ?TrackEAttempt
+    {
+        $row = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->addSelect('attemptFile', 'resourceNode', 'resourceFile')
+            ->from(TrackEAttempt::class, 'saved')
+            ->leftJoin('saved.attemptFiles', 'attemptFile')
+            ->leftJoin('attemptFile.resourceNode', 'resourceNode')
+            ->leftJoin('resourceNode.resourceFiles', 'resourceFile')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $row instanceof TrackEAttempt ? $row : null;
+    }
+
+    private function getFirstAttemptResourceNode(TrackEAttempt $attemptRow): ?ResourceNode
+    {
+        foreach ($attemptRow->getAttemptFiles() as $attemptFile) {
+            if (!$attemptFile instanceof AttemptFile) {
+                continue;
+            }
+
+            $resourceNode = $attemptFile->getResourceNode();
+            if ($resourceNode instanceof ResourceNode) {
+                return $resourceNode;
+            }
+        }
+
+        return null;
+    }
+
+    private function getOnlyofficeQuestionTemplateFile(CQuizQuestion $question): ?ResourceFile
+    {
+        $resourceNode = $question->getResourceNode();
+        if (!$resourceNode instanceof ResourceNode) {
+            return null;
+        }
+
+        foreach ($resourceNode->getResourceFiles() as $resourceFile) {
+            if ($resourceFile instanceof ResourceFile) {
+                return $resourceFile;
+            }
+        }
+
+        return null;
+    }
+
+    private function createAttemptFileResourceNodeFromContent(string $content, string $fileName, string $mimeType, User $user): ResourceNode
+    {
+        $tmpPath = tempnam(sys_get_temp_dir(), 'chamilo_onlyoffice_attempt_');
+        if (false === $tmpPath) {
+            throw new BadRequestHttpException('The Office document attempt file could not be prepared.');
+        }
+
+        $extension = strtolower((string) pathinfo($fileName, PATHINFO_EXTENSION));
+        if (!\in_array($extension, self::ONLYOFFICE_ALLOWED_EXTENSIONS, true)) {
+            $extension = 'docx';
+        }
+
+        $tmpPathWithExtension = $tmpPath.'.'.$extension;
+        if (false === @rename($tmpPath, $tmpPathWithExtension)) {
+            $tmpPathWithExtension = $tmpPath;
+        }
+
+        if (false === file_put_contents($tmpPathWithExtension, $content)) {
+            throw new BadRequestHttpException('The Office document attempt file could not be prepared.');
+        }
+
+        $uploadedFile = new UploadedFile($tmpPathWithExtension, $fileName, $mimeType, null, true);
+        $resourceType = $this->getOrCreateAttemptFileResourceType();
+
+        $node = new ResourceNode();
+        $node->setTitle($fileName);
+        $node->setResourceType($resourceType);
+        $node->setCreator($user);
+
+        $resourceFile = new ResourceFile();
+        $resourceFile
+            ->setTitle($fileName)
+            ->setOriginalName($fileName)
+            ->setMimeType($mimeType)
+            ->setSize(\strlen($content))
+            ->setFile($uploadedFile)
+        ;
+        $node->addResourceFile($resourceFile);
+
+        $this->entityManager->persist($node);
+        $this->entityManager->persist($resourceFile);
+
+        return $node;
+    }
+
+    private function getOrCreateAttemptFileResourceType(): ResourceType
+    {
+        $resourceType = $this->entityManager->getRepository(ResourceType::class)->findOneBy([
+            'title' => self::ATTEMPT_FILE_RESOURCE_TYPE,
+        ]);
+        if ($resourceType instanceof ResourceType) {
+            return $resourceType;
+        }
+
+        $tool = $this->entityManager->getRepository(Tool::class)->findOneBy([
+            'title' => 'quiz',
+        ]);
+        if (!$tool instanceof Tool) {
+            throw new BadRequestHttpException('Missing Tool "quiz" for attempt file uploads.');
+        }
+
+        $resourceType = new ResourceType();
+        $resourceType->setTitle(self::ATTEMPT_FILE_RESOURCE_TYPE);
+        $resourceType->setTool($tool);
+        $this->entityManager->persist($resourceType);
+
+        return $resourceType;
+    }
+
+    private function sanitizeFileName(string $fileName): string
+    {
+        $safeName = preg_replace('/[^A-Za-z0-9._-]+/', '_', basename($fileName));
+        if (!\is_string($safeName)) {
+            return 'office_document.docx';
+        }
+
+        $safeName = trim($safeName, '._-');
+
+        return '' !== $safeName ? $safeName : 'office_document.docx';
+    }
+
+    private function getOfficeMimeType(string $extension): string
+    {
+        return match ($extension) {
+            'doc' => 'application/msword',
+            'xls' => 'application/vnd.ms-excel',
+            'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            default => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        };
+    }
+
+    private function getOnlyofficeEditorUrl(TrackEAttempt $attemptRow, Course $course, ?Session $session): string
+    {
+        $resourceNode = $this->getFirstAttemptResourceNode($attemptRow);
+        $attempt = $attemptRow->getTrackEExercise();
+        $quiz = $attempt->getQuiz();
+        if (!$resourceNode instanceof ResourceNode || null === $resourceNode->getId() || null === $quiz || null === $quiz->getIid()) {
+            return '';
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $query = [
+            'resourceNodeId' => (int) $resourceNode->getId(),
+            'exerciseId' => (int) $quiz->getIid(),
+            'exeId' => (int) $attempt->getExeId(),
+            'questionId' => (int) $attemptRow->getQuestionId(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+            'gid' => (int) ($request?->query->getInt('gid', 0) ?? 0),
+            'origin' => 'exercise',
+            'embedded' => 1,
+            'forceEdit' => 'true',
+        ];
+
+        return '/plugin/Onlyoffice/editor.php?'.http_build_query($query);
+    }
+
     /**
      * @return array<int, array{answer: string, position: int, secondsSpent: int}>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
index c3034d76daa..29ca4f85554 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAttemptProcessor.php
@@ -65,6 +65,7 @@
     private const FREE_ANSWER_TYPES = [5];
     private const ORAL_EXPRESSION_TYPES = [13];
     private const UPLOAD_ANSWER_TYPES = [23];
+    private const ONLYOFFICE_TYPES = [30];
     private const ANNOTATION_TYPES = [20];
     private const HOTSPOT_TYPES = [6, 8, 26];
     private const PAGE_BREAK = 31;
@@ -502,6 +503,7 @@ private function isFinishSupportedQuestionType(int $type): bool
             || \in_array($type, self::FREE_ANSWER_TYPES, true)
             || \in_array($type, self::ORAL_EXPRESSION_TYPES, true)
             || \in_array($type, self::UPLOAD_ANSWER_TYPES, true)
+            || \in_array($type, self::ONLYOFFICE_TYPES, true)
             || \in_array($type, self::ANNOTATION_TYPES, true)
             || \in_array($type, self::HOTSPOT_TYPES, true);
     }
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
index 1693880cf98..6e6e9b2e60d 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -65,6 +65,7 @@
     private const PAGE_BREAK = 31;
     private const ORAL_EXPRESSION = 13;
     private const UPLOAD_ANSWER = 23;
+    private const ANSWER_IN_OFFICE_DOC = 30;
     private const ANNOTATION = 20;
     private const MULTIPLE_ANSWER_COMBINATION = 9;
     private const UNIQUE_ANSWER_NO_OPTION = 10;
@@ -110,6 +111,7 @@
         self::DRAGGABLE => 'Sequence ordering',
         self::ORAL_EXPRESSION => 'Oral expression',
         self::UPLOAD_ANSWER => 'Upload answer',
+        self::ANSWER_IN_OFFICE_DOC => 'Answer in Office document',
         self::ANNOTATION => 'Annotation',
         self::MEDIA_QUESTION => 'Media question',
         self::READING_COMPREHENSION => 'Reading comprehension',
@@ -1024,6 +1026,7 @@ private function scoreQuestion(CQuiz $quiz, CQuizQuestion $question, array $answ
             self::FREE_ANSWER,
             self::ORAL_EXPRESSION,
             self::UPLOAD_ANSWER,
+            self::ANSWER_IN_OFFICE_DOC,
             self::ANNOTATION => $this->scoreManualAnswer($rows),
             default => 0.0,
         };
@@ -2151,7 +2154,7 @@ private function getSavedDraggablePositions(array $rows): array
      */
     private function requiresManualCorrection(CQuizQuestion $question): bool
     {
-        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::UPLOAD_ANSWER, self::ANNOTATION], true);
+        return \in_array((int) $question->getType(), [self::FREE_ANSWER, self::ORAL_EXPRESSION, self::UPLOAD_ANSWER, self::ANSWER_IN_OFFICE_DOC, self::ANNOTATION], true);
     }
 
     private function getSavedAnswerIds(array $rows): array
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
index d070db8fd2c..2c437f4547e 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeProvider.php
@@ -69,6 +69,8 @@
     private const FREE_ANSWER_TYPES = [5];
     private const ORAL_EXPRESSION_TYPES = [13];
     private const UPLOAD_ANSWER_TYPES = [23];
+    private const ONLYOFFICE_TYPES = [30];
+    private const ANSWER_IN_OFFICE_DOC = 30;
     private const ANNOTATION_TYPES = [20];
     private const HOTSPOT_TYPES = [6, 8, 26];
     private const MEDIA_QUESTION = 15;
@@ -186,6 +188,7 @@ private function isFinishSupportedQuestionType(int $type): bool
             || \in_array($type, self::FREE_ANSWER_TYPES, true)
             || \in_array($type, self::ORAL_EXPRESSION_TYPES, true)
             || \in_array($type, self::UPLOAD_ANSWER_TYPES, true)
+            || \in_array($type, self::ONLYOFFICE_TYPES, true)
             || \in_array($type, self::ANNOTATION_TYPES, true)
             || \in_array($type, self::HOTSPOT_TYPES, true)
             || \in_array($type, self::STRUCTURAL_CONTENT_TYPES, true);
@@ -416,6 +419,7 @@ private function normalizeSavedAttemptFiles(TrackEAttempt $attemptRow, Course $c
                 'mimeType' => $mimeType,
                 'url' => $this->getAttemptFileDownloadUrl($attemptRow, $resourceNode, $course, $session),
                 'inlineUrl' => $this->getAttemptFileDownloadUrl($attemptRow, $resourceNode, $course, $session, true),
+                'onlyofficeEditorUrl' => $this->getOnlyofficeEditorUrl($attemptRow, $resourceNode, $course, $session),
             ];
         }
 
@@ -466,6 +470,33 @@ private function getAttemptFileDownloadUrl(
         );
     }
 
+
+    private function getOnlyofficeEditorUrl(TrackEAttempt $attemptRow, ResourceNode $resourceNode, Course $course, ?Session $session): string
+    {
+        $attempt = $attemptRow->getTrackEExercise();
+        $quiz = $attempt->getQuiz();
+        $resourceNodeId = (int) ($resourceNode->getId() ?? 0);
+        if (null === $quiz || null === $quiz->getIid() || 0 >= $resourceNodeId) {
+            return '';
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $query = [
+            'resourceNodeId' => $resourceNodeId,
+            'exerciseId' => (int) $quiz->getIid(),
+            'exeId' => (int) $attempt->getExeId(),
+            'questionId' => (int) $attemptRow->getQuestionId(),
+            'cid' => (int) $course->getId(),
+            'sid' => (int) ($session?->getId() ?? 0),
+            'gid' => (int) ($request?->query->getInt('gid', 0) ?? 0),
+            'origin' => 'exercise',
+            'embedded' => 1,
+            'forceEdit' => 'true',
+        ];
+
+        return '/plugin/Onlyoffice/editor.php?'.http_build_query($query);
+    }
+
     /**
      * @return array<int, int>
      */
@@ -1120,6 +1151,7 @@ private function normalizeQuestion(CQuizQuestion $question, CQuizRelQuestion $re
             'calculated' => $this->getCalculatedRuntime($question, $attempt),
             'annotation' => $this->getImageRuntime($question, $course, $session, [20]),
             'hotspot' => $this->getHotspotRuntime($question, $course, $session, $canManage),
+            'onlyoffice' => $this->getOnlyofficeRuntime($question, $course, $session, $attempt),
             'reading' => $this->getReadingRuntime($question),
             'content' => $this->getContentRuntime($question),
             'isContent' => \in_array($type, self::STRUCTURAL_CONTENT_TYPES, true),
@@ -1893,6 +1925,69 @@ private function getImageRuntime(CQuizQuestion $question, Course $course, ?Sessi
         ];
     }
 
+    /**
+     * @return array<string, mixed>|null
+     */
+    private function getOnlyofficeRuntime(CQuizQuestion $question, Course $course, ?Session $session, ?TrackEExercise $attempt): ?array
+    {
+        if (self::ANSWER_IN_OFFICE_DOC !== (int) $question->getType()) {
+            return null;
+        }
+
+        $templateName = (string) ($question->getExtra() ?: '');
+        $templateUrl = '';
+        $resourceNode = $question->getResourceNode();
+        if (null !== $resourceNode) {
+            $resourceFile = $resourceNode->getResourceFiles()->first();
+            if ($resourceFile instanceof ResourceFile) {
+                $templateName = (string) ($resourceFile->getOriginalName() ?: $templateName ?: $resourceNode->getTitle());
+                $templateUrl = $this->appendCourseContextToUrl($this->questionRepository->getHotSpotImageUrl($question), $course, $session);
+            }
+        }
+
+        $editorUrl = '';
+        if ($attempt instanceof TrackEExercise) {
+            $attemptRow = $this->getOnlyofficeAttemptRow((int) $attempt->getExeId(), (int) $question->getIid());
+            if ($attemptRow instanceof TrackEAttempt) {
+                foreach ($attemptRow->getAttemptFiles() as $attemptFile) {
+                    $attemptResourceNode = $attemptFile->getResourceNode();
+                    if ($attemptResourceNode instanceof ResourceNode) {
+                        $editorUrl = $this->getOnlyofficeEditorUrl($attemptRow, $attemptResourceNode, $course, $session);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return [
+            'templateName' => $templateName,
+            'templateUrl' => $templateUrl,
+            'editorUrl' => $editorUrl,
+            'manualCorrection' => true,
+        ];
+    }
+
+    private function getOnlyofficeAttemptRow(int $attemptId, int $questionId): ?TrackEAttempt
+    {
+        $row = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->addSelect('attemptFile', 'resourceNode', 'resourceFile')
+            ->from(TrackEAttempt::class, 'saved')
+            ->leftJoin('saved.attemptFiles', 'attemptFile')
+            ->leftJoin('attemptFile.resourceNode', 'resourceNode')
+            ->leftJoin('resourceNode.resourceFiles', 'resourceFile')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', $attemptId, Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+
+        return $row instanceof TrackEAttempt ? $row : null;
+    }
+
     /**
      * @return array<string, mixed>|null
      */
@@ -2116,6 +2211,7 @@ private function getQuestionTypeLabel(int $type): string
             21 => 'Reading comprehension',
             22 => 'Multiple answer true/false with degree of certainty',
             23 => 'Upload answer',
+            30 => 'Answer in Office document',
             24 => 'Matching combination',
             25 => 'Matching draggable combination',
             26 => 'Hotspot combination',
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index 84afd5b4832..1e58147b719 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -49,6 +49,7 @@
 {
     private const STATUS_COMPLETED = 'completed';
     private const ANNOTATION = 20;
+    private const ANSWER_IN_OFFICE_DOC = 30;
     private const HOTSPOT_DELINEATION = 8;
     private const DRAGGABLE = 18;
     private const VISIBILITY_PUBLISHED = 2;
@@ -1163,6 +1164,10 @@ private function normalizeQuestionAnswer(CQuizQuestion $question, array $rows, a
             return $this->normalizeUploadAnswer($rows, $visibility);
         }
 
+        if (self::ANSWER_IN_OFFICE_DOC === $type) {
+            return $this->normalizeOnlyofficeAnswer($rows, $visibility);
+        }
+
         if (self::ANNOTATION === $type) {
             return $this->normalizeAnnotationAnswer($question, $rows, $visibility);
         }
@@ -1814,6 +1819,35 @@ private function normalizeUploadAnswer(array $rows, array $visibility): array
         ];
     }
 
+    /**
+     * @param array<int, TrackEAttempt> $rows
+     * @param array<string, mixed>      $visibility
+     *
+     * @return array<string, mixed>
+     */
+    private function normalizeOnlyofficeAnswer(array $rows, array $visibility): array
+    {
+        $row = $rows[0] ?? null;
+        if (!$row instanceof TrackEAttempt) {
+            return [
+                'kind' => 'onlyoffice',
+                'files' => [],
+                'teacherComment' => null,
+                'marks' => 0.0,
+            ];
+        }
+
+        $showStudentAnswers = true === ($visibility['showStudentAnswers'] ?? true);
+
+        return [
+            'kind' => 'onlyoffice',
+            'files' => $showStudentAnswers ? $this->normalizeAttemptFiles($row) : [],
+            'teacherComment' => true === ($visibility['showFeedback'] ?? false) && '' !== $row->getTeacherComment() ? $row->getTeacherComment() : null,
+            'marks' => (float) $row->getMarks(),
+            'showStudentAnswers' => $showStudentAnswers,
+        ];
+    }
+
     /**
      * @param array<int, TrackEAttempt> $rows
      * @param array<string, mixed>      $visibility

From 2e1b272b82a773de0de05fb4e62c6f833c644b38 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Thu, 18 Jun 2026 15:22:14 -0500
Subject: [PATCH 20/21] Exercise: Add progressive adaptive mode

---
 assets/locales/en_US.json                     |  14 +-
 .../exercise/ExerciseConfigurationView.vue    | 145 +++++++++-
 .../vue/views/exercise/ExerciseResultView.vue |  15 ++
 .../Exercise/ExerciseRuntimeResult.php        |   6 +
 .../DataFixtures/SettingsCurrentFixtures.php  |   5 +
 .../Schema/V210/Version20260618123000.php     |  83 ++++++
 .../Settings/ExerciseSettingsSchema.php       |   3 +
 .../ExerciseConfigurationProcessor.php        | 109 ++++++--
 .../ExerciseConfigurationProvider.php         |  44 +++-
 .../ExerciseRuntimeAnswerProcessor.php        | 247 +++++++++++++++++-
 .../ExerciseRuntimeFinishProcessor.php        |  69 ++++-
 .../ExerciseRuntimeResultProvider.php         |  21 ++
 .../Entity/CQuizDestinationResult.php         |  88 +++++++
 .../Entity/CQuizRelQuestionCategory.php       |  16 ++
 14 files changed, 820 insertions(+), 45 deletions(-)
 create mode 100644 src/CoreBundle/Migrations/Schema/V210/Version20260618123000.php
 create mode 100644 src/CourseBundle/Entity/CQuizDestinationResult.php

diff --git a/assets/locales/en_US.json b/assets/locales/en_US.json
index 01754266c8c..cdf1db322cb 100644
--- a/assets/locales/en_US.json
+++ b/assets/locales/en_US.json
@@ -34,6 +34,7 @@
   "Access URL": "Access URL",
   "Account": "Account",
   "Account expired": "Account expired",
+  "Achieved level": "Achieved level",
   "Action failed": "Action failed",
   "Actions": "Actions",
   "Activate": "Activate",
@@ -332,6 +333,7 @@
   "Category": "Category",
   "Category deleted": "Category deleted",
   "Category description": "Category description",
+  "Category destinations": "Category destinations",
   "Category name": "Category name",
   "Category options": "Category options",
   "Category reordering is not enabled": "Category reordering is not enabled",
@@ -777,6 +779,7 @@
   "Enable final acceptance date (invisible to learners)": "Enable final acceptance date (invisible to learners)",
   "Enable handing over deadline (visible to learners)": "Enable handing over deadline (visible to learners)",
   "Enable notifications": "Enable notifications",
+  "Enable progressive adaptive tests by category destination": "Enable progressive adaptive tests by category destination",
   "Enable start time": "Enable start time",
   "Enable this user?": "Enable this user?",
   "Enable time control": "Enable time control",
@@ -1670,6 +1673,8 @@
   "Profile fields selected here will be shown before the survey questions.": "Profile fields selected here will be shown before the survey questions.",
   "Profile information": "Profile information",
   "Progress": "Progress",
+  "Progressive adaptive": "Progressive adaptive",
+  "Progressive adaptive result": "Progressive adaptive result",
   "Projects": "Projects",
   "Promoted Messages": "Promoted Messages",
   "Promoted messages": "Promoted messages",
@@ -2406,6 +2411,7 @@
   "Use the search box to find users quickly": "Use the search box to find users quickly",
   "Use the standard platform limits.": "Use the standard platform limits.",
   "Use this question in the test as a link (not a copy)": "Use this question in the test as a link (not a copy)",
+  "Use threshold:categoryId rules separated by @@. Use category 0 to finish the exercise.": "Use threshold:categoryId rules separated by @@. Use category 0 to finish the exercise.",
   "Used space": "Used space",
   "User": "User",
   "User added": "User added",
@@ -2643,5 +2649,11 @@
   "{0} surveys selected": "{0} surveys selected",
   "{0} updated": "{0} updated",
   "{0} user-class links imported": "{0} user-class links imported",
-  "{0}'s picture": "{0}'s picture"
+  "{0}'s picture": "{0}'s picture",
+  "Maximum score (%)": "Maximum score (%)",
+  "Go to": "Go to",
+  "Finish exercise": "Finish exercise",
+  "Remove destination": "Remove destination",
+  "Add destination": "Add destination",
+  "Rules are evaluated by score percentage in ascending order. Select Finish exercise to end the test.": "Rules are evaluated by score percentage in ascending order. Select Finish exercise to end the test."
 }
diff --git a/assets/vue/views/exercise/ExerciseConfigurationView.vue b/assets/vue/views/exercise/ExerciseConfigurationView.vue
index db5bc71a19f..3f2b34782ab 100644
--- a/assets/vue/views/exercise/ExerciseConfigurationView.vue
+++ b/assets/vue/views/exercise/ExerciseConfigurationView.vue
@@ -209,7 +209,7 @@
           </div>
 
           <div
-            v-if="showCategorySelectionOptions"
+            v-if="showCategorySelectionOptions || showCategoryDestinations"
             class="space-y-3 rounded-lg border border-gray-20 bg-gray-5 p-3"
           >
             <div class="flex flex-col gap-1 md:flex-row md:items-center md:justify-between">
@@ -234,6 +234,12 @@
                     <th class="px-3 py-2">{{ t("Categories") }}</th>
                     <th class="px-3 py-2">{{ t("Available questions") }}</th>
                     <th class="px-3 py-2">{{ t("Number of questions") }}</th>
+                    <th
+                      v-if="showCategoryDestinations"
+                      class="px-3 py-2"
+                    >
+                      {{ t("Category destinations") }}
+                    </th>
                   </tr>
                 </thead>
                 <tbody class="divide-y divide-gray-20 bg-white">
@@ -253,6 +259,56 @@
                         :min="-1"
                       />
                     </td>
+                    <td
+                      v-if="showCategoryDestinations"
+                      class="min-w-[520px] px-3 py-2"
+                    >
+                      <div class="space-y-3">
+                        <div
+                          v-for="(rule, ruleIndex) in row.destinationRules"
+                          :key="`category-destination-${row.categoryId}-${ruleIndex}`"
+                          class="grid gap-2 rounded-lg border border-gray-20 bg-white p-2 md:grid-cols-[140px_1fr_auto] md:items-end"
+                        >
+                          <BaseInputNumber
+                            :id="`exercise-category-destination-threshold-${row.categoryId}-${ruleIndex}`"
+                            v-model="rule.threshold"
+                            :label="t('Maximum score (%)')"
+                            :name="`categoryDestinations[${row.categoryId}][${ruleIndex}][threshold]`"
+                            :min="0"
+                            :max="100"
+                          />
+                          <BaseSelect
+                            :id="`exercise-category-destination-target-${row.categoryId}-${ruleIndex}`"
+                            v-model="rule.categoryId"
+                            :label="t('Go to')"
+                            :name="`categoryDestinations[${row.categoryId}][${ruleIndex}][categoryId]`"
+                            :options="destinationCategoryOptions(row)"
+                            option-label="label"
+                            option-value="value"
+                          />
+                          <BaseButton
+                            :label="t('Remove destination')"
+                            icon="delete"
+                            only-icon
+                            size="small"
+                            type="danger-text"
+                            @click="removeCategoryDestinationRule(row, ruleIndex)"
+                          />
+                        </div>
+
+                        <BaseButton
+                          :label="t('Add destination')"
+                          icon="add"
+                          size="small"
+                          type="secondary"
+                          @click="addCategoryDestinationRule(row)"
+                        />
+
+                        <p class="text-xs text-gray-50">
+                          {{ t("Rules are evaluated by score percentage in ascending order. Select Finish exercise to end the test.") }}
+                        </p>
+                      </div>
+                    </td>
                   </tr>
                 </tbody>
               </table>
@@ -916,6 +972,8 @@ const notificationOptions = computed(() => mapTranslatedOptions(options.value.no
 const saveCorrectAnswerOptions = computed(() => mapTranslatedOptions(options.value.saveCorrectAnswerOptions || []))
 const showRandomQuestionCount = computed(() => [2, 3, 4, 5, 6].includes(Number(form.questionSelectionType)))
 const showCategorySelectionOptions = computed(() => 3 <= Number(form.questionSelectionType))
+const showCategoryDestinations = computed(() => Number(form.feedbackType || 0) === 3 && true === settings.value.quizQuestionCategoryDestinations)
+const showCategoryMatrix = computed(() => showCategorySelectionOptions.value || showCategoryDestinations.value)
 const hasCategoryMatrixWarning = computed(() =>
   form.categoryMatrix.some((row) => {
     const count = Number(row.countQuestions || 0)
@@ -928,6 +986,37 @@ const booleanOptions = computed(() => [
   { booleanValue: true, label: t("Yes") },
   { booleanValue: false, label: t("No") },
 ])
+
+function destinationCategoryOptions(row) {
+  const sourceCategoryId = Number(row?.categoryId || 0)
+  const categoryItems = form.categoryMatrix
+    .filter((item) => 0 < Number(item.categoryId || 0) && Number(item.categoryId || 0) !== sourceCategoryId)
+    .map((item) => ({
+      value: Number(item.categoryId),
+      label: item.title || t("Untitled"),
+    }))
+
+  return [{ value: 0, label: t("Finish exercise") }, ...categoryItems]
+}
+
+function addCategoryDestinationRule(row) {
+  if (!Array.isArray(row.destinationRules)) {
+    row.destinationRules = []
+  }
+
+  row.destinationRules.push({
+    threshold: 100,
+    categoryId: 0,
+  })
+}
+
+function removeCategoryDestinationRule(row, index) {
+  if (!Array.isArray(row.destinationRules)) {
+    return
+  }
+
+  row.destinationRules.splice(index, 1)
+}
 const effectiveLockedFields = computed(() => {
   if (lockedFields.value.length > 0) {
     return lockedFields.value
@@ -1154,12 +1243,54 @@ function normalizeCategoryMatrix(rows) {
     return []
   }
 
-  return rows.map((row) => ({
-    categoryId: Number(row.categoryId || 0),
-    title: row.title || t("General"),
-    availableQuestions: Number(row.availableQuestions || 0),
-    countQuestions: Number(row.countQuestions ?? -1),
-  }))
+  return rows.map((row) => {
+    const destinations = row.destinations || serializeCategoryDestinationRules(row.destinationRules || [])
+
+    return {
+      categoryId: Number(row.categoryId || 0),
+      title: row.title || t("General"),
+      availableQuestions: Number(row.availableQuestions || 0),
+      countQuestions: Number(row.countQuestions ?? -1),
+      destinations,
+      destinationRules: parseCategoryDestinationRules(destinations),
+    }
+  })
+}
+
+function parseCategoryDestinationRules(destinations) {
+  if (!destinations || "string" !== typeof destinations) {
+    return []
+  }
+
+  return destinations
+    .split("@@")
+    .map((item) => item.trim())
+    .filter(Boolean)
+    .map((item) => {
+      const [threshold, categoryId] = item.split(":")
+
+      return {
+        threshold: Math.max(0, Math.min(100, Number(threshold || 0))),
+        categoryId: Math.max(0, Number(categoryId || 0)),
+      }
+    })
+    .filter((rule) => Number.isFinite(rule.threshold) && Number.isFinite(rule.categoryId))
+}
+
+function serializeCategoryDestinationRules(rules) {
+  if (!Array.isArray(rules)) {
+    return ""
+  }
+
+  return rules
+    .map((rule) => ({
+      threshold: Math.max(0, Math.min(100, Number(rule.threshold || 0))),
+      categoryId: Math.max(0, Number(rule.categoryId || 0)),
+    }))
+    .filter((rule) => Number.isFinite(rule.threshold) && Number.isFinite(rule.categoryId))
+    .sort((left, right) => left.threshold - right.threshold)
+    .map((rule) => `${rule.threshold}:${rule.categoryId}`)
+    .join("@@")
 }
 
 function normalizeNotificationValues(values) {
diff --git a/assets/vue/views/exercise/ExerciseResultView.vue b/assets/vue/views/exercise/ExerciseResultView.vue
index 835cba74f80..beecee27f4c 100644
--- a/assets/vue/views/exercise/ExerciseResultView.vue
+++ b/assets/vue/views/exercise/ExerciseResultView.vue
@@ -184,6 +184,19 @@
           >
             {{ t("Corrections are hidden according to the exercise result settings.") }}
           </div>
+
+          <div
+            v-if="progressiveAdaptiveResult.achievedLevel"
+            class="mt-4 rounded-lg border border-info/30 bg-support-1 p-4 text-sm text-support-4"
+          >
+            <div class="flex items-center gap-2 font-semibold">
+              <BaseIcon icon="flag-checkered" size="small" />
+              {{ t("Progressive adaptive result") }}
+            </div>
+            <div class="mt-2">
+              {{ t("Achieved level") }}: <strong>{{ progressiveAdaptiveResult.achievedLevel }}</strong>
+            </div>
+          </div>
         </div>
       </header>
 
@@ -1595,6 +1608,7 @@ const questions = ref([])
 const categoryScores = ref([])
 const ranking = ref([])
 const finalActions = ref({})
+const progressiveAdaptiveResult = ref({})
 const aiCorrection = ref({})
 const isStartingAttempt = ref(false)
 const correctionForms = ref({})
@@ -1811,6 +1825,7 @@ async function loadResult() {
     categoryScores.value = Array.isArray(response.categoryScores) ? response.categoryScores : []
     ranking.value = Array.isArray(response.ranking) ? response.ranking : []
     finalActions.value = response.finalActions || {}
+    progressiveAdaptiveResult.value = response.progressiveAdaptiveResult || {}
     aiCorrection.value = response.aiCorrection || {}
     initializeCorrectionForms()
     initializeAiCorrectionForms()
diff --git a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
index f216d40310f..0b49211f235 100644
--- a/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
+++ b/src/CoreBundle/ApiResource/Exercise/ExerciseRuntimeResult.php
@@ -104,6 +104,12 @@ final class ExerciseRuntimeResult
     #[Groups(['exercise_runtime_result:read'])]
     public array $aiCorrection = [];
 
+    /**
+     * @var array<string, mixed>
+     */
+    #[Groups(['exercise_runtime_result:read'])]
+    public array $progressiveAdaptiveResult = [];
+
     #[Groups(['exercise_runtime_result:read'])]
     public bool $canManage = false;
 
diff --git a/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php b/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php
index c32bd8af905..02cf4f775f5 100644
--- a/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php
+++ b/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php
@@ -2462,6 +2462,11 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Enable test categories',
                     'comment' => 'Test categories are not enabled by default because they add a level of complexity. Enable this feature to show all test categories related management icons appear.',
                 ],
+                [
+                    'name' => 'quiz_question_category_destinations',
+                    'title' => 'Enable progressive adaptive tests by category destination',
+                    'comment' => 'Enable progressive adaptive tests where each question category can redirect learners to another category depending on their score.',
+                ],
                 [
                     'name' => 'allow_mandatory_question_in_category',
                     'title' => 'Enable selecting mandatory questions',
diff --git a/src/CoreBundle/Migrations/Schema/V210/Version20260618123000.php b/src/CoreBundle/Migrations/Schema/V210/Version20260618123000.php
new file mode 100644
index 00000000000..37ff0cace23
--- /dev/null
+++ b/src/CoreBundle/Migrations/Schema/V210/Version20260618123000.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V210;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+final class Version20260618123000 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return 'Add progressive adaptive exercise category destinations.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        if ($schema->hasTable('c_quiz_rel_category')) {
+            $table = $schema->getTable('c_quiz_rel_category');
+            if (!$table->hasColumn('destinations')) {
+                $this->addSql('ALTER TABLE c_quiz_rel_category ADD destinations LONGTEXT DEFAULT NULL');
+            }
+        }
+
+        if (!$schema->hasTable('c_quiz_destination_result')) {
+            $this->addSql('CREATE TABLE c_quiz_destination_result (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, exe_id INT DEFAULT NULL, achieved_level VARCHAR(255) NOT NULL, hash VARCHAR(255) NOT NULL, INDEX IDX_7A2F95B6A76ED395 (user_id), INDEX IDX_7A2F95B6B5A18F57 (exe_id), UNIQUE INDEX UNIQ_7A2F95B6D1B862B8 (hash), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+            $this->addSql('ALTER TABLE c_quiz_destination_result ADD CONSTRAINT FK_7A2F95B6A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE');
+            $this->addSql('ALTER TABLE c_quiz_destination_result ADD CONSTRAINT FK_7A2F95B6B5A18F57 FOREIGN KEY (exe_id) REFERENCES track_e_exercises (exe_id) ON DELETE CASCADE');
+        }
+
+        if ($schema->hasTable('settings')) {
+            $this->upsertProgressiveAdaptiveSetting('settings');
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        if ($schema->hasTable('settings')) {
+            $this->deleteProgressiveAdaptiveSetting('settings');
+        }
+
+        if ($schema->hasTable('c_quiz_destination_result')) {
+            $this->addSql('DROP TABLE c_quiz_destination_result');
+        }
+
+        if ($schema->hasTable('c_quiz_rel_category')) {
+            $table = $schema->getTable('c_quiz_rel_category');
+            if ($table->hasColumn('destinations')) {
+                $this->addSql('ALTER TABLE c_quiz_rel_category DROP destinations');
+            }
+        }
+    }
+
+    private function upsertProgressiveAdaptiveSetting(string $table): void
+    {
+        $this->addSql(
+            'INSERT INTO '.$table.' (variable, category, title, comment, selected_value, access_url_changeable) '.
+            'SELECT ?, ?, ?, ?, ?, 0 WHERE NOT EXISTS (SELECT 1 FROM '.$table.' WHERE variable = ?)',
+            [
+                'quiz_question_category_destinations',
+                'exercise',
+                'Enable progressive adaptive tests by category destination',
+                'Enable progressive adaptive tests where each question category can redirect learners to another category depending on their score.',
+                'false',
+                'quiz_question_category_destinations',
+            ]
+        );
+    }
+
+    private function deleteProgressiveAdaptiveSetting(string $table): void
+    {
+        $this->addSql(
+            'DELETE FROM '.$table.' WHERE variable = ? AND category = ?',
+            [
+                'quiz_question_category_destinations',
+                'exercise',
+            ]
+        );
+    }
+}
diff --git a/src/CoreBundle/Settings/ExerciseSettingsSchema.php b/src/CoreBundle/Settings/ExerciseSettingsSchema.php
index 8968ede2311..97ee95bbd98 100644
--- a/src/CoreBundle/Settings/ExerciseSettingsSchema.php
+++ b/src/CoreBundle/Settings/ExerciseSettingsSchema.php
@@ -21,6 +21,7 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'exercise_min_score' => '0',
             'exercise_max_score' => '20',
             'enable_quiz_scenario' => 'true',
+            'quiz_question_category_destinations' => 'false',
             'allow_coach_feedback_exercises' => 'true',
             'show_official_code_exercise_result_list' => 'false',
             'email_alert_manager_on_new_quiz' => 'true',
@@ -86,6 +87,7 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'exercise_min_score' => ['string', 'null'],
             'exercise_max_score' => ['string', 'null'],
             'enable_quiz_scenario' => ['string'],
+            'quiz_question_category_destinations' => ['string'],
         ];
 
         $this->setMultipleAllowedTypes($allowedTypes, $builder);
@@ -97,6 +99,7 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('exercise_min_score')
             ->add('exercise_max_score')
             ->add('enable_quiz_scenario', YesNoType::class)
+            ->add('quiz_question_category_destinations', YesNoType::class)
             ->add('allow_coach_feedback_exercises', YesNoType::class)
             ->add('show_official_code_exercise_result_list', YesNoType::class)
             ->add('email_alert_manager_on_new_quiz', YesNoType::class)
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
index dbf1845d21d..2f924ab40cb 100644
--- a/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProcessor.php
@@ -47,6 +47,8 @@
  */
 final readonly class ExerciseConfigurationProcessor implements ProcessorInterface
 {
+    private const FEEDBACK_TYPE_DIRECT = 1;
+    private const FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE = 3;
     private const CSRF_TOKEN_ID = 'exercise_configuration';
     private const MEDIA_QUESTION = 15;
     private const PAGE_BREAK = 31;
@@ -141,12 +143,16 @@ private function applyCommonFields(CQuiz $quiz, ExerciseConfiguration $data, Cou
         }
 
         $feedbackType = $this->normalizeFeedbackType($data->feedbackType);
-        if (!$this->isSettingEnabled('enable_quiz_scenario') && \in_array($feedbackType, [1, 3], true)) {
-            $feedbackType = \in_array($quiz->getFeedbackType(), [1, 3], true) ? $quiz->getFeedbackType() : 0;
+        if (self::FEEDBACK_TYPE_DIRECT === $feedbackType && !$this->isSettingEnabled('enable_quiz_scenario')) {
+            $feedbackType = self::FEEDBACK_TYPE_DIRECT === $quiz->getFeedbackType() ? $quiz->getFeedbackType() : 0;
+        }
+
+        if (self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE === $feedbackType && !$this->isProgressiveAdaptiveSettingEnabled()) {
+            $feedbackType = self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE === $quiz->getFeedbackType() ? $quiz->getFeedbackType() : 0;
         }
 
         $resultsDisabled = $this->normalizeResultsDisabled($data->resultsDisabled);
-        if (\in_array($feedbackType, [1, 3], true)) {
+        if (\in_array($feedbackType, [self::FEEDBACK_TYPE_DIRECT, self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE], true)) {
             $resultsDisabled = 0;
         }
 
@@ -155,7 +161,7 @@ private function applyCommonFields(CQuiz $quiz, ExerciseConfiguration $data, Cou
             $type = CQuiz::ONE_PER_PAGE;
         }
 
-        if (\in_array($feedbackType, [1, 3], true)) {
+        if (\in_array($feedbackType, [self::FEEDBACK_TYPE_DIRECT, self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE], true)) {
             $type = CQuiz::ONE_PER_PAGE;
         }
 
@@ -446,6 +452,19 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function isProgressiveAdaptiveSettingEnabled(): bool
+    {
+        $value = $this->entityManager->getConnection()->fetchOne(
+            'SELECT selected_value FROM settings WHERE category = :category AND variable = :variable LIMIT 1',
+            [
+                'category' => 'exercise',
+                'variable' => 'quiz_question_category_destinations',
+            ]
+        );
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
     private function isSettingEnabled(string $name): bool
     {
         $value = $this->settingsManager->getSetting($name, true);
@@ -700,7 +719,7 @@ private function saveCategoryMatrix(CQuiz $quiz, ExerciseConfiguration $data): v
             ['exerciseId' => Types::INTEGER]
         );
 
-        foreach ($matrix as $categoryId => $countQuestions) {
+        foreach ($matrix as $categoryId => $categorySettings) {
             if (0 === (int) $categoryId) {
                 continue;
             }
@@ -708,11 +727,13 @@ private function saveCategoryMatrix(CQuiz $quiz, ExerciseConfiguration $data): v
             $connection->insert('c_quiz_rel_category', [
                 'exercise_id' => $exerciseId,
                 'category_id' => $categoryId,
-                'count_questions' => $countQuestions,
+                'count_questions' => $categorySettings['countQuestions'],
+                'destinations' => $categorySettings['destinations'],
             ], [
                 'exercise_id' => Types::INTEGER,
                 'category_id' => Types::INTEGER,
                 'count_questions' => Types::INTEGER,
+                'destinations' => Types::TEXT,
             ]);
         }
     }
@@ -720,7 +741,7 @@ private function saveCategoryMatrix(CQuiz $quiz, ExerciseConfiguration $data): v
     /**
      * @param array<int, array<string, mixed>> $matrix
      *
-     * @return array<int, int>
+     * @return array<int, array{countQuestions: int, destinations: ?string}>
      */
     private function normalizeCategoryMatrix(CQuiz $quiz, array $matrix): array
     {
@@ -741,7 +762,10 @@ private function normalizeCategoryMatrix(CQuiz $quiz, array $matrix): array
             }
 
             $countQuestions = (int) ($row['countQuestions'] ?? -1);
-            $normalized[$categoryId] = max(-1, $countQuestions);
+            $normalized[$categoryId] = [
+                'countQuestions' => max(-1, $countQuestions),
+                'destinations' => $this->normalizeCategoryDestinations((string) ($row['destinations'] ?? ''), $allowedCategoryIds),
+            ];
         }
 
         return $normalized;
@@ -872,7 +896,7 @@ private function getCategoryMatrix(CQuiz $quiz): array
             static fn (array $left, array $right): int => strcasecmp((string) $left['title'], (string) $right['title'])
         );
 
-        $savedCounts = $this->getSavedCategoryQuestionCounts($exerciseId);
+        $savedCategorySettings = $this->getSavedCategoryQuestionSettings($exerciseId);
         $matrix = [];
         foreach ($categories as $category) {
             $categoryId = (int) $category['categoryId'];
@@ -880,7 +904,8 @@ private function getCategoryMatrix(CQuiz $quiz): array
                 'categoryId' => $categoryId,
                 'title' => (string) $category['title'],
                 'availableQuestions' => (int) $category['availableQuestions'],
-                'countQuestions' => $savedCounts[$categoryId] ?? -1,
+                'countQuestions' => $savedCategorySettings[$categoryId]['countQuestions'] ?? -1,
+                'destinations' => $savedCategorySettings[$categoryId]['destinations'] ?? '',
             ];
         }
 
@@ -888,29 +913,69 @@ private function getCategoryMatrix(CQuiz $quiz): array
             'categoryId' => 0,
             'title' => 'General',
             'availableQuestions' => $generalQuestionCount,
-            'countQuestions' => $savedCounts[0] ?? -1,
+            'countQuestions' => $savedCategorySettings[0]['countQuestions'] ?? -1,
+            'destinations' => $savedCategorySettings[0]['destinations'] ?? '',
         ];
 
         return $matrix;
     }
 
     /**
-     * @return array<int, int>
+     * @param array<int, int> $allowedCategoryIds
      */
-    private function getSavedCategoryQuestionCounts(int $exerciseId): array
+    private function normalizeCategoryDestinations(string $destinations, array $allowedCategoryIds): ?string
+    {
+        $destinations = trim($destinations);
+        if ('' === $destinations) {
+            return null;
+        }
+
+        $items = [];
+        foreach (explode('@@', $destinations) as $item) {
+            $item = trim($item);
+            if ('' === $item || !str_contains($item, ':')) {
+                continue;
+            }
+
+            [$threshold, $categoryId] = array_pad(explode(':', $item, 2), 2, '0');
+            $thresholdValue = max(0, min(100, (int) $threshold));
+            $destinationCategoryId = max(0, (int) $categoryId);
+            if (0 !== $destinationCategoryId && !\in_array($destinationCategoryId, $allowedCategoryIds, true)) {
+                continue;
+            }
+
+            $items[$thresholdValue] = $thresholdValue.':'.$destinationCategoryId;
+        }
+
+        if ([] === $items) {
+            return null;
+        }
+
+        ksort($items);
+
+        return implode('@@', array_values($items));
+    }
+
+    /**
+     * @return array<int, array{countQuestions: int, destinations: string}>
+     */
+    private function getSavedCategoryQuestionSettings(int $exerciseId): array
     {
         $rows = $this->entityManager->getConnection()->fetchAllAssociative(
-            'SELECT category_id, count_questions FROM c_quiz_rel_category WHERE exercise_id = :exerciseId',
+            'SELECT category_id, count_questions, destinations FROM c_quiz_rel_category WHERE exercise_id = :exerciseId',
             ['exerciseId' => $exerciseId],
             ['exerciseId' => Types::INTEGER]
         );
 
-        $counts = [];
+        $settings = [];
         foreach ($rows as $row) {
-            $counts[(int) $row['category_id']] = (int) $row['count_questions'];
+            $settings[(int) $row['category_id']] = [
+                'countQuestions' => (int) $row['count_questions'],
+                'destinations' => (string) ($row['destinations'] ?? ''),
+            ];
         }
 
-        return $counts;
+        return $settings;
     }
 
     /**
@@ -928,6 +993,7 @@ private function getSettings(): array
             'allowNotificationSettingPerExercise' => $this->isSettingEnabled('exercise.allow_notification_setting_per_exercise'),
             'allowHideQuestionNumberSetting' => $this->isSettingEnabled('exercise.quiz_hide_question_number'),
             'enableQuizScenario' => $this->isSettingEnabled('enable_quiz_scenario'),
+            'quizQuestionCategoryDestinations' => $this->isProgressiveAdaptiveSettingEnabled(),
         ];
     }
 
@@ -996,9 +1062,12 @@ private function getFeedbackOptions(?CQuiz $quiz): array
             ['value' => 2, 'label' => 'Exam (no feedback)'],
         ];
 
-        if ($this->isSettingEnabled('enable_quiz_scenario') || \in_array($quiz?->getFeedbackType(), [1, 3], true)) {
-            $options[] = ['value' => 1, 'label' => 'Adaptative test with immediate feedback'];
-            $options[] = ['value' => 3, 'label' => 'Direct pop-up mode'];
+        if ($this->isSettingEnabled('enable_quiz_scenario') || self::FEEDBACK_TYPE_DIRECT === (int) ($quiz?->getFeedbackType() ?? 0)) {
+            $options[] = ['value' => self::FEEDBACK_TYPE_DIRECT, 'label' => 'Adaptative test with immediate feedback'];
+        }
+
+        if ($this->isProgressiveAdaptiveSettingEnabled() || self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE === (int) ($quiz?->getFeedbackType() ?? 0)) {
+            $options[] = ['value' => self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE, 'label' => 'Progressive adaptive'];
         }
 
         return $options;
diff --git a/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
index 597ed807fe6..20b95c0616c 100644
--- a/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseConfigurationProvider.php
@@ -245,6 +245,7 @@ private function getSettings(): array
             'allowNotificationSettingPerExercise' => $this->isSettingEnabled('exercise.allow_notification_setting_per_exercise'),
             'allowHideQuestionNumberSetting' => $this->isSettingEnabled('exercise.quiz_hide_question_number'),
             'enableQuizScenario' => $this->isSettingEnabled('enable_quiz_scenario'),
+            'quizQuestionCategoryDestinations' => $this->isProgressiveAdaptiveSettingEnabled(),
         ];
     }
 
@@ -315,9 +316,12 @@ private function getFeedbackOptions(?CQuiz $quiz): array
             ['value' => 2, 'label' => 'Exam (no feedback)'],
         ];
 
-        if ($this->isSettingEnabled('enable_quiz_scenario') || \in_array($quiz?->getFeedbackType(), [1, 3], true)) {
+        if ($this->isSettingEnabled('enable_quiz_scenario') || 1 === (int) ($quiz?->getFeedbackType() ?? 0)) {
             $options[] = ['value' => 1, 'label' => 'Adaptative test with immediate feedback'];
-            $options[] = ['value' => 3, 'label' => 'Direct pop-up mode'];
+        }
+
+        if ($this->isProgressiveAdaptiveSettingEnabled() || 3 === (int) ($quiz?->getFeedbackType() ?? 0)) {
+            $options[] = ['value' => 3, 'label' => 'Progressive adaptive'];
         }
 
         return $options;
@@ -394,7 +398,7 @@ private function getCategoryMatrix(CQuiz $quiz): array
             static fn (array $left, array $right): int => strcasecmp((string) $left['title'], (string) $right['title'])
         );
 
-        $savedCounts = $this->getSavedCategoryQuestionCounts($exerciseId);
+        $savedCategorySettings = $this->getSavedCategoryQuestionSettings($exerciseId);
         $matrix = [];
         foreach ($categories as $category) {
             $categoryId = (int) $category['categoryId'];
@@ -402,7 +406,8 @@ private function getCategoryMatrix(CQuiz $quiz): array
                 'categoryId' => $categoryId,
                 'title' => (string) $category['title'],
                 'availableQuestions' => (int) $category['availableQuestions'],
-                'countQuestions' => $savedCounts[$categoryId] ?? -1,
+                'countQuestions' => $savedCategorySettings[$categoryId]['countQuestions'] ?? -1,
+                'destinations' => $savedCategorySettings[$categoryId]['destinations'] ?? '',
             ];
         }
 
@@ -410,29 +415,33 @@ private function getCategoryMatrix(CQuiz $quiz): array
             'categoryId' => 0,
             'title' => 'General',
             'availableQuestions' => $generalQuestionCount,
-            'countQuestions' => $savedCounts[0] ?? -1,
+            'countQuestions' => $savedCategorySettings[0]['countQuestions'] ?? -1,
+            'destinations' => $savedCategorySettings[0]['destinations'] ?? '',
         ];
 
         return $matrix;
     }
 
     /**
-     * @return array<int, int>
+     * @return array<int, array{countQuestions: int, destinations: string}>
      */
-    private function getSavedCategoryQuestionCounts(int $exerciseId): array
+    private function getSavedCategoryQuestionSettings(int $exerciseId): array
     {
         $rows = $this->entityManager->getConnection()->fetchAllAssociative(
-            'SELECT category_id, count_questions FROM c_quiz_rel_category WHERE exercise_id = :exerciseId',
+            'SELECT category_id, count_questions, destinations FROM c_quiz_rel_category WHERE exercise_id = :exerciseId',
             ['exerciseId' => $exerciseId],
             ['exerciseId' => Types::INTEGER]
         );
 
-        $counts = [];
+        $settings = [];
         foreach ($rows as $row) {
-            $counts[(int) $row['category_id']] = (int) $row['count_questions'];
+            $settings[(int) $row['category_id']] = [
+                'countQuestions' => (int) $row['count_questions'],
+                'destinations' => (string) ($row['destinations'] ?? ''),
+            ];
         }
 
-        return $counts;
+        return $settings;
     }
 
     /**
@@ -988,6 +997,19 @@ private function canManageExercises(): bool
             || $this->security->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER');
     }
 
+    private function isProgressiveAdaptiveSettingEnabled(): bool
+    {
+        $value = $this->entityManager->getConnection()->fetchOne(
+            'SELECT selected_value FROM settings WHERE category = :category AND variable = :variable LIMIT 1',
+            [
+                'category' => 'exercise',
+                'variable' => 'quiz_question_category_destinations',
+            ]
+        );
+
+        return true === $value || 'true' === strtolower((string) $value) || '1' === (string) $value;
+    }
+
     private function isSettingEnabled(string $name): bool
     {
         $value = $this->settingsManager->getSetting($name, true);
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
index 166d28d2c9f..3948f64eb6a 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeAnswerProcessor.php
@@ -34,6 +34,7 @@
 use Chamilo\CourseBundle\Repository\CQuizRepository;
 use DateTime;
 use DateTimeImmutable;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -58,7 +59,7 @@
     private const LP_ITEM_TYPE_QUIZ = 'quiz';
     private const STATUS_INCOMPLETE = 'incomplete';
     private const FEEDBACK_TYPE_DIRECT = 1;
-    private const FEEDBACK_TYPE_POPUP = 3;
+    private const FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE = 3;
     private const UNIQUE_TYPES = [1, 10, 17, 21];
     private const MULTIPLE_TYPES = [2, 9, 14];
     private const TRUE_FALSE_TYPES = [11, 12];
@@ -178,7 +179,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         }
 
         $rows = $this->buildDraftRows($question, $data->answer, max(0, (int) $data->secondsSpent));
-        $feedback = $this->buildFeedback($quiz, $question, $rows);
+        $feedback = $this->buildFeedback($quiz, $attempt, $question, $rows);
         $marks = [] !== $feedback ? (float) ($feedback['score'] ?? 0.0) : 0.0;
         $this->deletePreviousDraftRows($attempt, $questionId);
 
@@ -1549,10 +1550,10 @@ private function getOrderedAnswers(CQuizQuestion $question): array
      *
      * @return array<string, mixed>
      */
-    private function buildFeedback(CQuiz $quiz, CQuizQuestion $question, array $rows): array
+    private function buildFeedback(CQuiz $quiz, TrackEExercise $attempt, CQuizQuestion $question, array $rows): array
     {
         $feedbackType = (int) $quiz->getFeedbackType();
-        if (!\in_array($feedbackType, [self::FEEDBACK_TYPE_DIRECT, self::FEEDBACK_TYPE_POPUP], true)) {
+        if (!\in_array($feedbackType, [self::FEEDBACK_TYPE_DIRECT, self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE], true)) {
             return [];
         }
 
@@ -1568,7 +1569,7 @@ private function buildFeedback(CQuiz $quiz, CQuizQuestion $question, array $rows
 
         return [
             'enabled' => true,
-            'mode' => self::FEEDBACK_TYPE_POPUP === $feedbackType ? 'popup' : 'direct',
+            'mode' => 'direct',
             'questionId' => (int) $question->getIid(),
             'status' => $status,
             'title' => $this->getFeedbackTitle($status),
@@ -1576,6 +1577,7 @@ private function buildFeedback(CQuiz $quiz, CQuizQuestion $question, array $rows
             'maxScore' => $maxScore,
             'entries' => $this->buildFeedbackEntries($question, $answers, $rows),
             ...$this->resolveAdaptiveFeedbackAction($quiz, $question, $status),
+            ...$this->resolveProgressiveAdaptiveFeedbackAction($quiz, $attempt, $question, $rows),
         ];
     }
 
@@ -1676,6 +1678,241 @@ private function resolveAdaptiveFeedbackAction(CQuiz $quiz, CQuizQuestion $quest
         return [];
     }
 
+    /**
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $currentRows
+     *
+     * @return array<string, mixed>
+     */
+    private function resolveProgressiveAdaptiveFeedbackAction(CQuiz $quiz, TrackEExercise $attempt, CQuizQuestion $question, array $currentRows): array
+    {
+        if (self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE !== (int) $quiz->getFeedbackType()) {
+            return [];
+        }
+
+        $category = $this->getPrimaryQuestionCategory($question);
+        if (!$category instanceof CQuizQuestionCategory || null === $category->getIid()) {
+            return ['afterAction' => 'next'];
+        }
+
+        $categoryId = (int) $category->getIid();
+        if (!$this->isLastQuestionInCategory($attempt, $question, $categoryId)) {
+            return ['afterAction' => 'next'];
+        }
+
+        $categoryQuestionIds = $this->getQuestionIdsInCategory($quiz, $categoryId);
+        $scoreInCategory = $this->calculateProgressiveCategoryPercentage($quiz, $attempt, $categoryQuestionIds, (int) $question->getIid(), $currentRows);
+        $destinationCategoryId = $this->resolveProgressiveDestinationCategory((int) ($quiz->getIid() ?? 0), $categoryId, $scoreInCategory);
+
+        if (0 >= $destinationCategoryId || $this->hasAnsweredCategory($attempt, $quiz, $destinationCategoryId)) {
+            return [
+                'afterAction' => 'finish',
+                'achievedLevel' => $category->getTitle(),
+                'categoryScore' => $scoreInCategory,
+            ];
+        }
+
+        $targetQuestionId = $this->getFirstQuestionIdInCategory($quiz, $destinationCategoryId);
+        if (0 >= $targetQuestionId) {
+            return [
+                'afterAction' => 'finish',
+                'achievedLevel' => $category->getTitle(),
+                'categoryScore' => $scoreInCategory,
+            ];
+        }
+
+        return [
+            'afterAction' => 'question',
+            'targetQuestionId' => $targetQuestionId,
+            'categoryScore' => $scoreInCategory,
+        ];
+    }
+
+    private function getPrimaryQuestionCategory(CQuizQuestion $question): ?CQuizQuestionCategory
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                return $category;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getQuestionIdsInCategory(CQuiz $quiz, int $categoryId): array
+    {
+        $relations = $this->entityManager->createQueryBuilder()
+            ->select('relQuestion', 'question', 'category')
+            ->from(CQuizRelQuestion::class, 'relQuestion')
+            ->innerJoin('relQuestion.question', 'question')
+            ->innerJoin('question.categories', 'category')
+            ->andWhere('IDENTITY(relQuestion.quiz) = :exerciseId')
+            ->andWhere('category.iid = :categoryId')
+            ->setParameter('exerciseId', (int) $quiz->getIid(), Types::INTEGER)
+            ->setParameter('categoryId', $categoryId, Types::INTEGER)
+            ->orderBy('relQuestion.questionOrder', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $questionIds = [];
+        foreach ($relations as $relation) {
+            if (!$relation instanceof CQuizRelQuestion) {
+                continue;
+            }
+
+            $question = $relation->getQuestion();
+            if ($question instanceof CQuizQuestion && null !== $question->getIid()) {
+                $questionIds[] = (int) $question->getIid();
+            }
+        }
+
+        return $questionIds;
+    }
+
+    private function getFirstQuestionIdInCategory(CQuiz $quiz, int $categoryId): int
+    {
+        $questionIds = $this->getQuestionIdsInCategory($quiz, $categoryId);
+        if ([] === $questionIds) {
+            return 0;
+        }
+
+        return (int) reset($questionIds);
+    }
+
+    /**
+     * @param array<int, int> $categoryQuestionIds
+     * @param array<int, array{answer: string, position: int, secondsSpent: int}> $currentRows
+     */
+    private function calculateProgressiveCategoryPercentage(CQuiz $quiz, TrackEExercise $attempt, array $categoryQuestionIds, int $currentQuestionId, array $currentRows): float
+    {
+        $score = 0.0;
+        $maxScore = 0.0;
+
+        foreach ($categoryQuestionIds as $questionId) {
+            $question = $this->entityManager->getRepository(CQuizQuestion::class)->find($questionId);
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $answers = $this->getQuestionAnswerMap($question);
+            $options = $this->getQuestionOptionMap($question);
+            $rows = $questionId === $currentQuestionId ? $currentRows : $this->getSavedProgressiveAttemptRows($attempt, $questionId);
+            $questionScore = $this->scoreFeedbackQuestion($quiz, $question, $answers, $options, $rows);
+            if (0 === (int) $quiz->getPropagateNeg() && 0 > $questionScore) {
+                $questionScore = 0.0;
+            }
+
+            $score += $questionScore;
+            $maxScore += $this->getQuestionWeight($question, $answers);
+        }
+
+        if (0.0 >= $maxScore) {
+            return 0.0;
+        }
+
+        return round(($score / $maxScore) * 100, 2);
+    }
+
+    /**
+     * @return array<int, array{answer: string, position: int, secondsSpent: int}>
+     */
+    private function getSavedProgressiveAttemptRows(TrackEExercise $attempt, int $questionId): array
+    {
+        $rows = $this->entityManager->createQueryBuilder()
+            ->select('saved')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId = :questionId')
+            ->setParameter('attemptId', (int) $attempt->getExeId(), Types::INTEGER)
+            ->setParameter('questionId', $questionId, Types::INTEGER)
+            ->orderBy('saved.position', 'ASC')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $normalized = [];
+        foreach ($rows as $row) {
+            if (!$row instanceof TrackEAttempt) {
+                continue;
+            }
+
+            $normalized[] = [
+                'answer' => (string) $row->getAnswer(),
+                'position' => (int) $row->getPosition(),
+                'secondsSpent' => (int) $row->getSecondsSpent(),
+            ];
+        }
+
+        return $normalized;
+    }
+
+    private function resolveProgressiveDestinationCategory(int $exerciseId, int $categoryId, float $scoreInCategory): int
+    {
+        $destinations = (string) $this->entityManager->getConnection()->fetchOne(
+            'SELECT destinations FROM c_quiz_rel_category WHERE exercise_id = :exerciseId AND category_id = :categoryId',
+            [
+                'exerciseId' => $exerciseId,
+                'categoryId' => $categoryId,
+            ],
+            [
+                'exerciseId' => Types::INTEGER,
+                'categoryId' => Types::INTEGER,
+            ]
+        );
+
+        if ('' === trim($destinations)) {
+            return 0;
+        }
+
+        $rules = [];
+        foreach (explode('@@', $destinations) as $rule) {
+            if (!str_contains($rule, ':')) {
+                continue;
+            }
+
+            [$threshold, $destination] = array_pad(explode(':', $rule, 2), 2, '0');
+            $rules[(int) $threshold] = max(0, (int) $destination);
+        }
+
+        if ([] === $rules) {
+            return 0;
+        }
+
+        ksort($rules);
+        foreach ($rules as $threshold => $destinationCategoryId) {
+            $matches = 100 === (int) $threshold ? $scoreInCategory <= $threshold : $scoreInCategory < $threshold;
+            if ($matches) {
+                return $destinationCategoryId;
+            }
+        }
+
+        return 0;
+    }
+
+    private function hasAnsweredCategory(TrackEExercise $attempt, CQuiz $quiz, int $categoryId): bool
+    {
+        $questionIds = $this->getQuestionIdsInCategory($quiz, $categoryId);
+        if ([] === $questionIds) {
+            return false;
+        }
+
+        $count = (int) $this->entityManager->createQueryBuilder()
+            ->select('COUNT(DISTINCT saved.questionId)')
+            ->from(TrackEAttempt::class, 'saved')
+            ->andWhere('IDENTITY(saved.trackExercise) = :attemptId')
+            ->andWhere('saved.questionId IN (:questionIds)')
+            ->setParameter('attemptId', (int) $attempt->getExeId(), Types::INTEGER)
+            ->setParameter('questionIds', $questionIds, ArrayParameterType::INTEGER)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return 0 < $count;
+    }
+
     private function scoreFeedbackQuestion(CQuiz $quiz, CQuizQuestion $question, array $answers, array $options, array $rows): float
     {
         $type = (int) $question->getType();
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
index 6e6e9b2e60d..32aebebfabf 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeFinishProcessor.php
@@ -21,7 +21,9 @@
 use Chamilo\CourseBundle\Entity\CLpView;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizDestinationResult;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
+use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestion;
 use Chamilo\CourseBundle\Repository\CQuizRepository;
@@ -51,6 +53,7 @@
     private const LP_STATUS_FAILED = 'failed';
     private const LP_STATUS_PASSED = 'passed';
     private const FEEDBACK_TYPE_DIRECT = 1;
+    private const FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE = 3;
     private const UNIQUE_ANSWER = 1;
     private const MULTIPLE_ANSWER = 2;
     private const FILL_IN_BLANKS = 3;
@@ -224,6 +227,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             ->setQuestionsToCheck(implode(',', $questionsToCheck))
         ;
 
+        $this->recordProgressiveAdaptiveResult($quiz, $attempt, $questions, $questionIds, $user);
         $this->recordSavedAnswersConfirmation($data, $attempt, $quiz, $course, $session, $user, \count($questionIds));
         $learnpathTracking = $this->synchronizeLearnpathTracking($request, $attempt, $quiz, $course, $session, $user);
 
@@ -867,7 +871,7 @@ private function isSupportedQuestionType(int $type): bool
      */
     private function normalizeCompletedQuestionIds(CQuiz $quiz, TrackEExercise $attempt, array $questionIds): array
     {
-        if (self::FEEDBACK_TYPE_DIRECT !== (int) $quiz->getFeedbackType()) {
+        if (!\in_array((int) $quiz->getFeedbackType(), [self::FEEDBACK_TYPE_DIRECT, self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE], true)) {
             return $questionIds;
         }
 
@@ -882,6 +886,69 @@ private function normalizeCompletedQuestionIds(CQuiz $quiz, TrackEExercise $atte
         ));
     }
 
+    /**
+     * @param array<int, CQuizQuestion> $questions
+     * @param array<int, int> $questionIds
+     */
+    private function recordProgressiveAdaptiveResult(CQuiz $quiz, TrackEExercise $attempt, array $questions, array $questionIds, User $user): void
+    {
+        if (self::FEEDBACK_TYPE_PROGRESSIVE_ADAPTIVE !== (int) $quiz->getFeedbackType()) {
+            return;
+        }
+
+        $achievedLevel = $this->resolveProgressiveAdaptiveAchievedLevel($questions, $questionIds);
+        if ('' === $achievedLevel) {
+            return;
+        }
+
+        $destinationResult = $this->entityManager->getRepository(CQuizDestinationResult::class)->findOneBy([
+            'exe' => $attempt,
+        ]);
+
+        if (!$destinationResult instanceof CQuizDestinationResult) {
+            $destinationResult = (new CQuizDestinationResult())
+                ->setExe($attempt)
+                ->setUser($user)
+                ->setHash(hash('sha256', uniqid((string) $attempt->getExeId(), true)))
+            ;
+        }
+
+        $destinationResult->setAchievedLevel($achievedLevel);
+        $this->entityManager->persist($destinationResult);
+    }
+
+    /**
+     * @param array<int, CQuizQuestion> $questions
+     * @param array<int, int> $questionIds
+     */
+    private function resolveProgressiveAdaptiveAchievedLevel(array $questions, array $questionIds): string
+    {
+        for ($index = \count($questionIds) - 1; $index >= 0; $index--) {
+            $question = $questions[$questionIds[$index]] ?? null;
+            if (!$question instanceof CQuizQuestion) {
+                continue;
+            }
+
+            $category = $this->getPrimaryQuestionCategory($question);
+            if ($category instanceof CQuizQuestionCategory) {
+                return $category->getTitle();
+            }
+        }
+
+        return '';
+    }
+
+    private function getPrimaryQuestionCategory(CQuizQuestion $question): ?CQuizQuestionCategory
+    {
+        foreach ($question->getCategories() as $category) {
+            if ($category instanceof CQuizQuestionCategory) {
+                return $category;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @return array<int, int>
      */
diff --git a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
index 1e58147b719..7831a3ce6d1 100644
--- a/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
+++ b/src/CoreBundle/State/Exercise/ExerciseRuntimeResultProvider.php
@@ -19,6 +19,7 @@
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
+use Chamilo\CourseBundle\Entity\CQuizDestinationResult;
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
 use Chamilo\CourseBundle\Entity\CQuizQuestionCategory;
 use Chamilo\CourseBundle\Entity\CQuizQuestionOption;
@@ -153,11 +154,31 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             : [];
         $response->finalActions = $this->getFinalActions($quiz, $attempt, $course, $session, $isReviewMode);
         $response->aiCorrection = $this->getAiCorrectionConfiguration($canManage && $isReviewMode);
+        $response->progressiveAdaptiveResult = $this->getProgressiveAdaptiveResult($attempt);
         $response->canManage = $canManage;
 
         return $response;
     }
 
+    /**
+     * @return array<string, mixed>
+     */
+    private function getProgressiveAdaptiveResult(TrackEExercise $attempt): array
+    {
+        $destinationResult = $this->entityManager->getRepository(CQuizDestinationResult::class)->findOneBy([
+            'exe' => $attempt,
+        ]);
+
+        if (!$destinationResult instanceof CQuizDestinationResult) {
+            return [];
+        }
+
+        return [
+            'achievedLevel' => $destinationResult->getAchievedLevel(),
+            'hash' => $destinationResult->getHash(),
+        ];
+    }
+
     private function getCourse(Request $request): Course
     {
         $courseId = $request->query->getInt('cid');
diff --git a/src/CourseBundle/Entity/CQuizDestinationResult.php b/src/CourseBundle/Entity/CQuizDestinationResult.php
new file mode 100644
index 00000000000..017aa8ee0db
--- /dev/null
+++ b/src/CourseBundle/Entity/CQuizDestinationResult.php
@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CourseBundle\Entity;
+
+use Chamilo\CoreBundle\Entity\TrackEExercise;
+use Chamilo\CoreBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Table(name: 'c_quiz_destination_result')]
+#[ORM\Entity]
+class CQuizDestinationResult
+{
+    #[ORM\Column(name: 'id', type: 'integer')]
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true, onDelete: 'CASCADE')]
+    private ?User $user = null;
+
+    #[ORM\ManyToOne(targetEntity: TrackEExercise::class)]
+    #[ORM\JoinColumn(name: 'exe_id', referencedColumnName: 'exe_id', nullable: true, onDelete: 'CASCADE')]
+    private ?TrackEExercise $exe = null;
+
+    #[ORM\Column(name: 'achieved_level', type: 'string', length: 255)]
+    private string $achievedLevel = '';
+
+    #[ORM\Column(name: 'hash', type: 'string', length: 255)]
+    private string $hash = '';
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    public function getExe(): ?TrackEExercise
+    {
+        return $this->exe;
+    }
+
+    public function setExe(?TrackEExercise $exe): self
+    {
+        $this->exe = $exe;
+
+        return $this;
+    }
+
+    public function getAchievedLevel(): string
+    {
+        return $this->achievedLevel;
+    }
+
+    public function setAchievedLevel(string $achievedLevel): self
+    {
+        $this->achievedLevel = $achievedLevel;
+
+        return $this;
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(string $hash): self
+    {
+        $this->hash = $hash;
+
+        return $this;
+    }
+}
diff --git a/src/CourseBundle/Entity/CQuizRelQuestionCategory.php b/src/CourseBundle/Entity/CQuizRelQuestionCategory.php
index 9bc329bf58b..12fd6a9ea61 100644
--- a/src/CourseBundle/Entity/CQuizRelQuestionCategory.php
+++ b/src/CourseBundle/Entity/CQuizRelQuestionCategory.php
@@ -31,6 +31,9 @@ class CQuizRelQuestionCategory
     #[ORM\Column(name: 'count_questions', type: 'integer', nullable: false)]
     protected int $countQuestions;
 
+    #[ORM\Column(name: 'destinations', type: 'text', nullable: true)]
+    protected ?string $destinations = null;
+
     public function getIid(): ?int
     {
         return $this->iid;
@@ -71,4 +74,17 @@ public function setCountQuestions(int $countQuestions): self
 
         return $this;
     }
+
+    public function getDestinations(): ?string
+    {
+        return $this->destinations;
+    }
+
+    public function setDestinations(?string $destinations): self
+    {
+        $this->destinations = $destinations;
+
+        return $this;
+    }
 }
+

From ac0f6e6cd3f34ec918e774b0c60583cb7cfd7d05 Mon Sep 17 00:00:00 2001
From: Christian Beeznest <christian.fasanando@beeznest.com>
Date: Tue, 23 Jun 2026 01:01:47 -0500
Subject: [PATCH 21/21] Exercise: Fix hotspot select action icon

---
 assets/vue/views/exercise/ExerciseQuestionEditorView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
index 2b3ec2c3d0d..d5d75a10c35 100644
--- a/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
+++ b/assets/vue/views/exercise/ExerciseQuestionEditorView.vue
@@ -674,7 +674,7 @@
                     <div class="flex justify-end gap-1">
                       <BaseButton
                         :label="t('Select')"
-                        icon="cursor-default-click"
+                        icon="crosshairs"
                         only-icon
                         size="small"
                         type="primary-text"