Test: Fix Filter in Scoring By Question Table

See: https://mantis.ilias.de/view.php?id=41667
surlabs · Oct 9, 2024 · 19af549 · 19af549
1 parent cdd6fca
commit 19af549
Showing 1 changed file with 21 additions and 26 deletions.
diff --git a/Modules/Test/classes/class.ilTestScoringByQuestionsGUI.php b/Modules/Test/classes/class.ilTestScoringByQuestionsGUI.php
@@ -22,8 +22,8 @@
 
 class ilTestScoringByQuestionsGUI extends ilTestScoringGUI
 {
-    public const ONLY_FINALIZED = 1;
-    public const EXCEPT_FINALIZED = 2;
+    public const EXCEPT_FINALIZED = 1;
+    public const ONLY_FINALIZED = 2;
 
     public function __construct(ilObjTest $a_object)
     {
@@ -105,31 +105,26 @@ protected function showManScoringByQuestionParticipantsTable(array $manPointsPos
                         $feedback = $complete_feedback[$active_id][$passNr - 1][$qst_id];
                     }
 
-                    $check_filter =
-                        ($finalized_filter !== self::ONLY_FINALIZED || $finalized_evaluation) &&
-                        ($finalized_filter !== self::EXCEPT_FINALIZED || !$finalized_evaluation);
-
-                    $check_answered = $answered_filter == false || $is_answered;
-
-                    if (
-                        isset($questionData['qid']) &&
-                        $questionData['qid'] == $selected_questionData['question_id'] &&
-                        $check_filter &&
-                        $check_answered
-                    ) {
-                        $table_data[] = [
-                            'pass_id' => $passNr - 1,
-                            'active_id' => $active_id,
-                            'qst_id' => $questionData['qid'],
-                            'reached_points' => assQuestion::_getReachedPoints(
-                                $active_id,
-                                (int) $questionData['qid'],
-                                $passNr - 1
-                            ),
-                            'maximum_points' => $this->questioninfo->getMaximumPoints((int) $questionData['qid']),
-                            'name' => $participant->getName()
-                        ] + $feedback;
+                    if (!isset($questionData['qid'])
+                        || $questionData['qid'] !== $selected_questionData['question_id']
+                        || $finalized_filter === self::ONLY_FINALIZED && !$finalized_evaluation
+                        || $finalized_filter === self::EXCEPT_FINALIZED && $finalized_evaluation
+                        || $answered_filter === true && !$is_answered) {
+                        continue;
                     }
+
+                    $table_data[] = [
+                        'pass_id' => $passNr - 1,
+                        'active_id' => $active_id,
+                        'qst_id' => $questionData['qid'],
+                        'reached_points' => assQuestion::_getReachedPoints(
+                            $active_id,
+                            (int) $questionData['qid'],
+                            $passNr - 1
+                        ),
+                        'maximum_points' => $this->questioninfo->getMaximumPoints((int) $questionData['qid']),
+                        'name' => $participant->getName()
+                    ] + $feedback;
                 }
             }
         } else {