Refine fixed timer spacing and frame

README.md

@@ -11,6 +11,9 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - filtrowanie listy pytań po kategorii,
 - przełącznik widoku listy: same pytania albo pytania z odpowiedziami,
 - frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
+- frontendowy widok testu na podstawie wybranego zestawu pytań,
+- dwuetapowe rozpoczęcie testu z loginem użytkownika i możliwością przedłużenia czasu,
+- zegar odliczający czas testu i automatyczne zakończenie po jego upływie,
 - 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,
@@ -19,10 +22,11 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - opcjonalne zdjęcie wybierane z Media Managera,
 - publikowanie, filtrowanie i usuwanie pytań w panelu administratora,
 - tworzenie zestawów pytań w panelu administratora i przypisywanie do nich pytań,
+- czas trwania w minutach (suwak), treść i obraz zestawu testowego,
 - tabela `#__testquestions_questions` tworzona podczas instalacji.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.9.1).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.16.2).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

@@ -3,6 +3,12 @@
     <fieldset name="details">
         <field name="id" type="hidden" />
         <field name="title" type="text" label="COM_TESTQUESTIONS_SET_TITLE" required="true" maxlength="255" />
+        <field name="subject_id" type="sql" label="COM_TESTQUESTIONS_SUBJECT" required="true" query="SELECT id, title FROM #__testquestions_subjects WHERE published = 1 ORDER BY title ASC" key_field="id" value_field="title" translate_query="false">
+            <option value="0">COM_TESTQUESTIONS_SELECT_SUBJECT</option>
+        </field>
+        <field name="duration" type="range" label="COM_TESTQUESTIONS_SET_DURATION" description="COM_TESTQUESTIONS_SET_DURATION_DESC" min="0" max="120" step="1" default="0" filter="integer" />
+        <field name="test_content" type="editor" label="COM_TESTQUESTIONS_SET_TEST_CONTENT" buttons="true" filter="safehtml" height="150" />
+        <field name="image" type="media" label="COM_TESTQUESTIONS_SET_IMAGE" directory="images/testquestions" preview="tooltip" />
         <field name="description" type="textarea" label="COM_TESTQUESTIONS_SET_DESCRIPTION" rows="4" filter="raw" />
         <field name="published" type="list" label="JSTATUS" default="1">
             <option value="1">JPUBLISHED</option>

administrator/components/com_testquestions/forms/subject.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <fieldset name="details">
+        <field name="id" type="hidden" />
+        <field name="title" type="text" label="COM_TESTQUESTIONS_SUBJECT_TITLE" required="true" maxlength="150" />
+        <field name="published" type="list" label="JSTATUS" default="1">
+            <option value="1">JPUBLISHED</option>
+            <option value="0">JUNPUBLISHED</option>
+        </field>
+    </fieldset>
+</form>

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

@@ -56,3 +56,17 @@ COM_TESTQUESTIONS_SET_SEARCH="Szukaj zestawów..."
 COM_TESTQUESTIONS_SET_CATEGORY_FILTER="Filtruj pytania według kategorii"
 COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
 COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
+COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
+COM_TESTQUESTIONS_SUBJECTS="Przedmioty"
+COM_TESTQUESTIONS_SET_DURATION="Czas trwania testu (minuty)"
+COM_TESTQUESTIONS_SET_DURATION_DESC="Ustaw czas trwania testu w minutach za pomocą suwaka."
+COM_TESTQUESTIONS_SET_TEST_CONTENT="Treść testu"
+COM_TESTQUESTIONS_SET_IMAGE="Obraz testu"
+COM_TESTQUESTIONS_SUBJECT="Przedmiot"
+COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
+COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"
+COM_TESTQUESTIONS_EDIT_SUBJECT="Edytuj przedmiot"
+COM_TESTQUESTIONS_SELECT_SUBJECT="-- wybierz przedmiot --"
+COM_TESTQUESTIONS_FILTER_SUBJECT="Wszystkie przedmioty"
+COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS="Wybrane pytania"
+COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS="Pytania do wyboru"

administrator/components/com_testquestions/sql/install.mysql.utf8mb4.sql

@@ -40,7 +40,11 @@ VALUES (1, 'Bez kategorii', 1, 0);
 
 CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
+  `duration` smallint unsigned NOT NULL DEFAULT 0,
+  `test_content` text NULL,
+  `image` varchar(1024) NOT NULL DEFAULT '',
   `description` text NULL,
   `published` tinyint NOT NULL DEFAULT 1,
   `ordering` int NOT NULL DEFAULT 0,
@@ -53,6 +57,15 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
   `set_id` int unsigned NOT NULL,
   `question_id` int unsigned NOT NULL,

administrator/components/com_testquestions/sql/uninstall.mysql.utf8mb4.sql

@@ -1,3 +1,4 @@
 DROP TABLE IF EXISTS `#__testquestions_set_questions`;
 DROP TABLE IF EXISTS `#__testquestions_sets`;
+DROP TABLE IF EXISTS `#__testquestions_subjects`;
 DROP TABLE IF EXISTS `#__testquestions_questions`;

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

@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `subject_id` int unsigned NOT NULL DEFAULT 0 AFTER `id`;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `duration` smallint unsigned NOT NULL DEFAULT 0 AFTER `title`,
+  ADD COLUMN `test_content` text NULL AFTER `duration`,
+  ADD COLUMN `image` varchar(1024) NOT NULL DEFAULT '' AFTER `test_content`;

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+UPDATE `#__testquestions_sets`
+SET `duration` = `duration` * 60
+WHERE `duration` > 0;

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

@@ -0,0 +1,3 @@
+UPDATE `#__testquestions_sets`
+SET `duration` = ROUND(`duration` / 60)
+WHERE `duration` > 0;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,10 @@
 CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
+  `duration` smallint unsigned NOT NULL DEFAULT 0,
+  `test_content` text NULL,
+  `image` varchar(1024) NOT NULL DEFAULT '',
   `description` text NULL,
   `published` tinyint NOT NULL DEFAULT 1,
   `ordering` int NOT NULL DEFAULT 0,
@@ -13,6 +17,15 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
   `set_id` int unsigned NOT NULL,
   `question_id` int unsigned NOT NULL,

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

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

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

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

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

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

administrator/components/com_testquestions/src/Controller/SubjectController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class SubjectController extends FormController
+{
+    protected $view_item = 'subject';
+    protected $view_list = 'subjects';
+
+    public function cancel($key = null)
+    {
+        $this->setRedirect('index.php?option=com_testquestions&view=subjects');
+
+        return true;
+    }
+}

administrator/components/com_testquestions/src/Controller/SubjectsController.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class SubjectsController extends AdminController
+{
+    protected $text_prefix = 'COM_TESTQUESTIONS';
+
+    public function getModel($name = 'Subject', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}

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

@@ -50,7 +50,7 @@ class SetModel extends AdminModel
 
         return $db->setQuery(
             $db->getQuery(true)
-                ->select(['q.id', 'q.question', 'q.category_id', 'c.title AS category_title'])
+                ->select(['q.id', 'q.question', 'q.question_type', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.category_id', 'c.title AS category_title'])
                 ->from($db->quoteName('#__testquestions_questions', 'q'))
                 ->leftJoin($db->quoteName('#__testquestions_categories', 'c') . ' ON c.id = q.category_id')
                 ->order('c.title ASC, q.ordering ASC, q.id ASC')
@@ -71,7 +71,8 @@ class SetModel extends AdminModel
 
     public function save($data)
     {
-        $questionIds = array_values(array_unique(array_filter(array_map('intval', (array) ($data['question_ids'] ?? [])))));
+        $formData = Factory::getApplication()->getInput()->post->get('jform', [], 'array');
+        $questionIds = array_values(array_unique(array_filter(array_map('intval', (array) ($formData['question_ids'] ?? $data['question_ids'] ?? [])))));
         unset($data['question_ids']);
 
         if (!parent::save($data)) {

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

@@ -14,14 +14,16 @@ class SetsModel extends ListModel
         parent::populateState($ordering, $direction);
         $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
         $this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+        $this->setState('filter.subject_id', $this->getUserStateFromRequest($this->context . '.filter.subject_id', 'filter_subject_id', '', 'int'));
     }
 
     protected function getListQuery()
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true)
-            ->select(['s.*', 'COUNT(sq.question_id) AS question_count'])
+            ->select(['s.*', 'sub.title AS subject_title', 'COUNT(sq.question_id) AS question_count'])
             ->from($db->quoteName('#__testquestions_sets', 's'))
+            ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
             ->leftJoin($db->quoteName('#__testquestions_set_questions', 'sq') . ' ON sq.set_id = s.id')
             ->group('s.id');
 
@@ -35,6 +37,23 @@ class SetsModel extends ListModel
             $query->where('s.published = ' . (int) $published);
         }
 
+        if ((int) $this->getState('filter.subject_id') > 0) {
+            $query->where('s.subject_id = ' . (int) $this->getState('filter.subject_id'));
+        }
+
         return $query->order('s.ordering ASC, s.title ASC');
     }
+
+    public function getSubjects()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title'])
+                ->from($db->quoteName('#__testquestions_subjects'))
+                ->where($db->quoteName('published') . ' = 1')
+                ->order($db->quoteName('title') . ' ASC')
+        )->loadObjectList();
+    }
 }

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class SubjectModel extends AdminModel
+{
+    public function getTable($name = 'Subject', $prefix = 'Administrator', $config = [])
+    {
+        return $this->getMVCFactory()->createTable($name, $prefix, $config);
+    }
+
+    public function getForm($data = [], $loadData = true)
+    {
+        return $this->loadForm('com_testquestions.subject', 'subject', ['control' => 'jform', 'load_data' => $loadData]);
+    }
+
+    protected function loadFormData()
+    {
+        return Factory::getApplication()->getUserState('com_testquestions.edit.subject.data', []) ?: $this->getItem();
+    }
+}

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class SubjectsModel extends ListModel
+{
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->getQuery(true)
+            ->select('*')
+            ->from($db->quoteName('#__testquestions_subjects'))
+            ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('title') . ' ASC');
+    }
+}

administrator/components/com_testquestions/src/Table/SubjectTable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class SubjectTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__testquestions_subjects', 'id', $db);
+    }
+
+    public function check($updateNulls = false): bool
+    {
+        $this->title = trim((string) $this->title);
+
+        return $this->title !== '' && parent::check($updateNulls);
+    }
+}

administrator/components/com_testquestions/src/View/Sets/HtmlView.php

@@ -14,12 +14,14 @@ class HtmlView extends BaseHtmlView
     protected $items;
     protected $pagination;
     protected $state;
+    protected $subjects;
 
     public function display($tpl = null)
     {
         $this->items = $this->get('Items');
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
+        $this->subjects = $this->get('Subjects');
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));
@@ -50,5 +52,10 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_QUESTIONS',
             'list'
         );
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=subjects',
+            'COM_TESTQUESTIONS_SUBJECTS',
+            'list'
+        );
     }
 }

administrator/components/com_testquestions/src/View/Subject/HtmlView.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subject;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+
+    public function display($tpl = null)
+    {
+        $this->form = $this->get('Form');
+        $this->item = $this->get('Item');
+        ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SUBJECT') : Text::_('COM_TESTQUESTIONS_NEW_SUBJECT'));
+        ToolbarHelper::apply('subject.apply', 'JTOOLBAR_APPLY');
+        ToolbarHelper::save('subject.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::save2new('subject.save2new', 'JTOOLBAR_SAVE_AND_NEW');
+        ToolbarHelper::cancel('subject.cancel', 'JTOOLBAR_CANCEL');
+
+        return parent::display($tpl);
+    }
+}

administrator/components/com_testquestions/src/View/Subjects/HtmlView.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subjects;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_SUBJECTS'));
+        ToolbarHelper::addNew('subject.add', 'JTOOLBAR_NEW');
+        ToolbarHelper::editList('subject.edit', 'JTOOLBAR_EDIT');
+        ToolbarHelper::deleteList('', 'subjects.delete', 'JTOOLBAR_DELETE');
+        ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -47,8 +47,6 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <th scope="col" class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
                 <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_QUESTION'); ?></th>
-                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_TYPE'); ?></th>
-                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_CORRECT'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
             </tr>
@@ -67,16 +65,14 @@ HTMLHelper::_('behavior.multiselect');
                             <?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 class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $item->answer_a; ?></span><?php if ((int) $item->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
-                                <div><strong>B:</strong> <?php echo $item->answer_b; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $item->answer_b; ?></span><?php if ((int) $item->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
-                                <div><strong>C:</strong> <?php echo $item->answer_c; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $item->answer_c; ?></span><?php if ((int) $item->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
-                                <div><strong>D:</strong> <?php echo $item->answer_d; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $item->answer_d; ?></span><?php if ((int) $item->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></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>
                 <td><?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'questions.', true, 'cb'); ?></td>
                 <td><?php echo (int) $item->id; ?></td>
             </tr>

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

@@ -10,27 +10,74 @@ HTMLHelper::_('behavior.formvalidator');
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=set&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
     <fieldset class="adminform">
         <?php echo $this->form->renderField('title'); ?>
+        <?php echo $this->form->renderField('subject_id'); ?>
+        <?php echo $this->form->renderField('duration'); ?>
+        <output id="set-duration-value" class="form-text mb-3"></output>
+        <?php echo $this->form->renderField('test_content'); ?>
+        <?php echo $this->form->renderField('image'); ?>
         <?php echo $this->form->renderField('description'); ?>
         <?php echo $this->form->renderField('published'); ?>
-        <div class="mb-3">
-            <label for="set-question-category" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_CATEGORY_FILTER'); ?></label>
-            <select id="set-question-category" class="form-select">
-                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ALL_CATEGORIES'); ?></option>
-                <?php foreach ($this->categories as $category) : ?>
-                    <option value="<?php echo (int) $category->id; ?>"><?php echo $this->escape($category->title); ?></option>
-                <?php endforeach; ?>
-            </select>
-        </div>
         <fieldset class="mb-3">
-            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_QUESTIONS'); ?></legend>
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
-            <div id="set-question-list" class="border rounded p-3">
+            <div id="set-selected-question-list" class="border rounded p-3">
                 <?php foreach ($this->questions as $question) : ?>
-                    <div class="form-check set-question-row" data-category="<?php echo (int) $question->category_id; ?>">
+                    <?php if (!in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
-                        <input class="form-check-input" type="checkbox" name="jform[question_ids][]" value="<?php echo (int) $question->id; ?>" id="set-question-<?php echo (int) $question->id; ?>" <?php echo in_array((int) $question->id, (array) $this->item->question_ids, true) ? 'checked' : ''; ?>>
+                    <div class="form-check set-question-row">
+                        <input class="form-check-input" type="checkbox" name="jform[question_ids][]" value="<?php echo (int) $question->id; ?>" id="set-question-<?php echo (int) $question->id; ?>" checked>
                         <label class="form-check-label" for="set-question-<?php echo (int) $question->id; ?>">
                             <span class="badge bg-secondary"><?php echo $this->escape($question->category_title ?: \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_UNCATEGORIZED')); ?></span>
                             <?php echo $this->escape(trim(strip_tags($question->question))); ?>
                         </label>
+                        <details class="ms-4 mt-1 mb-2">
+                            <summary><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SHOW_DETAILS'); ?></summary>
+                            <div class="mt-2 p-2 bg-light border rounded">
+                                <?php if ($question->question_type === 'open') : ?>
+                                    <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $this->escape($question->answer_open); ?></div>
+                                <?php else : ?>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <?php endif; ?>
+                            </div>
+                        </details>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        </fieldset>
+        <fieldset class="mb-3">
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS'); ?></legend>
+            <div class="mb-3">
+                <label for="set-question-category" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_CATEGORY_FILTER'); ?></label>
+                <select id="set-question-category" class="form-select">
+                    <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ALL_CATEGORIES'); ?></option>
+                    <?php foreach ($this->categories as $category) : ?>
+                        <option value="<?php echo (int) $category->id; ?>"><?php echo $this->escape($category->title); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div id="set-available-question-list" class="border rounded p-3">
+                <?php foreach ($this->questions as $question) : ?>
+                    <?php if (in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
+                    <div class="form-check set-available-question-row" data-category="<?php echo (int) $question->category_id; ?>">
+                        <input class="form-check-input" type="checkbox" name="jform[question_ids][]" value="<?php echo (int) $question->id; ?>" id="set-question-<?php echo (int) $question->id; ?>">
+                        <label class="form-check-label" for="set-question-<?php echo (int) $question->id; ?>">
+                            <span class="badge bg-secondary"><?php echo $this->escape($question->category_title ?: \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_UNCATEGORIZED')); ?></span>
+                            <?php echo $this->escape(trim(strip_tags($question->question))); ?>
+                        </label>
+                        <details class="ms-4 mt-1 mb-2">
+                            <summary><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SHOW_DETAILS'); ?></summary>
+                            <div class="mt-2 p-2 bg-light border rounded">
+                                <?php if ($question->question_type === 'open') : ?>
+                                    <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $this->escape($question->answer_open); ?></div>
+                                <?php else : ?>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <?php endif; ?>
+                            </div>
+                        </details>
                     </div>
                 <?php endforeach; ?>
             </div>
@@ -42,7 +89,7 @@ HTMLHelper::_('behavior.formvalidator');
 <script>
 document.addEventListener('DOMContentLoaded', function () {
     const filter = document.getElementById('set-question-category');
-    const rows = document.querySelectorAll('.set-question-row');
+    const rows = document.querySelectorAll('.set-available-question-row');
 
     if (!filter) {
         return;
@@ -55,3 +102,20 @@ document.addEventListener('DOMContentLoaded', function () {
     });
 });
 </script>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const duration = document.getElementById('jform_duration');
+    const output = document.getElementById('set-duration-value');
+
+    if (!duration || !output) {
+        return;
+    }
+
+    const updateDuration = function () {
+        output.textContent = duration.value + ' min';
+    };
+
+    duration.addEventListener('input', updateDuration);
+    updateDuration();
+});
+</script>

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

@@ -9,16 +9,24 @@ HTMLHelper::_('behavior.multiselect');
 ?>
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="row mb-3">
-        <div class="col-md-6">
+        <div class="col-md-4">
             <input type="text" name="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="form-control" placeholder="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SEARCH')); ?>">
         </div>
-        <div class="col-md-3">
+        <div class="col-md-2">
             <select name="filter_published" class="form-select" onchange="this.form.submit();">
                 <option value=""><?php echo \Joomla\CMS\Language\Text::_('JOPTION_SELECT_PUBLISHED'); ?></option>
                 <option value="1" <?php echo $this->state->get('filter.published') === '1' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JPUBLISHED'); ?></option>
                 <option value="0" <?php echo $this->state->get('filter.published') === '0' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></option>
             </select>
         </div>
+        <div class="col-md-3">
+            <select name="filter_subject_id" class="form-select" onchange="this.form.submit();">
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FILTER_SUBJECT'); ?></option>
+                <?php foreach ($this->subjects as $subject) : ?>
+                    <option value="<?php echo (int) $subject->id; ?>" <?php echo (int) $this->state->get('filter.subject_id') === (int) $subject->id ? 'selected' : ''; ?>><?php echo $this->escape($subject->title); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
         <div class="col-md-3">
             <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=sets'); ?>" class="btn btn-secondary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_CLEAR'); ?></a>
@@ -30,6 +38,7 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <th scope="col" class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
                 <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
+                <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT'); ?></th>
                 <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_QUESTION_COUNT'); ?></th>
                 <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
@@ -40,6 +49,7 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
                 <th scope="row"><a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->title); ?></a></th>
+                <td><?php echo $this->escape($item->subject_title ?: '—'); ?></td>
                 <td><?php echo (int) $item->question_count; ?></td>
                 <td><?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'sets.', true, 'cb'); ?></td>
                 <td><?php echo (int) $item->id; ?></td>

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

@@ -0,0 +1,13 @@
+<?php
+
+defined('_JEXEC') or die;
+
+Joomla\CMS\HTML\HTMLHelper::_('behavior.formvalidator');
+?>
+<form action="index.php?option=com_testquestions&view=subject&layout=edit&id=<?php echo (int) $this->item->id; ?>" method="post" name="adminForm" id="subject-form" class="form-validate">
+    <?php echo $this->form->renderField('title'); ?>
+    <?php echo $this->form->renderField('published'); ?>
+    <?php echo $this->form->renderField('id'); ?>
+    <input type="hidden" name="task" value="">
+    <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+</form>

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

@@ -0,0 +1,24 @@
+<?php defined('_JEXEC') or die; ?>
+<form action="index.php?option=com_testquestions&view=subjects" method="post" name="adminForm" id="adminForm">
+    <table class="table table-striped">
+        <thead><tr>
+            <th><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.checkall'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT_TITLE'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
+        </tr></thead>
+        <tbody>
+        <?php foreach ($this->items as $i => $item) : ?>
+            <tr>
+                <td><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.id', $i, $item->id); ?></td>
+                <th><a href="index.php?option=com_testquestions&task=subject.edit&id=<?php echo (int) $item->id; ?>"><?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a></th>
+                <td><?php echo $item->published ? Joomla\CMS\Language\Text::_('JPUBLISHED') : Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></td>
+                <td><?php echo (int) $item->id; ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+    <input type="hidden" name="boxchecked" value="0">
+    <input type="hidden" name="task" value="">
+    <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+</form>

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.9.1</version>
+    <version>1.16.2</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

@@ -17,3 +17,13 @@ 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ź"
+COM_TESTQUESTIONS_SET_DURATION="Czas trwania testu"
+COM_TESTQUESTIONS_SET_NOT_FOUND="Nie znaleziono wybranego zestawu testowego."
+COM_TESTQUESTIONS_SELECT_SET="Wybierz zestaw pytań"
+COM_TESTQUESTIONS_SHOW_SET="Pokaż zestaw"
+COM_TESTQUESTIONS_YOUR_ANSWER="Twoja odpowiedź"
+COM_TESTQUESTIONS_PARTICIPANT_NAME="Login lub nazwa użytkownika"
+COM_TESTQUESTIONS_EXTRA_TIME="Przedłużenie czasu"
+COM_TESTQUESTIONS_START_TEST="Rozpocznij test"
+COM_TESTQUESTIONS_SET_START_HINT="Wybierz zestaw, wpisz login lub nazwę użytkownika i zatwierdź rozpoczęcie testu."
+COM_TESTQUESTIONS_TIMER_REMAINING="Pozostały czas"

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

@@ -1,3 +1,6 @@
 COM_TESTQUESTIONS="Pytania testowe"
 COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
 COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."
+COM_TESTQUESTIONS_SET_MENU_ITEM_TITLE="Zestaw testowy"
+COM_TESTQUESTIONS_SET_MENU_ITEM_DESCRIPTION="Wyświetla test na podstawie wybranego zestawu pytań."
+COM_TESTQUESTIONS_SET_SELECT="Zestaw pytań"

components/com_testquestions/media/egzamin.css

@@ -18,6 +18,18 @@
     margin: auto;
 }
 
+.com-testquestions #test-timer-container {
+    position: fixed;
+    left: 2rem;
+    bottom: 2rem;
+    z-index: 1050;
+    margin: 0;
+    padding: 0;
+    background: transparent;
+    border: 0;
+    box-shadow: none;
+}
+
 .com-testquestions .timer-text {
     position: absolute;
     top: 50%;

components/com_testquestions/src/Model/SetModel.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Site\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class SetModel extends BaseDatabaseModel
+{
+    protected function getSetId(): int
+    {
+        $application = Factory::getApplication();
+        $menu = $application->getMenu()->getActive();
+        $menuSetId = $menu ? (int) $menu->getParams()->get('set_id', 0) : 0;
+
+        return $application->getInput()->getInt('set_id', $menuSetId);
+    }
+
+    public function getSet()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $setId = $this->getSetId();
+
+        if ($setId < 1) {
+            return null;
+        }
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['s.*', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_sets', 's'))
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->where('s.id = ' . $setId)
+                ->where('s.published = 1')
+        )->loadObject();
+    }
+
+    public function getItems()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $setId = $this->getSetId();
+
+        if ($setId < 1) {
+            return [];
+        }
+
+        return $db->setQuery(
+            $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.image'])
+                ->from($db->quoteName('#__testquestions_set_questions', 'sq'))
+                ->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id')
+                ->where('sq.set_id = ' . $setId)
+                ->where('q.published = 1')
+                ->order('sq.ordering ASC, q.id ASC')
+        )->loadObjectList();
+    }
+
+    public function getSets()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['s.id', 's.title', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_sets', 's'))
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->where('s.published = 1')
+                ->order('sub.title ASC, s.title ASC')
+        )->loadObjectList();
+    }
+}

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

@@ -0,0 +1,78 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Site\View\Set;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $set;
+    protected $items;
+    protected $sets;
+    protected $results;
+    protected $started;
+
+    public function display($tpl = null)
+    {
+        $this->getDocument()->getWebAssetManager()->registerAndUseStyle(
+            'com_testquestions.exam',
+            'media/com_testquestions/egzamin.css'
+        );
+        $this->set = $this->get('Set');
+        $this->items = $this->get('Items');
+        $this->sets = $this->get('Sets');
+        $input = Factory::getApplication()->getInput();
+        $this->started = $input->getMethod() === 'POST'
+            && $input->post->getString('participant_name', '') !== ''
+            && $input->post->getInt('set_id', 0) > 0;
+        $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/set/default.php

@@ -0,0 +1,150 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+?>
+<div class="com-testquestions egzamin">
+    <?php if (!$this->started) : ?>
+    <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post" class="mb-4">
+        <label for="test-set" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_SET'); ?></label>
+        <div class="input-group">
+            <select id="test-set" name="set_id" class="form-select egzamin" required>
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_SET'); ?></option>
+                <?php foreach ($this->sets as $set) : ?>
+                    <option value="<?php echo (int) $set->id; ?>" <?php echo $this->set && (int) $this->set->id === (int) $set->id ? 'selected' : ''; ?>><?php echo htmlspecialchars(($set->subject_title ? $set->subject_title . ' — ' : '') . $set->title, ENT_QUOTES, 'UTF-8'); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+        <div class="mt-3">
+            <label for="participant-name" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PARTICIPANT_NAME'); ?></label>
+            <input type="text" id="participant-name" name="participant_name" class="form-control" required>
+        </div>
+        <div class="mt-3">
+            <label for="extra-time" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_EXTRA_TIME'); ?></label>
+            <select id="extra-time" name="extra_time" class="form-select" >
+                <option value="0">0 min</option>
+                <option value="5">5 min</option>
+                <option value="10">10 min</option>
+                <option value="15">15 min</option>
+                <option value="30">30 min</option>
+            </select>
+        </div>
+        <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_START_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+    </form>
+    <?php endif; ?>
+    <?php if (!$this->started) : ?>
+        <?php if (!$this->set && $this->sets) : ?><div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_START_HINT'); ?></div><?php endif; ?>
+    <?php elseif (!$this->set) : ?>
+        <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NOT_FOUND'); ?></div>
+    <?php else : ?>
+        <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 ((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($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) : ?>
+            <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo ((int) $this->set->duration + $extraTime) * 60; ?>" 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>
+                </svg>
+                <div id="test-timer-text" class="timer-text">--:--</div>
+            </div>
+        <?php endif; ?>
+        <?php if ($this->results) : ?>
+            <div class="alert alert-success test-result"><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 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) : ?>
+                <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($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
+                    <?php if ($item->question_type === 'open') : ?>
+                        <div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
+                            <?php if ($this->results) : ?>
+                                <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_YOUR_ANSWER'); ?>:</strong>
+                                <?php echo htmlspecialchars($this->results['items'][$item->id]['selected'] ?: '—', ENT_QUOTES, 'UTF-8'); ?>
+                            <?php else : ?>
+                                <label for="set-answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
+                                <input type="text" id="set-answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $item->id; ?>]" class="form-control">
+                            <?php endif; ?>
+                        </div>
+                    <?php else : ?>
+                        <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); ?>
+                            <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>
+                            </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="set_id" value="<?php echo (int) $this->set->id; ?>">
+                <input type="hidden" name="participant_name" value="<?php echo htmlspecialchars(Factory::getApplication()->getInput()->post->getString('participant_name', ''), ENT_QUOTES, 'UTF-8'); ?>">
+                <input type="hidden" name="extra_time" value="<?php echo (int) $extraTime; ?>">
+                <input type="hidden" name="task" value="check">
+                <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+                <?php if (!$this->results) : ?>
+                    <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+                <?php endif; ?>
+            </form>
+        <?php endif; ?>
+    <?php endif; ?>
+</div>
+<?php if ($this->started && !$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const container = document.getElementById('test-timer-container');
+    const text = document.getElementById('test-timer-text');
+    const ring = document.getElementById('test-timer-ring');
+    const form = document.getElementById('test-form');
+
+    if (!container || !text || !ring || !form) {
+        return;
+    }
+
+    const total = parseInt(container.dataset.duration, 10);
+    const circumference = 2 * Math.PI * 54;
+    let remaining = total;
+    let submitted = false;
+
+    ring.style.strokeDasharray = circumference + ' ' + circumference;
+
+    const update = function () {
+        const minutes = Math.floor(remaining / 60);
+        const seconds = remaining % 60;
+        text.textContent = String(minutes).padStart(2, '0') + ':' + String(seconds).padStart(2, '0');
+        ring.style.strokeDashoffset = circumference * (1 - remaining / total);
+
+        if (remaining <= 0 && !submitted) {
+            submitted = true;
+            form.submit();
+        }
+    };
+
+    update();
+    const interval = window.setInterval(function () {
+        remaining -= 1;
+        update();
+
+        if (submitted) {
+            window.clearInterval(interval);
+        }
+    }, 1000);
+});
+</script>
+<?php endif; ?>

components/com_testquestions/tmpl/set/default.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="COM_TESTQUESTIONS_SET_MENU_ITEM_TITLE">
+        <message>COM_TESTQUESTIONS_SET_MENU_ITEM_DESCRIPTION</message>
+    </layout>
+    <fields name="request">
+        <fieldset name="request">
+            <field name="set_id" type="sql" label="COM_TESTQUESTIONS_SET_SELECT" required="true"
+                query="SELECT id AS value, title AS text FROM #__testquestions_sets WHERE published = 1 ORDER BY title"
+                key_field="value" value_field="text" />
+        </fieldset>
+    </fields>
+</metadata>

egzamin.css

@@ -154,6 +154,18 @@ div.odpup
     gap: .25rem;
 }
 
+.com-testquestions #test-timer-container {
+    position: fixed;
+    left: 2rem;
+    bottom: 2rem;
+    z-index: 1050;
+    margin: 0;
+    padding: 0;
+    background: transparent;
+    border: 0;
+    box-shadow: none;
+}
+
 .com-testquestions .question-number {
     flex: 0 0 auto;
     white-space: nowrap;