Award partial points from AI assessment

README.md

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

administrator/components/com_testquestions/config.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="aiapikey" addfieldprefix="Komponent\Component\Testquestions\Administrator\Field" label="COM_TESTQUESTIONS_AI_API_KEY" filter="raw" autocomplete="off" size="120" class="w-100" />
+        </fieldset>
+    </fields>
+</config>

administrator/components/com_testquestions/forms/set.xml

@@ -2,7 +2,13 @@
 <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>

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

@@ -49,6 +49,34 @@ 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_SETTINGS_SAVED="Ustawienia AI zapisano."
+COM_TESTQUESTIONS_AI_SAVE_FAILED="Nie udało się zapisać ustawień AI."
+COM_TESTQUESTIONS_AI_PROVIDER_INVALID="Wybierz prawidłowego dostawcę AI."
+COM_TESTQUESTIONS_AI_EVALUATE_ALL="AI — oceń wszystkie niezaliczone pytania otwarte (%s)"
+COM_TESTQUESTIONS_AI_BULK_DONE="AI oceniło %s pytań."
+COM_TESTQUESTIONS_AI_BULK_PARTIAL="AI oceniło %s pytań; nie udało się ocenić %s. Błąd: %s"
+COM_TESTQUESTIONS_AI_NO_OPEN_QUESTIONS="Brak niezaliczonych pytań otwartych do oceny 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ń"
@@ -68,13 +96,20 @@ 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"
+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ź"

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;
 
@@ -84,6 +87,7 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
   `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,

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/sql/updates/mysql/1.42.1.sql

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,73 @@
+<?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 AiController extends BaseController
+{
+    public function save(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.admin', 'com_testquestions') && !$user->authorise('core.options', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $provider = strtolower($input->post->getCmd('ai_provider', ''));
+        if (!in_array($provider, ['openai', 'grok'], true)) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_PROVIDER_INVALID'));
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $row = $db->setQuery(
+            $db->getQuery(true)
+                ->select([$db->quoteName('extension_id'), $db->quoteName('params')])
+                ->from($db->quoteName('#__extensions'))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+                ->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
+        )->loadObject();
+
+        if (!$row) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
+        }
+
+        $settings = json_decode((string) $row->params, true);
+        $settings = is_array($settings) ? $settings : [];
+        $apiKey = trim((string) $input->post->get('ai_api_key', '', 'RAW'));
+
+        $settings['ai_provider'] = $provider;
+        if ($apiKey !== '') {
+            $settings['ai_api_key'] = $apiKey;
+        }
+
+        $extension = (object) [
+            'extension_id' => (int) $row->extension_id,
+            'params' => json_encode($settings, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+        ];
+
+        if (!$db->updateObject('#__extensions', $extension, 'extension_id')) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
+        }
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=ai', false),
+            Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
+        );
+    }
+
+    public function cancel(): void
+    {
+        $this->setRedirect(Route::_('index.php?option=com_testquestions&view=questions', false));
+    }
+}

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

@@ -13,6 +13,98 @@ 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) {
+            $errorMessage = $error->getMessage();
+            $message = str_starts_with($errorMessage, 'AI_KEY_EMPTY|')
+                ? 'Diagnostyka konfiguracji AI (1.42.8): ' . substr($errorMessage, strlen('AI_KEY_EMPTY|'))
+                : ($errorMessage === 'AI_NOT_CONFIGURED'
+                    ? Text::_('COM_TESTQUESTIONS_AI_NOT_CONFIGURED')
+                    : Text::sprintf('COM_TESTQUESTIONS_AI_ERROR', $errorMessage));
+            $type = 'error';
+        }
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
+            $message,
+            $type
+        );
+    }
+
+    public function aiAll(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $id = $input->post->getInt('id');
+        $message = '';
+        $type = 'message';
+
+        try {
+            $summary = $this->getModel('Result')->evaluateAllWithAi($id);
+            if ($summary['failed'] > 0) {
+                $message = Text::sprintf(
+                    'COM_TESTQUESTIONS_AI_BULK_PARTIAL',
+                    $summary['evaluated'],
+                    $summary['failed'],
+                    $summary['first_error']
+                );
+                $type = 'warning';
+            } else {
+                $message = Text::sprintf('COM_TESTQUESTIONS_AI_BULK_DONE', $summary['evaluated']);
+            }
+        } catch (\Throwable $error) {
+            $errorMessage = $error->getMessage();
+            $message = $errorMessage === 'AI_NO_OPEN_QUESTIONS'
+                ? Text::_('COM_TESTQUESTIONS_AI_NO_OPEN_QUESTIONS')
+                : ($errorMessage === 'AI_NOT_CONFIGURED'
+                    ? Text::_('COM_TESTQUESTIONS_AI_NOT_CONFIGURED')
+                    : Text::sprintf('COM_TESTQUESTIONS_AI_ERROR', $errorMessage));
+            $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);
@@ -27,10 +119,5 @@ class ResultController extends BaseController
         if (!$model->saveAssessment($id, $points, $comments)) {
             throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_RESULT_NOT_FOUND'));
         }
-
-        $this->setRedirect(
-            Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
-            Text::_('COM_TESTQUESTIONS_RESULT_SAVED')
-        );
     }
 }

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/Field/AiapikeyField.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Field;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Form\Field\PasswordField;
+
+class AiapikeyField extends PasswordField
+{
+    protected $type = 'Aiapikey';
+
+    protected function getInput(): string
+    {
+        $id = htmlspecialchars($this->id, ENT_QUOTES, 'UTF-8');
+        $length = mb_strlen((string) $this->value);
+
+        return '<div class="input-group">'
+            . parent::getInput()
+            . '<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="' . $id . '">Pokaż</button>'
+            . '</div>'
+            . '<small class="form-text text-muted">Klucz: ' . (int) $length . ' znaków.</small>'
+            . '<script>
+                document.addEventListener("click", function (event) {
+                    var button = event.target.closest("[data-ai-key-toggle]");
+                    if (!button) return;
+                    var input = document.getElementById(button.getAttribute("data-ai-key-toggle"));
+                    if (!input) return;
+                    var visible = input.type === "text";
+                    input.type = visible ? "password" : "text";
+                    button.textContent = visible ? "Pokaż" : "Ukryj";
+                });
+            </script>';
+    }
+}

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

@@ -6,6 +6,8 @@ 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
 {
@@ -52,7 +54,8 @@ class ResultModel extends BaseDatabaseModel
 
         foreach ($item->answers as $questionId => &$answer) {
             $key = (string) $questionId;
-            $answer['awarded_points'] = max(0, (int) ($awardedPoints[$key] ?? 0));
+            $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);
@@ -71,4 +74,138 @@ class ResultModel extends BaseDatabaseModel
 
         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');
+        $provider = trim((string) $params->get('ai_provider', 'openai'));
+        $apiKey = trim((string) $params->get('ai_api_key', ''));
+        $componentKeyLength = mb_strlen($apiKey);
+
+        // Odczytaj zapisane parametry bezpośrednio z bazy. Dzięki temu nie użyjemy
+        // nieaktualnej wartości z pamięci ComponentHelper, a maska pola hasła
+        // (np. ********) nie zostanie potraktowana jako prawdziwy klucz.
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $storedParams = (string) $db->setQuery(
+            $db->getQuery(true)
+                ->select($db->quoteName('params'))
+                ->from($db->quoteName('#__extensions'))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+                ->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
+        )->loadResult();
+        $storedParams = json_decode($storedParams, true);
+
+        if (is_array($storedParams)) {
+            $storedProvider = trim((string) ($storedParams['ai_provider'] ?? ''));
+            $storedApiKey = trim((string) ($storedParams['ai_api_key'] ?? ''));
+
+            if ($storedProvider !== '') {
+                $provider = $storedProvider;
+            }
+
+            if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
+                $apiKey = $storedApiKey;
+            }
+        }
+
+        if (trim($apiKey) === '') {
+            $databaseKey = is_array($storedParams) ? trim((string) ($storedParams['ai_api_key'] ?? '')) : '';
+            $databaseKeyLength = preg_match('/^\*+$/', $databaseKey) ? 0 : mb_strlen($databaseKey);
+            throw new \RuntimeException(
+                'AI_KEY_EMPTY|provider=' . ($provider !== '' ? $provider : '(pusty)')
+                . '|component_chars=' . $componentKeyLength
+                . '|database_chars=' . $databaseKeyLength
+                . '|database_params=' . (is_array($storedParams) ? 'json' : 'unreadable')
+            );
+        }
+
+        $aiResult = (new AiService())->evaluate(
+            $provider,
+            $apiKey,
+            strip_tags((string) $question->question),
+            (string) ($answer['selected'] ?? ''),
+            (string) $question->answer_open,
+            (int) $question->points
+        );
+        $item->answers[$questionId]['ai_feedback'] = $aiResult['feedback'];
+        $item->answers[$questionId]['awarded_points'] = $aiResult['awarded_points'];
+
+        $correctionPoints = 0;
+        foreach ($item->answers as $savedAnswer) {
+            $correctionPoints += (int) ($savedAnswer['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,
+        ];
+
+        if (!$db->updateObject('#__testquestions_results', $row, 'id')) {
+            throw new \RuntimeException('Nie udało się zapisać oceny AI.');
+        }
+
+        return $aiResult['feedback'];
+    }
+
+    public function evaluateAllWithAi(int $id): array
+    {
+        $item = $this->getItem($id);
+
+        if (!$item) {
+            throw new \RuntimeException('Nie znaleziono zapisanego testu.');
+        }
+
+        $questionIds = [];
+        foreach ($item->answers as $questionId => $answer) {
+            $question = $item->questions[(int) $questionId] ?? null;
+            if ($question && $question->question_type === 'open' && empty($answer['correct'])) {
+                $questionIds[] = (int) $questionId;
+            }
+        }
+
+        if (!$questionIds) {
+            throw new \RuntimeException('AI_NO_OPEN_QUESTIONS');
+        }
+
+        $evaluated = 0;
+        $failed = 0;
+        $firstError = '';
+
+        foreach ($questionIds as $questionId) {
+            try {
+                $this->evaluateWithAi($id, $questionId);
+                $evaluated++;
+            } catch (\Throwable $error) {
+                $failed++;
+                $firstError = $firstError ?: $error->getMessage();
+
+                if (in_array($error->getMessage(), ['AI_NOT_CONFIGURED'], true)
+                    || str_starts_with($error->getMessage(), 'AI_KEY_EMPTY|')) {
+                    break;
+                }
+            }
+        }
+
+        return [
+            'evaluated' => $evaluated,
+            'failed' => $failed,
+            'first_error' => $firstError,
+            'total' => count($questionIds),
+        ];
+    }
 }

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

@@ -13,6 +13,9 @@ class ResultsModel extends ListModel
     {
         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()
@@ -30,6 +33,34 @@ class ResultsModel extends ListModel
             $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,99 @@
+<?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, int $maxPoints): array
+    {
+        $provider = strtolower(trim($provider));
+        $provider = preg_replace('/[^a-z]/', '', $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 (trim($apiKey) === '') {
+            throw new \RuntimeException('AI_NOT_CONFIGURED');
+        }
+
+        if (!in_array($provider, ['openai', 'grok'], true)) {
+            throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
+        }
+
+        $input = "Oceń odpowiedź ucznia na pytanie otwarte i ustal liczbę uznanych punktów.\n"
+            . "Maksymalna liczba punktów za to pytanie: " . max(0, $maxPoints) . ".\n"
+            . "Przyznaj liczbę całkowitą od 0 do maksymalnej liczby punktów. Przyznaj punkty proporcjonalnie za poprawne elementy odpowiedzi; pełne punkty za komplet, część punktów za częściową odpowiedź. Nie przekraczaj limitu.\n\n"
+            . "Pytanie:\n" . $question . "\n\n"
+            . "Wzorzec odpowiedzi:\n" . $pattern . "\n\n"
+            . "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
+            . "Zwróć wyłącznie poprawny obiekt JSON w formacie {\"awarded_points\": liczba_całkowita, \"feedback\": \"krótka ocena po polsku\"}. W ocenie opisz poprawne i brakujące elementy. 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.');
+        }
+
+        $jsonText = preg_replace('/^```(?:json)?\s*|\s*```$/i', '', trim($text));
+        $result = json_decode($jsonText, true);
+
+        if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
+            $start = strpos($jsonText, '{');
+            $end = strrpos($jsonText, '}');
+            if ($start !== false && $end !== false && $end > $start) {
+                $result = json_decode(substr($jsonText, $start, $end - $start + 1), true);
+            }
+        }
+
+        if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
+            throw new \RuntimeException('AI zwróciło nieprawidłowy format oceny i punktów.');
+        }
+
+        return [
+            'awarded_points' => min(max(0, $maxPoints), max(0, (int) $result['awarded_points'])),
+            'feedback' => trim((string) ($result['feedback'] ?? '')),
+        ];
+    }
+
+    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/Ai/HtmlView.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Ai;
+
+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;
+
+class HtmlView extends BaseHtmlView
+{
+    protected array $settings = [];
+
+    public function display($tpl = null)
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $raw = (string) $db->setQuery(
+            $db->getQuery(true)
+                ->select($db->quoteName('params'))
+                ->from($db->quoteName('#__extensions'))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+                ->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
+        )->loadResult();
+        $this->settings = json_decode($raw, true) ?: [];
+
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_AI_SETTINGS'));
+        ToolbarHelper::link('index.php?option=com_testquestions&view=questions', 'COM_TESTQUESTIONS_QUESTIONS', 'arrow-left');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -63,5 +63,11 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_RESULTS',
             'list'
         );
+
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=ai',
+            'COM_TESTQUESTIONS_AI_SETTINGS_MENU',
+            'cog'
+        );
     }
 }

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

@@ -21,6 +21,8 @@ class HtmlView extends BaseHtmlView
         }
 
         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

@@ -14,12 +14,14 @@ 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');
 

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::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
-        ToolbarHelper::save('set.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
         ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
     }
 }

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

@@ -0,0 +1,44 @@
+<?php defined('_JEXEC') or die; ?>
+<?php use Joomla\CMS\HTML\HTMLHelper; ?>
+<?php use Joomla\CMS\Router\Route; ?>
+<?php $provider = (string) ($this->settings['ai_provider'] ?? 'openai'); ?>
+<?php $apiKey = (string) ($this->settings['ai_api_key'] ?? ''); ?>
+<form action="<?php echo Route::_('index.php?option=com_testquestions&view=ai'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="card" style="max-width: 900px;">
+        <div class="card-body">
+            <div class="mb-3">
+                <label for="ai-provider" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_PROVIDER'); ?></label>
+                <select id="ai-provider" name="ai_provider" class="form-select" required>
+                    <option value="openai" <?php echo $provider === 'openai' ? 'selected' : ''; ?>>OpenAI</option>
+                    <option value="grok" <?php echo $provider === 'grok' ? 'selected' : ''; ?>>Grok</option>
+                </select>
+            </div>
+            <div class="mb-3">
+                <label for="ai-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_API_KEY'); ?></label>
+                <div class="input-group">
+                    <input type="password" id="ai-api-key" name="ai_api_key" value="<?php echo htmlspecialchars($apiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
+                    <button type="button" class="btn btn-outline-secondary" id="ai-key-toggle">Pokaż</button>
+                </div>
+                <small class="form-text text-muted">
+                    <?php echo $apiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($apiKey) . ' znaków. Pozostaw pole bez zmian, aby zachować klucz.' : 'Nie zapisano jeszcze klucza API.'; ?>
+                </small>
+            </div>
+            <button type="submit" class="btn btn-primary" onclick="this.form.task.value='ai.save';">
+                <?php echo \Joomla\CMS\Language\Text::_('JTOOLBAR_SAVE'); ?>
+            </button>
+            <a class="btn btn-secondary" href="<?php echo Route::_('index.php?option=com_testquestions&view=questions'); ?>">
+                <?php echo \Joomla\CMS\Language\Text::_('JCANCEL'); ?>
+            </a>
+        </div>
+    </div>
+    <input type="hidden" name="task" value="ai.save">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>
+<script>
+document.getElementById('ai-key-toggle')?.addEventListener('click', function () {
+    const input = document.getElementById('ai-api-key');
+    const visible = input.type === 'text';
+    input.type = visible ? 'password' : 'text';
+    this.textContent = visible ? 'Pokaż' : 'Ukryj';
+});
+</script>

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

@@ -13,10 +13,30 @@
         <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="resultForm" id="result-form">
+    <form action="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm">
+    <?php $pendingAiCount = 0; ?>
+    <?php foreach ($this->item->answers as $questionId => $answer) : ?>
+        <?php $candidate = $this->item->questions[(int) $questionId] ?? null; ?>
+        <?php if ($candidate && $candidate->question_type === 'open' && empty($answer['correct'])) { $pendingAiCount++; } ?>
+    <?php endforeach; ?>
+    <?php if ($pendingAiCount > 0) : ?>
+        <div class="mb-3">
+            <button type="submit" class="btn btn-primary" formaction="<?php echo Route::_('index.php?option=com_testquestions&task=result.aiAll&id=' . (int) $this->item->id); ?>" onclick="this.form.task.value='result.aiAll';">
+                <?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_AI_EVALUATE_ALL', $pendingAiCount); ?>
+            </button>
+        </div>
+    <?php endif; ?>
     <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; ?>
@@ -27,14 +47,23 @@
                 <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>
-                <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>:</strong> <?php echo chr(64 + (int) $question->correct_answer); ?></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::_('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS'); ?></label>
+                        <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" 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); ?>">
+                        <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>
@@ -44,7 +73,6 @@
             <?php endif; ?>
         </article>
     <?php endforeach; ?>
-    <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSAVE'); ?></button>
     <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'); ?>

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

@@ -10,13 +10,35 @@ use Joomla\CMS\Router\Route;
         <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 class="col-md-3"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></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>
@@ -25,7 +47,15 @@ use Joomla\CMS\Router\Route;
             <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>
-                <td><?php echo (int) $item->points_before; ?> / <?php echo (int) $item->points_after; ?></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>

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

@@ -8,21 +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 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 if ($canOrderQuestions) : ?>
-                <?php foreach ($this->questions as $question) : ?>
+                <div class="form-text mb-2"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_REORDER_INFO'); ?></div>
-                    <?php if (!in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
+            <?php endif; ?>
-                    <div class="form-check set-question-row">
+            <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>
@@ -82,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');

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.23.0</version>
+    <version>1.43.1</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>
@@ -19,6 +19,7 @@
     <administration>
         <menu link="index.php?option=com_testquestions&amp;view=questions">COM_TESTQUESTIONS</menu>
         <files folder="administrator/components/com_testquestions">
+            <filename>config.xml</filename>
             <folder>forms</folder>
             <folder>services</folder>
             <folder>sql</folder>

components/com_testquestions/src/Model/SetModel.php

@@ -9,6 +9,9 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 
 class SetModel extends BaseDatabaseModel
 {
+    protected $resolvedSetId;
+    protected $randomizeQuestions = true;
+
     protected function getSetId(): int
     {
         $application = Factory::getApplication();
@@ -27,34 +30,62 @@ class SetModel extends BaseDatabaseModel
             return null;
         }
 
-        return $db->setQuery(
+        $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');
-        $setId = $this->getSetId();
+        if ($this->resolvedSetId === null) {
+            $this->getSet();
+        }
+        $setId = (int) $this->resolvedSetId;
 
         if ($setId < 1) {
             return [];
         }
 
-        return $db->setQuery(
+        $query = $db->getQuery(true)
-            $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')
+                ->where('q.published = 1');
-                ->order('sq.ordering ASC, q.id ASC')
+
-        )->loadObjectList();
+        $query->order($this->randomizeQuestions ? 'RAND()' : 'sq.ordering ASC, q.id ASC');
+
+        return $db->setQuery($query)->loadObjectList();
     }
 
     public function getSets()
@@ -67,6 +98,7 @@ class SetModel extends BaseDatabaseModel
                 ->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();
     }
@@ -82,7 +114,9 @@ class SetModel extends BaseDatabaseModel
         }
 
         $pointsBefore = 0;
+        $pointsTotal = 0;
         foreach (($result['items'] ?? []) as $item) {
+            $pointsTotal += (int) ($item['points'] ?? 0);
             if (!empty($item['correct'])) {
                 $pointsBefore += (int) ($item['points'] ?? 0);
             }
@@ -97,6 +131,7 @@ class SetModel extends BaseDatabaseModel
             '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),

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

@@ -85,6 +85,9 @@ class HtmlView extends BaseHtmlView
             '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,
         ];
     }