Preserve randomized question order in test results

README.md

@@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.21).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.23).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/sql/updates/mysql/1.43.22.sql

@@ -0,0 +1 @@
+-- Wydanie 1.43.22: kolejność odpowiedzi zamkniętych jest losowana i zapisywana dla podejścia.

administrator/components/com_testquestions/sql/updates/mysql/1.43.23.sql

@@ -0,0 +1 @@
+-- Wydanie 1.43.23: zachowano w wyniku kolejność pytań z wylosowanego testu.

com_testquestions.xml

@@ -4,7 +4,7 @@
     <creationDate>2026-10-14</creationDate>
     <author>Komponent</author>
     <license>GNU General Public License version 2 or later</license>
-    <version>1.43.21</version>
+    <version>1.43.23</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>

components/com_testquestions/src/View/Set/HtmlView.php

@@ -25,6 +25,26 @@ class HtmlView extends BaseHtmlView
         $this->items = $this->get('Items');
         $this->sets = $this->get('Sets');
         $input = Factory::getApplication()->getInput();
+        if ($input->getCmd('task') === 'check' && $input->getMethod() === 'POST' && $this->items) {
+            $submittedQuestionOrder = array_map('intval', (array) $input->post->get('question_order', [], 'array'));
+            $expectedQuestionIds = array_map(static function ($item) {
+                return (int) $item->id;
+            }, $this->items);
+            $sortedSubmittedOrder = $submittedQuestionOrder;
+            $sortedExpectedIds = $expectedQuestionIds;
+            sort($sortedSubmittedOrder);
+            sort($sortedExpectedIds);
+
+            if ($sortedSubmittedOrder === $sortedExpectedIds) {
+                $itemsById = [];
+                foreach ($this->items as $item) {
+                    $itemsById[(int) $item->id] = $item;
+                }
+                $this->items = array_values(array_map(static function ($questionId) use ($itemsById) {
+                    return $itemsById[$questionId];
+                }, $submittedQuestionOrder));
+            }
+        }
         $this->started = $input->getMethod() === 'POST'
             && $input->post->getString('participant_name', '') !== ''
             && $input->post->getInt('set_id', 0) > 0;
@@ -51,6 +71,7 @@ class HtmlView extends BaseHtmlView
         }
 
         $answers = (array) $input->post->get('answers', [], 'array');
+        $submittedAnswerOrder = (array) $input->post->get('answer_order', [], 'array');
         $results = [];
         $correct = 0;
 
@@ -70,6 +91,14 @@ class HtmlView extends BaseHtmlView
                 $isCorrect = (string) $item->correct_answer === $selected;
             }
 
+            $answerOrder = array_map('intval', explode(',', (string) ($submittedAnswerOrder[$item->id] ?? '')));
+            sort($answerOrder);
+            if ($item->question_type !== 'closed' || $answerOrder !== [1, 2, 3, 4]) {
+                $answerOrder = [1, 2, 3, 4];
+            } else {
+                $answerOrder = array_map('intval', explode(',', (string) $submittedAnswerOrder[$item->id]));
+            }
+
             if ($isCorrect) {
                 $correct++;
             }
@@ -78,6 +107,7 @@ class HtmlView extends BaseHtmlView
                 'selected' => $selected,
                 'correct' => $isCorrect,
                 'points' => (int) ($item->points ?? 0),
+                'answer_order' => $answerOrder,
             ];
         }
 

components/com_testquestions/tmpl/set/default.php

@@ -84,7 +84,18 @@ $resolveImageUrl = static function ($path) {
         <?php endif; ?>
         <?php if ($this->items) : ?>
             <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post" id="test-form">
+            <?php if (!$this->results) : ?>
+                <?php foreach ($this->items as $item) : ?><input type="hidden" name="question_order[]" value="<?php echo (int) $item->id; ?>"><?php endforeach; ?>
+            <?php endif; ?>
             <?php foreach ($this->items as $number => $item) : ?>
+                <?php
+                $answerOrder = $this->results && !empty($this->results['items'][$item->id]['answer_order'])
+                    ? $this->results['items'][$item->id]['answer_order']
+                    : [1, 2, 3, 4];
+                if (!$this->results && $item->question_type === 'closed') {
+                    shuffle($answerOrder);
+                }
+                ?>
                 <article class="testquestion mb-4">
                     <div class="pyt"><div class="question-header"><span class="question-number"><?php echo ($number + 1) . '.'; ?></span><div class="question-text"><?php echo $item->question; ?></div></div></div>
                     <?php if ($item->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($item->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
@@ -99,12 +110,14 @@ $resolveImageUrl = static function ($path) {
                             <?php endif; ?>
                         </div>
                     <?php else : ?>
+                        <?php if (!$this->results) : ?><input type="hidden" name="answer_order[<?php echo (int) $item->id; ?>]" value="<?php echo htmlspecialchars(implode(',', $answerOrder), ENT_QUOTES, 'UTF-8'); ?>"><?php endif; ?>
                         <ol type="A" class="answer-list">
-                        <?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
-                            <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
-                            <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
+                        <?php foreach ($answerOrder as $displayIndex => $optionValue) : ?>
+                            <?php $answerField = 'answer_' . chr(96 + (int) $optionValue); ?>
+                            <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) $optionValue; ?>
+                            <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) $optionValue; ?>
                             <li class="<?php echo $isSelected && $this->results['items'][$item->id]['correct'] ? 'odpup' : ($isSelected ? 'odpu' : ($isCorrectAnswer ? 'odpp' : 'odp')); ?>">
-                                <label><input type="radio" name="answers[<?php echo (int) $item->id; ?>]" value="<?php echo $answerIndex + 1; ?>" <?php echo $isSelected ? 'checked' : ''; ?>><strong><?php echo chr(65 + $answerIndex); ?>.</strong> <span class="answer-text"><?php echo $item->$answerField; ?></span></label>
+                                <label><input type="radio" name="answers[<?php echo (int) $item->id; ?>]" value="<?php echo (int) $optionValue; ?>" <?php echo $isSelected ? 'checked' : ''; ?>><strong><?php echo chr(65 + $displayIndex); ?>.</strong> <span class="answer-text"><?php echo $item->$answerField; ?></span></label>
                             </li>
                         <?php endforeach; ?>
                         </ol>