Add AI evaluation for incorrect open answers

README.md

@@ -11,6 +11,12 @@ 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,
+- zapisywanie wyników testów i zaznaczonych odpowiedzi w bazie danych,
+- podgląd zapisanych testów w panelu administratora,
+- zapisywanie i wyświetlanie czasu wykonania testu,
 - 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,11 +25,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, treść i obraz zestawu testowego,
+- 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.12.3).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.42.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

@@ -2,11 +2,17 @@
 <form>
     <fieldset name="details">
         <field name="id" type="hidden" />
+        <field name="parent_id" type="hidden" default="0" />
         <field name="title" type="text" label="COM_TESTQUESTIONS_SET_TITLE" required="true" maxlength="255" />
+        <field name="set_type" type="list" label="COM_TESTQUESTIONS_SET_TYPE" default="ordinary" required="true">
+            <option value="ordinary">COM_TESTQUESTIONS_SET_TYPE_ORDINARY</option>
+            <option value="multi">COM_TESTQUESTIONS_SET_TYPE_MULTI</option>
+            <option value="variant">COM_TESTQUESTIONS_SET_TYPE_VARIANT</option>
+        </field>
         <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="number" label="COM_TESTQUESTIONS_SET_DURATION" description="COM_TESTQUESTIONS_SET_DURATION_DESC" min="0" max="1440" filter="integer" />
+        <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" />

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

@@ -49,6 +49,27 @@ COM_TESTQUESTIONS_SETS="Zestawy pytań"
 COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
 COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
 COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
+COM_TESTQUESTIONS_SET_TYPE="Rodzaj zestawu"
+COM_TESTQUESTIONS_SET_TYPE_ORDINARY="Zwykły zestaw"
+COM_TESTQUESTIONS_SET_TYPE_MULTI="Zestaw wielowariantowy"
+COM_TESTQUESTIONS_SET_TYPE_VARIANT="Wariant zestawu"
+COM_TESTQUESTIONS_SET_VARIANTS="Warianty zestawu"
+COM_TESTQUESTIONS_SET_ADD_VARIANT="Dodaj wariant"
+COM_TESTQUESTIONS_SET_PARENT="Zestaw nadrzędny"
+COM_TESTQUESTIONS_SET_NO_VARIANTS="Brak wariantów"
+COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO="Pytania są dodawane w poszczególnych wariantach zestawu."
+COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolejność."
+COM_TESTQUESTIONS_SET_SAVE="Zapisz"
+COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE="Zapisz i zamknij"
+COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu nadrzędnego."
+COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
+COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
+COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
+COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja AI"
+COM_TESTQUESTIONS_AI_EVALUATE="AI"
+COM_TESTQUESTIONS_AI_RESULT="Ocena AI"
+COM_TESTQUESTIONS_AI_NOT_CONFIGURED="Skonfiguruj dostawcę i klucz API w ustawieniach komponentu."
+COM_TESTQUESTIONS_AI_ERROR="Nie udało się uzyskać odpowiedzi AI: %s"
 COM_TESTQUESTIONS_SET_DESCRIPTION="Opis zestawu"
 COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
 COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
@@ -59,9 +80,34 @@ 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="Podaj czas trwania testu w minutach."
+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_RESULTS="Zapisane testy"
+COM_TESTQUESTIONS_RESULT_PREVIEW="Podgląd zapisanego testu"
+COM_TESTQUESTIONS_RESULT_NOT_FOUND="Nie znaleziono zapisanego testu."
+COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
+COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
+COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
+COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
+COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
+COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
+COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"
+COM_TESTQUESTIONS_RESULT_AWARDED_POINTS="Uznane punkty (maksymalnie %s)"
+COM_TESTQUESTIONS_RESULT_COMMENT="Komentarz"
+COM_TESTQUESTIONS_RESULT_SAVED="Dane wyniku zostały zapisane."
+COM_TESTQUESTIONS_RESULT_SAVE="Zapisz"
+COM_TESTQUESTIONS_RESULT_SAVE_AND_CLOSE="Zapisz i zamknij"
+COM_TESTQUESTIONS_RESULTS_SEARCH="Szukaj po użytkowniku lub zestawie..."
+COM_TESTQUESTIONS_RESULTS_TEST_NAME="Nazwa testu"
+COM_TESTQUESTIONS_RESULTS_ALL_TESTS="Wszystkie zestawy"
+COM_TESTQUESTIONS_RESULTS_DATE_FROM="Data od"
+COM_TESTQUESTIONS_RESULTS_DATE_TO="Data do"
+COM_TESTQUESTIONS_YOUR_ANSWER="Twoja odpowiedź"
+COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"
+COM_TESTQUESTIONS_ANSWER_CORRECT="Poprawna odpowiedź"
+COM_TESTQUESTIONS_ANSWER_INCORRECT="Niepoprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
 COM_TESTQUESTIONS_SUBJECT="Przedmiot"
 COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
 COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"

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

@@ -40,6 +40,8 @@ VALUES (1, 'Bez kategorii', 1, 0);
 
 CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `parent_id` int unsigned NOT NULL DEFAULT 0,
+  `set_type` varchar(12) NOT NULL DEFAULT 'ordinary',
   `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
   `duration` smallint unsigned NOT NULL DEFAULT 0,
@@ -54,6 +56,7 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `modified_by` int unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `idx_published` (`published`),
+  KEY `idx_parent_id` (`parent_id`),
   KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
@@ -73,3 +76,24 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
   PRIMARY KEY (`set_id`, `question_id`),
   KEY `idx_question_id` (`question_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `set_id` int unsigned NOT NULL,
+  `participant_name` varchar(255) NOT NULL DEFAULT '',
+  `started` datetime NULL DEFAULT NULL,
+  `execution_time` int unsigned NOT NULL DEFAULT 0,
+  `extra_time` smallint unsigned NOT NULL DEFAULT 0,
+  `correct_count` smallint unsigned NOT NULL DEFAULT 0,
+  `total_count` smallint unsigned NOT NULL DEFAULT 0,
+  `percentage` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `points_total` int unsigned NOT NULL DEFAULT 0,
+  `points_before` int unsigned NOT NULL DEFAULT 0,
+  `points_after` int unsigned NOT NULL DEFAULT 0,
+  `answers` longtext NULL,
+  `created` datetime NOT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_set_id` (`set_id`),
+  KEY `idx_created` (`created`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

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

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

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.16.3.sql

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

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

@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `set_id` int unsigned NOT NULL,
+  `participant_name` varchar(255) NOT NULL DEFAULT '',
+  `extra_time` smallint unsigned NOT NULL DEFAULT 0,
+  `correct_count` smallint unsigned NOT NULL DEFAULT 0,
+  `total_count` smallint unsigned NOT NULL DEFAULT 0,
+  `percentage` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `answers` longtext NULL,
+  `created` datetime NOT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_set_id` (`set_id`),
+  KEY `idx_created` (`created`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

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

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

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

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

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

@@ -0,0 +1,3 @@
+ALTER TABLE `#__testquestions_results`
+  ADD COLUMN `started` datetime NULL DEFAULT NULL AFTER `participant_name`,
+  ADD COLUMN `execution_time` int unsigned NOT NULL DEFAULT 0 AFTER `started`;

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

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

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

@@ -0,0 +1 @@
+-- Per-question awarded points and comments are stored in the existing answers JSON column.

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

@@ -0,0 +1,8 @@
+ALTER TABLE `#__testquestions_results`
+  ADD COLUMN `points_before` int unsigned NOT NULL DEFAULT 0 AFTER `percentage`,
+  ADD COLUMN `points_after` int unsigned NOT NULL DEFAULT 0 AFTER `points_before`;
+
+UPDATE `#__testquestions_results`
+SET `points_before` = `correct_count`,
+    `points_after` = `correct_count`
+WHERE `points_before` = 0 AND `points_after` = 0;

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

@@ -0,0 +1 @@
+-- Corrected points are calculated as automatic points plus manually awarded correction points.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+ALTER TABLE `#__testquestions_results`
+  ADD COLUMN `points_total` int unsigned NOT NULL DEFAULT 0 AFTER `percentage`;
+
+UPDATE `#__testquestions_results`
+SET `points_total` = `total_count`
+WHERE `points_total` = 0;

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `parent_id` int unsigned NOT NULL DEFAULT 0 AFTER `id`,
+  ADD COLUMN `set_type` varchar(12) NOT NULL DEFAULT 'ordinary' AFTER `parent_id`;
+
+UPDATE `#__testquestions_sets`
+SET `set_type` = 'ordinary'
+WHERE `set_type` = '' OR `set_type` IS NULL;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+-- AI feedback is stored in the existing answers JSON column.

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

@@ -0,0 +1,79 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+class ResultController extends BaseController
+{
+    public function save(): void
+    {
+        $this->saveAssessment();
+        $id = Factory::getApplication()->getInput()->post->getInt('id');
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
+            Text::_('COM_TESTQUESTIONS_RESULT_SAVED')
+        );
+    }
+
+    public function save2close(): void
+    {
+        $this->saveAssessment();
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=results', false),
+            Text::_('COM_TESTQUESTIONS_RESULT_SAVED')
+        );
+    }
+
+    public function ai(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $id = $input->post->getInt('id');
+        $questionId = $input->post->getInt('ai_question_id');
+        $message = Text::_('COM_TESTQUESTIONS_AI_RESULT');
+        $type = 'message';
+
+        try {
+            $this->getModel('Result')->evaluateWithAi($id, $questionId);
+        } catch (\Throwable $error) {
+            $message = $error->getMessage() === 'AI_NOT_CONFIGURED'
+                ? Text::_('COM_TESTQUESTIONS_AI_NOT_CONFIGURED')
+                : Text::sprintf('COM_TESTQUESTIONS_AI_ERROR', $error->getMessage());
+            $type = 'error';
+        }
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
+            $message,
+            $type
+        );
+    }
+
+    private function saveAssessment(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $id = $input->post->getInt('id');
+        $points = (array) $input->post->get('awarded_points', [], 'array');
+        $comments = (array) $input->post->get('comments', [], 'array');
+        $model = $this->getModel('Result');
+
+        if (!$model->saveAssessment($id, $points, $comments)) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_RESULT_NOT_FOUND'));
+        }
+    }
+}

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

@@ -11,8 +11,89 @@ class SetController extends FormController
     protected $view_item = 'set';
     protected $view_list = 'sets';
 
+    public function addvariant(): void
+    {
+        $parentId = $this->input->getInt('parent_id');
+        $this->setRedirect('index.php?option=com_testquestions&view=set&layout=edit&parent_id=' . $parentId);
+    }
+
+    public function save2close($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? 0);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+        $result = parent::save2close($key, $urlVar);
+
+        if ($result) {
+            if ($itemId > 0) {
+                $item = $this->getModel()->getItem($itemId);
+                $parentId = (int) ($item->parent_id ?? $parentId);
+            }
+
+            if ($parentId > 0) {
+                $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
+            }
+        }
+
+        return $result;
+    }
+
+    public function save($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $result = parent::save($key, $urlVar);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+
+        if ($result && $itemId > 0) {
+            $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $itemId);
+        }
+
+        return $result;
+    }
+
+    public function saveandclose($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? 0);
+        $result = parent::save($key, $urlVar);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+
+        if ($result && $itemId > 0 && $parentId < 1) {
+            $item = $this->getModel()->getItem($itemId);
+            $parentId = (int) ($item->parent_id ?? 0);
+        }
+
+        if ($result) {
+            $this->setRedirect(
+                $parentId > 0
+                    ? 'index.php?option=com_testquestions&task=set.edit&id=' . $parentId
+                    : 'index.php?option=com_testquestions&view=sets'
+            );
+        }
+
+        return $result;
+    }
+
     public function cancel($key = null)
     {
+        $parentId = $this->input->getInt('parent_id');
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? $parentId);
+
+        if ($parentId < 1) {
+            $itemId = $this->input->getInt('id');
+            if ($itemId > 0) {
+                $item = $this->getModel()->getItem($itemId);
+                $parentId = (int) ($item->parent_id ?? 0);
+            }
+        }
+
+        if ($parentId > 0) {
+            $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
+
+            return true;
+        }
+
         $this->setRedirect('index.php?option=com_testquestions&view=sets');
 
         return true;

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

@@ -0,0 +1,115 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Component\ComponentHelper;
+use Komponent\Component\Testquestions\Administrator\Service\AiService;
+
+class ResultModel extends BaseDatabaseModel
+{
+    public function getItem($pk = null)
+    {
+        $id = (int) ($pk ?: Factory::getApplication()->getInput()->getInt('id'));
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $item = $db->setQuery(
+            $db->getQuery(true)
+                ->select(['r.*', 's.title AS set_title', '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')
+                ->where('r.id = ' . $id)
+        )->loadObject();
+
+        if (!$item) {
+            return null;
+        }
+
+        $item->answers = json_decode((string) $item->answers, true) ?: [];
+        $ids = array_map('intval', array_keys($item->answers));
+        $item->questions = [];
+
+        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'])
+                    ->from($db->quoteName('#__testquestions_questions'))
+                    ->where('id IN (' . implode(',', $ids) . ')')
+            )->loadObjectList('id');
+        }
+
+        return $item;
+    }
+
+    public function saveAssessment(int $id, array $awardedPoints, array $comments): bool
+    {
+        $item = $this->getItem($id);
+
+        if (!$item) {
+            return false;
+        }
+
+        foreach ($item->answers as $questionId => &$answer) {
+            $key = (string) $questionId;
+            $maxPoints = (int) ($item->questions[(int) $questionId]->points ?? 0);
+            $answer['awarded_points'] = min($maxPoints, max(0, (int) ($awardedPoints[$key] ?? 0)));
+            $answer['comment'] = trim((string) ($comments[$key] ?? ''));
+        }
+        unset($answer);
+
+        $correctionPoints = 0;
+        foreach ($item->answers as $answer) {
+            $correctionPoints += (int) ($answer['awarded_points'] ?? 0);
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $row = (object) [
+            'id' => $id,
+            'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
+            'points_after' => (int) $item->points_before + $correctionPoints,
+        ];
+
+        return (bool) $db->updateObject('#__testquestions_results', $row, 'id');
+    }
+
+    public function evaluateWithAi(int $id, int $questionId): string
+    {
+        $item = $this->getItem($id);
+
+        if (!$item) {
+            throw new \RuntimeException('Nie znaleziono zapisanego testu.');
+        }
+
+        $answer = $item->answers[$questionId] ?? null;
+        $question = $item->questions[$questionId] ?? null;
+
+        if (!$item || !$answer || !$question || $question->question_type !== 'open' || !empty($answer['correct'])) {
+            throw new \RuntimeException('Nieprawidłowe pytanie do oceny AI.');
+        }
+
+        $params = ComponentHelper::getParams('com_testquestions');
+        $feedback = (new AiService())->evaluate(
+            (string) $params->get('ai_provider', 'openai'),
+            (string) $params->get('ai_api_key', ''),
+            strip_tags((string) $question->question),
+            (string) ($answer['selected'] ?? ''),
+            (string) $question->answer_open
+        );
+        $item->answers[$questionId]['ai_feedback'] = $feedback;
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $row = (object) [
+            'id' => $id,
+            'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
+        ];
+
+        if (!$db->updateObject('#__testquestions_results', $row, 'id')) {
+            throw new \RuntimeException('Nie udało się zapisać oceny AI.');
+        }
+
+        return $feedback;
+    }
+}

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

@@ -0,0 +1,66 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class ResultsModel extends ListModel
+{
+    protected function populateState($ordering = 'r.created', $direction = 'desc')
+    {
+        parent::populateState($ordering, $direction);
+        $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+        $this->setState('filter.set_id', $this->getUserStateFromRequest($this->context . '.filter.set_id', 'filter_set_id', 0, 'int'));
+        $this->setState('filter.date_from', $this->getUserStateFromRequest($this->context . '.filter.date_from', 'filter_date_from', '', 'string'));
+        $this->setState('filter.date_to', $this->getUserStateFromRequest($this->context . '.filter.date_to', 'filter_date_to', '', 'string'));
+    }
+
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $query = $db->getQuery(true)
+            ->select(['r.*', 's.title AS set_title', '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');
+
+        $search = trim((string) $this->getState('filter.search'));
+        if ($search !== '') {
+            $needle = $db->quote('%' . $db->escape($search, true) . '%', false);
+            $query->where('(r.participant_name LIKE ' . $needle . ' OR s.title LIKE ' . $needle . ')');
+        }
+
+        $setId = (int) $this->getState('filter.set_id');
+        if ($setId > 0) {
+            $query->where('r.set_id = ' . $setId);
+        }
+
+        $dateFrom = (string) $this->getState('filter.date_from');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateFrom)) {
+            $query->where('r.created >= ' . $db->quote($dateFrom . ' 00:00:00'));
+        }
+
+        $dateTo = (string) $this->getState('filter.date_to');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateTo)) {
+            $query->where('r.created <= ' . $db->quote($dateTo . ' 23:59:59'));
+        }
+
+        return $query->order('r.created DESC, r.id DESC');
+    }
+
+    public function getSets(): array
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['s.id', 's.title', 's.published', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_sets', 's'))
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->order('sub.title ASC, s.title ASC, s.id ASC')
+        )->loadObjectList();
+    }
+}

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

@@ -25,6 +25,14 @@ class SetModel extends AdminModel
 
         if ($item && !empty($item->id)) {
             $db = Factory::getContainer()->get('DatabaseDriver');
+            if ((int) $item->parent_id > 0) {
+                $item->parent_title = (string) $db->setQuery(
+                    $db->getQuery(true)
+                        ->select($db->quoteName('title'))
+                        ->from($db->quoteName('#__testquestions_sets'))
+                        ->where($db->quoteName('id') . ' = ' . (int) $item->parent_id)
+                )->loadResult();
+            }
             $item->question_ids = $db->setQuery(
                 $db->getQuery(true)
                     ->select($db->quoteName('question_id'))
@@ -41,7 +49,32 @@ class SetModel extends AdminModel
 
     protected function loadFormData()
     {
-        return Factory::getApplication()->getUserState('com_testquestions.edit.set.data', []) ?: $this->getItem();
+        $data = Factory::getApplication()->getUserState('com_testquestions.edit.set.data', []) ?: $this->getItem();
+        $parentId = Factory::getApplication()->getInput()->getInt('parent_id');
+
+        $hasId = is_array($data) ? !empty($data['id']) : !empty($data->id);
+
+        if ($parentId > 0 && !$hasId) {
+            $parent = $this->getItem($parentId);
+            $variantCount = count($this->getVariants($parentId));
+
+            if ($parent) {
+                $data = [
+                    'parent_id' => $parentId,
+                    'set_type' => 'variant',
+                    'title' => $parent->title . ' — wariant ' . ($variantCount + 1),
+                    'subject_id' => $parent->subject_id,
+                    'duration' => $parent->duration,
+                    'test_content' => $parent->test_content,
+                    'image' => $parent->image,
+                    'description' => $parent->description,
+                    'published' => $parent->published,
+                    'question_ids' => [],
+                ];
+            }
+        }
+
+        return $data;
     }
 
     public function getQuestions()
@@ -69,12 +102,49 @@ class SetModel extends AdminModel
         )->loadObjectList();
     }
 
+    public function getVariants($parentId = null)
+    {
+        $parentId = (int) ($parentId ?: Factory::getApplication()->getInput()->getInt('id'));
+
+        if ($parentId < 1) {
+            return [];
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title', 'published'])
+                ->from($db->quoteName('#__testquestions_sets'))
+                ->where($db->quoteName('parent_id') . ' = ' . $parentId)
+                ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('id') . ' ASC')
+        )->loadObjectList();
+    }
+
     public function save($data)
     {
         $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']);
 
+        $parentId = (int) ($formData['parent_id'] ?? $data['parent_id'] ?? 0);
+        $parentId = max(0, $parentId);
+        $data['parent_id'] = $parentId;
+
+        if ($parentId > 0) {
+            $data['set_type'] = 'variant';
+            $parent = $this->getItem($parentId);
+            if ($parent) {
+                $data['duration'] = (int) $parent->duration;
+            }
+        } elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
+            $data['set_type'] = 'ordinary';
+        }
+
+        if ($parentId === 0 && ($data['set_type'] ?? 'ordinary') === 'multi') {
+            $questionIds = [];
+        }
+
         if (!parent::save($data)) {
             return false;
         }
@@ -111,12 +181,28 @@ class SetModel extends AdminModel
         $db = Factory::getContainer()->get('DatabaseDriver');
         $ids = array_map('intval', (array) $pks);
 
+        if ($ids) {
+            $childIds = $db->setQuery(
+                $db->getQuery(true)
+                    ->select($db->quoteName('id'))
+                    ->from($db->quoteName('#__testquestions_sets'))
+                    ->where($db->quoteName('parent_id') . ' IN (' . implode(',', $ids) . ')')
+            )->loadColumn();
+            $ids = array_values(array_unique(array_merge($ids, array_map('intval', $childIds))));
+        }
+
         if ($ids) {
             $db->setQuery(
                 $db->getQuery(true)
                     ->delete($db->quoteName('#__testquestions_set_questions'))
                     ->where($db->quoteName('set_id') . ' IN (' . implode(',', $ids) . ')')
             )->execute();
+
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->delete($db->quoteName('#__testquestions_sets'))
+                    ->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
+            )->execute();
         }
 
         return true;

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

@@ -21,10 +21,12 @@ class SetsModel extends ListModel
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true)
-            ->select(['s.*', 'sub.title AS subject_title', 'COUNT(sq.question_id) AS question_count'])
+            ->select(['s.*', 'sub.title AS subject_title', 'p.title AS parent_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_sets', 'p') . ' ON p.id = s.parent_id')
             ->leftJoin($db->quoteName('#__testquestions_set_questions', 'sq') . ' ON sq.set_id = s.id')
+            ->where('s.parent_id = 0')
             ->group('s.id');
 
         $search = trim((string) $this->getState('filter.search'));

administrator/components/com_testquestions/src/Service/AiService.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Service;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Http\HttpFactory;
+
+class AiService
+{
+    public function evaluate(string $provider, string $apiKey, string $question, string $answer, string $pattern): string
+    {
+        $provider = strtolower(trim($provider));
+        $config = $provider === 'grok'
+            ? ['url' => 'https://api.x.ai/v1/responses', 'model' => 'grok-4.7']
+            : ['url' => 'https://api.openai.com/v1/responses', 'model' => 'gpt-4.1-mini'];
+
+        if (!in_array($provider, ['openai', 'grok'], true) || trim($apiKey) === '') {
+            throw new \RuntimeException('AI_NOT_CONFIGURED');
+        }
+
+        $input = "Oceń odpowiedź ucznia na pytanie otwarte.\n\n"
+            . "Pytanie:\n" . $question . "\n\n"
+            . "Wzorzec odpowiedzi:\n" . $pattern . "\n\n"
+            . "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
+            . "Napisz po polsku krótką ocenę: czy odpowiedź może zostać uznana za poprawną, jakie elementy są poprawne lub błędne oraz czy warto przyznać punkty. Nie zmieniaj wzorca odpowiedzi.";
+
+        $payload = json_encode([
+            'model' => $config['model'],
+            'input' => $input,
+            'temperature' => 0.1,
+        ], JSON_UNESCAPED_UNICODE);
+
+        $response = HttpFactory::getHttp()->post(
+            $config['url'],
+            $payload,
+            [
+                'Authorization' => 'Bearer ' . trim($apiKey),
+                'Content-Type' => 'application/json',
+            ],
+            60
+        );
+        $body = json_decode((string) $response->body, true);
+
+        if ((int) $response->code < 200 || (int) $response->code >= 300) {
+            throw new \RuntimeException((string) ($body['error']['message'] ?? ('HTTP ' . (int) $response->code)));
+        }
+
+        $text = $this->extractText($body);
+        if ($text === '') {
+            throw new \RuntimeException('Brak treści odpowiedzi AI.');
+        }
+
+        return $text;
+    }
+
+    private function extractText(array $body): string
+    {
+        if (!empty($body['output_text']) && is_string($body['output_text'])) {
+            return trim($body['output_text']);
+        }
+
+        $parts = [];
+        foreach ((array) ($body['output'] ?? []) as $output) {
+            foreach ((array) ($output['content'] ?? []) as $content) {
+                if (!empty($content['text']) && is_string($content['text'])) {
+                    $parts[] = $content['text'];
+                }
+            }
+        }
+
+        return trim(implode("\n", $parts));
+    }
+}

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

@@ -57,5 +57,17 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_SETS',
             'list'
         );
+
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=results',
+            'COM_TESTQUESTIONS_RESULTS',
+            'list'
+        );
+
+        ToolbarHelper::link(
+            'index.php?option=com_config&view=component&component=com_testquestions',
+            'COM_TESTQUESTIONS_AI_SETTINGS_MENU',
+            'cog'
+        );
     }
 }

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Result;
+
+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 $item;
+
+    public function display($tpl = null)
+    {
+        $this->item = $this->get('Item');
+
+        if (!$this->item) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_RESULT_NOT_FOUND'));
+        }
+
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULT_PREVIEW'));
+        ToolbarHelper::save('result.save', 'COM_TESTQUESTIONS_RESULT_SAVE');
+        ToolbarHelper::custom('result.save2close', 'save', 'save', 'COM_TESTQUESTIONS_RESULT_SAVE_AND_CLOSE', false);
+        ToolbarHelper::link('index.php?option=com_testquestions&view=results', 'COM_TESTQUESTIONS_RESULTS', 'back');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Results;
+
+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;
+    protected $pagination;
+    protected $state;
+    protected $sets;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        $this->pagination = $this->get('Pagination');
+        $this->state = $this->get('State');
+        $this->sets = $this->get('Sets');
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
+        ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -4,6 +4,7 @@ namespace Komponent\Component\Testquestions\Administrator\View\Set;
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -14,6 +15,9 @@ class HtmlView extends BaseHtmlView
     protected $item;
     protected $questions;
     protected $categories;
+    protected $variants;
+    protected $isVariant;
+    protected $parentTitle = '';
 
     public function display($tpl = null)
     {
@@ -21,6 +25,15 @@ class HtmlView extends BaseHtmlView
         $this->item = $this->get('Item');
         $this->questions = $this->get('Questions');
         $this->categories = $this->get('Categories');
+        $this->variants = $this->item && (int) $this->item->id > 0 ? $this->get('Variants') : [];
+        $parentId = Factory::getApplication()->getInput()->getInt('parent_id');
+        $this->isVariant = (int) ($this->item->parent_id ?? 0) > 0 || $parentId > 0;
+        $this->parentTitle = (string) ($this->item->parent_title ?? '');
+
+        if ($this->isVariant && $this->parentTitle === '' && $parentId > 0) {
+            $parent = $this->getModel()->getItem($parentId);
+            $this->parentTitle = (string) ($parent->title ?? '');
+        }
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));
@@ -34,8 +47,8 @@ class HtmlView extends BaseHtmlView
     protected function addToolbar()
     {
         ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
-        ToolbarHelper::apply('set.apply', 'JTOOLBAR_APPLY');
-        ToolbarHelper::save('set.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
+        ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
         ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
     }
 }

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

@@ -57,5 +57,10 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_SUBJECTS',
             'list'
         );
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=results',
+            'COM_TESTQUESTIONS_RESULTS',
+            'list'
+        );
     }
 }

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><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>
+                                <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 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 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 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/result/default.php

@@ -0,0 +1,68 @@
+<?php defined('_JEXEC') or die; ?>
+<?php use Joomla\CMS\HTML\HTMLHelper; ?>
+<?php use Joomla\CMS\Router\Route; ?>
+<div class="container-fluid">
+    <dl class="row">
+        <div class="row"<?php echo (int) $this->item->extra_time > 0 ? ' style="background-color: #fff3cd;"' : ''; ?>>
+            <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></dt>
+            <dd class="col-sm-9"><?php echo $this->escape($this->item->participant_name); ?></dd>
+        </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>
+        <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>
+        <dd class="col-sm-9"><?php echo (int) $this->item->points_before; ?> / <?php echo (int) $this->item->points_after; ?></dd>
+        <?php $pointsTotal = (int) $this->item->points_total ?: (int) $this->item->total_count; ?>
+        <?php $pointsAfterPercentage = $pointsTotal ? round(((int) $this->item->points_after / $pointsTotal) * 100, 2) : 0; ?>
+        <?php $grade = 'NDST'; ?>
+        <?php foreach ([['CEL', 100], ['BDB', 90], ['BDB-', 80], ['DB+', 75], ['DB', 70], ['DB-', 65], ['DST+', 60], ['DST', 55], ['DST-', 50], ['DOP+', 45], ['DOP', 40], ['DOP-', 35], ['NDST+', 30], ['NDST', 0]] as $gradeScale) : ?>
+            <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
+        <?php endforeach; ?>
+        <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GRADE'); ?></dt>
+        <dd class="col-sm-9"><?php echo $this->escape($grade); ?></dd>
+        <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></dt>
+        <dd class="col-sm-9"><?php echo floor((int) $this->item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $this->item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></dd>
+    </dl>
+    <form action="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm">
+    <h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_ANSWERS'); ?></h2>
+    <?php foreach ($this->item->answers as $questionId => $answer) : ?>
+        <?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 ($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>
+            <?php else : ?>
+                <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?>:</strong> <?php echo $answer['selected'] ? chr(64 + (int) $answer['selected']) : '—'; ?></div>
+            <?php endif; ?>
+            <div class="mt-2 <?php echo !empty($answer['correct']) ? 'text-success' : 'text-danger'; ?>"><?php echo !empty($answer['correct']) ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?></div>
+            <?php if (empty($answer['correct'])) : ?>
+                <?php if ($question->question_type === 'open') : ?>
+                    <div class="mt-3">
+                        <button type="submit" name="ai_question_id" value="<?php echo (int) $questionId; ?>" onclick="this.form.task.value='result.ai';" formaction="<?php echo Route::_('index.php?option=com_testquestions&task=result.ai&id=' . (int) $this->item->id); ?>" class="btn btn-outline-primary">
+                            <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_EVALUATE'); ?>
+                        </button>
+                    </div>
+                    <?php if (!empty($answer['ai_feedback'])) : ?>
+                        <div class="alert alert-info mt-3"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></div>
+                    <?php endif; ?>
+                <?php endif; ?>
+                <div class="row mt-3">
+                    <div class="col-md-3">
+                        <label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS', (int) ($question->points ?? 0)); ?></label>
+                        <input type="number" min="0" max="<?php echo (int) ($question->points ?? 0); ?>" name="awarded_points[<?php echo (int) $questionId; ?>]" id="awarded-points-<?php echo (int) $questionId; ?>" class="form-control" value="<?php echo (int) ($answer['awarded_points'] ?? 0); ?>">
+                    </div>
+                    <div class="col-md-9">
+                        <label for="result-comment-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?></label>
+                        <textarea name="comments[<?php echo (int) $questionId; ?>]" id="result-comment-<?php echo (int) $questionId; ?>" class="form-control" rows="2"><?php echo htmlspecialchars((string) ($answer['comment'] ?? ''), ENT_QUOTES, 'UTF-8'); ?></textarea>
+                    </div>
+                </div>
+            <?php endif; ?>
+        </article>
+    <?php endforeach; ?>
+    <input type="hidden" name="task" value="result.save">
+    <input type="hidden" name="id" value="<?php echo (int) $this->item->id; ?>">
+    <?php echo HTMLHelper::_('form.token'); ?>
+    </form>
+</div>

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

@@ -0,0 +1,68 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+?>
+<form action="<?php echo Route::_('index.php?option=com_testquestions&view=results'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row mb-3">
+        <div class="col-md-6">
+            <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_RESULTS_SEARCH')); ?>">
+        </div>
+    </div>
+    <div class="row mb-3">
+        <div class="col-md-6">
+            <label for="filter-set-id" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_TEST_NAME'); ?></label>
+            <select name="filter_set_id" id="filter-set-id" class="form-select">
+                <option value="0"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_ALL_TESTS'); ?></option>
+                <?php foreach ($this->sets as $set) : ?>
+                    <option value="<?php echo (int) $set->id; ?>" <?php echo (int) $this->state->get('filter.set_id') === (int) $set->id ? 'selected' : ''; ?>><?php echo $this->escape(($set->subject_title ? $set->subject_title . ' — ' : '') . $set->title . (!(int) $set->published ? ' (nieopublikowany)' : '')); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+    </div>
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <label for="filter-date-from" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_DATE_FROM'); ?></label>
+            <input type="date" name="filter_date_from" id="filter-date-from" value="<?php echo $this->escape($this->state->get('filter.date_from')); ?>" class="form-control">
+        </div>
+        <div class="col-md-3">
+            <label for="filter-date-to" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_DATE_TO'); ?></label>
+            <input type="date" name="filter_date_to" id="filter-date-to" value="<?php echo $this->escape($this->state->get('filter.date_to')); ?>" class="form-control">
+        </div>
+        <div class="col-md-3 align-self-end"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></div>
+    </div>
+    <table class="table table-striped">
+        <thead><tr>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GRADE'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
+        </tr></thead>
+        <tbody>
+        <?php foreach ($this->items as $item) : ?>
+            <tr class="<?php echo (int) $item->extra_time > 0 ? 'table-warning' : ''; ?>">
+                <th><a href="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->participant_name); ?></a></th>
+                <td><?php echo $this->escape(($item->subject_title ? $item->subject_title . ' — ' : '') . $item->set_title); ?></td>
+                <?php $pointsTotal = (int) $item->points_total ?: (int) $item->total_count; ?>
+                <?php $pointsBeforePercentage = $pointsTotal ? round(((int) $item->points_before / $pointsTotal) * 100, 2) : 0; ?>
+                <?php $pointsAfterPercentage = $pointsTotal ? round(((int) $item->points_after / $pointsTotal) * 100, 2) : 0; ?>
+                <?php $grade = 'NDST'; ?>
+                <?php foreach ([['CEL', 100], ['BDB', 90], ['BDB-', 80], ['DB+', 75], ['DB', 70], ['DB-', 65], ['DST+', 60], ['DST', 55], ['DST-', 50], ['DOP+', 45], ['DOP', 40], ['DOP-', 35], ['NDST+', 30], ['NDST', 0]] as $gradeScale) : ?>
+                    <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
+                <?php endforeach; ?>
+                <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</td>
+                <td><?php echo $this->escape($grade); ?></td>
+                <td><?php echo floor((int) $item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></td>
+                <td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+    <?php echo $this->pagination->getListFooter(); ?>
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>

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

@@ -8,20 +8,58 @@ use Joomla\CMS\Router\Route;
 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">
+    <?php $canOrderQuestions = $this->isVariant || (string) $this->item->set_type === 'ordinary'; ?>
     <fieldset class="adminform">
+        <?php echo $this->form->renderField('parent_id'); ?>
+        <?php if ($this->isVariant) : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->parentTitle); ?></div>
+            <input type="hidden" name="jform[set_type]" value="variant">
+        <?php else : ?>
+            <?php echo $this->form->renderField('set_type'); ?>
+        <?php endif; ?>
         <?php echo $this->form->renderField('title'); ?>
         <?php echo $this->form->renderField('subject_id'); ?>
-        <?php echo $this->form->renderField('duration'); ?>
+        <?php if (!$this->isVariant) : ?>
+            <?php echo $this->form->renderField('duration'); ?>
+            <output id="set-duration-value" class="form-text mb-3"></output>
+        <?php else : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO'); ?></div>
+        <?php endif; ?>
         <?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'); ?>
+        <?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?>
+            <fieldset class="mb-3">
+                <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend>
+                <?php if ($this->variants) : ?>
+                    <ul class="list-group mb-3">
+                        <?php foreach ($this->variants as $variant) : ?>
+                            <li class="list-group-item d-flex justify-content-between align-items-center">
+                                <a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $variant->id); ?>"><?php echo $this->escape($variant->title); ?></a>
+                                <span class="badge <?php echo (int) $variant->published ? 'bg-success' : 'bg-secondary'; ?>"><?php echo (int) $variant->published ? \Joomla\CMS\Language\Text::_('JPUBLISHED') : \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></span>
+                            </li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php else : ?>
+                    <p><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NO_VARIANTS'); ?></p>
+                <?php endif; ?>
+                <a class="btn btn-secondary" href="<?php echo Route::_('index.php?option=com_testquestions&task=set.addvariant&parent_id=' . (int) $this->item->id); ?>">
+                    <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ADD_VARIANT'); ?>
+                </a>
+            </fieldset>
+        <?php endif; ?>
+        <?php if (!((string) $this->item->set_type === 'multi' && (int) $this->item->parent_id === 0)) : ?>
         <fieldset class="mb-3">
             <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
-            <div id="set-selected-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-question-row">
+            <?php if ($canOrderQuestions) : ?>
+                <div class="form-text mb-2"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_REORDER_INFO'); ?></div>
+            <?php endif; ?>
+            <div id="set-selected-question-list" class="border rounded p-3" data-sortable="<?php echo $canOrderQuestions ? '1' : '0'; ?>">
+                <?php $questionsById = []; foreach ($this->questions as $availableQuestion) : $questionsById[(int) $availableQuestion->id] = $availableQuestion; endforeach; ?>
+                <?php foreach ((array) $this->item->question_ids as $selectedQuestionId) : ?>
+                    <?php $question = $questionsById[(int) $selectedQuestionId] ?? null; if (!$question) continue; ?>
+                    <div class="form-check set-question-row"<?php echo $canOrderQuestions ? ' draggable="true"' : ''; ?>>
                         <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>
@@ -33,10 +71,10 @@ HTMLHelper::_('behavior.formvalidator');
                                 <?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><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_a; ?></span></div>
-                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_b; ?></span></div>
-                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_c; ?></span></div>
-                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_d; ?></span></div>
+                                    <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>
@@ -70,10 +108,10 @@ HTMLHelper::_('behavior.formvalidator');
                                 <?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><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_a; ?></span></div>
-                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_b; ?></span></div>
-                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_c; ?></span></div>
-                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?><span><?php echo $question->answer_d; ?></span></div>
+                                    <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>
@@ -81,11 +119,57 @@ HTMLHelper::_('behavior.formvalidator');
                 <?php endforeach; ?>
             </div>
         </fieldset>
+        <?php else : ?>
+            <div class="alert alert-info">
+                <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO'); ?>
+            </div>
+        <?php endif; ?>
     </fieldset>
     <input type="hidden" name="task" value="">
     <?php echo HTMLHelper::_('form.token'); ?>
 </form>
 <script>
+document.addEventListener('DOMContentLoaded', function () {
+    const list = document.getElementById('set-selected-question-list');
+
+    if (!list || list.dataset.sortable !== '1') {
+        return;
+    }
+
+    let dragged = null;
+
+    list.querySelectorAll('.set-question-row[draggable="true"]').forEach(function (row) {
+        row.addEventListener('dragstart', function (event) {
+            dragged = row;
+            row.classList.add('opacity-50');
+            event.dataTransfer.effectAllowed = 'move';
+        });
+
+        row.addEventListener('dragend', function () {
+            row.classList.remove('opacity-50');
+            dragged = null;
+        });
+
+        row.addEventListener('dragover', function (event) {
+            event.preventDefault();
+            event.dataTransfer.dropEffect = 'move';
+        });
+
+        row.addEventListener('drop', function (event) {
+            event.preventDefault();
+
+            if (!dragged || dragged === row) {
+                return;
+            }
+
+            const rect = row.getBoundingClientRect();
+            const insertAfter = event.clientY > rect.top + rect.height / 2;
+            list.insertBefore(dragged, insertAfter ? row.nextSibling : row);
+        });
+    });
+});
+</script>
+<script>
 document.addEventListener('DOMContentLoaded', function () {
     const filter = document.getElementById('set-question-category');
     const rows = document.querySelectorAll('.set-available-question-row');
@@ -101,3 +185,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

@@ -38,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_SET_TYPE'); ?></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>
@@ -48,7 +49,8 @@ HTMLHelper::_('behavior.multiselect');
         <?php foreach ($this->items as $i => $item) : ?>
             <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>
+                <th scope="row"><a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo (int) $item->parent_id > 0 ? '↳ ' : ''; ?><?php echo $this->escape($item->title); ?></a><?php if ((int) $item->parent_id > 0 && $item->parent_title) : ?> <small class="text-muted">(<?php echo $this->escape($item->parent_title); ?>)</small><?php endif; ?></th>
+                <td><?php echo $this->escape($item->set_type === 'multi' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_MULTI') : ($item->set_type === 'variant' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_VARIANT') : \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_ORDINARY'))); ?></td>
                 <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>

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.12.3</version>
+    <version>1.42.0</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>
@@ -30,6 +30,17 @@
             <language tag="en-GB">en-GB/com_testquestions.sys.ini</language>
         </languages>
     </administration>
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="COM_TESTQUESTIONS_AI_SETTINGS">
+                <field name="ai_provider" type="list" label="COM_TESTQUESTIONS_AI_PROVIDER">
+                    <option value="openai">OpenAI</option>
+                    <option value="grok">Grok</option>
+                </field>
+                <field name="ai_api_key" type="password" label="COM_TESTQUESTIONS_AI_API_KEY" filter="raw" autocomplete="off" />
+            </fieldset>
+        </fields>
+    </config>
     <install>
         <sql>
             <file driver="mysql" charset="utf8mb4">sql/install.mysql.utf8mb4.sql</file>

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,144 @@
+<?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 $resolvedSetId;
+    protected $randomizeQuestions = true;
+
+    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;
+        }
+
+        $set = $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.parent_id = 0')
+                ->where('s.published = 1')
+        )->loadObject();
+
+        if (!$set) {
+            return null;
+        }
+
+        $this->resolvedSetId = $setId;
+        $this->randomizeQuestions = $set->set_type !== 'multi';
+
+        if ($set->set_type === 'multi') {
+            $variantId = (int) $db->setQuery(
+                $db->getQuery(true)
+                    ->select('id')
+                    ->from($db->quoteName('#__testquestions_sets'))
+                    ->where('parent_id = ' . $setId)
+                    ->where('published = 1')
+                    ->order('RAND()')
+                    ->setLimit(1)
+            )->loadResult();
+
+            $this->resolvedSetId = $variantId;
+        }
+
+        return $set;
+    }
+
+    public function getItems()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        if ($this->resolvedSetId === null) {
+            $this->getSet();
+        }
+        $setId = (int) $this->resolvedSetId;
+
+        if ($setId < 1) {
+            return [];
+        }
+
+        $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'])
+                ->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');
+
+        $query->order($this->randomizeQuestions ? 'RAND()' : 'sq.ordering ASC, q.id ASC');
+
+        return $db->setQuery($query)->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')
+                ->where('s.parent_id = 0')
+                ->order('sub.title ASC, s.title ASC')
+        )->loadObjectList();
+    }
+
+    public function saveResult(string $participantName, int $extraTime, int $startedAt, array $result): bool
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $setId = $this->getSetId();
+        $user = Factory::getApplication()->getIdentity();
+
+        if ($setId < 1 || trim($participantName) === '') {
+            return false;
+        }
+
+        $pointsBefore = 0;
+        $pointsTotal = 0;
+        foreach (($result['items'] ?? []) as $item) {
+            $pointsTotal += (int) ($item['points'] ?? 0);
+            if (!empty($item['correct'])) {
+                $pointsBefore += (int) ($item['points'] ?? 0);
+            }
+        }
+
+        $row = (object) [
+            'set_id' => $setId,
+            'participant_name' => trim($participantName),
+            'started' => $startedAt > 0 ? gmdate('Y-m-d H:i:s', $startedAt) : null,
+            'execution_time' => $startedAt > 0 ? max(0, time() - $startedAt) : 0,
+            'extra_time' => max(0, $extraTime),
+            'correct_count' => (int) ($result['correct'] ?? 0),
+            'total_count' => (int) ($result['total'] ?? 0),
+            'percentage' => (float) ($result['percentage'] ?? 0),
+            'points_total' => $pointsTotal,
+            'points_before' => $pointsBefore,
+            'points_after' => $pointsBefore,
+            'answers' => json_encode($result['items'] ?? [], JSON_UNESCAPED_UNICODE),
+            'created' => Factory::getDate()->toSql(),
+            'created_by' => $user ? (int) $user->id : 0,
+        ];
+
+        return (bool) $db->insertObject('#__testquestions_results', $row);
+    }
+}

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

@@ -0,0 +1,94 @@
+<?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);
+
+        if ($this->results) {
+            $this->getModel()->saveResult(
+                $input->post->getString('participant_name', ''),
+                $input->post->getInt('extra_time', 0),
+                $input->post->getInt('test_started_at', 0),
+                $this->results
+            );
+        }
+
+        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,
+                'points' => (int) ($item->points ?? 0),
+            ];
+        }
+
+        return [
+            'items' => $results,
+            'correct' => $correct,
+            'total' => count($items),
+            'points_total' => array_sum(array_map(static function ($item) {
+                return (int) ($item->points ?? 0);
+            }, $items)),
+            'percentage' => count($items) ? round(($correct / count($items)) * 100, 2) : 0,
+        ];
+    }
+}

components/com_testquestions/tmpl/set/default.php

@@ -0,0 +1,154 @@
+<?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'); ?>">
+        <input type="hidden" name="test_started_at" value="<?php echo time(); ?>">
+    </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="test_started_at" value="<?php echo (int) Factory::getApplication()->getInput()->post->getInt('test_started_at', time()); ?>">
+                <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;
+        const ratio = remaining / total;
+        text.textContent = String(minutes).padStart(2, '0') + ':' + String(seconds).padStart(2, '0');
+        ring.style.strokeDashoffset = circumference * (1 - remaining / total);
+        ring.style.stroke = ratio <= 0.1 ? '#dc3545' : (ratio <= 0.2 ? '#fd7e14' : '#4a86cf');
+
+        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;