Randomize test answers consistently per attempt

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.19).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.22).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.20: czas testu bez ustawionego limitu zestawu jest sumowany z czasów pytań.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.21: naprawiono wyświetlanie obrazów w szczegółach rozwiązanego testu.

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/src/Model/ResultModel.php

@@ -17,7 +17,7 @@ class ResultModel extends BaseDatabaseModel
         $db = Factory::getContainer()->get('DatabaseDriver');
         $item = $db->setQuery(
             $db->getQuery(true)
-                ->select(['r.*', 's.title AS set_title', 'sub.title AS subject_title'])
+                ->select(['r.*', 's.title AS set_title', 's.image AS set_image', 'sub.title AS subject_title'])
                 ->from($db->quoteName('#__testquestions_results', 'r'))
                 ->leftJoin($db->quoteName('#__testquestions_sets', 's') . ' ON s.id = r.set_id')
                 ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
@@ -35,7 +35,7 @@ class ResultModel extends BaseDatabaseModel
         if ($ids) {
             $item->questions = $db->setQuery(
                 $db->getQuery(true)
-                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points'])
+                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points', 'image'])
                     ->from($db->quoteName('#__testquestions_questions'))
                     ->where('id IN (' . implode(',', $ids) . ')')
             )->loadObjectList('id');

administrator/components/com_testquestions/tmpl/result/default.php

@@ -1,6 +1,18 @@
 <?php defined('_JEXEC') or die; ?>
 <?php use Joomla\CMS\HTML\HTMLHelper; ?>
 <?php use Joomla\CMS\Router\Route; ?>
+<?php use Joomla\CMS\Uri\Uri; ?>
+<?php
+$resolveImageUrl = static function ($path) {
+    $path = trim((string) $path);
+
+    if ($path === '' || preg_match('#^(https?:)?//#i', $path)) {
+        return $path;
+    }
+
+    return Uri::root() . ltrim($path, '/');
+};
+?>
 <div class="container-fluid">
     <dl class="row">
         <div class="row"<?php echo (int) $this->item->extra_time > 0 ? ' style="background-color: #fff3cd;"' : ''; ?>>
@@ -9,6 +21,7 @@
         </div>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></dt>
         <dd class="col-sm-9"><?php echo $this->escape(($this->item->subject_title ? $this->item->subject_title . ' — ' : '') . $this->item->set_title); ?></dd>
+        <?php if (!empty($this->item->set_image)) : ?><dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_IMAGE'); ?></dt><dd class="col-sm-9"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->item->set_image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy" style="max-width: 100%; height: auto;"></dd><?php endif; ?>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_SCORE'); ?></dt>
         <dd class="col-sm-9"><?php echo (int) $this->item->correct_count; ?> / <?php echo (int) $this->item->total_count; ?> (<?php echo htmlspecialchars((string) $this->item->percentage, ENT_QUOTES, 'UTF-8'); ?>%)</dd>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></dt>
@@ -61,6 +74,7 @@
         <?php $question = $this->item->questions[(int) $questionId] ?? null; if (!$question) continue; ?>
         <article class="mb-4 border rounded p-3">
             <div class="mb-2"><?php echo $question->question; ?></div>
+            <?php if (!empty($question->image)) : ?><div class="mb-3"><img src="<?php echo htmlspecialchars($resolveImageUrl($question->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy" style="max-width: 100%; height: auto;"></div><?php endif; ?>
             <?php if ($question->question_type === 'open') : ?>
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_YOUR_ANSWER'); ?>:</strong> <?php echo htmlspecialchars($answer['selected'] ?: '—', ENT_QUOTES, 'UTF-8'); ?></div>
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>:</strong> <?php echo htmlspecialchars($question->answer_open, ENT_QUOTES, 'UTF-8'); ?></div>

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.19</version>
+    <version>1.43.22</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>

components/com_testquestions/src/Model/SetModel.php

@@ -77,7 +77,7 @@ class SetModel extends BaseDatabaseModel
         }
 
         $query = $db->getQuery(true)
-                ->select(['q.id', 'q.question_type', 'q.question', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.points', 'q.image'])
+                ->select(['q.id', 'q.question_type', 'q.question', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.points', 'q.image', 'q.time_limit'])
                 ->from($db->quoteName('#__testquestions_set_questions', 'sq'))
                 ->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id')
                 ->where('sq.set_id = ' . $setId)

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

@@ -51,6 +51,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 +71,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 +87,7 @@ class HtmlView extends BaseHtmlView
                 'selected' => $selected,
                 'correct' => $isCorrect,
                 'points' => (int) ($item->points ?? 0),
+                'answer_order' => $answerOrder,
             ];
         }
 

components/com_testquestions/tmpl/set/default.php

@@ -5,6 +5,8 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Uri\Uri;
 
+$testDurationSeconds = 0;
+
 $resolveImageUrl = static function ($path) {
     $path = trim((string) $path);
 
@@ -50,16 +52,26 @@ $resolveImageUrl = static function ($path) {
     <?php elseif (!$this->set) : ?>
         <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NOT_FOUND'); ?></div>
     <?php else : ?>
+        <?php
+        $extraTime = Factory::getApplication()->getInput()->post->getInt('extra_time', 0);
+        $baseDurationSeconds = (int) $this->set->duration > 0
+            ? (int) $this->set->duration * 60
+            : array_sum(array_map(static function ($item) {
+                return max(0, (int) ($item->time_limit ?? 0));
+            }, $this->items));
+        $testDurationSeconds = $baseDurationSeconds + ($extraTime * 60);
+        $durationMinutes = intdiv($testDurationSeconds, 60);
+        $durationRemainder = $testDurationSeconds % 60;
+        ?>
         <header class="test-set-header">
             <?php if ($this->set->subject_title) : ?><div class="text-muted"><?php echo htmlspecialchars($this->set->subject_title, ENT_QUOTES, 'UTF-8'); ?></div><?php endif; ?>
             <h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
-            <?php $extraTime = Factory::getApplication()->getInput()->post->getInt('extra_time', 0); ?>
+            <?php if ($testDurationSeconds > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo $durationMinutes; ?> min<?php if ($durationRemainder > 0) : ?> <?php echo $durationRemainder; ?> s<?php endif; ?></div><?php endif; ?>
-            <?php if ((int) $this->set->duration > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo (int) $this->set->duration + $extraTime; ?> min</div><?php endif; ?>
             <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
             <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
         </header>
-        <?php if (!$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
+        <?php if (!$this->results && $testDurationSeconds > 0) : ?>
-            <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo ((int) $this->set->duration + $extraTime) * 60; ?>" aria-live="polite">
+            <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo $testDurationSeconds; ?>" aria-live="polite">
                 <svg width="120" height="120" viewBox="0 0 120 120" aria-hidden="true">
                     <circle cx="60" cy="60" r="54" fill="none" stroke="#dfe3e7" stroke-width="8"></circle>
                     <circle id="test-timer-ring" class="progress-ring__circle" cx="60" cy="60" r="54" fill="none" stroke="#4a86cf" stroke-width="8" stroke-linecap="round"></circle>
@@ -73,6 +85,14 @@ $resolveImageUrl = static function ($path) {
         <?php if ($this->items) : ?>
             <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post" id="test-form">
             <?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; ?>
@@ -87,12 +107,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 foreach ($answerOrder as $displayIndex => $optionValue) : ?>
-                            <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
+                            <?php $answerField = 'answer_' . chr(96 + (int) $optionValue); ?>
-                            <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
+                            <?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>
@@ -118,7 +140,7 @@ $resolveImageUrl = static function ($path) {
         <?php endif; ?>
     <?php endif; ?>
 </div>
-<?php if ($this->started && !$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
+<?php if ($this->started && !$this->results && $testDurationSeconds > 0) : ?>
 <script>
 document.addEventListener('DOMContentLoaded', function () {
     const container = document.getElementById('test-timer-container');