Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

ywarnier · ywarnier · commit 57d8ccd4b117 · 2025-03-23T09:35:37.000+01:00
diff --git a/main/exercise/exercise_report.php b/main/exercise/exercise_report.php
@@ -312,7 +312,13 @@
     if (isset($_POST['send_notification'])) {
         //@todo move this somewhere else
         $subject = get_lang('ExamSheetVCC');
-        $message = isset($_POST['notification_content']) ? $_POST['notification_content'] : '';
+        $message = $_POST['notification_content'] ?? '';
+
+        $feedbackComments = ExerciseLib::getFeedbackComments($id);
+        $message .= "<div style='padding:10px; border:1px solid #ddd; border-radius:5px;'>";
+        $message .= $feedbackComments;
+        $message .= "</div>";
+
         MessageManager::send_message_simple(
             $student_id,
             $subject,
diff --git a/main/exercise/multiple_answer.class.php b/main/exercise/multiple_answer.class.php
@@ -184,11 +184,58 @@ public function createAnswersForm($form)
         $form->setConstants(['nb_answers' => $nb_answers]);
     }
 
+    /**
+     * Validate question answers before saving.
+     *
+     * @param object $form The form object.
+     * @return array|bool True if valid, or an array with errors if invalid.
+     */
+    public function validateAnswers($form)
+    {
+        $nb_answers = $form->getSubmitValue('nb_answers');
+        $hasCorrectAnswer = false;
+        $hasValidWeighting = false;
+        $errors = [];
+        $error_fields = [];
+
+        for ($i = 1; $i <= $nb_answers; $i++) {
+            $isCorrect = $form->getSubmitValue("correct[$i]");
+            $weighting = trim($form->getSubmitValue("weighting[$i]") ?? '');
+
+            if ($isCorrect) {
+                $hasCorrectAnswer = true;
+
+                if (is_numeric($weighting) && floatval($weighting) > 0) {
+                    $hasValidWeighting = true;
+                }
+            }
+        }
+
+        if (!$hasCorrectAnswer) {
+            $errors[] = get_lang('AtLeastOneCorrectAnswerRequired');
+            $error_fields[] = "correct";
+        }
+
+        if ($hasCorrectAnswer && !$hasValidWeighting) {
+            // Only show if at least one correct answer exists but its weighting is not valid
+            $errors[] = get_lang('AtLeastOneCorrectAnswerMustHaveAPositiveScore');
+        }
+
+        return empty($errors) ? true : ['errors' => $errors, 'error_fields' => $error_fields];
+    }
+
     /**
      * {@inheritdoc}
      */
     public function processAnswersCreation($form, $exercise)
     {
+        $validationResult = $this->validateAnswers($form);
+        if ($validationResult !== true) {
+            Display::addFlash(Display::return_message(implode("<br>", $validationResult['errors']), 'error'));
+
+            return;
+        }
+
         $questionWeighting = 0;
         $objAnswer = new Answer($this->iid);
         $nb_answers = $form->getSubmitValue('nb_answers');
diff --git a/main/exercise/question_admin.inc.php b/main/exercise/question_admin.inc.php
@@ -51,50 +51,53 @@
     }
 
     // FORM VALIDATION
-    if (isset($_POST['submitQuestion']) && $form->validate()) {
-        // Question
-        $objQuestion->processCreation($form, $objExercise);
-        $objQuestion->processAnswersCreation($form, $objExercise);
-        // TODO: maybe here is the better place to index this tool, including answers text
-        // redirect
-        if (in_array($objQuestion->type, [HOT_SPOT, HOT_SPOT_COMBINATION, HOT_SPOT_DELINEATION])) {
-            echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&page='.$page.'&hotspotadmin='.$objQuestion->iid.'&'.api_get_cidreq(
-                ).'"</script>';
-        } elseif (in_array($objQuestion->type, [MULTIPLE_ANSWER_DROPDOWN, MULTIPLE_ANSWER_DROPDOWN_COMBINATION])) {
-            $url = 'admin.php?'
-                .api_get_cidreq().'&'
-                .http_build_query(['exerciseId' => $exerciseId, 'page' => $page, 'mad_admin' => $objQuestion->iid]);
-            echo '<script type="text/javascript">window.location.href="'.$url.'"</script>';
-        } else {
-            if (isset($_GET['editQuestion'])) {
-                if (empty($exerciseId)) {
-                    Display::addFlash(Display::return_message(get_lang('ItemUpdated')));
-                    $url = 'admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&editQuestion='.$objQuestion->iid;
-                    echo '<script type="text/javascript">window.location.href="'.$url.'"</script>';
-                    exit;
-                }
-                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&page='.$page.'&message=ItemUpdated"</script>';
+    if (isset($_POST['submitQuestion'])) {
+        $validationResult = true;
+        if (method_exists($objQuestion, 'validateAnswers')) {
+            $validationResult = $objQuestion->validateAnswers($form);
+        }
+        if (is_array($validationResult) && !empty($validationResult['errors'])) {
+            echo Display::return_message(implode("<br>", $validationResult['errors']), 'error', false);
+        } elseif ($form->validate()) {
+            $objQuestion->processCreation($form, $objExercise);
+            $objQuestion->processAnswersCreation($form, $objExercise);
+            if (in_array($objQuestion->type, [HOT_SPOT, HOT_SPOT_COMBINATION, HOT_SPOT_DELINEATION])) {
+                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&page='.$page.'&hotspotadmin='.$objQuestion->iid.'&'.api_get_cidreq().'";</script>';
+            } elseif (in_array($objQuestion->type, [MULTIPLE_ANSWER_DROPDOWN, MULTIPLE_ANSWER_DROPDOWN_COMBINATION])) {
+                $url = 'admin.php?'.api_get_cidreq().'&'.http_build_query(['exerciseId' => $exerciseId, 'page' => $page, 'mad_admin' => $objQuestion->iid]);
+                echo '<script type="text/javascript">window.location.href="'.$url.'";</script>';
             } else {
-                // New question
-                $page = 1;
-                $length = api_get_configuration_value('question_pagination_length');
-                if (!empty($length)) {
-                    $page = round($objExercise->getQuestionCount() / $length);
+                if (isset($_GET['editQuestion'])) {
+                    if (empty($exerciseId)) {
+                        Display::addFlash(Display::return_message(get_lang('ItemUpdated')));
+                        $url = 'admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&editQuestion='.$objQuestion->iid;
+                        echo '<script type="text/javascript">window.location.href="'.$url.'";</script>';
+                        exit;
+                    }
+                    echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&page='.$page.'&message=ItemUpdated";</script>';
+                } else {
+                    // New question
+                    $page = 1;
+                    $length = api_get_configuration_value('question_pagination_length');
+                    if (!empty($length)) {
+                        $page = round($objExercise->getQuestionCount() / $length);
+                    }
+                    echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&page='.$page.'&message=ItemAdded";</script>';
                 }
-                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&page='.$page.'&message=ItemAdded"</script>';
             }
+            exit();
         }
-    } else {
-        if (isset($questionName)) {
-            echo '<h3>'.$questionName.'</h3>';
-        }
-        if (!empty($pictureName)) {
-            echo '<img src="../document/download.php?doc_url=%2Fimages%2F'.$pictureName.'" border="0">';
-        }
-        if (!empty($msgErr)) {
-            echo Display::return_message($msgErr);
-        }
-        // display the form
-        $form->display();
     }
+
+    if (isset($questionName)) {
+        echo '<h3>'.$questionName.'</h3>';
+    }
+    if (!empty($pictureName)) {
+        echo '<img src="../document/download.php?doc_url=%2Fimages%2F'.$pictureName.'" border="0">';
+    }
+    if (!empty($msgErr)) {
+        echo Display::return_message($msgErr);
+    }
+
+    $form->display();
 }
diff --git a/main/exercise/unique_answer.class.php b/main/exercise/unique_answer.class.php
@@ -335,11 +335,64 @@ public function setDirectOptions($i, FormValidator $form, $renderer, $select_lp_
         );
     }
 
+    /**
+     * Validate question answers before saving.
+     * @return bool|string True if valid, error message if invalid.
+     */
+    public function validateAnswers($form)
+    {
+        $correct = $form->getSubmitValue('correct');
+        $nb_answers = $form->getSubmitValue('nb_answers');
+        $hasCorrectAnswer = false;
+        $hasPositiveScore = false;
+        $errors = [];
+        $error_fields = [];
+
+        for ($i = 1; $i <= $nb_answers; $i++) {
+            $answer = trim($form->getSubmitValue("answer[$i]") ?? '');
+            $weighting = trim($form->getSubmitValue("weighting[$i]") ?? '');
+            $isCorrect = ($correct == $i);
+            if (empty($answer)) {
+                $errors[] = sprintf(get_lang('NoAnswerCanBeEmpty'), $i);
+                $error_fields[] = "answer[$i]";
+            }
+
+            if ($weighting === '' || !is_numeric($weighting)) {
+                $errors[] = sprintf(get_lang('ScoreMustBeNumeric'), $i);
+                $error_fields[] = "weighting[$i]";
+            }
+
+            if ($isCorrect) {
+                $hasCorrectAnswer = true;
+                if (floatval($weighting) > 0) {
+                    $hasPositiveScore = true;
+                }
+            }
+        }
+
+        if (!$hasCorrectAnswer) {
+            $errors[] = get_lang('ACorrectAnswerIsRequired');
+            $error_fields[] = "correct";
+        }
+
+        if (!$hasPositiveScore) {
+            $errors[] = get_lang('TheCorrectAnswerMustHaveAPositiveScore');
+        }
+
+        return empty($errors) ? true : ['errors' => $errors, 'error_fields' => $error_fields];
+    }
+
     /**
      * {@inheritdoc}
      */
     public function processAnswersCreation($form, $exercise)
     {
+        $validationResult = $this->validateAnswers($form);
+        if ($validationResult !== true) {
+            Display::addFlash(Display::return_message(implode("<br>", $validationResult['errors']), 'error'));
+            return;
+        }
+
         $questionWeighting = $nbrGoodAnswers = 0;
         $correct = $form->getSubmitValue('correct');
         $objAnswer = new Answer($this->iid);
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
@@ -7416,4 +7416,63 @@ private static function subscribeSessionWhenFinishedFailure(int $exerciseId): vo
             );
         }
     }
+
+    /**
+     * Get formatted feedback comments for an exam attempt.
+     */
+    public static function getFeedbackComments(int $examId): string
+    {
+        $TBL_TRACK_ATTEMPT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $TBL_QUIZ_QUESTION = Database::get_course_table(TABLE_QUIZ_QUESTION);
+
+        $sql = "SELECT ta.question_id, ta.teacher_comment, q.question AS title
+            FROM $TBL_TRACK_ATTEMPT ta
+            INNER JOIN $TBL_QUIZ_QUESTION q ON ta.question_id = q.iid
+            WHERE ta.exe_id = $examId
+            AND ta.teacher_comment IS NOT NULL
+            AND ta.teacher_comment != ''
+            GROUP BY ta.question_id
+            ORDER BY q.position ASC, ta.id ASC";
+
+        $result = Database::query($sql);
+        $commentsByQuestion = [];
+
+        while ($row = Database::fetch_array($result)) {
+            $questionId = $row['question_id'];
+            $questionTitle = Security::remove_XSS($row['title']);
+            $comment = Security::remove_XSS(trim(strip_tags($row['teacher_comment'])));
+
+            if (!empty($comment)) {
+                if (!isset($commentsByQuestion[$questionId])) {
+                    $commentsByQuestion[$questionId] = [
+                        'title' => $questionTitle,
+                        'comments' => [],
+                    ];
+                }
+                $commentsByQuestion[$questionId]['comments'][] = $comment;
+            }
+        }
+
+        if (empty($commentsByQuestion)) {
+            return "<p>" . get_lang('NoAdditionalComments') . "</p>";
+        }
+
+        $output = "<h3>" . get_lang('TeacherFeedback') . "</h3>";
+        $output .= "<table border='1' cellpadding='5' cellspacing='0' width='100%' style='border-collapse: collapse;'>";
+
+        foreach ($commentsByQuestion as $questionId => $data) {
+            $output .= "<tr>
+                        <td><b>" . get_lang('Question') . " #$questionId:</b> " . $data['title'] . "</td>
+                    </tr>";
+            foreach ($data['comments'] as $comment) {
+                $output .= "<tr>
+                            <td style='padding-left: 20px;'><i>" . get_lang('Feedback') . ":</i> $comment</td>
+                        </tr>";
+            }
+        }
+
+        $output .= "</table>";
+
+        return $output;
+    }
 }
