Show all exam questions

README.md

@@ -9,6 +9,11 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - edytor formatowania treści pytania i odpowiedzi zamkniętych,
 - czas odpowiedzi, punktacja 1–9 oraz zarządzalne kategorie pytań,
 - filtrowanie listy pytań po kategorii,
+- przełącznik widoku listy: same pytania albo pytania z odpowiedziami,
+- frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
+- pozycję menu „Arkusz egzaminacyjny” z opcjonalnym symbolem arkusza,
+- listę wyboru dostępnych symboli arkuszy na stronie klienckiej,
+- możliwość rozwiązania arkusza i wyświetlenia wyniku oraz odpowiedzi poprawnych i zaznaczonych,
 - opcjonalny symbol testu, rok egzaminu i numer pytania z arkusza,
 - wskazanie poprawnej odpowiedzi,
 - opcjonalne zdjęcie wybierane z Media Managera,
@@ -17,6 +22,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.4.0).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.7.1).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/question.xml

@@ -16,9 +16,9 @@
             <option value="4">4</option><option value="5">5</option><option value="6">6</option>
             <option value="7">7</option><option value="8">8</option><option value="9">9</option>
         </field>
-        <field name="test_symbol" type="text" label="COM_TESTQUESTIONS_FIELD_TEST_SYMBOL" description="COM_TESTQUESTIONS_FIELD_TEST_SYMBOL_DESC" required="false" maxlength="100" filter="string" />
+        <field name="test_symbol" type="text" label="COM_TESTQUESTIONS_FIELD_TEST_SYMBOL" required="false" maxlength="100" filter="string" />
-        <field name="exam_year" type="number" label="COM_TESTQUESTIONS_FIELD_EXAM_YEAR" description="COM_TESTQUESTIONS_FIELD_EXAM_YEAR_DESC" required="false" min="1900" max="2100" filter="integer" />
+        <field name="exam_year" type="number" label="COM_TESTQUESTIONS_FIELD_EXAM_YEAR" required="false" min="1900" max="2100" filter="integer" />
-        <field name="question_number" type="number" label="COM_TESTQUESTIONS_FIELD_QUESTION_NUMBER" description="COM_TESTQUESTIONS_FIELD_QUESTION_NUMBER_DESC" required="false" min="1" max="9999" filter="integer" />
+        <field name="question_number" type="number" label="COM_TESTQUESTIONS_FIELD_QUESTION_NUMBER" required="false" min="1" max="9999" filter="integer" />
         <field name="question_type" type="list" label="COM_TESTQUESTIONS_FIELD_TYPE" default="closed" required="true">
             <option value="closed">COM_TESTQUESTIONS_TYPE_CLOSED</option>
             <option value="open">COM_TESTQUESTIONS_TYPE_OPEN</option>

administrator/components/com_testquestions/language/en-GB/com_testquestions.ini

@@ -8,13 +8,12 @@ COM_TESTQUESTIONS_FIELD_CATEGORY="Kategoria"
 COM_TESTQUESTIONS_FIELD_TIME_LIMIT="Czas na odpowiedź"
 COM_TESTQUESTIONS_FIELD_POINTS="Liczba punktów"
 COM_TESTQUESTIONS_FIELD_TEST_SYMBOL="Symbol testu"
-COM_TESTQUESTIONS_FIELD_TEST_SYMBOL_DESC="Opcjonalny symbol arkusza lub testu egzaminacyjnego."
 COM_TESTQUESTIONS_FIELD_EXAM_YEAR="Rok egzaminu"
-COM_TESTQUESTIONS_FIELD_EXAM_YEAR_DESC="Opcjonalny rok przeprowadzenia egzaminu."
 COM_TESTQUESTIONS_FIELD_QUESTION_NUMBER="Numer pytania"
-COM_TESTQUESTIONS_FIELD_QUESTION_NUMBER_DESC="Opcjonalny numer pytania w arkuszu egzaminacyjnym."
 COM_TESTQUESTIONS_MANAGE_CATEGORIES="Kategorie"
 COM_TESTQUESTIONS_FILTER_CATEGORY="Wszystkie kategorie"
+COM_TESTQUESTIONS_VIEW_QUESTIONS_ONLY="Same pytania"
+COM_TESTQUESTIONS_VIEW_WITH_ANSWERS="Pytania i odpowiedzi"
 COM_TESTQUESTIONS_CATEGORIES="Kategorie pytań"
 COM_TESTQUESTIONS_CATEGORY_TITLE="Nazwa kategorii"
 COM_TESTQUESTIONS_TYPE_CLOSED="Zamknięte — wybór odpowiedzi"

administrator/components/com_testquestions/language/en-GB/com_testquestions.sys.ini

@@ -1,2 +1,4 @@
 COM_TESTQUESTIONS="Pytania testowe"
 COM_TESTQUESTIONS_DESCRIPTION="Gromadzenie pytań testowych z czterema odpowiedziami i opcjonalnym zdjęciem."
+COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
+COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."

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

@@ -0,0 +1 @@
+-- Hide exam year and question number until a test symbol is entered.

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

@@ -0,0 +1 @@
+-- Toggle exam metadata fields based on the test symbol in the question form.

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

@@ -0,0 +1 @@
+-- Administrator list view switch for showing answers.

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

@@ -0,0 +1 @@
+-- Frontend view for displaying questions from a selected exam sheet.

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

@@ -0,0 +1 @@
+-- Add frontend menu item metadata for exam sheet view.

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

@@ -0,0 +1 @@
+-- Ensure frontend menu item language metadata is available.

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

@@ -0,0 +1 @@
+-- Use a selectable list of available exam sheet symbols on the frontend.

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

@@ -0,0 +1 @@
+-- Remove temporary exam seed data from the installer. No data is imported by this release.

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

@@ -0,0 +1 @@
+-- Display formatted exam sheet labels on the frontend.

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

@@ -0,0 +1 @@
+-- Limit exam sheet selection to symbols beginning with E.

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

@@ -0,0 +1 @@
+-- Add client-side test completion and result calculation.

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

@@ -0,0 +1 @@
+-- No database changes required for version 1.7.1.

administrator/components/com_testquestions/src/Model/QuestionsModel.php

@@ -21,6 +21,9 @@ class QuestionsModel extends ListModel
         $this->setState('filter.category_id', $this->getUserStateFromRequest(
             $this->context . '.filter.category_id', 'filter_category_id', '', 'int'
         ));
+        $this->setState('filter.show_answers', $this->getUserStateFromRequest(
+            $this->context . '.filter.show_answers', 'filter_show_answers', '0', 'int'
+        ));
     }
 
     protected function getListQuery()

administrator/components/com_testquestions/tmpl/question/edit.php

@@ -34,3 +34,31 @@ defined('_JEXEC') or die;
     <input type="hidden" name="task" value="question.save">
     <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
 </form>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const symbol = document.getElementById('jform_test_symbol');
+    const fields = ['jform_exam_year', 'jform_question_number'];
+
+    if (!symbol) {
+        return;
+    }
+
+    const toggleExamFields = function () {
+        const show = symbol.value.trim() !== '';
+
+        fields.forEach(function (id) {
+            const field = document.getElementById(id);
+            const wrapper = field ? field.closest('.control-group, .form-group') : null;
+
+            if (wrapper) {
+                wrapper.classList.toggle('hidden', !show);
+                wrapper.style.display = show ? '' : 'none';
+            }
+        });
+    };
+
+    symbol.addEventListener('input', toggleExamFields);
+    symbol.addEventListener('change', toggleExamFields);
+    toggleExamFields();
+});
+</script>

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

@@ -29,6 +29,12 @@ HTMLHelper::_('behavior.multiselect');
                 <?php endforeach; ?>
             </select>
         </div>
+        <div class="col-md-2">
+            <select name="filter_show_answers" class="form-select" onchange="this.form.submit();">
+                <option value="0" <?php echo (int) $this->state->get('filter.show_answers') === 0 ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_VIEW_QUESTIONS_ONLY'); ?></option>
+                <option value="1" <?php echo (int) $this->state->get('filter.show_answers') === 1 ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_VIEW_WITH_ANSWERS'); ?></option>
+            </select>
+        </div>
         <div class="col-md-2">
             <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button>
             <a href="<?php echo Route::_('index.php?option=com_testquestions&view=questions'); ?>" class="btn btn-secondary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_CLEAR'); ?></a>
@@ -56,6 +62,18 @@ HTMLHelper::_('behavior.multiselect');
                         <?php echo $this->escape(strip_tags($item->question)); ?>
                     </a>
                     <?php if ($item->image) : ?><span class="icon-image ms-2" title="<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_HAS_IMAGE'); ?>"></span><?php endif; ?>
+                    <?php if ((int) $this->state->get('filter.show_answers') === 1) : ?>
+                        <div class="mt-2 ps-3 border-start">
+                            <?php if ($item->question_type === 'open') : ?>
+                                <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $item->answer_open; ?></div>
+                            <?php else : ?>
+                                <div><strong>A:</strong> <?php echo $item->answer_a; ?></div>
+                                <div><strong>B:</strong> <?php echo $item->answer_b; ?></div>
+                                <div><strong>C:</strong> <?php echo $item->answer_c; ?></div>
+                                <div><strong>D:</strong> <?php echo $item->answer_d; ?></div>
+                            <?php endif; ?>
+                        </div>
+                    <?php endif; ?>
                 </th>
                 <td><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TYPE_' . strtoupper($item->question_type)); ?></td>
                 <td><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_' . chr(64 + (int) $item->correct_answer)); ?></td>

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

components/com_testquestions/language/en-GB/com_testquestions.ini

@@ -1,2 +1,19 @@
 COM_TESTQUESTIONS="Pytania testowe"
+COM_TESTQUESTIONS_TEST_SYMBOL="Symbol arkusza egzaminacyjnego"
+COM_TESTQUESTIONS_SELECT_TEST_SYMBOL="Wybierz arkusz egzaminacyjny"
+COM_TESTQUESTIONS_SHOW_TEST="Pokaż pytania"
+COM_TESTQUESTIONS_NO_TEST_QUESTIONS="Nie znaleziono pytań dla podanego arkusza."
+COM_TESTQUESTIONS_TEST_SHEET="Arkusz"
+COM_TESTQUESTIONS_TIME_LIMIT="Czas"
+COM_TESTQUESTIONS_POINTS="Punkty"
+COM_TESTQUESTIONS_FINISH_TEST="Zakończ test"
+COM_TESTQUESTIONS_RESULT="Wynik"
+COM_TESTQUESTIONS_ANSWER_CORRECT="Poprawna odpowiedź"
+COM_TESTQUESTIONS_ANSWER_INCORRECT="Niepoprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_ANSWER="Poprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
+COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"
+COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
+COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."
+COM_TESTQUESTIONS_MENU_TEST_SYMBOL_DESC="Opcjonalnie wybierz symbol arkusza, który ma być wyświetlany po wejściu z menu."
 COM_TESTQUESTIONS_ENTER_ANSWER="Wpisz odpowiedź"

components/com_testquestions/language/en-GB/com_testquestions.sys.ini

@@ -0,0 +1,3 @@
+COM_TESTQUESTIONS="Pytania testowe"
+COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
+COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."

components/com_testquestions/src/Controller/DisplayController.php

@@ -5,8 +5,18 @@ namespace Komponent\Component\Testquestions\Site\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Session\Session;
 
 class DisplayController extends BaseController
 {
     protected $default_view = 'questions';
+
+    public function check()
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException('Invalid token', 403);
+        }
+
+        return $this->display();
+    }
 }

components/com_testquestions/src/Model/QuestionsModel.php

@@ -9,13 +9,54 @@ use Joomla\CMS\MVC\Model\ListModel;
 
 class QuestionsModel extends ListModel
 {
+    protected function populateState($ordering = 'ordering', $direction = 'asc')
+    {
+        parent::populateState($ordering, $direction);
+        $menu = Factory::getApplication()->getMenu()->getActive();
+        $menuSymbol = $menu ? (string) $menu->getParams()->get('test_symbol', '') : '';
+        $symbol = Factory::getApplication()->getInput()->getString('test_symbol', $menuSymbol);
+        $this->setState('filter.test_symbol', trim($symbol));
+        $this->setState('list.limit', 0);
+    }
+
     protected function getListQuery()
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
-        return $db->getQuery(true)
+        $query = $db->getQuery(true)
-            ->select(['question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image'])
+            ->select(['id', 'test_symbol', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image', 'time_limit', 'points'])
             ->from($db->quoteName('#__testquestions_questions'))
             ->where($db->quoteName('published') . ' = 1')
             ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('id') . ' ASC');
+
+        $symbol = $this->getState('filter.test_symbol');
+
+        if ($symbol !== '') {
+            $query->where($db->quoteName('test_symbol') . ' = ' . $db->quote($symbol));
+        } else {
+            $query->where('1 = 0');
+        }
+
+        return $query;
+    }
+
+    public function getTestSymbols()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select([
+                    'q.' . $db->quoteName('test_symbol'),
+                    'q.' . $db->quoteName('exam_year'),
+                    'c.' . $db->quoteName('title', 'category_title'),
+                ])
+                ->from($db->quoteName('#__testquestions_questions', 'q'))
+                ->leftJoin($db->quoteName('#__testquestions_categories', 'c') . ' ON c.id = q.category_id')
+                ->where('q.' . $db->quoteName('published') . ' = 1')
+                ->where('q.' . $db->quoteName('test_symbol') . ' <> ' . $db->quote(''))
+                ->where('q.' . $db->quoteName('test_symbol') . ' LIKE ' . $db->quote('E%'))
+                ->group(['q.' . $db->quoteName('test_symbol'), 'q.' . $db->quoteName('exam_year'), 'c.' . $db->quoteName('title')])
+                ->order('q.' . $db->quoteName('exam_year') . ' DESC, q.' . $db->quoteName('test_symbol') . ' ASC')
+        )->loadObjectList();
     }
 }

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

@@ -5,14 +5,93 @@ namespace Komponent\Component\Testquestions\Site\View\Questions;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Factory;
 
 class HtmlView extends BaseHtmlView
 {
     protected $items;
+    protected $symbol;
+    protected $symbols;
+    protected $results;
+
+    public function formatSheetLabel($sheet)
+    {
+        $qualification = (string) ($sheet->category_title ?: '');
+
+        if (preg_match('/^([A-Z]+)(\d+)$/i', $qualification, $matches)) {
+            $qualification = strtoupper($matches[1]) . '.' . $matches[2];
+        }
+
+        $months = [
+            1 => 'Styczeń', 2 => 'Luty', 3 => 'Marzec', 4 => 'Kwiecień',
+            5 => 'Maj', 6 => 'Czerwiec', 7 => 'Lipiec', 8 => 'Sierpień',
+            9 => 'Wrzesień', 10 => 'Październik', 11 => 'Listopad', 12 => 'Grudzień',
+        ];
+        $period = '';
+
+        if (preg_match('/-(\d{2})\.(\d{2})$/', (string) $sheet->test_symbol, $matches)) {
+            $month = (int) $matches[2];
+            $year = (int) $sheet->exam_year ?: 2000 + (int) $matches[1];
+            $period = ($months[$month] ?? '') . ' ' . $year;
+        } elseif ($sheet->exam_year) {
+            $period = (string) $sheet->exam_year;
+        }
+
+        return trim('Kwalifikacja ' . $qualification . ($period ? ' - ' . $period : '') . ' (' . $sheet->test_symbol . ')');
+    }
 
     public function display($tpl = null)
     {
         $this->items = $this->get('Items');
+        $this->symbol = $this->get('State')->get('filter.test_symbol');
+        $this->symbols = $this->get('TestSymbols');
+        $this->results = $this->buildResults($this->items);
         return parent::display($tpl);
     }
+
+    protected function buildResults(array $items)
+    {
+        $input = Factory::getApplication()->getInput();
+
+        if ($input->getCmd('task') !== 'check' || $input->getMethod() !== 'POST') {
+            return null;
+        }
+
+        $answers = (array) $input->post->get('answers', [], 'array');
+        $results = [];
+        $correct = 0;
+
+        foreach ($items as $item) {
+            $selected = isset($answers[$item->id]) ? trim((string) $answers[$item->id]) : '';
+            $isCorrect = false;
+
+            if ($item->question_type === 'open') {
+                $patterns = preg_split('/\s*\|\s*/', (string) $item->answer_open, -1, PREG_SPLIT_NO_EMPTY);
+                foreach ($patterns as $pattern) {
+                    if (mb_strtolower(trim($pattern), 'UTF-8') === mb_strtolower($selected, 'UTF-8')) {
+                        $isCorrect = true;
+                        break;
+                    }
+                }
+            } else {
+                $isCorrect = (string) $item->correct_answer === $selected;
+            }
+
+            if ($isCorrect) {
+                $correct++;
+            }
+
+            $results[$item->id] = [
+                'selected' => $selected,
+                'correct' => $isCorrect,
+            ];
+        }
+
+        return [
+            'items' => $results,
+            'correct' => $correct,
+            'total' => count($items),
+            'percentage' => count($items) ? round(($correct / count($items)) * 100, 2) : 0,
+        ];
+    }
 }

components/com_testquestions/tmpl/questions/default.php

@@ -6,6 +6,34 @@ use Joomla\CMS\HTML\HTMLHelper;
 ?>
 <div class="com-testquestions">
     <h1><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS'); ?></h1>
+    <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="get" class="mb-4">
+        <label for="test-symbol" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TEST_SYMBOL'); ?></label>
+        <div class="input-group">
+            <select id="test-symbol" name="test_symbol" class="form-select" required>
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_TEST_SYMBOL'); ?></option>
+                <?php foreach ($this->symbols as $symbol) : ?>
+                    <option value="<?php echo htmlspecialchars($symbol->test_symbol, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $this->symbol === $symbol->test_symbol ? 'selected' : ''; ?>><?php echo htmlspecialchars($this->formatSheetLabel($symbol), ENT_QUOTES, 'UTF-8'); ?></option>
+                <?php endforeach; ?>
+            </select>
+            <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SHOW_TEST'); ?></button>
+        </div>
+    </form>
+
+    <?php if ($this->symbol !== '' && !$this->items) : ?>
+        <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_TEST_SYMBOL'); ?></div>
+    <?php elseif ($this->symbol !== '') : ?>
+        <h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TEST_SHEET'); ?>: <?php echo htmlspecialchars($this->symbol, ENT_QUOTES, 'UTF-8'); ?></h2>
+        <?php if ($this->results) : ?>
+            <div class="alert alert-success">
+                <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT'); ?>:</strong>
+                <?php echo (int) $this->results['correct']; ?> / <?php echo (int) $this->results['total']; ?>
+                (<?php echo htmlspecialchars((string) $this->results['percentage'], ENT_QUOTES, 'UTF-8'); ?>%)
+            </div>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($this->items) : ?>
+    <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post">
     <?php foreach ($this->items as $number => $item) : ?>
         <article class="testquestion mb-4">
             <h2><?php echo ($number + 1) . '. '; ?><?php echo $item->question; ?></h2>
@@ -14,15 +42,42 @@ use Joomla\CMS\HTML\HTMLHelper;
             <?php endif; ?>
             <?php if ($item->question_type === 'open') : ?>
                 <label for="answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
-                <input type="text" id="answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $number; ?>]" class="form-control">
+                <input type="text" id="answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $item->id; ?>]" class="form-control" value="<?php echo $this->results ? htmlspecialchars($this->results['items'][$item->id]['selected'], ENT_QUOTES, 'UTF-8') : ''; ?>">
             <?php else : ?>
-            <ol type="A">
+            <ol type="A" class="list-unstyled">
-                <li><?php echo $item->answer_a; ?></li>
+                <?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
-                <li><?php echo $item->answer_b; ?></li>
+                    <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
-                <li><?php echo $item->answer_c; ?></li>
+                    <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
-                <li><?php echo $item->answer_d; ?></li>
+                    <li class="mb-2">
+                        <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> <?php echo $item->$answerField; ?>
+                            <?php if ($isSelected) : ?>
+                                <span class="badge bg-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?></span>
+                            <?php endif; ?>
+                            <?php if ($isCorrectAnswer) : ?>
+                                <span class="badge bg-success"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?></span>
+                            <?php endif; ?>
+                        </label>
+                    </li>
+                <?php endforeach; ?>
             </ol>
             <?php endif; ?>
+            <?php if ($this->results) : ?>
+                <div class="mt-2 <?php echo $this->results['items'][$item->id]['correct'] ? 'text-success' : 'text-danger'; ?>">
+                    <?php echo $this->results['items'][$item->id]['correct'] ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?>
+                    <?php if ($item->question_type === 'closed') : ?>
+                        — <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>: <?php echo chr(64 + (int) $item->correct_answer); ?>
+                    <?php else : ?>
+                        — <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>: <?php echo htmlspecialchars($item->answer_open, ENT_QUOTES, 'UTF-8'); ?>
+                    <?php endif; ?>
+                </div>
+            <?php endif; ?>
         </article>
     <?php endforeach; ?>
+        <input type="hidden" name="task" value="check">
+        <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+        <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'); ?></button>
+    </form>
+    <?php endif; ?>
 </div>

components/com_testquestions/tmpl/questions/default.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="COM_TESTQUESTIONS_MENU_ITEM_TITLE">
+        <message>COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION</message>
+    </layout>
+    <fields name="request">
+        <fieldset name="request">
+            <field name="test_symbol" type="sql" label="COM_TESTQUESTIONS_TEST_SYMBOL" description="COM_TESTQUESTIONS_MENU_TEST_SYMBOL_DESC"
+                query="SELECT DISTINCT test_symbol AS value, test_symbol AS text FROM #__testquestions_questions WHERE published = 1 AND test_symbol LIKE 'E%' ORDER BY test_symbol"
+                key_field="value" value_field="text" />
+        </fieldset>
+    </fields>
+</metadata>